Commit graph

3815 commits

Author SHA1 Message Date
Benjamin Neff
0df2f519f0
Merge branch 'next-minor' into develop 2019-05-13 22:52:23 +02:00
Benjamin Neff
4a22f08539
Merge branch 'master' into next-minor 2019-05-13 22:52:08 +02:00
Benjamin Neff
dc7c5ffef6
Merge branch 'release/0.7.11.0' 2019-05-13 22:51:22 +02:00
Benjamin Neff
5aec9b966c
updated 74 locale files [ci skip] 2019-05-13 22:49:16 +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
Dennis Schubert
3704be8bec
Prepare 0.7.12.0 cycle
[ci skip]
2019-05-05 04:22:10 +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
d486fbce8c
Merge branch 'next-minor' into develop 2019-04-30 00:21:55 +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
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
Benjamin Neff
fc0de7bbd0
Merge branch 'next-minor' into develop 2019-02-26 01:02:52 +01:00
Benjamin Neff
a4031e09e1
Merge branch 'master' into next-minor 2019-02-26 01:02:42 +01:00
Benjamin Neff
663da1ef25
Merge branch 'release/0.7.10.0' 2019-02-26 01:01:51 +01:00
Benjamin Neff
7595168e01
updated 7 locale files [ci skip] 2019-02-26 00:57:43 +01:00
Benjamin Neff
4687d7e1ea
Start 0.7.11.0 cycle 2019-02-19 01:48:11 +01:00
Benjamin Neff
cdfcccd75d
Merge branch 'next-minor' into develop 2019-01-14 03:15:51 +01:00
Benjamin Neff
3ea4396ddb
Merge branch 'master' into next-minor 2019-01-14 03:13:44 +01:00
Benjamin Neff
1edcb0013c
Merge branch 'release/0.7.9.0' 2019-01-14 03:11:54 +01:00
Benjamin Neff
1925127964
updated 87 locale files [ci skip] 2019-01-14 03:09:05 +01:00
Benjamin Neff
71595b4cbd
Start 0.7.10.0 cycle 2019-01-07 02:03:06 +01:00
Benjamin Neff
2b2852267a
Merge branch 'next-minor' into develop 2019-01-06 22:18:48 +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
Hank Grabowski
58d2ce7ba6
Ignore Users in Mobile UI
fixes #7840

closes #7884
2019-01-06 21:55:33 +01:00
Benjamin Neff
6824ef5baf
Merge branch 'next-minor' into develop 2018-11-25 22:38:03 +01:00
Benjamin Neff
5a0381f832
Merge branch 'master' into next-minor 2018-11-25 22:37:43 +01:00
Benjamin Neff
6185355e92
Merge branch 'release/0.7.8.0' 2018-11-25 22:36:59 +01:00
Benjamin Neff
09a8c84ae0
updated 51 locale files [ci skip] 2018-11-25 22:34:46 +01:00
Besnik Bleta
5766a08b22
Better wording for the latest changes, part II and final
closes #7934
2018-11-25 22:32:20 +01:00
Besnik Bleta
440775f3b0
Better wording for the latest changes 2018-11-25 22:32:17 +01:00
Besnik Bleta
5ee85721f7
Fixing an oldsyntax error of considering %{actors} as a number, rather than a list of people’s usernames 2018-11-25 22:32:17 +01:00
Besnik Bleta
6c2b3a7b11
Update sq translations 2018-11-25 22:32:14 +01:00
Benjamin Neff
2d6a68c28f
Start 0.7.9.0 cycle
[ci skip]
2018-11-19 00:50:04 +01:00
Benjamin Neff
5b0066a426
Merge branch 'next-minor' into develop 2018-11-18 19:36:51 +01:00
Benjamin Neff
7a958bce69
Bump cucumber 2018-11-18 19:32:16 +01:00
Benjamin Neff
fa0e34f687
Merge branch 'hotfix/0.7.7.1' 2018-11-08 20:57:09 +01:00
Dennis Schubert
cd16f29c39
Merge branch 'next-minor' into develop 2018-11-08 05:14:36 +01:00
Benjamin Neff
3c55a425c7
Fix script domain for instagram in CSP header
closes #7920
2018-11-08 05:12:55 +01:00
Benjamin Neff
d3bb7ade78
Merge branch 'next-minor' into develop 2018-11-02 01:39:11 +01:00
flaburgan
65e0f90b86
Reword the web handler setting
fixes #7838

closes #7909
2018-11-02 01:35:44 +01:00
Dennis Schubert
0133a9f354
updated 17 locale files [ci skip] 2018-10-27 00:13:47 +02:00