Commit graph

1519 commits

Author SHA1 Message Date
Steffen van Bergerem
5aeac0c2e3 Merge pull request #6324 from AugierLe42e/styling-main-stream
Styling main stream
2015-09-18 20:55:43 +02:00
augier
f00f3965ff Styling main stream 2015-09-18 19:13:49 +02:00
SansPseudoFix
ccaf107ae5 Fix for tag overflow - fixes #6142
Fix for tag overflow - fixes #6142
2015-09-17 13:54:41 +02:00
Jonne Haß
70b200e10d Merge branch 'stable' into develop 2015-09-15 09:52:12 +02:00
Steffen van Bergerem
8bb3d4d8a8 Remove unused color variables
closes  #6404
2015-09-15 09:51:06 +02:00
Jonne Haß
0508c1b8d4 Merge branch 'stable' into develop 2015-09-14 22:06:52 +02:00
Steffen van Bergerem
05a6d95811 Always show public photos
closes #6398
2015-09-14 22:04:53 +02:00
Steffen van Bergerem
953b03d086 Fix adding the first comment in the mobile view 2015-09-12 14:52:18 +02:00
Steffen van Bergerem
441656b480 Display headline and new conversation button in same line for mobile conversations 2015-09-12 12:23:37 +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
Steffen van Bergerem
fdbb32ff96 Use white entypo icons for active list-group items in notifications 2015-09-11 07:48:20 +02:00
Jonne Haß
f9a452265d Merge branch 'stable' into develop 2015-09-07 13:35:56 +02:00
Lukas Matt
e57bdeed19 Set onlineHelp link in jsxc options
related to diaspora/jsxc#125

Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>

closes #6388
2015-09-07 13:35:51 +02:00
Lukas Matt
a40a34ee8c autoLang default value is true
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
2015-09-07 13:35:49 +02:00
Jonne Haß
176b32c815 Merge branch 'stable' into develop 2015-09-07 12:41:36 +02:00
realtin
0b420d0308 adapt templates to allow moderator to view reports
(#5324)
2015-09-07 12:29:46 +02:00
Steffen van Bergerem
426f55e685 Merge branch 'stable' into develop 2015-09-05 16:12:00 +02:00
sjain1107
928576bc88 6306-add-spinner-on-initial-stream-load
closes #6384
2015-09-05 16:11:09 +02:00
Florian Staudacher
738413c65f fix some issues with pod-checking
add tooltips in the frontend
fix a JS problem with empty hostname
use `find_in_batches` correctly
add a migration to clean up the pods table + unique index on hostname
2015-08-30 18:50:34 +02:00
Dennis Schubert
4f2f3cca59 Merge branch 'stable' into develop 2015-08-29 21:44:31 +02:00
Steffen van Bergerem
1874c37706 Fix back-to-top backbone view
closes #6360
2015-08-29 21:44:24 +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
Steffen van Bergerem
696eebbe5d Add mobile comment box only once 2015-08-29 15:21:44 +02:00
Steffen van Bergerem
cd602c19fd Fix i18n spec 2015-08-29 14:46:20 +02:00
Steffen van Bergerem
3bc5b673c6 Refactor mobile comment js code and add tests 2015-08-29 14:46:20 +02:00
Steffen van Bergerem
5b918606fa Display mobile reaction box only once 2015-08-29 14:33:42 +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
Steffen van Bergerem
7e9a88573b Merge pull request #6325 from AugierLe42e/add-toggle-mobile-menu
Add 'Toggle mobile' item to menu + minor styling
2015-08-27 22:58:00 +02:00
augier
4364a80330 Keeping badges on the header 2015-08-27 22:00:43 +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
Steffen van Bergerem
0df0926739 Convert BackToTop to a backbone view 2015-08-25 04:17:24 +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
augier
a7bd029526 Add 'toggle mobile' item to menu + minor styling 2015-08-23 13:53:05 +02:00
Steffen van Bergerem
eaf012c82c Fix style regressions and code style for sidebar polishing PR 2015-08-23 13:15:01 +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
40ef382a6e Merge branch 'stable' into develop 2015-08-22 01:35:32 +02:00
Anton Tkachov
ef6c8a5448 Issue #6180: Update stream faces block if somebody was blocked
closes #6320
2015-08-22 01:35:23 +02:00
Steffen van Bergerem
51bfc6e114 Merge pull request #6319 from AugierLe42e/body-padding-use-variable
[Quickfix] Body padding-top use BS' SCSS variable
2015-08-22 01:19:36 +02:00
Lukas Matt
dbc57d9371 Load bower dependencies on jsxc initialization
We moved the libraries from jsxc.deb.js

Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
2015-08-21 12:43:50 +02:00