Dennis Schubert
4cb0d18a63
Merge branch 'stable' into develop
2016-02-22 11:27:45 +01:00
Dennis Schubert
fbabc541ae
updated 111 locale files [ci skip]
2016-02-22 11:26:04 +01:00
Dennis Schubert
5d77708aa8
updated 111 locale files
2016-02-09 13:15:21 +01:00
Dennis Schubert
677bddc3d3
Merge branch 'stable' into develop
2016-02-09 12:42:26 +01:00
Steffen van Bergerem
ac5a7746e2
Remove contacts_title method and translations
...
closes #6687
2016-02-09 12:42:21 +01:00
Steffen van Bergerem
482cbe7fcc
Add reason for post report to email sent to admins
2016-02-07 17:58:03 +01:00
Steffen van Bergerem
0c05b474c5
Merge pull request #6509 from AugierLe42e/fix-mobile-comment
...
Refactor mobile comment section
2016-02-05 11:30:04 +01:00
Augier
a5198e9a01
Fix no reaction case
2016-02-03 16:06:24 +01:00
fla
1e27b509f9
Add number of votes on poll answers
2016-01-24 14:31:06 +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
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
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ß
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
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
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
augier
ebeafb7894
Add custom error page when prompt=none
2016-01-04 16:49:57 +09:00
theworldbright
82600003b3
Flash error messages when redirect_uri is invalid
2016-01-04 16:49:56 +09:00
augier
7b2be0d3c6
Support displaying TOS and policy
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
augier
8c2af74447
Fixing last remarks
2016-01-04 16:49:54 +09:00
augier
c33cce0953
Styling user consent form
2016-01-04 16:49:54 +09:00
theworldbright
1a7f2edc01
Perform major refactoring
...
- Add foreign_keys
- Remove unused classes/methods
- Fix pronto errors
- Add method to retrieve client id from name
- Remove TODO comments
- Fix unnecessary private key generation
2016-01-04 16:49:54 +09:00
theworldbright
4dae744a4a
Adjust translations for user applications page
2016-01-04 16:49:53 +09:00
augier
469521c572
Addin scopes translation and description
2016-01-04 16:49:52 +09:00
augier
b9da104b28
Revoke button on applications page
2016-01-04 16:49:52 +09:00
augier
308170f691
Add applications information page
2016-01-04 16:49:52 +09:00
theworldbright
bc5e5c7420
Fix pronto errors
2016-01-04 16:49:51 +09:00
Augier
c6eb722517
Replace ERB by HAML, added locales, corrected Gemfile
2016-01-04 16:49:49 +09:00
Jonne Haß
1ed904449d
Merge branch 'stable' into develop
2015-12-31 14:21:10 +01:00
Jonne Haß
237445d41b
Drop plurals hack at the contacts key
...
as it's not even used anymore and confuses WTI
2015-12-31 14:20:10 +01:00
Jonne Haß
505071336f
Merge branch 'stable' into develop
2015-12-27 17:51:33 +01:00
Besnik Bleta
680955ad8c
Update for sq translation
2015-12-27 17:49:39 +01:00
Jonne Haß
22711ff7f0
Merge branch 'stable' into develop
2015-12-04 06:55:41 +01:00
Stéphane Guillou
2f4b817c46
Fix missing word in locked account message
...
closes #6577
2015-12-04 06:55:10 +01:00
Jonne Haß
d9c4f6fe07
Merge branch 'stable' into develop
2015-11-22 18:02:47 +01:00
Jonne Haß
bbb348ea5b
updated 32 locale files [ci skip]
2015-11-22 16:02:28 +01:00
Marien Fressinaud
461e4cfd8c
Cleanup the code
...
- Extract JS from HTML
- Remove search link on message
- Remove duplicated invitation modal
2015-10-14 22:31:39 +02:00
fla
da1b0b5666
Add links to add or invite contacts
2015-10-14 22:31:22 +02:00
Steffen van Bergerem
64773d883e
Add permalink for stream elements
2015-10-06 23:29:09 +02:00
Lukas Matt
d1e3e568b9
Report tab; bootstrap3 compatible, add user detail btn
...
The reported_user_details button will redirect you
to admin user_search. This can be useful if the podmin
wants to lock, unlock or delete the account which is
responsible for the reported post
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
2015-10-03 10:58:01 +02:00
Jonne Haß
176b32c815
Merge branch 'stable' into develop
2015-09-07 12:41:36 +02:00
realtin
15b186518c
add moderators to report email recievers
...
and refactor coding style according to pull request comments
(#5324 )
2015-09-07 12:31:25 +02:00
Jonne Haß
6fb6b8dc8a
Merge branch 'stable' into develop
2015-09-06 13:56:25 +02:00
