Commit Graph

216 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
5328355c3e Add tests for visible admin links and fix bug 2015-08-21 19:09:26 +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
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
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
Alberto Garcia Cabeza
0d54cca910 Changes test for pagination 2015-08-20 12:55:31 +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
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
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
947514fbfc adds pagination to debates#index
Ref: #80
2015-08-19 16:30:25 +02:00
kikito
21c2fa2e3d Adds user.verified_organization? 2015-08-19 12:08:03 +02:00
kikito
b28f63b016 merges master and fixes conflicts 2015-08-18 09:35:13 +02:00
Juanjo Bazán
862a239d87 fixes specs and makes stats for admins eyes only 2015-08-17 22:00:54 +02:00
Juanjo Bazán
7e1cd2940d Fix conflicts 2015-08-17 21:08:15 +02:00
rgarcia
cf4495e17c adds spec for error messages on registration signup [#99] 2015-08-17 19:25:40 +02:00
Eloy Gomez
5b0cd4a8ba Show charts using c3.js 2015-08-17 19:15:17 +02:00
Eloy Gomez
5d91663016 Add a helper for build c3.js chart compatible data 2015-08-17 19:13:56 +02:00
Raimond Garcia
a9a24befb8 Merge pull request #192 from AyuntamientoMadrid/official-position
Official positions
2015-08-17 18:49:22 +02:00
Juanjo Bazán
5c630ac41d adds settings area to admin 2015-08-17 18:38:57 +02:00
kikito
66c8931ae9 adds account tests to increase test coverage 2015-08-17 18:31:04 +02:00
rgarcia
ce05826a92 adds robustness to spec 2015-08-17 18:30:04 +02:00
kikito
9e1581656a merges master and fixes conflicts 2015-08-17 17:38:34 +02:00
Juanjo Bazán
fabcb42328 adds edition/management of officials to admin zone 2015-08-17 17:04:29 +02:00
Juanjo Bazán
8390165ba8 adds official scope 2015-08-17 15:22:49 +02:00
Juanjo Bazán
e29ae67f31 adds methods to add/remove official position 2015-08-17 15:22:49 +02:00
Juanjo Bazán
d80fd8e468 adds official? method to User 2015-08-17 15:22:49 +02:00
kikito
1c435eacbe adds filters to admin/organizations 2015-08-17 14:25:43 +02:00
rgarcia
d9a31b7158 adds specs for moderation [#136] 2015-08-17 13:39:58 +02:00
rgarcia
f31ed2940d adds moderation to comments and debates [#136] 2015-08-17 13:39:31 +02:00
kikito
3096a73892 Moves organization verification to Admin from Moderation 2015-08-17 13:22:38 +02:00
kikito
42b441a866 fixes specs by using the correct capthca helper instead of deactivating it 2015-08-17 12:29:42 +02:00
kikito
8ca546a431 merges master and fixes conflicts 2015-08-17 02:40:11 +02:00
kikito
e84873d875 Modifies devise shared link to include organisations sometimes 2015-08-17 01:16:08 +02:00
kikito
9af1f2f4a9 Adds registration controller for organizations 2015-08-17 01:16:07 +02:00
kikito
9343952d52 Adds User.organization_attributes 2015-08-17 01:16:07 +02:00
rgarcia
bea38226fe fixes spacing 2015-08-16 22:45:43 +02:00
rgarcia
a81612b226 improves consistency of error messages [#110] 2015-08-16 15:57:09 +02:00
Juanjo Bazán
7cc7efb2c7 uses timezone aware method instead of Date 2015-08-16 00:22:17 +02:00
Juanjo Bazán
e2e1783418 adds spec
checks failed debate create/update and inclusion of featured tags
2015-08-16 00:01:30 +02:00
Juanjo Bazán
aeceaf9ea8 fixes bug: edit Debate was not validating captcha 2015-08-15 23:51:30 +02:00