Commit Graph

71 Commits

Author SHA1 Message Date
Juanjo Bazán
7e1cd2940d Fix conflicts 2015-08-17 21:08:15 +02:00
Eloy Gomez
5d91663016 Add a helper for build c3.js chart compatible data 2015-08-17 19:13:56 +02:00
Juanjo Bazán
a13f4920a1 adds Settings 2015-08-17 18:13:30 +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
rgarcia
f31ed2940d adds moderation to comments and debates [#136] 2015-08-17 13:39:31 +02:00
rgarcia
9abe303b31 removes unused method 2015-08-16 23:05:01 +02:00
rgarcia
bea38226fe fixes spacing 2015-08-16 22:45:43 +02:00
rgarcia
9f2d60c4ce refactors voted debates 2015-08-15 14:57:41 +02:00
rgarcia
4751954377 refactors debate search 2015-08-15 14:57:04 +02:00
David Gil
1227ce7c08 clean up tags_count_out_of_limit 2015-08-12 17:34:04 +02:00
David Gil
9a1bdb7aca move tags helper to view, fix case when less than 5 tags were present, tag list was showing a + link 2015-08-12 16:26:41 +02:00
David Gil
06d8c96d54 Limiting max number of tags shown on debate cards ~ issue#144 2015-08-12 16:26:41 +02:00
David Gil
7c8948639f move model code out of migration 2015-08-12 14:59:54 +02:00
David Gil
1ee3378768 adding a few tests 2015-08-12 14:59:54 +02:00
David Gil
575c2dd281 faking children_count counter cache due to possible bug with awesome_nested_set 2015-08-12 14:59:21 +02:00
David Gil
0291f574a2 add vote counters to comments 2015-08-12 14:59:21 +02:00
David Gil
19ef481917 adding counter_cache to comments children and WIPing on the issue 2015-08-12 14:58:36 +02:00
David Gil
44d4fa9fc4 order comments by the most recent first 2015-08-11 20:27:37 +02:00
rgarcia
4839081ad2 uses simple_captcha instead of recaptcha [#51] 2015-08-10 20:24:56 +02:00
kikito
84d848df7e Adapts the CommentsController to the new permissions system 2015-08-10 15:40:23 +02:00
kikito
ce27a6f2ea Adapts AccountController to new permissions system 2015-08-10 15:10:47 +02:00
kikito
30e738a2fe Add cancan authorization in all main urls 2015-08-10 14:59:42 +02:00
kikito
a9a4f4fb81 Undo user.moderator? returning true for admins 2015-08-10 13:00:26 +02:00
kikito
8b53ae6f08 Adds Abilities for Debates 2015-08-10 12:38:22 +02:00
Eloy Gomez
02f19aa4b1 Add visit_id to debate 2015-08-08 13:09:22 +02:00
Juanjo Bazán
f8becd1b23 Merge branch 'master' into admin-77 2015-08-08 13:00:41 +02:00
Eloy Gomez
a83a787090 Add model visit 2015-08-08 12:56:41 +02:00
Eloy Gomez
aaeb77d969 Add gem ahoy_matey and some dependencies 2015-08-08 12:05:55 +02:00
rgarcia
3752054aab sends emails [#23] 2015-08-07 20:52:53 +02:00
kikito
9eae91c764 Makes user.moderator? return true for administrators 2015-08-07 18:52:09 +02:00
Juanjo Bazán
d04383db24 validates uniqueness of admins & mods 2015-08-07 18:20:20 +02:00
kikito
c04d397e66 Implements User.administrator? & User.moderator? 2015-08-07 17:20:20 +02:00
kikito
3378790764 Adds migrations & models for administrators & moderators 2015-08-07 17:04:50 +02:00
Juanjo Bazán
af0698da35 fixes conflicts 2015-08-07 10:12:58 +02:00
Juanjo Bazán
6e7832957a adds method to get user votes on specific debates 2015-08-06 18:10:14 +02:00
kikito
72c33330cf Adds nickname-related validations & name to User 2015-08-06 16:53:18 +02:00
kikito
5c141e36ab uses the debate title length in the debates form 2015-08-06 14:01:48 +02:00
rgarcia
fa5b678b69 fixes conflicts with master [#25] 2015-08-05 13:47:23 +02:00
kikito
87dd655d70 Make debate.description always html_safe 2015-08-04 18:42:49 +02:00
kikito
b53bc42dcd Uses the TagSanitizer in Debate 2015-08-03 19:32:00 +02:00
Juanjo Bazán
8fa6bab454 Merge pull request #76 from AyuntamientoMadrid/sanitize-debate-desc-71
Sanitizes debate desc
2015-08-02 22:32:42 +02:00
rgarcia
7a50d2064c adds voting methods to comment model [#25] 2015-08-02 13:35:48 +02:00
kikito
c1028f794c Implement description sanitization 2015-07-31 16:10:32 +02:00
Juanjo Bazán
627616d9ff adds devise's confirmable/reconfirmable to user 2015-07-31 13:51:03 +02:00
Juanjo Bazán
df1a800d94 adds editable methods to Debate 2015-07-19 14:46:21 +02:00
Juanjo Bazán
984984473f Fix conflict 2015-07-18 21:58:43 +02:00
Juanjo Bazán
b6d2a5efd6 uses new hash syntax by default 2015-07-18 21:49:36 +02:00