Jonne Haß
700e5588e0
Merge branch 'next-minor' into develop
2019-05-24 22:43:13 +02:00
Jonne Haß
1227f34b2a
Pass normalized URI to OpenGraphReader
...
This ensures the hostname is downcase and thus subsequent third party library
assumptions hold, namely http-cookie (pulled through faraday-cookie_jar) doesn't
raise
closes #8021
2019-05-24 22:43:08 +02:00
Benjamin Neff
314239ff2a
Merge branch 'next-minor' into develop
2019-05-12 00:25:52 +02:00
Benjamin Neff
e5ba9a1a46
Move translations to registrations.closed
...
And remove unused translations and make "another pod" translatable.
closes #7896
2019-05-12 00:25:36 +02:00
flaburgan
4feab5219e
Use a partial to share code between mobile and desktop, add the new route to the RegistrationController, drop flash message for closed registrations
2019-05-12 00:25:36 +02:00
alebor-5
469983a623
Improve communication about signing up on closed pods
...
fixes #7767
2019-05-12 00:25:08 +02:00
flaburgan
6826e89a95
Change design, add a link to the official website
...
fixes #7910
closes #7966
2019-05-12 00:12:12 +02:00
David Moseler
e04ddd0bcc
Clarify pod is part of diaspora in splash screen
2019-05-12 00:09:58 +02:00
Benjamin Neff
165b8f4f6e
Don't encrypt the OTP secret
...
It doesn't add any security to have this encrypted, but it adds
complexity for podmins, because they need to backup the key.
closes #8014
2019-05-12 00:06:28 +02:00
Dennis Schubert
74c3debefe
Merge branch 'next-minor' into develop
2019-05-01 00:22:09 +02:00
Dennis Schubert
caf822f497
Make sure 2fa settings have the right background color
...
closes #8008
2019-05-01 00:22:04 +02:00
Benjamin Neff
d25d9f96f9
Merge branch 'next-minor' into develop
2019-04-30 22:52:00 +02:00
Benjamin Neff
54fd4846c0
Use password to disable 2FA instead of a token
...
Using token doesn't make much sense when you can generate new tokens
right below.
closes #8006
2019-04-30 22:51:51 +02:00
Benjamin Neff
ecda6eccf6
Remove password reset and sign up link below two factor form
...
They don't make sense on that page, because at this stage, the user
already has an account and also has already entered their password.
closes #8005
2019-04-30 22:51:11 +02:00
Benjamin Neff
d486fbce8c
Merge branch 'next-minor' into develop
2019-04-30 00:21:55 +02:00
Dennis Schubert
3c06bb2f4c
Center <p>s inside formes used as secondary labels
...
closes #8004
2019-04-30 00:21:43 +02:00
Dennis Schubert
ef137f09f2
Add lock icon to the 2fa OTP field
2019-04-30 00:21:36 +02:00
Benjamin Neff
607659939d
Enable paranoid mode for devise
...
fixes #8001
closes #8003
2019-04-30 00:21:00 +02:00
lislis
9d5b981809
Two factor authentication ( #7751 )
2019-04-28 23:24:40 +02:00
lislis
1da118780e
Two factor authentication ( #7751 )
2019-04-28 19:06:48 +02:00
Benjamin Neff
8372fb2240
Merge branch 'next-minor' into develop
2019-04-28 16:48:49 +02:00
Benjamin Neff
17af65e22c
Allow links with only the diaspora ID to link to a profile
...
closes #8000
2019-04-28 16:48:31 +02:00
Benjamin Neff
91aae4d755
Fix 500er when calling protocol handler with invalid URL
2019-04-28 16:44:29 +02:00
Benjamin Neff
d58646085f
Merge branch 'next-minor' into develop
2019-04-27 19:12:35 +02:00
Benjamin Neff
035b6f39fc
Change wording of description in PWA manifest
2019-04-27 19:11:27 +02:00
Benjamin Neff
cf350c3e92
Merge pull request #7660 from cmrd-senya/archive-import-backend
...
Archive import backend implementation
2019-04-27 19:07:09 +02:00
Benjamin Neff
6ba9b24c1a
Merge branch 'next-minor' into develop
2019-04-27 18:00:40 +02:00
flaburgan
2073791cee
Add a manifest.json file as a first step to make diaspora* a PWA
...
fixes #7997
closes #7998
2019-04-27 18:00:14 +02:00
flaburgan
5b6cef0679
Remove legacy mobile web-capable
2019-04-27 17:56:51 +02:00
cmrd Senya
597d9e0275
AccountMigration: support chained migration case
2019-04-26 20:29:26 +03:00
cmrd Senya
f85f167f50
Implement archive import backend
...
This implements archive import feature.
The feature is divided in two main subfeatures: archive validation and archive import.
Archive validation performs different validation on input user archive. This can be
used without actually running import, e.g. when user wants to check the archive
before import from the frontend. Validators may add messages and modify the archive.
Validators are separated in two types: critical validators and non-critical validators.
If validations by critical validators fail it means we can't import archive.
If non-critical validations fail, we can import archive, but some warning messages
are rendered.
Also validators may change archive contents, e.g. when some entity can't be
imported it may be removed from the archive.
Validators' job is to take away complexity from the importer and perform the validations
which are not implemented in other parts of the system, e.g. DB validations or
diaspora_federation entity validations.
Archive importer then takes the modified archive from the validator and imports it.
In order to incapsulate high-level migration logic a MigrationService is
introduced. MigrationService links ArchiveValidator, ArchiveImporter and
AccountMigration.
Also here is introduced a rake task which may be used by podmins to run archive
import.
2019-04-26 18:41:27 +03:00
Benjamin Neff
e0a6189ec4
Merge branch 'next-minor' into develop
2019-03-30 15:05:47 +01:00
Benjamin Neff
c063f6fa1b
Bump devise
2019-03-30 15:01:00 +01:00
Benjamin Neff
707e358e48
Merge branch 'next-minor' into develop
2019-02-19 01:30:08 +01:00
Dennis Schubert
e47d0d9675
Replace dandelion.jpg with a public domain photo
...
Closes #7972
closes #7976
2019-02-19 01:29:52 +01:00
Dennis Schubert
97805e6602
Merge branch 'next-minor' into develop
2019-01-13 02:17:22 +01:00
Benjamin Neff
2894984f57
Fix order of posts on tags-stream for tags including 'activity'
...
closes #7959
2019-01-13 02:17:15 +01:00
Benjamin Neff
2b2852267a
Merge branch 'next-minor' into develop
2019-01-06 22:18:48 +01:00
flaburgan
3f700c3960
Fix photos galley when too many thumbnails by adding a scroll-x
...
fixes #7942
closes #7943
2019-01-06 22:12:38 +01:00
flaburgan
c8a1f308c6
Rename 'toggle mobile' to 'switch to touch-optimized mode' or 'switch to standard mode'
...
closes #7926
2019-01-06 22:04:22 +01:00
flaburgan
6804132c15
Do not autofollow back a user you are ignoring
...
fixes #7808
closes #7913
2019-01-06 22:02:10 +01:00
Hank Grabowski
58d2ce7ba6
Ignore Users in Mobile UI
...
fixes #7840
closes #7884
2019-01-06 21:55:33 +01:00
Benjamin Neff
b30c4e4e97
Merge branch 'next-minor' into develop
2018-11-17 21:08:23 +01:00
Benjamin Neff
98d165c0c5
Bump acts-as-taggable-on
2018-11-17 21:04:37 +01:00
Benjamin Neff
652b0064e6
Merge branch 'next-minor' into develop
2018-11-08 20:58:35 +01:00
Benjamin Neff
25a9f5d5d7
Merge branch 'master' into next-minor
2018-11-08 20:58:22 +01:00
Benjamin Neff
32cd764786
Fix XSS via OpenGraph on mobile
2018-11-08 20:41:50 +01:00
Dennis Schubert
ffe6fc0aa1
Merge branch 'next-minor' into develop
2018-11-08 05:08:16 +01:00
flaburgan
e33466de89
Display raw images in gallery
...
closes #7890
2018-11-08 05:08:04 +01:00
Dennis Schubert
cee30c36a0
Merge branch 'next-minor' into develop
2018-11-08 05:06:53 +01:00
