Commit graph

20280 commits

Author SHA1 Message Date
Dennis Schubert
cb5f26a709
Merge branch 'next-minor' into develop 2019-05-05 04:23:09 +02:00
Dennis Schubert
3704be8bec
Prepare 0.7.12.0 cycle
[ci skip]
2019-05-05 04:22:10 +02:00
Dennis Schubert
39b86ed486
Remvoe unused Changelog headline
[ci skip]
2019-05-05 04:21:37 +02:00
Jonne Haß
dfeea521f5 Merge branch 'next-minor' into develop 2019-05-03 17:18:53 +02:00
flaburgan
83a9877def Improve likes steps
closes #8002
2019-05-03 17:17:32 +02:00
flaburgan
554faa4116 Reorganize steps a bit 2019-05-03 17:15:32 +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
Jonne Haß
f7103267a1 Merge branch 'next-minor' into develop 2019-04-28 23:25:04 +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
cmrd Senya
ce597380e6 Merge branch 'next-minor' into develop 2019-04-28 19:29:36 +03:00
cmrd Senya
3f74a759b3 Bump diaspora_federation 2019-04-28 19:28:25 +03:00
Benjamin Neff
8372fb2240
Merge branch 'next-minor' into develop 2019-04-28 16:48:49 +02:00
Jonne Haß
1e827161fe
rubocop: increase complexity limits [ci skip] 2019-04-28 16:48:40 +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
cmrd Senya
8b35356709 AccountMigration: fix flaky spec 2019-04-28 13:56:35 +03:00
Jonne Haß
a19891174e rubocop: increase complexity limits [ci skip] 2019-04-28 11:08:16 +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
cmrd Senya
3c94c1bd29 AuthorPrivateKeyValidator: support old serialization method of RSA keys 2019-04-27 19:17:54 +03: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
ee0c3e9865 Account import: add missing profile fields 2019-04-27 17:44:19 +03:00
Jonne Haß
214c2d7af7 Specs: Ensure photos always width and height 2019-04-27 16:05:35 +02:00
Jonne Haß
91b6a807c7 API: fix birthday format in responses 2019-04-27 16:05:22 +02:00
Jonne Haß
52e4e9f903 API: Update post location format to floats instead of floats as strings 2019-04-27 16:04:44 +02:00
Jonne Haß
af59bf3265 API: Do not return redundant author for photos 2019-04-27 16:03:55 +02:00
Jonne Haß
8afa17f940 Don't return aspect order in single user info API route 2019-04-27 16:03:02 +02:00
Jonne Haß
9b8f10358a Introduce JSON Schema for API responses and validate the responses against it 2019-04-27 16:01:54 +02:00
cmrd Senya
b5db8820d6 Account Migration rake task: render warnings with a newline 2019-04-27 15:13:14 +03:00
cmrd Senya
f7324adb9c Account import: import profile data too 2019-04-27 15:13:14 +03:00
cmrd Senya
bffe2b651c AccountMigration spec: flatten shared examples more 2019-04-26 20:58:28 +03:00
cmrd Senya
882e4f9868 AccountMigration specs: remove unused user shortcuts 2019-04-26 20:44:09 +03:00
cmrd Senya
a3196a1089 ArchiveValidator: remove unused TODO 2019-04-26 20:33:21 +03:00
cmrd Senya
597d9e0275 AccountMigration: support chained migration case 2019-04-26 20:29:26 +03:00
cmrd Senya
dd9ac758e8 AccountMigration integration specs: use single example instead of multiple to speed up the spec 2019-04-26 20:13:19 +03:00
cmrd Senya
f774c46db3 AccountMigration specs: move one-time shared contexts in place 2019-04-26 19:45:55 +03:00
cmrd Senya
6b88d2f4e0 AccountMigration specs: move 2-line shared context in place 2019-04-26 19:38:23 +03:00
Jonne Haß
f7a27f0c07 Ignore Metrics/AbcSize Rubocop for PostPresenter#as_api_response
[ci skip]
2019-04-26 18:18:48 +02:00