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
