Commit Graph

2696 Commits

Author SHA1 Message Date
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
rgarcia
afdb0980b0 removes empty % sign when there are no votes 2015-07-18 21:27:56 +02:00
rgarcia
b060ffaa17 fixing conflicts [#9] 2015-07-18 18:19:00 +02:00
rgarcia
73c3890027 fixing conflicts [#9] 2015-07-18 18:16:10 +02:00
rgarcia
090890f1ef adds votes feature specs [#9] 2015-07-18 18:10:36 +02:00
rgarcia
e006549092 adds votes to debates [#9] 2015-07-18 18:10:19 +02:00
rgarcia
28e36b76e2 fixing conflicts [#7] 2015-07-18 18:04:23 +02:00
rgarcia
fce0068bf4 fixing conflicts [#7] 2015-07-18 17:40:38 +02:00
rgarcia
05705f3174 configures act_as_commentable_with_threading gem [#7] 2015-07-18 17:38:33 +02:00
rgarcia
12d35085e0 fixing conflicts [#8] 2015-07-18 17:30:31 +02:00
rgarcia
6adedf45b8 configures act_as_taggable [#8] 2015-07-18 17:23:00 +02:00
rgarcia
1f725a2c51 removes unused association [#11] 2015-07-18 17:20:30 +02:00
rgarcia
20e31def2e adds convenience methods and association [#11] 2015-07-18 17:20:30 +02:00
rgarcia
45094a86bc adds author to debates [#11] 2015-07-18 17:20:30 +02:00
rgarcia
31e17396f5 removes unused association [#11] 2015-07-18 17:11:46 +02:00
rgarcia
bf11dba092 adds convenience methods and association [#11] 2015-07-18 14:49:31 +02:00
rgarcia
e92174e107 adds author to debates [#11] 2015-07-18 14:49:22 +02:00
rgarcia
75f1638cd6 fixing conflicts [#6] 2015-07-16 21:29:44 +02:00
rgarcia
f618a9f45d adds devise configuration [#6] 2015-07-16 19:47:54 +02:00
rgarcia
8df23ed498 adds debate validations [#5] 2015-07-16 19:26:01 +02:00
rgarcia
b216470d59 adds debate model 2015-07-15 21:07:15 +02:00
rgarcia
8db3630837 initial commit 2015-07-15 13:32:13 +02:00