Jonne Haß
24d9be2e68
Merge branch 'stable' into develop
2015-08-27 21:03:16 +02:00
augier
2ce7a1e185
Mobile subdomain
...
closes #6354
2015-08-27 21:01:36 +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
Jonne Haß
2bf6c87964
Merge branch 'stable' into develop
2015-08-23 22:49:51 +02:00
theworldbright
6e74ee7d21
Make PostPresenter inherit from BasePresenter
...
closes #6315
2015-08-23 22:49:45 +02:00
theworldbright
335b1c32aa
Refactor post presenter
2015-08-23 22:49:12 +02:00
Jonne Haß
865cfc1cc2
Merge pull request #6342 from svbergerem/sidebar-polishing-code-style
...
Fix style regressions and code style for sidebar polishing PR
2015-08-23 16:13:40 +02:00
Steffen van Bergerem
89a3ea6d20
Merge branch 'stable' into develop
2015-08-23 14:45:33 +02:00
Jonne Haß
a1ca45b201
Update NodeInfo to final 1.0 schema
...
closes #6340
2015-08-23 14:45:20 +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
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
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
augier
38f811f9fd
Admin panel use 'form-control' class for selects
2015-08-22 01:20:33 +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
Jonne Haß
d396d5555f
Merge branch 'stable' into develop
2015-08-21 14:23:46 +02:00
Benjamin Neff
663835ed3a
remove old webfinger/hcard code
...
closes #6310
2015-08-21 14:23:08 +02:00
Benjamin Neff
d28e03f053
use discovery from diaspora_federation gem
2015-08-21 14:21:43 +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
Jonne Haß
b4923cc17c
Merge pull request #6276 from Zauberstuhl/fix_broken_jsxc
...
bump diaspora_jsxc to v0.1.2
2015-08-19 10:18:22 +02:00
augier
95c3d9694b
Body padding-top use BS' SCSS variable
2015-08-15 11:31:25 +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
b34f0e792f
followed tags selected state was missing
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
Pablo Cuadrado
9bd7ceb722
removing uppercase to prevent l18n issues
2015-08-11 18:08:12 +02:00
Pablo Cuadrado
c8ba4f061e
polishing of the right sidebar
2015-08-11 18:08:12 +02:00
Steffen van Bergerem
e8acaa08ad
Remove browser detection
2015-08-10 22:55:05 +02:00
Steffen van Bergerem
8bc86eb98b
Replace jquery.autocomplete with typeahead.js
2015-08-10 22:55:05 +02:00
Jonne Haß
25be9ecfd2
Merge branch 'stable' into develop
2015-08-09 18:35:44 +02:00
theworldbright
d7c92431ae
Extract service from comments controller
...
closes #6307
2015-08-09 18:35:11 +02:00
Jason Robinson
cb909c0d70
Strip leading/trailing whitespace from pod tags list in social relay well known
...
Closes #6303
2015-08-09 00:33:35 +03:00
Jonne Haß
480384a077
Merge branch 'stable' into develop
2015-08-06 22:56:30 +02:00
Steffen van Bergerem
dc576fb0d6
Check if person is nil in person_image_tag
...
closes #6286
2015-08-06 22:55:41 +02:00
Steffen van Bergerem
0aa453e437
Merge pull request #6291 from AugierLe42e/change-actions-icons-mobile
...
Use entypo icons on mobile posts
2015-08-06 18:00:03 +02:00
augier
f917757b5b
Use entypo icons on mobile posts
2015-08-06 15:56:58 +02:00