Commit Graph

20144 Commits

Author SHA1 Message Date
David Gil
d134284774 background is the new before(:each) 2015-08-12 14:59:54 +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
caa0c3eaab change background by before(:each) in tests - background is evil! 2015-08-12 14:59:22 +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
Alberto Garcia Cabeza
00af11396d Improves styles for auth pages 2015-08-12 14:07:34 +02:00
kikito
5cef152c37 Adds organization rejection & tests 2015-08-12 13:47:47 +02:00
Juanjo Bazán
e880cb4f1a removes unused line from spec 2015-08-12 12:00:06 +02:00
Alberto Garcia Cabeza
502920c7f2 Improves styles for account page, adds user image 2015-08-12 11:53:28 +02:00
Alberto Garcia Cabeza
94dc53e68c Improves styles for account page, adds user avatar 2015-08-12 11:44:15 +02:00
Enrique García
1299987272 Merge pull request #146 from dgilperez/issue-142
Fixes #142
2015-08-12 10:50:38 +02:00
Enrique García
d243d81fea Merge pull request #150 from AyuntamientoMadrid/votes
Avoid voting by not logged users
2015-08-12 10:15:06 +02:00
Manuel Maldonado
4b501ee46b Capistrano recipe 2015-08-12 01:36:42 +02:00
David Gil
10588a989c revert using pluck to use map again 2015-08-12 00:02:19 +02:00
Juanjo Bazán
0541e9e936 shows not-logged votes on hover if user not logged
Fixes #85
2015-08-11 23:20:42 +02:00
David Gil
44d4fa9fc4 order comments by the most recent first 2015-08-11 20:27:37 +02:00
kikito
523e69fb02 Adds validations for organizations 2015-08-11 19:48:11 +02:00
kikito
9ee1e5dbc5 Adds Abilities for Organizations 2015-08-11 19:34:18 +02:00
David Gil
9d2bece0b3 Fixes #142 2015-08-11 19:33:55 +02:00
kikito
83e3dd1c6f Implements User#organization? and User#verified_organization? 2015-08-11 19:15:00 +02:00
kikito
3551b55bdd add migration for User organization fields 2015-08-11 18:57:16 +02:00
Alberto Garcia Cabeza
3cddc1070a Adds styles for not logged votes 2015-08-11 17:40:27 +02:00
Raimond Garcia
d86eb9f550 Merge pull request #145 from AyuntamientoMadrid/home
moves featured debates to home page
2015-08-11 17:31:53 +02:00
rgarcia
4dd7e14ac4 moves featured debates to home page 2015-08-11 17:26:25 +02:00
Raimond Garcia
2c88c6e07d Merge pull request #141 from AyuntamientoMadrid/debates
Improves styles for debates
2015-08-11 13:21:42 +02:00
Alberto Garcia Cabeza
d5c27b36d5 Improves styles for debate show and comments 2015-08-11 13:16:24 +02:00
Alberto Garcia Cabeza
f9e0dad7a2 Adds links on comments title 2015-08-11 12:00:54 +02:00
Juanjo Bazán
d7931f3d74 adds ImageMagick to README 2015-08-11 11:18:57 +02:00
Raimond Garcia
37790341a9 Merge pull request #140 from AyuntamientoMadrid/fix-debates-vote
Fixes votes in debates' show
2015-08-11 11:05:54 +02:00
Raimond Garcia
7fbdd96de3 Merge pull request #139 from AyuntamientoMadrid/update-gems
Update dependencies
2015-08-11 11:05:21 +02:00
Juanjo Bazán
f36f408f63 fixes votes in debates' show
Closes #135
2015-08-11 10:57:48 +02:00
Juanjo Bazán
3f27458ce2 updates dependencies
makes gemnasium happy
2015-08-11 10:43:33 +02:00
Juanjo Bazán
6346d79c1e Merge pull request #137 from AyuntamientoMadrid/captcha-51
uses simple_captcha instead of recaptcha [#51]
2015-08-11 09:57:22 +02:00
Raimond Garcia
240125d9e8 Merge pull request #138 from AyuntamientoMadrid/styleguide
Creates style guide html
2015-08-10 21:30:14 +02:00
Alberto Garcia Cabeza
a2f83e2ced Creates style guide html 2015-08-10 20:50:29 +02:00
rgarcia
4839081ad2 uses simple_captcha instead of recaptcha [#51] 2015-08-10 20:24:56 +02:00
Juanjo Bazán
ee463f2ab1 Merge pull request #127 from Ferdy89/compartir-en-redes-sociales
Adds sharing buttons
2015-08-10 18:36:44 +02:00
Fernando Seror
6d20972f34 Share in social networks
* Add the social buttons gem to the Gemfile

* Initializer and translations for the social buttons

* Add the social buttons assets to the sprockets require

* Add the social buttons in the show debate view

* Spec to lock down the amount of social share buttons to three
2015-08-10 11:00:39 -05:00
Raimond Garcia
8053034ddf Merge pull request #132 from AyuntamientoMadrid/i18n-files
adds i18n files for new namespaces
2015-08-10 17:04:00 +02:00
Juanjo Bazán
8b50b60814 adds i18n files for new namespaces 2015-08-10 16:58:35 +02:00
Raimond Garcia
17aba2303d Merge pull request #131 from AyuntamientoMadrid/footer
Footer
2015-08-10 16:49:12 +02:00
rgarcia
66e4581a84 fixes conflicts with master 2015-08-10 16:46:27 +02:00
Raimond Garcia
16183d9909 Merge pull request #116 from AyuntamientoMadrid/admin-77
Administrator and Moderator basic interface
2015-08-10 16:41:47 +02:00
kikito
7f5f5d6b19 Adds i18n for unauthorized messages 2015-08-10 16:24:01 +02:00
kikito
51323fa891 Adds back missing authenticate_user! calls 2015-08-10 16:05:58 +02:00
kikito
84d848df7e Adapts the CommentsController to the new permissions system 2015-08-10 15:40:23 +02:00
Alberto Garcia Cabeza
91cdfbc8a1 Adds content on footer 2015-08-10 15:39:38 +02:00
Eloy Gomez
cfd923138c Add minimum PostgreSQL version. 2015-08-10 15:39:14 +02:00