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 |
|
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
|
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 |
|
rgarcia
|
101477c7da
|
refactors admin layout
|
2015-08-14 13:33:30 +02:00 |
|
rgarcia
|
88defaa455
|
adds admin layout and access links [#163]
|
2015-08-14 12:37:44 +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 |
|
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
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
Alberto Garcia Cabeza
|
3cddc1070a
|
Adds styles for not logged votes
|
2015-08-11 17:40:27 +02:00 |
|
rgarcia
|
4dd7e14ac4
|
moves featured debates to home page
|
2015-08-11 17:26:25 +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
|
f36f408f63
|
fixes votes in debates' show
Closes #135
|
2015-08-11 10:57:48 +02:00 |
|