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ß
d60a87ee85
Merge branch 'stable' into develop
2015-08-27 15:26:11 +02:00
Jonne Haß
f627919fc4
bump uglifier
2015-08-27 15:24:18 +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
Jonne Haß
8816c7bc84
Bump Rails to 4.2.4
2015-08-27 05:19:59 +02:00
Dennis Schubert
7bd1795855
Merge pull request #6348 from diaspora/6279-backport
...
6279 backport
2015-08-27 05:09:04 +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
Dennis Schubert
e0ad53e465
Merge pull request #6347 from jhass/bump_rails
...
Bump Rails to 4.2.4
2015-08-25 04:15:53 +02:00
Jonne Haß
41b4234ecb
Bump Rails to 4.2.4
2015-08-25 01:14:48 +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ß
aeea030c9a
Merge branch 'stable' into develop
2015-08-24 20:30:03 +02:00
Jonne Haß
e614e93aeb
Merge pull request #6344 from ruby-ve/es-VE_locale
...
updating locales es-VE
2015-08-24 20:29:56 +02:00
Johan
c3041fd516
updating locales es-VE
2015-08-23 20:20:17 -04:30
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
Jonne Haß
a7b854e743
add haml-lint
2015-08-23 13:21:53 +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
Jonne Haß
e54208d39b
Merge branch 'stable' into develop
2015-08-23 11:13:47 +02:00
Steffen van Bergerem
a7287f4f93
Disable the handlebars auto-indent feature
...
closes #6339
2015-08-23 11:13:42 +02:00
augier
450bf4f4ba
Refactor and minor styling
2015-08-23 09:59:12 +02:00
Jonne Haß
515d2ba9d5
Merge branch 'stable' into develop
2015-08-22 21:53:19 +02:00
Lukas Matt
f44bb613b9
bump diaspora-vines to v0.2.0-develop
...
closes #6338
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
2015-08-22 21:51:42 +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
Benjamin Neff
21e5bd8697
add save callback for webfinger
2015-08-21 14:21:43 +02:00
Benjamin Neff
65b056341c
update federation gem
2015-08-21 14:21:42 +02:00
Jonne Haß
3de942fd88
Merge pull request #6334 from Zauberstuhl/bump_jsxc_develop
...
bump diaspora_jsxc to v0.1.4-develop
2015-08-21 13:24:37 +02:00
Jonne Haß
8e1301c969
Merge branch 'stable' into develop
2015-08-21 13:24:27 +02:00
Jonne Haß
a7bb6170ab
Merge pull request #6333 from Zauberstuhl/bump_jsxc_alpha
...
Bump jsxc alpha
2015-08-21 13:20:23 +02:00
Lukas Matt
bfcb1c3c88
bump diaspora_jsxc to v0.1.4-develop
...
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
2015-08-21 13:04:38 +02:00
Lukas Matt
afde20f638
bump diaspora_jsxc to v0.1.4.alpha
...
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
2015-08-21 13:01:32 +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ß
7714b83a72
Merge branch 'stable' into develop
2015-08-20 00:21:33 +02:00
