Sayed Abdelhaleem
fa97a5a5a2
Issue #6662 : fix refresh my photos routing error
...
closes #6667
2016-02-01 11:24:16 +01:00
Jonne Haß
f4454f4488
Merge branch 'stable' into develop
2016-01-30 15:04:29 +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
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
Steffen van Bergerem
5bd15e23f8
Clean up scss code for original white background
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
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
7e8bd0f411
Add fallback for failed app logo rendering
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
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
theworldbright
9439a16d98
Fix failing auth code test and styles
2016-01-04 16:49:54 +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
e55a0b0d0b
Replace scopes with constants in Authorization
2016-01-04 16:49:54 +09:00
augier
07c12ba057
Using Camo for the application logo
2016-01-04 16:49:53 +09:00
augier
3fb2d262b8
Using entypo icon as default application image
2016-01-04 16:49:52 +09:00
augier
098e8e46dd
CSS for applications settings page
2016-01-04 16:49:52 +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
de4f68c289
Support for more metadata
2016-01-04 16:49:50 +09:00
theworldbright
17fde49d61
Implement ID Token for the implicit flow
2016-01-04 16:49:50 +09:00
Augier
c6eb722517
Replace ERB by HAML, added locales, corrected Gemfile
2016-01-04 16:49:49 +09:00
theworldbright
3cfbcbce8f
Implement authorization endpoint (part 1)
...
The user can now authenticate with the authorization
server's authorization endpoint and receive a fake
id token.
2016-01-04 16:49:49 +09:00
fla
3a1235e2b2
Unify not connected header on desktop and mobile
2015-12-30 00:04:13 +01:00
fla
119ded6fdc
remove landing header on sign in mobile page
2015-12-29 23:55:46 +01:00
fla
96af4a0aec
Add header on not connected pages on mobile version
2015-12-29 23:55:46 +01:00
Jonne Haß
21cb1f44cd
Merge branch 'stable' into develop
2015-12-08 17:30:32 +01:00
apsc92
fdb3ae5cb8
Fix_notifications_timestamp_issue #4826
...
closes #6573
2015-12-08 17:30:27 +01:00
augier
02e82029c3
Use entypo-mail on mobile view
2015-11-15 14:11:29 +01:00
Steffen van Bergerem
3c43819bce
Merge pull request #6504 from sarithats/fix/login_button
...
Change login button color
2015-10-21 08:16:54 +02:00
Dennis Schubert
1338725308
Merge pull request #6492 from marienfressinaud/6062-add-search-and-invte-links-when-no-contacts
...
Add invite links when no contacts
2015-10-21 01:20:59 +02:00
Saritha
7b08cdd488
Change button color to blue
...
Fix #6449
Fix: SyntaxError in 'app/views/devise/passwords/edit.mobile.haml'
2015-10-20 12:53:59 +05:30
Jonne Haß
810f24db74
Merge branch 'stable' into develop
2015-10-15 12:20:46 +02:00
Steffen van Bergerem
06c1d2e9e3
Compare person id in people show view
...
closes #6505
2015-10-15 12:20:13 +02:00
Dennis Schubert
228f3852b2
Merge branch 'stable' into develop
2015-10-15 05:58:44 +02:00
Steffen van Bergerem
995ce18c37
Display publisher on user profile path
...
closes #6503
2015-10-15 05:58:38 +02: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
Giniouxe
1ae838b596
Open invite link in modal
2015-10-14 22:31:22 +02:00
fla
da1b0b5666
Add links to add or invite contacts
2015-10-14 22:31:22 +02:00
Jonne Haß
77295ffcfb
Merge pull request #6487 from svbergerem/move-reshare-count
...
Move reshare count
2015-10-10 20:51:27 +02:00
Steffen van Bergerem
e9350a57fc
Fix pronto error, remove unused file
2015-10-10 14:22:59 +02:00
augier
aefd7273d9
Drop ID
2015-10-10 12:34:59 +02:00
augier
c62927bf00
Use backbone for flash messages
2015-10-10 12:15:41 +02:00
Jonne Haß
92b5ea29ed
Merge branch 'stable' into develop
2015-10-07 22:29:45 +02:00
Steffen van Bergerem
e0be1b49f1
Add public stream
...
closes #6465
2015-10-07 22:29:39 +02:00
Steffen van Bergerem
b59c99807b
Move settings.scss
2015-10-05 16:12:40 +02:00
Steffen van Bergerem
66fb953591
Move registration.scss
2015-10-05 16:12:40 +02:00
Steffen van Bergerem
052d20d30d
Move base.scss
2015-10-05 01:51:13 +02:00
Lukas Matt
97ee2cd975
Display all reports and give the ability to review them
2015-10-03 17:18:03 +02:00
Lukas Matt
95072d6010
Add get_reported_guid spec for report helper
...
* two new methods in report model reported_author and item
* merge deletion methods in report model
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
2015-10-03 17:17:06 +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
fla
97a5a5cbe3
Hide publisher cancel button on xsmall screens
2015-09-30 23:19:14 +02:00
Steffen van Bergerem
ff99db1fd3
Change conversation page style
2015-09-27 23:11:19 +02:00
Jonne Haß
4087036e63
Merge pull request #6428 from svbergerem/unify-error-pages
...
Unify error pages
2015-09-27 11:42:03 +02:00
Steffen van Bergerem
9d6ce5b110
Merge pull request #6336 from AugierLe42e/clean-publisher
...
Cleaning publisher
2015-09-26 00:49:34 +02:00
Steffen van Bergerem
8a02bc6e71
Redesign error pages
2015-09-25 22:24:04 +02:00
Steffen van Bergerem
bf6b0e4616
Fix remaining BS3 regressions
2015-09-25 00:31:16 +02:00
augier
c3ddd4c086
Cleaning publisher a bit + responsive styling
2015-09-24 08:54:19 +02:00
augier
f00f3965ff
Styling main stream
2015-09-18 19:13:49 +02:00
Steffen van Bergerem
7bcccde9f4
Merge pull request #6383 from AugierLe42e/improve-mobile-conversations-design
...
[Quickfix] Improve mobile conversations design
2015-09-12 12:20:59 +02:00
augier
44d71c3905
Improve mobile conversations design
2015-09-11 23:17:02 +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
realtin
0b420d0308
adapt templates to allow moderator to view reports
...
(#5324 )
2015-09-07 12:29:46 +02:00
Steffen van Bergerem
5020ac45c7
Merge branch 'stable' into develop
2015-08-29 18:19:12 +02:00
SansPseudoFix
110284626a
Fix mobile pagination for notifications view
...
Fix syntax
Fix syntax
closes #6364
2015-08-29 18:13:54 +02:00
Jonne Haß
bf92a7441e
Bump selenium-webdriver, implement aspect sorting cucumber step with selenium API
2015-08-29 15:58:08 +02:00
augier
3a5406a6e1
Styling of mobile header compilant with desktop version
2015-08-28 20:30:07 +02:00
augier
2ca963fadb
Correcting BS3 regression on badge color + spelling mistake
2015-08-28 13:02:48 +02:00
Steffen van Bergerem
9446a3ae21
Merge pull request #6301 from AugierLe42e/image-gallery
...
Using Blueimp image gallery
2015-08-27 23:59:46 +02:00
augier
63bfcb7c98
Using Blueimp image gallery
2015-08-27 23:50:20 +02:00
Jonne Haß
a30ba5697e
Merge pull request #6290 from Raven24/pod_test
...
test pods for connectivity
2015-08-27 11:38:18 +02:00
Steffen van Bergerem
b4a5819aa8
Merge pull request #6349 from Faldrian/beautify-blocked-persons
...
Beautify ignored people list and add diaspora handle for identification
2015-08-27 11:00:56 +02:00
Faldrian
37793f7dbb
beautify ignored people list and add diaspora handle for identification
2015-08-27 09:52:49 +02:00
Dennis Schubert
6b863defa3
Merge branch 'stable' into develop
2015-08-27 05:25:51 +02:00
Steffen van Bergerem
3c370ea56e
Remove unused js code (stream widget and dropdowns)
...
closes #6279
2015-08-25 04:26:17 +02:00
Florian Staudacher
ea397ffdfb
Add connection test for pods in the network
...
* add a class for checking pod connectivity
* extend pod model to handle new functionality
* add an admin frontend to list pods and re-trigger checks manually
* add a daily worker to run through all the pods
* add unit tests for most of the new code
2015-08-24 22:04:53 +02:00
Steffen van Bergerem
eddfa7cb5c
Merge pull request #6309 from AugierLe42e/left-navbar-polishing
...
Left and right navbar polishing
2015-08-23 11:29:51 +02:00
augier
450bf4f4ba
Refactor and minor styling
2015-08-23 09:59:12 +02:00
Steffen van Bergerem
a76b228478
Merge pull request #6321 from AugierLe42e/admin-use-bs-forms
...
[Quickfix] Admin panel use 'form-control' class for selects
2015-08-22 03:56:39 +02:00
Steffen van Bergerem
36eb283546
Merge pull request #6302 from AugierLe42e/comment-button-misbehaving
...
[Quickfix] Fixing comment button misbehaving
2015-08-22 02:07:14 +02:00
augier
38f811f9fd
Admin panel use 'form-control' class for selects
2015-08-22 01:20:33 +02:00
Augier
75b317895d
Fixing comment button misbehaving
2015-08-14 16:18:42 +02:00
augier
281d1a9161
Rebasing and fixing tests
2015-08-11 18:12:02 +02:00
Pablo Cuadrado
bc1b6bd44d
polishing the sidebar on large (lg on BS3) screens
2015-08-11 18:08:26 +02:00
Pablo Cuadrado
37e3a2749f
- left background to the far left of the screen
...
- large screen breakpoints from BS3
- hover color is the same of link color (variable $blue)
2015-08-11 18:08:26 +02:00
Pablo Cuadrado
b787db13ba
minor css polishing for the username
...
trying a new set of responsive grid rules
2015-08-11 18:08:26 +02:00
Pablo Cuadrado
267d98f132
leftnavbar with full sized clickable anchors, better padding, weight font reduced, overall looks polished
...
fixed background added for contrast, hideable on SM or XS bootstrap-based sizes.
2015-08-11 18:08:26 +02:00
Pablo Cuadrado
c38da4c787
controlling right sidebar behaviour on large screens
2015-08-11 18:08:13 +02:00
Pablo Cuadrado
754d8107a8
reasonable max-width for right sidebar
2015-08-11 18:08:12 +02:00
