Commit Graph

20144 Commits

Author SHA1 Message Date
kikito
c6976b0905 Adds test for not using moderation links in my own comments 2015-08-24 18:36:56 +02:00
kikito
36fb9b60b2 Use a js-class instead of an id for moderator-comment-actions 2015-08-24 18:35:59 +02:00
Juanjo Bazán
030fd49120 allows comment as moderator/administrator
Ref: #170
2015-08-24 18:17:04 +02:00
Juanjo Bazán
57228636c4 adds as_moderator/administrator methods to comment 2015-08-24 17:47:09 +02:00
kikito
0279c08792 fixes typo 2015-08-24 17:23:50 +02:00
Juanjo Bazán
46643185f8 adds administrator_id to comments 2015-08-24 17:22:38 +02:00
Juanjo Bazán
42348511e1 adds moderator_id to comments 2015-08-24 17:22:21 +02:00
kikito
5e31a9f338 adds a new "organization sigup success" view. Related with #226 2015-08-24 14:34:58 +02:00
Juanjo Bazán
3085f265d8 adds abilities for commenting as moderator/admin 2015-08-24 13:17:58 +02:00
Alberto Garcia Cabeza
dffb8e8a5e Adds styles for comment as administrator 2015-08-24 12:29:35 +02:00
Alberto Garcia Cabeza
cfd25042b6 Adds styles for comment as moderator 2015-08-24 12:22:31 +02:00
Raimond Garcia
f1b625aadd Merge pull request #230 from jjballano/196-phantomjs-dependency
#196 phantomjs dependency
2015-08-24 10:32:12 +02:00
jjballano
3af058bec1 PhantomJS 2.0 as a prerequisite 2015-08-24 06:30:30 +01:00
jjballano
4b0f7b54ca PhantomJS 2.0 as a prerequisite 2015-08-24 06:25:45 +01:00
Jose Manuel
982dc180cc Adds moderators config to admin console 2015-08-24 01:50:01 +01:00
Raimond Garcia
86ebe64dba Merge pull request #229 from AyuntamientoMadrid/flag-as-inappropiate-171
Flag as inappropiate
2015-08-23 22:06:28 +02:00
kikito
c88f7c1f30 merges master and fixes conflicts 2015-08-23 20:27:11 +02:00
kikito
720630e0ab Fixes failing spec which expected a menu id 2015-08-23 18:32:00 +02:00
Raimond Garcia
8f2cec60bf Merge pull request #223 from AyuntamientoMadrid/improve_admin
Improve admin
2015-08-23 12:11:14 +02:00
Alberto Garcia Cabeza
908d19e2e7 Improves styles for admin 2015-08-23 11:45:43 +02:00
kikito
5db63228ad Adds moderation sidebar 2015-08-23 00:02:40 +02:00
kikito
5eeaa7d189 implements /moderation/debates 2015-08-22 23:20:55 +02:00
kikito
47842cb1cc Refactors spec/features/moderation/comments_spec 2015-08-22 20:56:05 +02:00
kikito
169809496e Adds filters & refactors to comment moderation 2015-08-22 20:28:48 +02:00
kikito
8bc92811b6 Adds traits to debate & comment factories 2015-08-22 20:20:47 +02:00
kikito
9785749057 Refactors organization factories & admin controller 2015-08-22 19:46:28 +02:00
Alberto Garcia Cabeza
30d685ec32 Adds styles for organizations 2015-08-22 18:06:27 +02:00
Alberto Garcia Cabeza
6b4b0553b9 Adds new icons for admin menu 2015-08-22 18:06:03 +02:00
Alberto Garcia Cabeza
9d992da2be Adds new icon for rejected items 2015-08-22 18:05:32 +02:00
Alberto Garcia Cabeza
570169af57 Changes icons classes names 2015-08-22 14:46:26 +02:00
Alberto Garcia Cabeza
d1a3ea6fd4 Updates custom icons font 2015-08-22 14:45:43 +02:00
Juanjo Bazán
752c8f6651 updates Gemfile 2015-08-22 12:50:11 +02:00
Raimond Garcia
c473c30792 Merge pull request #222 from AyuntamientoMadrid/mails
Improves emails
2015-08-22 11:48:08 +02:00
kikito
4f0c49f921 Changes moderation/comments to allow for different commentable_types 2015-08-22 09:15:20 +02:00
Juanjo Bazán
c08d2cdf08 improves emails
Adds texts and i18n, ready to add design now.
Advances #221
2015-08-21 23:01:51 +02:00
kikito
00b51bbc23 Adds first version of comment moderation
Missing:
* Ensure removing a flag updates the flagged_at attribute correctly
* Showing the debate when the comment is not a “root”
* Filter (pending / reviewed / all)
* Order
* Same for debates
2015-08-21 22:01:47 +02:00
kikito
b7718a2e5d Adds i18n for comment moderation view 2015-08-21 21:59:11 +02:00
kikito
2c49d30952 Adds review-related methods to comment & debate 2015-08-21 21:58:48 +02:00
kikito
b4bd70436a Adds routes for new methods in comment & debate moderation 2015-08-21 21:57:00 +02:00
kikito
5e32fd2fa4 Adds new abilities for moderators
extends hiding (i.e. you can not hide your own content or yourself) and
adds marking as reviewed
2015-08-21 20:39:40 +02:00
kikito
0fe7740a41 Refactors ability making flagging more efficient 2015-08-21 20:36:04 +02:00
kikito
007ca4afe0 Adds reviewed_at to comments and debates tables 2015-08-21 20:34:56 +02:00
Raimond Garcia
a9a8359bc7 Merge pull request #216 from AyuntamientoMadrid/design_improvements
Design improvements
2015-08-21 20:17:34 +02:00
rgarcia
0e6afa941d removes ssl from staging and production envs 2015-08-21 19:27:50 +02:00
rgarcia
3126200c15 removes tests and revision check before deploy 2015-08-21 19:27:10 +02:00
rgarcia
24d3342af2 uses server_name from secrets 2015-08-21 19:18:30 +02:00
kikito
5328355c3e Add tests for visible admin links and fix bug 2015-08-21 19:09:26 +02:00
Alberto Garcia Cabeza
fbc1817f81 Modifies test for not logged users 2015-08-21 19:03:43 +02:00
Raimond Garcia
db45451d9b Merge pull request #215 from AyuntamientoMadrid/deploy
Deploy
2015-08-21 19:03:01 +02:00
rgarcia
a7dc306a40 Merge branch 'master' into deploy 2015-08-21 19:00:22 +02:00