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
Dennis Schubert
a8008571b3
Bump devise
2016-01-21 20:55:46 +01:00
Dennis Schubert
f7d42fa83d
Bump nokogiri
2016-01-21 20:47:54 +01:00
Dennis Schubert
64a780c831
Prepare 0.5.6.1 hotfix
2016-01-21 20:47:44 +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
augier
054971c7de
Big refactor on mobile comments
2016-01-15 15:54:34 +01:00
Marien Fressinaud
bde3b47c02
[WIP] [mobile] Embedded new comment form in HTML
2016-01-15 15:54:34 +01:00
Dennis Schubert
053625c277
Merge branch 'stable' into develop
2016-01-13 23:11:35 +01:00
Dennis Schubert
e30019988f
Merge branch 'master' into stable
2016-01-13 23:10:27 +01:00
Dennis Schubert
5aef0441e8
Merge branch 'release/0.5.6.0'
2016-01-13 23:09:51 +01:00
Jonne Haß
aa6e4ec0d2
Merge pull request #6631 from svbergerem/white-color-theme
...
White color theme
2016-01-12 16:35:42 +01:00
Jonne Haß
ec0ba06857
Merge branch 'stable' into develop
2016-01-12 16:26:04 +01:00
Benjamin Neff
4cb6afdc94
fix plurals (10-19 was handled as 'one')
...
closes #6630
2016-01-12 16:25:26 +01:00
Jonne Haß
4fe9bb0bfe
Merge branch 'stable' into develop
2016-01-12 16:08:33 +01:00
Benjamin Neff
96677c14d1
update rubocop.yml
...
* ignore bin folder (generated files)
* allow same length for modules as for classes
closes #6635
2016-01-12 16:08:27 +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
Dennis Schubert
cb3f269218
Merge branch 'stable' into develop
2016-01-09 20:11:20 +01:00
Steffen van Bergerem
e99ecd259c
Update markdown-it
...
closes #6626
2016-01-09 20:11:15 +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
Dennis Schubert
439ea693a0
Merge pull request #6617 from manuelVo/ignored-user-show-posts-on-profile
...
Show posts of ignored users on their profile page
2016-01-06 10:48:50 +01:00
Dennis Schubert
ccd10d2873
Merge branch 'stable' into develop
2016-01-06 01:05:03 +01:00
Dennis Schubert
65a28fcde0
Start 0.5.7.0 cycle
...
[ci skip]
2016-01-06 01:04:27 +01:00
Dennis Schubert
40e780abcf
Merge branch 'stable' into develop
2016-01-06 00:49:15 +01:00
Benjamin Neff
812510b44a
refactoring tests again
...
closes #6595
2016-01-06 00:47:55 +01:00
cmrd Senya
b6c7f004e4
Further receive tests development
2016-01-06 00:47:42 +01:00
cmrd Senya
2aaf45166b
bump diaspora_federation
2016-01-06 00:47:42 +01:00
cmrd Senya
56f022f28c
Fix a few issues with public receiver which include:
...
* Make Retraction be allowed to be received publicly (probably just never used before anywhere)
* Since public receiver bypasses @object.receive in some cases add the author signature verification for relayables to protect from relayables forgery
* xml_author was wrong in some cases for RelayableRetraction
2016-01-06 00:46:14 +01:00
cmrd Senya
e54f87b7a6
Add rspec persistance file
2016-01-06 00:46:14 +01:00
Jonne Haß
764a3fec1d
Merge branch 'stable' into develop
2016-01-05 21:34:11 +01:00
Jonne Haß
d025cc38d3
Drop another plurals hack at aspects
...
It doesn't look used anymore either
2016-01-05 21:33:41 +01:00
Manuel Vögele
4f34ecafa4
Show posts of ignored users on their profile page
2016-01-04 18:29:30 +01:00
Steffen van Bergerem
079d5ab298
Merge branch 'stable' into develop
2016-01-04 14:19:53 +01:00
Steffen van Bergerem
09e2c1af2e
Mention media.ccc.de in the changelog [ci skip]
2016-01-04 14:19:44 +01:00
theworldbright
38439277d6
Add licenses where appropriate
2016-01-04 17:22:44 +09:00
theworldbright
b09ee87912
Update json-jwt legacy methods
2016-01-04 17:01:41 +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
