Commit graph

4078 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
a928e40d7f
Merge branch 'next-minor' into develop 2018-10-14 06:03:12 +02:00
Zachary Rabinovich
c4fed4bbcc
Add the ability to assign roles in the admin panel
closes #7868
2018-10-14 06:03:06 +02:00
Dennis Schubert
9bab794ea4
Merge branch 'next-minor' into develop 2018-10-08 02:50:36 +02:00
Benjamin Neff
fc6893d4fc
Remove facebook integration
Facebook removed the API and facebook integration is broken now, so lets
remove it.

closes #7874
2018-10-08 02:50:25 +02:00
Benjamin Neff
1289b3b541
Merge branch 'next-minor' into develop 2018-07-13 10:22:04 +02:00
Dennis Schubert
af500dabbc
Add section in the User's settings to register the protocol handler
closes #7833
2018-07-13 10:19:43 +02:00
Benjamin Neff
dcbdb69e22
Merge branch 'next-minor' into develop 2018-07-11 01:35:50 +02:00
cmrd Senya
2e0b382699
Use 'post' prefix for status message route helpers
This is required to make url_for(StatusMessage.new) work
2018-07-11 01:24:28 +02:00
Benjamin Neff
0b9ba559c7
Merge branch 'next-minor' into develop 2018-06-18 02:48:47 +02:00
flaburgan
3d83fbdbe5
Link to the pod in the emails footer
closes #7814
2018-06-18 02:47:56 +02:00
Benjamin Neff
66175f6908
Merge branch 'next-minor' into develop 2018-04-12 01:56:07 +02:00
Benjamin Neff
e31ca1fd3b
Fix link to "Make yourself an admin" 2018-04-12 01:45:56 +02:00
Steffen van Bergerem
01ae004518
Make public stream accessible for logged out users
Fixes #6564.

closes #7775
2018-04-12 01:42:17 +02:00
Benjamin Neff
7d6623d069
Remove contacts page on profiles
closes #7769
2018-04-12 01:40:49 +02:00
Benjamin Neff
4fa92c1823
Remove flag for contacts visible to each other
This feature only worked on the same pod and was more confusing than
useful.
2018-04-12 01:39:11 +02:00