Benjamin Neff
58483bdd2c
Merge branch 'next-minor' into develop
2022-07-31 23:14:32 +02:00
Benjamin Neff
eaedd3d26c
updated 11 locale files [ci skip]
2022-07-31 23:08:59 +02:00
Thorsten Claus
416c806012
Adding total and active count to pod view
...
The backend adds the total count for all pods, as well as the count for active pods.
In the frontend shows the new counts but without any further user interactions
2022-07-31 00:19:41 +02:00
Benjamin Neff
5669ba6b48
Merge branch 'next-minor' into develop
2022-07-16 04:44:59 +02:00
Benjamin Neff
a9ae84f3a6
Remove markerb dependency
...
markerb is dead and isn't compatible with rails 6 anymore. Removing it
means adding separate templates for text and html, this sadly means some
code duplication, but also luckily the templates aren't that
complicated, so the duplication is also very minimal.
2022-07-16 04:22:51 +02:00
Benjamin Neff
5d81555ae1
Merge branch 'next-minor' into develop
2022-03-05 16:31:34 +01:00
Dennis Schubert
7611391f9f
Don't suggest to retry exports on failure.
...
closes #8343
2022-03-05 16:31:25 +01:00
Benjamin Neff
7e889f71eb
Merge branch 'next-minor' into develop
2022-02-12 00:12:01 +01:00
Benjamin Neff
d7fb7405ae
updated 25 locale files [ci skip]
2022-02-11 23:59:53 +01:00
Benjamin Neff
95c0bb9ef2
Merge branch 'next-minor' into develop
2021-10-25 03:46:48 +02:00
Benjamin Neff
3292ce64fc
Change placeholder in translations for #8304
2021-10-25 03:26:05 +02:00
Benjamin Neff
89cd77751f
Change placeholder in translations for #8037
2021-10-25 03:26:04 +02:00
Benjamin Neff
d22ae06cff
updated 82 locale files [ci skip]
2021-10-25 03:26:04 +02:00
flaburgan
5b3f75f011
Remind the username in the reset password e-mail
...
closes #8037
2021-10-25 01:58:47 +02:00
Benjamin Neff
274edf7589
Merge branch 'next-minor' into develop
2021-09-19 14:30:07 +02:00
Thorsten Claus
4c337c6952
8139 add a podmin mail to footer
...
fixes #8139
closes #8242
2021-09-19 14:27:46 +02:00
Thorsten Claus
2db1d5d641
Fixing PR Rewview issues
2021-04-18 13:11:25 +02:00
Thorsten Claus
ddee980426
Adds a local-public tag on the sidebar that shows all posts local to this pod
2021-04-18 13:11:25 +02:00
Dennis Schubert
e0995e540b
updated 17 locale files [ci skip]
2020-11-06 01:10:18 +01:00
Dennis Schubert
611e445e17
Fix private/public confusion.
2020-11-04 16:21:43 +01:00
Dennis Schubert
04138da009
Slightly polish the OAuth Scope descriptions.
2020-11-01 18:40:28 +01:00
Jonne Haß
0b51bff255
fix wording for api.openid_connect.scopes.notifications
2020-10-30 15:23:01 +01:00
Dennis Schubert
f842da5488
updated 68 locale files [ci skip]
2020-10-30 02:04:19 +01:00
Dennis Schubert
af649adcd9
Fix typo in en.api.openid_connect.authorizations.scopes.interactions.description
2020-10-30 02:02:30 +01:00
Dennis Schubert
517e3b22ba
Expose a user's .current_sign_in_ip in the admin panel
2020-09-02 21:06:13 +02:00
Dennis Schubert
2f608d4a78
Merge branch 'next-minor' into develop
2020-06-24 18:48:01 +02:00
Dennis Schubert
0937bfc420
updated 9 locale files [ci skip]
2020-06-24 18:46:08 +02:00
Dennis Schubert
44bbb44c81
Merge branch 'next-minor' into develop
2020-06-14 22:13:08 +02:00
Dennis Schubert
3c124cefc3
updated 6 locale files [ci skip]
2020-06-14 22:10:24 +02:00
Benjamin Neff
984b739eb4
Merge branch 'next-minor' into develop
2020-02-12 00:38:14 +01:00
Benjamin Neff
6f65d9f96c
updated 11 locale files [ci skip]
2020-02-12 00:29:37 +01:00
Jonne Haß
dcbd02cf7f
Return 403 for unauthorized API requests
...
Also cleanup error handling code and remove last translatable
API error messages
2020-02-02 21:49:20 +01:00
Jonne Haß
6bbcb7415b
API: don't make error messages translatable
2020-02-02 18:04:11 +01:00
Jonne Haß
39c863ead9
Merge branch 'develop' into api
2020-01-21 23:35:01 +01:00
cmrd Senya
c348a763cf
API: add profile:read_private scope
2020-01-21 23:34:43 +01:00
Jonne Haß
d08b31f2ed
OpenID: remove private profile data claims that are not returned anyway and fix return values for profile and picture
2020-01-21 23:34:43 +01:00
Jonne Haß
ab04633474
fix styling on the new authorization page
2020-01-21 23:34:43 +01:00
Dennis Schubert
862fa38f8b
Remove the JSXC/Prosody integration.
...
As per discussion on https://discourse.diasporafoundation.org/t/removing-diaspora-s-current-chat-integration/2718 , nobody raised serious concerns or objections. Given future plans, we do not think having an unfinished implementation of something that likely will not get finished in the current form is worth it. So let's get rid of it.
2019-10-18 23:14:14 +02:00
Benjamin Neff
1e8a96d817
updated 64 locale files [ci skip]
2019-06-25 02:06:07 +02:00
Benjamin Neff
4a22f08539
Merge branch 'master' into next-minor
2019-05-13 22:52:08 +02:00
Benjamin Neff
5aec9b966c
updated 74 locale files [ci skip]
2019-05-13 22:49:16 +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
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
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
Jonne Haß
99411fced7
Merge branch 'develop' into api
2019-04-26 17:54:08 +02:00
