Commit Graph

411 Commits

Author SHA1 Message Date
kikito
e68ee3ffae Replaces id by js-class in moderator-debate-actions 2015-08-24 18:45:22 +02:00
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
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
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
169809496e Adds filters & refactors to comment moderation 2015-08-22 20:28:48 +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
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
2c49d30952 Adds review-related methods to comment & debate 2015-08-21 21:58:48 +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
Raimond Garcia
a9a8359bc7 Merge pull request #216 from AyuntamientoMadrid/design_improvements
Design improvements
2015-08-21 20:17:34 +02:00
kikito
5328355c3e Add tests for visible admin links and fix bug 2015-08-21 19:09:26 +02:00
Alberto Garcia Cabeza
ff6285d114 Improves general styles 2015-08-21 18:57:09 +02:00
Juanjo Bazán
b396a3b415 refactors user's registration
Simplifies process and fields: 

* In: username
* Out: first_name, last_name, phone, nickname, use_nickname?

Closes #213
2015-08-21 16:41:08 +02:00
Alberto Garcia Cabeza
3c29ac90c9 Merge branch 'master' into reorganize_header 2015-08-21 13:05:21 +02:00
Alberto Garcia Cabeza
6bd060f536 Reorganizes header links, adds responsive styles 2015-08-21 13:04:41 +02:00
Alberto Garcia Cabeza
efd7b688cb Renames language to locale 2015-08-21 08:50:09 +02:00
kikito
01eb89f5f4 DRYes comment views related with flagging as inappropiate 2015-08-20 22:54:05 +02:00
Alberto Garcia Cabeza
2415a0fae2 Adds styles for language select 2015-08-20 21:28:10 +02:00
kikito
12e8cf2056 Allows flagging debates as inappropriate 2015-08-20 19:26:36 +02:00
kikito
ee881230ba merges master and fixes conflicts 2015-08-20 18:50:10 +02:00
kikito
e7effbf77c Allows flagging comments as inappropriate 2015-08-20 18:47:16 +02:00
kikito
246145e4cb adds abilities for regular users 2015-08-20 18:45:32 +02:00
Juanjo Bazán
896fe41db0 favors with_hidden 2015-08-20 17:52:59 +02:00
Juanjo Bazán
f0a6926710 adds restore user action for administrators 2015-08-20 16:06:23 +02:00
kikito
8944327405 adds InappropiateFlag model with relations and specs 2015-08-20 16:03:00 +02:00
Juanjo Bazán
b340d7741a adds hiding users by moderators 2015-08-20 13:16:37 +02:00
Juanjo Bazán
259aa29de7 adds new abilities 2015-08-20 13:16:37 +02:00
Juanjo Bazán
bd16e9345a adds paranoia to User 2015-08-20 13:16:37 +02:00
Alberto Garcia Cabeza
51d08d9798 Adds styles for pagination 2015-08-20 12:35:00 +02:00
Juanjo Bazán
9e15652d58 adds kaminari views 2015-08-20 11:35:46 +02:00
Enrique García
307fb05e09 Merge pull request #201 from AyuntamientoMadrid/pagination
Adds Pagination
2015-08-20 00:54:06 +02:00
kikito
5c3f664da4 Fixes links in Admin::Organizations to handle filters + pages 2015-08-20 00:50:50 +02:00
kikito
710e83fb22 Adds locale switcher js code + feature tests 2015-08-19 21:40:17 +02:00
kikito
5205ac99e3 Moves the locale switcher to its own shared view 2015-08-19 21:39:57 +02:00
kikito
961a317c9b Adds (a modified version of) queryParameters.js 2015-08-19 21:26:29 +02:00
kikito
480ecd39c4 Replaces locales helper which returns an array by another which returns select options 2015-08-19 21:25:56 +02:00
kikito
c9c4f95fdc Rename language style to locale 2015-08-19 21:07:17 +02:00
Juanjo Bazán
ec6b702d00 Merge pull request #200 from AyuntamientoMadrid/locale-switch-turbolinks-166
disable turbolinks in locale switcher. fixes #166
2015-08-19 18:00:35 +02:00