Jonne Haß
f4454f4488
Merge branch 'stable' into develop
2016-01-30 15:04:29 +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
40c42eb5b3
Merge pull request #6641 from Flaburgan/add-poll-result
...
Add answer poll counts
2016-01-26 23:54:37 +01:00
Dennis Schubert
7c197756dd
Merge branch 'stable' into develop
2016-01-26 15:19:55 +01:00
Dennis Schubert
211365c169
Merge branch 'master' into stable
2016-01-26 15:19:27 +01:00
Dennis Schubert
ad20bb052c
Fix include_root_in_json misuse
...
since it is no longer exposed for instances, our post_presenter failed
hard.
2016-01-26 15:18:02 +01:00
fla
1e27b509f9
Add number of votes on poll answers
2016-01-24 14:31:06 +01:00
cmrd Senya
ed61ef6d6a
Replace sidetiq with sidekiq-cron
...
closes #6616
2016-01-24 07:20:44 +01:00
Dennis Schubert
515cda7658
Merge branch 'stable' into develop
2016-01-24 07:15:04 +01:00
Benjamin Neff
44ab0df02b
fix suppress_annoying_errors
...
closes #6653
2016-01-24 07:14:58 +01:00
Dennis Schubert
b1aa8aacfd
Merge branch 'stable' into develop
2016-01-24 07:13:11 +01:00
Steffen van Bergerem
0213bbc028
Add podmin email to 500 error page
...
closes #6652
2016-01-24 07:12:06 +01:00
Steffen van Bergerem
a3adc2fb36
Fix timeago tooltips for reshares
2016-01-21 22:42:30 +01:00
Dennis Schubert
dd93cb6cad
Merge pull request #6646 from svbergerem/commenting-when-ignored
...
Tell user that the author might ignore them when commenting/liking failed
2016-01-21 21:07:37 +01:00
Steffen van Bergerem
a52c8a2f55
Tell user that the author might ignore them when commenting/liking failed
2016-01-21 21:02:39 +01:00
Dennis Schubert
ff867cd471
Merge branch 'stable' into develop
2016-01-21 21:00:32 +01:00
Steffen van Bergerem
749016a7b4
Fix keyboard shortcuts on profile pages
...
closes #6647
2016-01-21 21:00:26 +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
Steffen van Bergerem
5bd15e23f8
Clean up scss code for original white background
2016-01-10 00:48:30 +01:00
jpope
cab192b69e
add original white background color theme
2016-01-10 00:48:30 +01:00
Steffen van Bergerem
67922f8ad4
Merge pull request #6483 from Flaburgan/add-not-connected-header-to-mobile
...
Add header on not connected pages on mobile version
2016-01-08 13:33:04 +01:00
Jonne Haß
baeff22451
Merge pull request #6095 from AugierLe42e/openid
...
OpenID Connect
2016-01-06 12:30:15 +01:00
Manuel Vögele
4f34ecafa4
Show posts of ignored users on their profile page
2016-01-04 18:29:30 +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
augier
10314ffc8c
Fixing more remarks
2016-01-04 16:49:58 +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
9f85a90f55
Update code_used to false after issues new code
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
7e8bd0f411
Add fallback for failed app logo rendering
2016-01-04 16:49:58 +09:00
theworldbright
fd4022a55c
Fix pronto remarks
2016-01-04 16:49:58 +09:00
theworldbright
773a5a67d9
Add default kid to ID token
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
augier
73c1f0bc70
Fix pronto remarks
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
