Dennis Schubert
230ec02ad7
Merge branch 'stable' into develop
2016-05-06 02:20:38 +02:00
sjain1107
4cd2f1d9c1
Add inviter diaspora-ID to the invite email #6796
...
closes #6817
2016-05-06 02:20:31 +02:00
cmrd Senya
77bd220e24
Redirect to "/users/sign_in" after AccountDeletion
...
There is no point to redirect to "/stream" after the account deletion
because the user is logged off.
2016-04-07 12:02:46 +03:00
theworldbright
bb3849e4b1
Fix API privilege scope escalation
2016-03-11 17:18:21 -08:00
Benjamin Neff
0c8588eec8
PostService: create find!
...
* find returns nil if nothing found
* find! raises errors if not found or not visible
2016-03-07 05:52:54 +01:00
Benjamin Neff
e6b72b526f
remove "not public" error page
...
this is not used anymore:
* not logged in users are redirected to the login page
* logged in users see the normal 404 page
2016-03-07 05:52:54 +01:00
Benjamin Neff
d94eae0d45
refactoring PostService
...
* move presenters back to controllers, this is view-logic
* use PostService in CommentService
* remove iframe route, this is not used anymore
* id/guid limit at 16 chars, hex(8) is 16 chars long
2016-03-07 05:52:54 +01:00
Benjamin Neff
b398b115bc
refactoring CommentService
2016-03-07 05:52:54 +01:00
Benjamin Neff
5a46da47c3
refactoring StatusMessageCreationService
...
* move parameter normalization back to controller, because this is
frontend-specific.
* if the StatusMessage is public, save also public photos
2016-03-07 00:00:27 +01:00
Jonne Haß
39ae5e741e
Merge pull request #6732 from SuperTux88/cleanup-aspect_visibilities
...
Cleanup aspect visibilities
2016-03-05 11:05:55 +01:00
Benjamin Neff
acb91c79d2
improve pod connection check
...
* use port for check
* respect entries in /etc/hosts
* test /.well-known/host-meta
* don't allow redirects to other domains
2016-03-05 02:57:11 +01:00
Benjamin Neff
f913128967
don't add public shareables to aspect_visibilities
2016-03-04 20:13:52 +01:00
Steffen van Bergerem
d9e3f3a734
Merge branch 'stable' into develop
2016-02-23 09:38:53 +01:00
Dennis Schubert
9f2e5b1868
Only mark unread notifications as read otherwise, the UPDATE statement would update all the notifications...
...
closes #6711
2016-02-23 09:38:34 +01:00
Dennis Schubert
dbdf352a6b
Merge branch 'stable' into develop
2016-02-23 06:35:26 +01:00
Steffen van Bergerem
0392549702
Add footer on conversations page
...
closes #6710
2016-02-23 06:35:15 +01:00
Dennis Schubert
535057aca4
Merge branch 'stable' into develop
2016-02-21 04:26:25 +01:00
Marien Fressinaud
27a8e0fbca
Test if user is nil in #reset_authentication_token
...
Actually it redirects to stream page and says that user is already logged in.
Fix https://github.com/diaspora/diaspora/issues/6326
2016-02-21 04:24:50 +01:00
Steffen van Bergerem
89f21e87f8
Remove unused code
2016-02-14 02:48:51 +01:00
Dennis Schubert
15d5e0febc
Merge branch 'stable' into develop
2016-02-07 16:31:53 +01:00
Steffen van Bergerem
785665b9ad
Fix mobile registration layout after failed registration
...
closes #6677
2016-02-07 16:31:48 +01:00
Jonne Haß
32bda8fe20
Merge branch 'stable' into develop
2016-01-28 18:47:18 +01:00
Faldrian
8e3816e64e
let mention-regex only match usable strings
...
closes #6658
2016-01-28 18:47:13 +01:00
Steffen van Bergerem
6fce81fc99
Merge branch 'stable' into develop
2016-01-20 21:37:30 +01:00
tamatsyk
960e651764
internationalize controller rescue_from text
...
Fix typos
change forbitten to forbidden
fix styling issue and copypaste
improve code style for aspec_memberships_controller.rb with rubocop
fix styling issues
aligned elements of hash literals
fix typo
fix locale name and styling of its usage
fix failing tests
closes #6554
2016-01-20 21:37:02 +01:00
theworldbright
38439277d6
Add licenses where appropriate
2016-01-04 17:22:44 +09:00
theworldbright
58aef5658b
Fix remaining remarks
2016-01-04 17:01:40 +09:00
augier
ef7ea1a855
General text error + CSS styling
...
Minor merge conflict fix by theworldbright
2016-01-04 16:49:59 +09:00
theworldbright
c1e1f9bf69
Fix 500 error when unknown algorithm is used for JWT
2016-01-04 16:49:58 +09:00
theworldbright
4cde41486b
Fix handling of prompt=login
2016-01-04 16:49:58 +09:00
theworldbright
a4095692b7
Add default kid to jwks.json
2016-01-04 16:49:58 +09:00
theworldbright
1e3421713a
Handle error when request object is signed
2016-01-04 16:49:58 +09:00
theworldbright
fd4022a55c
Fix pronto remarks
2016-01-04 16:49:58 +09:00
theworldbright
ed1dc256a8
Fix handling of error message in authorization controller
2016-01-04 16:49:58 +09:00
augier
ebeafb7894
Add custom error page when prompt=none
2016-01-04 16:49:57 +09:00
theworldbright
c6bec2f2dc
Return error to RP instead of user for prompt=none
2016-01-04 16:49:57 +09:00
theworldbright
7865a30fec
Return an JSON error response for invalid jwks_uri
2016-01-04 16:49:57 +09:00
theworldbright
3440709ec5
Explicitly state no support for user info alg
2016-01-04 16:49:57 +09:00
theworldbright
f1b394de0f
Fix remaining remarks
2016-01-04 16:49:57 +09:00
augier
d028b5672e
Fix remarks
2016-01-04 16:49:57 +09:00
theworldbright
2f8c391ac6
Fix pronto and travis errors
2016-01-04 16:49:57 +09:00
theworldbright
8f5094c29e
Gracefully handle SSL verification failure
2016-01-04 16:49:56 +09:00
theworldbright
0fbcb71255
Add support for request_uri and claims
2016-01-04 16:49:56 +09:00
theworldbright
82600003b3
Flash error messages when redirect_uri is invalid
2016-01-04 16:49:56 +09:00
theworldbright
e4edad0646
Fix test for the auth missing the response_type parameter
2016-01-04 16:49:56 +09:00
theworldbright
adcf2ab7ab
Fix test for prompt == "none"
2016-01-04 16:49:56 +09:00
augier
d351db1982
Filter for prompt handling
2016-01-04 16:49:56 +09:00
augier
7b2be0d3c6
Support displaying TOS and policy
2016-01-04 16:49:56 +09:00
theworldbright
9c9880d880
Move JWKs files to database
2016-01-04 16:49:56 +09:00
augier
2c7d102019
Design for authorization page when client_name not providen + XSS spec
2016-01-04 16:49:55 +09:00
