Jonne Haß
176b32c815
Merge branch 'stable' into develop
2015-09-07 12:41:36 +02:00
zaziemo
d38741d5eb
add more specs to test moderator role
...
fixes #5324
closes #6351
2015-09-07 12:38:12 +02:00
zaziemo
c2c6ed5dea
refactor moderator role and add specs
...
#5324
2015-09-07 12:32:09 +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
098c30c2b7
adapt report spec for the moderator
2015-09-07 12:29:46 +02:00
zaziemo
b2dc77e1e6
change method name for a better understanding of what the befor_filter does
...
and correct test syntax
#5324
2015-09-07 12:24:12 +02:00
realtin
bc75371b7a
report controller renders index for the moderator
...
(#5324 )
2015-09-07 12:24:12 +02:00
zaziemo
3a3c881735
add new role moderator analogue to admin role
...
#5324
2015-09-07 12:24:12 +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
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
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
Dennis Schubert
6b863defa3
Merge branch 'stable' into develop
2015-08-27 05:25:51 +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
335b1c32aa
Refactor post presenter
2015-08-23 22:49:12 +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
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
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
augier
281d1a9161
Rebasing and fixing tests
2015-08-11 18:12:02 +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
augier
f917757b5b
Use entypo icons on mobile posts
2015-08-06 15:56:58 +02:00
Jonne Haß
4442616b0d
Merge branch 'stable' into develop
2015-07-30 12:01:35 +02:00
Steffen van Bergerem
536d1fe0e7
Move nsfw-shield to status-message
...
closes #6270
2015-07-30 12:00:48 +02:00
Steffen van Bergerem
e402bbdd3d
Merge pull request #6245 from AugierLe42e/fix-nsfw-author
...
Fix nsfw author
2015-07-30 00:28:15 +02:00
augier
9a23c92f8e
Show author of NSFW post
2015-07-29 21:13:41 +02:00
Jonne Haß
4abc0c5988
Merge branch 'stable' into develop
2015-07-29 10:06:04 +02:00
Steffen van Bergerem
67653cf465
Update backbone.js
...
closes #6262
2015-07-29 10:04:18 +02:00
Dennis Schubert
04135d7b28
Merge branch 'stable' into develop
2015-07-27 02:05:14 +02:00
