Commit Graph

85 Commits

Author SHA1 Message Date
rgarcia
32f2a4f2a1 adds admin verification to view stats 2015-08-17 22:30:24 +02:00
Juanjo Bazán
862a239d87 fixes specs and makes stats for admins eyes only 2015-08-17 22:00:54 +02:00
Juanjo Bazán
7e1cd2940d Fix conflicts 2015-08-17 21:08:15 +02:00
Eloy Gomez
5b0cd4a8ba Show charts using c3.js 2015-08-17 19:15:17 +02:00
Juanjo Bazán
5c630ac41d adds settings area to admin 2015-08-17 18:38:57 +02:00
Juanjo Bazán
fabcb42328 adds edition/management of officials to admin zone 2015-08-17 17:04:29 +02:00
Juanjo Bazán
d758958b9b removes layout from admin tags controller
layout is inherited from admin base controller
2015-08-17 15:22:50 +02:00
rgarcia
f31ed2940d adds moderation to comments and debates [#136] 2015-08-17 13:39:31 +02:00
rgarcia
efa0cf16d9 uses comment strong parameters 2015-08-16 23:05:01 +02:00
rgarcia
bea38226fe fixes spacing 2015-08-16 22:45:43 +02:00
rgarcia
a81612b226 improves consistency of error messages [#110] 2015-08-16 15:57:09 +02:00
Juanjo Bazán
aeceaf9ea8 fixes bug: edit Debate was not validating captcha 2015-08-15 23:51:30 +02:00
Juanjo Bazán
8cb654092b Merge pull request #176 from dgilperez/issue-172
Adds CRUD for tags to admin section and featured tags support for debates
2015-08-15 22:00:37 +02:00
David Gil
308d71e517 remove unused method 2015-08-15 20:05:33 +02:00
David Gil
a4ec38d752 adds create and destroy to the tags CRUD 2015-08-15 20:01:52 +02:00
David Gil
1de941d1fa adding featured tags list to debate form 2015-08-15 18:36:10 +02:00
David Gil
0a4aafd8de scaffolds a tag list to mark tags as featured on the admin section 2015-08-15 18:22:29 +02:00
rgarcia
9f2d60c4ce refactors voted debates 2015-08-15 14:57:41 +02:00
rgarcia
88defaa455 adds admin layout and access links [#163] 2015-08-14 12:37:44 +02:00
Alberto Garcia Cabeza
ea5612c5bd Modifies styles welcome and debates index 2015-08-12 15:27:28 +02:00
David Gil
10588a989c revert using pluck to use map again 2015-08-12 00:02:19 +02:00
David Gil
44d4fa9fc4 order comments by the most recent first 2015-08-11 20:27:37 +02:00
rgarcia
4dd7e14ac4 moves featured debates to home page 2015-08-11 17:26:25 +02:00
rgarcia
4839081ad2 uses simple_captcha instead of recaptcha [#51] 2015-08-10 20:24:56 +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
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
kikito
a9a4f4fb81 Undo user.moderator? returning true for admins 2015-08-10 13:00:26 +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
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
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
rgarcia
a65396886a adds error messages to account edit 2015-08-07 17:47:53 +02:00
kikito
8d83607331 Implements dashboard controllers & views for admin & moderation 2015-08-07 17:20:28 +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
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
33489e7b0c adds css classes to voted options in debates
for logged users.
Closes #88
2015-08-06 18:53:05 +02:00
rgarcia
515d083633 use custom layout for devise controllers 2015-08-06 16:01:01 +02:00
rgarcia
ec6d34a49f fixes conflicts 2015-08-06 13:42:57 +02:00
Fernando Seror
c4eb29f99d Merge branch 'master' into escoger_idioma_803
Conflicts:
	app/controllers/application_controller.rb
2015-08-05 15:47:52 -05:00
Fernando Seror
a89d621d1d Allow locale to be set through the front-end
* Store the last used locale in the session
* Allow home page to be identified in helpers even when containing
  parameters
* Create initializer to explicitly set the available locales, the
  default and the load_path
2015-08-05 15:43:39 -05:00