David Gil
|
a4ec38d752
|
adds create and destroy to the tags CRUD
|
2015-08-15 20:01:52 +02:00 |
|
David Gil
|
664f656fe3
|
tests featured tags administration and adding featured tags to debates
|
2015-08-15 19:38:42 +02:00 |
|
David Gil
|
8b89cc5117
|
adds some js to click-and-add tags to the debate's tag list input
|
2015-08-15 18:57:27 +02:00 |
|
Juanjo Bazán
|
c909db4022
|
Merge pull request #175 from AyuntamientoMadrid/refactoring
Refactoring
|
2015-08-15 18:53:01 +02:00 |
|
David Gil
|
1de941d1fa
|
adding featured tags list to debate form
|
2015-08-15 18:36:10 +02:00 |
|
David Gil
|
0a4aafd8de
|
scaffolds a tag list to mark tags as featured on the admin section
|
2015-08-15 18:22:29 +02:00 |
|
David Gil
|
ae960bba9f
|
adds featured field to tags
|
2015-08-15 18:21:25 +02:00 |
|
rgarcia
|
9f2d60c4ce
|
refactors voted debates
|
2015-08-15 14:57:41 +02:00 |
|
rgarcia
|
4751954377
|
refactors debate search
|
2015-08-15 14:57:04 +02:00 |
|
Raimond Garcia
|
8cf8d9f857
|
Merge pull request #174 from AyuntamientoMadrid/improving_debates
Improving debates
|
2015-08-15 02:14:21 +02:00 |
|
rgarcia
|
cc1e1aab60
|
fixes specs
for vampires
|
2015-08-15 01:55:39 +02:00 |
|
Alberto Garcia Cabeza
|
09d71ad84f
|
Merge branch 'master' into improving_debates
Conflicts:
app/assets/stylesheets/debates.scss
app/assets/stylesheets/participacion.scss
|
2015-08-15 01:45:56 +02:00 |
|
Alberto Garcia Cabeza
|
3ab3285ce4
|
Cleans scss files
|
2015-08-15 01:20:26 +02:00 |
|
Alberto Garcia Cabeza
|
510a5c8332
|
Improves styles for tag cloud
|
2015-08-15 01:13:55 +02:00 |
|
Alberto Garcia Cabeza
|
4d8b0a01ce
|
Includes count number of comments on debate show
|
2015-08-15 01:13:34 +02:00 |
|
Alberto Garcia Cabeza
|
26e2a7bcbb
|
Cleans style guide
|
2015-08-15 01:05:46 +02:00 |
|
Alberto Garcia Cabeza
|
f98510cea7
|
Improves styles for simple captcha
|
2015-08-15 01:05:00 +02:00 |
|
Alberto Garcia Cabeza
|
feb85c2aea
|
Adds blog link on header
|
2015-08-15 00:58:45 +02:00 |
|
Alberto Garcia Cabeza
|
7f2897aef4
|
Removes unused images
|
2015-08-15 00:57:41 +02:00 |
|
Alberto Garcia Cabeza
|
a255d15793
|
Updates custom icons fonts
|
2015-08-15 00:56:58 +02:00 |
|
Alberto Garcia Cabeza
|
468e8c2f39
|
Removes unused lato fonts
|
2015-08-15 00:56:00 +02:00 |
|
Alberto Garcia Cabeza
|
b37279c8e7
|
Replaces Roboto font with Open Sans
|
2015-08-15 00:55:30 +02:00 |
|
Juanjo Bazán
|
7919460554
|
removes comment
|
2015-08-14 23:41:00 +02:00 |
|
Raimond Garcia
|
ce309f352f
|
Merge pull request #158 from dgilperez/issue-156
Añadir initial.js para mostrar Gmail-ish avatares - issue #156
|
2015-08-14 21:40:59 +02:00 |
|
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 |
|