Commit graph

4114 commits

Author SHA1 Message Date
Benjamin Neff
4902a35972
Merge branch 'next-minor' into develop 2021-11-23 00:56:41 +01:00
Benjamin Neff
ec22f5883e
Bump omniauth 2021-11-06 17:43:57 +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
David Morley
af9f26d11c
Change domain for poduptime
closes #8304
2021-10-25 01:59:30 +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
Benjamin Neff
4c46ca1a94
Merge branch 'next-minor' into develop 2021-07-04 22:09:32 +02:00
Dennis Schubert
407f51d5a3
Allow points and dashes in the username.
This reverts b3ca504c40. We don't quite know why that was added, but we assume it's because of format strings. Some pre-2011 users exist that still have dots or dashes in their username, and those accounts are somewhat broken now.

closes #8266
2021-07-04 22:07:21 +02:00
Benjamin Neff
d27eefeb34
Merge branch 'next-minor' into develop 2021-06-30 23:27:57 +02:00
Benjamin Neff
c203c1eb94
Cleanup unused commenting_disabled? and can_comment?
closes #8262
2021-06-30 23:19:29 +02:00
Thorsten Claus
2db1d5d641 Fixing PR Rewview issues 2021-04-18 13:11:25 +02:00
Thorsten Claus
4147249d2d Makes the local posts link be configured for special audiences 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
Jonne Haß
5f00b4a4e6 Merge branch 'next-minor' into develop 2021-04-11 17:13:46 +02:00
Gayathrir1666
ef9e764f7a Add scrollbar to aspect dropdowns
closes #8213
closes #7696

Co-authored-by: Hank Grabowski <hankgrabowski@gmail.com>
Co-authored-by: Thorsten Claus <thorstenclaus@web.de>
2021-04-11 17:13:25 +02:00
Jonne Haß
2c8bf3b5da Merge branch 'next-minor' into develop 2021-04-11 13:16:21 +02:00
Thorsten Claus
a420ba2cfc Formatting post per user fractions
closes #8227
2021-04-11 13:16:15 +02:00
Dennis Schubert
d4f92a8fae
Merge branch 'next-minor' into develop 2021-02-21 19:45:00 +01:00
Thorsten Claus
d7941230a4
Replace some http links with their https counterparts.
closes #8207
2021-02-21 19:44:42 +01:00
Benjamin Neff
caa8a29605
Merge branch 'next-minor' into develop 2020-12-30 14:16:08 +01:00
Benjamin Neff
1faddbc911
Fix "Change email" button position on mobile-ui
closes #8193
2020-12-30 14:16:02 +01:00
Thorsten Claus
d2acad1aed
Enlarge accept and deny buttons in open-id authorization (#8183)
* Enlarge accept and deny buttons

* Move Accept/Deny buttons to the center on mobile, moved right on dektops
2020-11-14 19:22:40 +01:00
Jonne Haß
6a4a983fa1 Merge branch 'next-minor' into develop 2020-11-02 15:34:08 +01:00
David Morley
9793f89761 Update poduptime link to diaspora only list
closes #8174
2020-11-02 15:33:38 +01:00
Jonne Haß
15c11b87ca Merge branch 'next-minor' into develop 2020-09-04 21:58:57 +02:00
Jonne Haß
08395cc877 Migrate configuration to TOML
YAML is just too easy to get wrong

closes #8132
2020-09-04 21:48:54 +02:00
Dennis Schubert
517e3b22ba
Expose a user's .current_sign_in_ip in the admin panel 2020-09-02 21:06:13 +02:00
Jonne Haß
d13bcc00e0 Merge branch 'next-minor' into develop 2020-03-21 19:15:14 +01:00
Vitalie Ciubotaru
827a2ce991 Remove links to deleted profiles in admin user stats
closes #8063
closes #8061
2020-03-21 19:14:56 +01:00
Benjamin Neff
4139ae2549
Merge branch 'next-minor' into develop 2020-02-12 00:13:19 +01:00
Dennis Schubert
75ef13b5d1
Replace content_security_policy_nonce with content_security_policy_script_nonce.
To avoid an conflict with Rails, and to avoid confusing by twitter's gem overloading the method.
2020-02-11 23:53:14 +01:00
Jonne Haß
2da33408f9 Merge branch 'next-minor' into develop 2020-01-27 09:30:14 +01:00
Jonne Haß
1e642be040 Hide sign up link in mobile header when registrations are disabled
closes #8060
2020-01-27 09:30:11 +01:00
Jonne Haß
1bf05e7921 use desktop openid connect authorizations and error pages on mobile for now 2020-01-21 23:35:01 +01:00
Jonne Haß
39c863ead9 Merge branch 'develop' into api 2020-01-21 23:35:01 +01:00
Jonne Haß
2f7acbe4b3 API: fix missing page parameter to integer conversion 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
Jonne Haß
cb679371ac Merge branch 'develop' into api 2020-01-21 23:34:43 +01:00
Jonne Haß
16e754f4c7 API: don't return default avatar 2020-01-21 23:34:00 +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
6f14f1b850
Merge branch 'next-minor' into develop 2019-06-17 01:20:42 +02:00
Benjamin Neff
ef31ea6b96
Enable remember me for all forms
fixes #8023
2019-06-17 01:12:42 +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