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
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
Alberto Garcia Cabeza
91cdfbc8a1
Adds content on footer
2015-08-10 15:39:38 +02:00
Eloy Gomez
fe2080aff9
Display some stats
2015-08-08 14:33:44 +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
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
rgarcia
a65396886a
adds error messages to account edit
2015-08-07 17:47:53 +02:00
rgarcia
076448ec80
fixes credentials page
2015-08-07 17:47:12 +02:00
kikito
8d83607331
Implements dashboard controllers & views for admin & moderation
2015-08-07 17:20:28 +02:00
Alberto Garcia Cabeza
8fdba1b5b4
Merges accounts show with registrations edit
2015-08-07 12:16:20 +02:00
Juanjo Bazán
af0698da35
fixes conflicts
2015-08-07 10:12:58 +02:00
Raimond Garcia
3279eeba45
Merge pull request #111 from AyuntamientoMadrid/user_nickname_98
...
User nickname
2015-08-07 09:23:44 +02:00
Juanjo Bazán
37199125fa
refactors votes view code to helper
2015-08-07 09:19:02 +02:00
Alberto Garcia Cabeza
df3884ad18
Adds styles for debate new
2015-08-06 20:54:37 +02:00
rgarcia
6e59df2a3b
adds link to debate description
2015-08-06 20:54:37 +02:00
Alberto Garcia Cabeza
f9cb8151ff
Adds styles for authentication pages
2015-08-06 20:53:14 +02:00
kikito
a194d9584b
merges master and fixes conflicts
2015-08-06 19:25:51 +02:00
kikito
c4c764df38
Adds nickname and use_nickname to "my profile"
2015-08-06 19:19:45 +02:00
kikito
17a741d838
Adds nickname support in the registration form
2015-08-06 18:54:03 +02:00
Juanjo Bazán
cdaa3e2808
favors dom_id
2015-08-06 18:53:40 +02:00
Juanjo Bazán
33489e7b0c
adds css classes to voted options in debates
...
for logged users.
Closes #88
2015-08-06 18:53:05 +02:00
Juanjo Bazán
8d36487cd0
Merge pull request #105 from AyuntamientoMadrid/description_link
...
adds link to debate description
2015-08-06 18:09:44 +02:00
Alberto Garcia Cabeza
1067d2272e
Adds styles for debate new
2015-08-06 17:59:22 +02:00
rgarcia
515d083633
use custom layout for devise controllers
2015-08-06 16:01:01 +02:00
rgarcia
ae34be1ddd
adds link to debate description
2015-08-06 15:50:36 +02:00
Juanjo Bazán
44e049e483
Merge pull request #104 from AyuntamientoMadrid/debates_title_length_93
...
Debates title length
2015-08-06 15:25:16 +02:00
kikito
5c141e36ab
uses the debate title length in the debates form
2015-08-06 14:01:48 +02:00
rgarcia
ec6d34a49f
fixes conflicts
2015-08-06 13:42:57 +02:00
Alberto Garcia Cabeza
56f480d5c0
Improves CSS styles for votes
2015-08-06 12:53:19 +02:00
Alberto Garcia Cabeza
f0be767ae8
Updates styles for debates show
2015-08-06 12:42:41 +02:00
Alberto Garcia Cabeza
77ecf39852
Updates styles for debates index
2015-08-06 11:19:37 +02:00
