Commit Graph

20065 Commits

Author SHA1 Message Date
rgarcia
98463e4930 adds comments to debates [#7] 2015-07-18 17:38:57 +02:00
rgarcia
05705f3174 configures act_as_commentable_with_threading gem [#7] 2015-07-18 17:38:33 +02:00
rgarcia
dc8969781a cleans up schema [#8] 2015-07-18 17:33:45 +02:00
rgarcia
12d35085e0 fixing conflicts [#8] 2015-07-18 17:30:31 +02:00
rgarcia
eb083c700b adds tags feature specs [#8] 2015-07-18 17:28:15 +02:00
rgarcia
e20af8ab06 adds tag cloud [#8] 2015-07-18 17:24:30 +02:00
rgarcia
72bc790310 adds tags to debates [#8] 2015-07-18 17:24:16 +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
0cb0a691c8 adds author validation spec [#11] 2015-07-18 17:20:30 +02:00
rgarcia
4ed8881116 fixing specs [#11] 2015-07-18 17:20:30 +02:00
rgarcia
6430693b85 updates specs for debate authors [#11] 2015-07-18 17:20:30 +02:00
rgarcia
83ac9dc1fc displays terms of conditions in new and create [#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
272c03f6a5 adds first name and last name to users 2015-07-18 17:20:17 +02:00
Juanjo Bazán
370924a377 Merge pull request #11 from AyuntamientoMadrid/devise_debates-11
Integrar devise con debates (ruby)
2015-07-18 17:14:31 +02:00
rgarcia
31e17396f5 removes unused association [#11] 2015-07-18 17:11:46 +02:00
rgarcia
967b5cdcb5 adds author validation spec [#11] 2015-07-18 15:09:28 +02:00
rgarcia
bcd96ab1b4 fixing specs [#11] 2015-07-18 15:09:06 +02:00
rgarcia
c55021e18b fixing conflicts [#8] 2015-07-18 15:04:36 +02:00
rgarcia
9a8cc47784 updates specs for debate authors [#11] 2015-07-18 14:50:14 +02:00
rgarcia
9b4182250b displays terms of conditions in new and create [#11] 2015-07-18 14:49:57 +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
acc8be3b46 adds basic devise feature specs 2015-07-18 14:47:04 +02:00
rgarcia
9fa952c118 adds first name and last name to users 2015-07-18 14:47:04 +02:00
rgarcia
9bdf9dce11 adds devise spanish translations 2015-07-18 14:47:04 +02:00
rgarcia
3108228cc7 adds user menu 2015-07-18 14:47:04 +02:00
Juanjo Bazán
79def8e655 Merge pull request #14 from AyuntamientoMadrid/devise-basic-actions
Devise basic actions
2015-07-18 14:38:54 +02:00
rgarcia
8f78509b0c adds basic devise feature specs 2015-07-17 19:53:19 +02:00
rgarcia
62d0a385ab adds first name and last name to users 2015-07-17 19:52:55 +02:00
rgarcia
83654042d9 adds devise spanish translations 2015-07-17 19:52:54 +02:00
rgarcia
30982d101f adds user menu 2015-07-17 19:52:54 +02:00
Raimond Garcia
3ee102c0c5 Merge pull request #13 from AyuntamientoMadrid/update-ruby
updates Ruby to 2.2.2
2015-07-16 21:55:58 +02:00
Juanjo Bazán
d6cbac934e updates ruby version to 2.2.2 2015-07-16 21:49:00 +02:00
Juanjo Bazán
b60312a402 Merge pull request #6 from AyuntamientoMadrid/users-6
Adds User
2015-07-16 21:32:41 +02:00
rgarcia
75f1638cd6 fixing conflicts [#6] 2015-07-16 21:29:44 +02:00
Juanjo Bazán
f09f7a17c2 Merge pull request #5 from AyuntamientoMadrid/debates-5
Adds Debate resource
2015-07-16 21:26:08 +02:00
rgarcia
a4ee10fd3f fixing specs [#5] 2015-07-16 20:27:09 +02:00
rgarcia
c24c78e5e7 fixing conflicts [#5] 2015-07-16 20:18:33 +02:00
rgarcia
e88832b5a3 fixing conflicts [#6] 2015-07-16 20:14:18 +02:00
Juanjo Bazán
24fb2765b9 Merge pull request #4 from AyuntamientoMadrid/capybara-4
Capybara configuration
2015-07-16 20:07:44 +02:00
Juanjo Bazán
9abc5d925b Merge pull request #2 from AyuntamientoMadrid/foundation-2
Foundation configuration
2015-07-16 20:07:05 +02:00
rgarcia
1d17d1d1f7 updates db schema [#6] 2015-07-16 19:50:03 +02:00
rgarcia
f618a9f45d adds devise configuration [#6] 2015-07-16 19:47:54 +02:00
rgarcia
a63b272f8b adds debate feature specs [#5] 2015-07-16 19:26:34 +02:00
rgarcia
62349acc54 adds debate model specs [#5] 2015-07-16 19:26:17 +02:00
rgarcia
8df23ed498 adds debate validations [#5] 2015-07-16 19:26:01 +02:00
rgarcia
9b3d41552d configures responders gem [#5] 2015-07-16 19:25:47 +02:00