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 |
|
Eloy Gomez
|
02f19aa4b1
|
Add visit_id to debate
|
2015-08-08 13:09:22 +02:00 |
|
Eloy Gomez
|
b23ca8deb1
|
Create event on debate creation
|
2015-08-08 13:08:48 +02:00 |
|
Juanjo Bazán
|
f8becd1b23
|
Merge branch 'master' into admin-77
|
2015-08-08 13:00:41 +02:00 |
|
Eloy Gomez
|
a83a787090
|
Add model visit
|
2015-08-08 12:56:41 +02:00 |
|
Eloy Gomez
|
aaeb77d969
|
Add gem ahoy_matey and some dependencies
|
2015-08-08 12:05:55 +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 |
|
kikito
|
9eae91c764
|
Makes user.moderator? return true for administrators
|
2015-08-07 18:52:09 +02:00 |
|
Juanjo Bazán
|
d04383db24
|
validates uniqueness of admins & mods
|
2015-08-07 18:20:20 +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 |
|
kikito
|
c04d397e66
|
Implements User.administrator? & User.moderator?
|
2015-08-07 17:20:20 +02:00 |
|
kikito
|
3378790764
|
Adds migrations & models for administrators & moderators
|
2015-08-07 17:04:50 +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
|
beb05106cb
|
Fixes conflicts
|
2015-08-06 20:58:54 +02:00 |
|
Alberto Garcia Cabeza
|
df3884ad18
|
Adds styles for debate new
|
2015-08-06 20:54:37 +02:00 |
|
Alberto Garcia Cabeza
|
724cffa4ce
|
Updates icons fonts
|
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
|
6e7832957a
|
adds method to get user votes on specific debates
|
2015-08-06 18:10:14 +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 |
|
Alberto Garcia Cabeza
|
c7cd29360d
|
Updates icons fonts
|
2015-08-06 17:59:05 +02:00 |
|
kikito
|
72c33330cf
|
Adds nickname-related validations & name to User
|
2015-08-06 16:53:18 +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 |
|
Enrique García
|
ca575a6f20
|
Merge pull request #101 from AyuntamientoMadrid/show-0-votes
shows "0%" when there's zero votes
|
2015-08-06 12:00:37 +02:00 |
|
Alberto Garcia Cabeza
|
77ecf39852
|
Updates styles for debates index
|
2015-08-06 11:19:37 +02:00 |
|
Alberto Garcia Cabeza
|
e69eb1eae8
|
Creates new sass for variables
|
2015-08-06 11:19:13 +02:00 |
|
Alberto Garcia Cabeza
|
228fd80688
|
Updates icons font
|
2015-08-06 11:18:56 +02:00 |
|