Commit Graph

571 Commits

Author SHA1 Message Date
David Gil
2f41341ca8 cleanup 2015-08-14 21:15:59 +02:00
David Gil
bf95e55345 more explicit and versatile usage of avatar_image, changing style option by a direct size - asuming we will always use square images 2015-08-14 21:15:59 +02:00
David Gil
925921d605 adding initial.js to show Gmail-like user avatars; adding avatar_image helper to abstract from plugin options adding the two currently used styles, profile and small 2015-08-14 21:15:59 +02:00
Enrique García
2397344597 Merge pull request #169 from AyuntamientoMadrid/staging_deploy_fixes
adds fixes for staging deploys
2015-08-14 18:13:40 +02:00
Enrique García
beac5de0c3 Merge pull request #151 from manolomaldonado/capistrano
Capistrano recipe
2015-08-14 18:11:11 +02:00
rgarcia
76826af7dd adds fixes for staging deploys 2015-08-14 18:09:05 +02:00
Enrique García
0d78e4c92d Merge pull request #165 from AyuntamientoMadrid/admin_layout_refactoring
refactors admin layout
2015-08-14 13:35:42 +02:00
rgarcia
101477c7da refactors admin layout 2015-08-14 13:33:30 +02:00
Juanjo Bazán
577f08ea88 Merge pull request #164 from AyuntamientoMadrid/admin_layout-163
adds admin layout and access links [#163]
2015-08-14 12:41:55 +02:00
rgarcia
88defaa455 adds admin layout and access links [#163] 2015-08-14 12:37:44 +02:00
Raimond Garcia
15aafe570b Merge pull request #162 from AyuntamientoMadrid/fix-comment-form
fixes bug that hides comment form after reply
2015-08-13 20:35:59 +02:00
Juanjo Bazán
f2ea7fd95e fixes bug that hides comment form after reply
Closes #160
2015-08-13 18:27:48 +02:00
Enrique García
d832d41209 Merge pull request #157 from AyuntamientoMadrid/tags
Adds styles for tag cloud
2015-08-13 12:24:32 +02:00
kikito
83c96b1f32 Fixes tags spec 2015-08-13 12:14:04 +02:00
Raimond Garcia
1e6440955f Merge pull request #159 from AyuntamientoMadrid/license
changes license
2015-08-12 19:41:22 +02:00
Juanjo Bazán
76a5d17030 changes license to Affero GPL version 3 2015-08-12 19:30:42 +02:00
Juanjo Bazán
24b4a09a0d Merge pull request #153 from AyuntamientoMadrid/contributing
updates Contributing with best practices
2015-08-12 19:21:01 +02:00
Raimond Garcia
281d754a51 Merge pull request #149 from dgilperez/issue-144
Limitar número de etiquetas mostradas issue#144
2015-08-12 17:40:07 +02:00
David Gil
1227ce7c08 clean up tags_count_out_of_limit 2015-08-12 17:34:04 +02:00
Alberto Garcia Cabeza
8bee3abb7b Adds styles for tag clod 2015-08-12 17:08:39 +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
41e5496d2b add a couple of tests for the tag limit feature 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
Raimond Garcia
e49567c953 Merge pull request #154 from AyuntamientoMadrid/debates
Debates
2015-08-12 15:59:20 +02:00
Alberto Garcia Cabeza
ea5612c5bd Modifies styles welcome and debates index 2015-08-12 15:27:28 +02:00
Alberto Garcia Cabeza
d6c7528df3 Improves styles of debates show page 2015-08-12 15:26:46 +02:00
rgarcia
73e1365320 updates Contributing with best practices 2015-08-12 15:16:03 +02:00
Raimond Garcia
94345b0b51 Merge pull request #148 from dgilperez/issue-143-new
Incluir número total de respuestas y votos en comentarios - Fix #143
2015-08-12 15:08:09 +02:00
David Gil
d70d417c87 using explicit texts instead of I18n calls in tests 2015-08-12 15:02:59 +02:00
David Gil
a3550a55a5 create spec/models/comment_spec and add a few tests for children count 2015-08-12 14:59:54 +02:00
David Gil
9a2ef8366e change background by let since model tests do not know about background 2015-08-12 14:59:54 +02:00
David Gil
6176e148f0 fix non working migration 2015-08-12 14:59:54 +02:00
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
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
David Gil
9d2bece0b3 Fixes #142 2015-08-11 19:33:55 +02:00