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 |
|
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 |
|
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 |
|