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
rgarcia
4839081ad2
uses simple_captcha instead of recaptcha [ #51 ]
2015-08-10 20:24:56 +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
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
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
kikito
ce27a6f2ea
Adapts AccountController to new permissions system
2015-08-10 15:10:47 +02:00
kikito
c1c1362780
Adapts debates controller to new permissions system
2015-08-10 15:00:14 +02:00
kikito
30e738a2fe
Add cancan authorization in all main urls
2015-08-10 14:59:42 +02:00
Alberto Garcia Cabeza
c80d9b0a47
Reorganizes scss files
2015-08-10 13:33:02 +02:00
kikito
a9a4f4fb81
Undo user.moderator? returning true for admins
2015-08-10 13:00:26 +02:00
kikito
8b53ae6f08
Adds Abilities for Debates
2015-08-10 12:38:22 +02:00
Alberto Garcia Cabeza
6c0dd32ed1
Adds styles for debates voted and no voted
2015-08-10 12:08:43 +02:00
Alberto Garcia Cabeza
c048f25941
Fixes conflicts
2015-08-08 13:28:29 +02:00
Alberto Garcia Cabeza
fdfef95595
Adds styles for account page and edit user
2015-08-08 13:21:46 +02:00
Juanjo Bazán
f8becd1b23
Merge branch 'master' into admin-77
2015-08-08 13:00:41 +02:00
Juanjo Bazán
90a3dcdc16
Merge pull request #119 from AyuntamientoMadrid/header
...
Changes styles for header
2015-08-08 01:51:59 +02:00
Alberto Garcia Cabeza
d45a22781a
Changes styles for header
2015-08-07 23:23:16 +02:00
rgarcia
a949d54a85
removes unused json respond block [ #77 ]
2015-08-07 21:52:14 +02:00
rgarcia
beb1a796f5
adds email sending preferences [ #23 ]
2015-08-07 20:56:27 +02:00
rgarcia
3752054aab
sends emails [ #23 ]
2015-08-07 20:52:53 +02:00
kikito
dac5b8d22a
Make /admin and /moderation only accesible to Admins & Moderators
2015-08-07 19:15:08 +02:00
