zaziemo
3a3c881735
add new role moderator analogue to admin role
...
#5324
2015-09-07 12:24:12 +02:00
Dennis Schubert
908f63fae9
Merge branch 'stable' into develop
2015-09-07 04:23:33 +02:00
Dennis Schubert
81084cde46
Merge branch 'master' into stable
2015-09-07 04:23:23 +02:00
Dennis Schubert
782c1ef6ee
Merge branch 'release/0.5.3.0'
2015-09-07 04:22:47 +02:00
Jonne Haß
6fb6b8dc8a
Merge branch 'stable' into develop
2015-09-06 13:56:25 +02:00
Jonne Haß
c0da031e33
Merge branch 'release/0.5.3.0' into stable
2015-09-06 13:56:10 +02:00
Jonne Haß
f855fb9718
updated 60 locale files [ci skip]
2015-09-06 13:53:41 +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
Jonne Haß
ac6e9fd7c7
Merge branch 'stable' into develop
2015-09-03 21:39:24 +02:00
Jonne Haß
ca5fa14376
Merge branch 'release/0.5.3.0' into stable
2015-09-03 21:39:13 +02:00
Lukas Matt
23c016cf36
Update wiki links in diaspora config
...
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
2015-09-03 21:38:56 +02:00
Dennis Schubert
67df0a20ee
Merge branch 'stable' into develop
2015-09-01 03:52:33 +02:00
Dennis Schubert
f75a6147a5
Bump version number
...
[ci skip]
2015-09-01 03:52:06 +02:00
Jonne Haß
5e2b1458cd
Merge pull request #6375 from Raven24/more_exceptions
...
forgot to pass through my own exception
2015-09-01 01:40:53 +02:00
Florian Staudacher
f8e93e1554
forgot to pass my own exceptions through
2015-09-01 01:36:04 +02:00
Jonne Haß
84083bd8bd
Merge pull request #6371 from Raven24/more_exceptions
...
pod check - make the error handling more robust
2015-08-31 20:34:22 +02:00
Florian Staudacher
461c8e67cd
make the error handling more robust
...
catch more exceptions higher up in the hierarchy
- don't stop checking all pods if there's just one malfolmed pod
avoid echoing the complete body on json error
2015-08-31 19:39:00 +02:00
Jonne Haß
3cc475c887
Merge branch 'stable' into develop
2015-08-30 22:34:56 +02:00
Jonne Haß
e47be13ae8
Merge pull request #6370 from svbergerem/update-rails_admin
...
Bump rails_admin
2015-08-30 22:34:46 +02:00
Steffen van Bergerem
a01cea0b63
Bump rails_admin
2015-08-30 21:52:52 +02:00
Jonne Haß
55eed936b0
Merge pull request #6355 from Raven24/pod-test-fixup
...
fixup pod list frontend
2015-08-30 20:18:06 +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
39fb1a6db2
Merge branch 'stable' into develop
2015-08-30 10:17:28 +02:00
Jason Robinson
0087fefd14
Change default autofollow_on_join_user
...
Due to performance of joindiaspora.com, a decision was made to set up a project pod that hosts the official support and news autofollow account (see https://www.loomio.org/d/tyZdcGNo/diasporahq-account-move-to-a-project-pod ). The new account is hq@pod.diaspora.software .
closes #6369
2015-08-30 10:17:05 +02:00
Jonne Haß
48bc79f1b5
Merge branch 'stable' into develop
2015-08-30 01:14:54 +02:00
Jonne Haß
1223699f76
Disable all network requests in Cucumber suite
...
closes #6368
2015-08-30 01:14:49 +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
Dennis Schubert
8c54d83f03
Merge branch 'stable' into develop
...
closes #6335
2015-08-29 21:38:55 +02:00
Steffen van Bergerem
82081af71a
Add Code of Conduct
2015-08-29 21:38:11 +02:00
Jonne Haß
9842841c18
Merge branch 'stable' into develop
2015-08-29 19:55:09 +02:00
Steffen van Bergerem
34319758ed
Improve posts from ... page cukes
...
closes #6367
2015-08-29 19:55:03 +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ß
05e87b3170
Merge pull request #6363 from svbergerem/mobile-view-multiple-reaction-boxes
...
Mobile view multiple reaction boxes
2015-08-29 17:02:45 +02:00
Jonne Haß
1dee542933
Merge branch 'stable' into develop
2015-08-29 17:01:14 +02:00
Jonne Haß
78e183738e
Merge pull request #6366 from jhass/aspect_sorting_cuke
...
Bump selenium-webdriver, implement aspect sorting cucumber step with …
2015-08-29 16:51:04 +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
Steffen van Bergerem
1b8d61f44c
Merge pull request #6285 from AugierLe42e/port-mobile-header-bs3
...
Styling of mobile header consistant with desktop version
2015-08-28 21:44:15 +02:00
augier
3a5406a6e1
Styling of mobile header compilant with desktop version
2015-08-28 20:30:07 +02:00
Steffen van Bergerem
cdc6e9128b
Merge pull request #6357 from AugierLe42e/badges-fix
...
[Quickfix] Correcting BS3 regression on badge color + spelling mistake
2015-08-28 15:55:33 +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
