Commit Graph

678 Commits

Author SHA1 Message Date
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
kikito
5328355c3e Add tests for visible admin links and fix bug 2015-08-21 19:09:26 +02:00
kikito
01eb89f5f4 DRYes comment views related with flagging as inappropiate 2015-08-20 22:54:05 +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
e5f893c8d1 Adds i18n texts for flagging content 2015-08-20 18:45:56 +02:00
kikito
246145e4cb adds abilities for regular users 2015-08-20 18:45:32 +02:00
Enrique García
73f5c4e21e Merge pull request #208 from AyuntamientoMadrid/hide-users
Moderate users
2015-08-20 18:00:43 +02:00
Juanjo Bazán
896fe41db0 favors with_hidden 2015-08-20 17:52:59 +02:00
Juanjo Bazán
aff366827d removes unused route 2015-08-20 16:14:22 +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
kikito
1e6ed6940b Merge branch 'master' into flag-as-inappropiate-171 2015-08-20 16:01:04 +02:00
kikito
1458037ee8 adds db migrations for flagging comments & debates as inappropiate 2015-08-20 15:35:47 +02:00
Juanjo Bazán
a269750c49 improves moderation users spec to include comments 2015-08-20 13:47:45 +02:00
Juanjo Bazán
8bb0a13f3f removes unused :js from spec 2015-08-20 13:30:40 +02:00
Juanjo Bazán
37ef85ed91 adds spec for paranoid added bulk methods 2015-08-20 13:26:51 +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
Juanjo Bazán
2b6ea3a40f Merge pull request #207 from AyuntamientoMadrid/pagination
Pagination styles
2015-08-20 13:15:42 +02:00
Juanjo Bazán
d70ca040f3 ignores unused kaminari i18n keys 2015-08-20 13:10:21 +02:00
Alberto Garcia Cabeza
0d54cca910 Changes test for pagination 2015-08-20 12:55:31 +02:00
rgarcia
839314868c adding staging.rb 2015-08-20 12:50:36 +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
5b529c7963 Merge pull request #206 from AyuntamientoMadrid/code-of-conduct
Code of conduct
2015-08-20 11:19:29 +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
Juanjo Bazán
541a7479ab Merge pull request #203 from AyuntamientoMadrid/select-language-switcher-155
Select language switcher
2015-08-19 22:56:09 +02:00
Juanjo Bazán
b2f29215ee unifies localization specs 2015-08-19 22:51:58 +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
332df09491 Add locale entry to each locale 2015-08-19 21:07:35 +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
Juanjo Bazán
fda8412ed3 adds pagination to admin lists
Ref: #80
2015-08-19 16:32:40 +02:00
Juanjo Bazán
a43c753ebb updates style of admin/organizations 2015-08-19 16:32:39 +02:00
Juanjo Bazán
3732b7f420 adds pagination to 1st level comments in debate
Ref: #80
2015-08-19 16:32:39 +02:00
Juanjo Bazán
10d7e9effe changes to unambiguous order declaration.
Specified as a string referred table of 'created_at' was ambiguous, index failed when filtering by tag
2015-08-19 16:32:39 +02:00
Juanjo Bazán
0066cb0514 compares ids 2015-08-19 16:32:39 +02:00
Juanjo Bazán
947514fbfc adds pagination to debates#index
Ref: #80
2015-08-19 16:30:25 +02:00
Juanjo Bazán
0b760ff217 Merge pull request #202 from AyuntamientoMadrid/deleted_user_comment
Deleted user comment
2015-08-19 16:28:28 +02:00
Juanjo Bazán
d2ac8b7f43 applies hidden users styles commented 2015-08-19 16:22:24 +02:00
Alberto Garcia Cabeza
2eccd30eff Adds styles for deleted users, improves previous 2015-08-19 15:01:10 +02:00