consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,144 Commits 1 Branch 0 Tags
a6d470ded657ff18d11d25b901b63facbfae6eb1
Commit Graph

20144 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Gil
994774ec65 prevents for Comments.initialize to be called twice causing unexpected behaviour in forms, when initialize_modules is called on ajax:complete 2015-08-14 21:23:06 +02:00
David Gil
f835154233 adds a helper for avatars in specs 2015-08-14 21:18:35 +02:00
David Gil
c6154fe48d testing avatar presence 2015-08-14 21:16:53 +02:00
David Gil
2b16716ee1 add author-photo css class to author avatar 2015-08-14 21:16:53 +02:00
David Gil
d870706a26 rename css class 2015-08-14 21:16:53 +02:00
David Gil
9d4a3b08d7 use initialjs-rails instead our own copy of initial.js and view helper 2015-08-14 21:16:53 +02:00
David Gil
65998070cc initialize user avatars on ajax:complete for comments to show correctly after create 2015-08-14 21:15:59 +02:00
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
kikito
60a1cc2267 Adds User.is_organization and User.organization_name 2015-08-14 20:24:19 +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
kikito
4e5d53f2f1 Updates the Moderation Organisation controller 2015-08-13 20:05:32 +02:00
kikito
976c88177d Updates User model, moving org stuff to Organisation model 2015-08-13 20:04:57 +02:00
kikito
bdf462c16b Adds new Organization model 2015-08-13 20:04:21 +02:00
kikito
b4b69d89e7 Updates abilities for the new organisations 
Note that unverified organisations can now create debates and comments
- that is a change over the initial request
 2015-08-13 20:03:38 +02:00
kikito
19db7f9dda Updates factories to use the new organization table structure 2015-08-13 20:02:29 +02:00
Juanjo Bazán
f2ea7fd95e fixes bug that hides comment form after reply 
Closes #160
 2015-08-13 18:27:48 +02:00
kikito
91804b5f7c replaces organization migrations with a new table 2015-08-13 18:18:49 +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
kikito
a59ef10e44 adds organization controller, with views and tests 2015-08-12 18:26:12 +02:00
kikito
cb301c4426 adds organization factory and refactors ability_spec 2015-08-12 18:24:57 +02:00
kikito
674e2c5b8c Adds User.organizations scope 2015-08-12 17:49:01 +02:00
kikito
450b0098c6 Adds abilities for verifying/rejecting organizations 2015-08-12 17:48:25 +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