kikito
9e1581656a
merges master and fixes conflicts
2015-08-17 17:38:34 +02:00
kikito
c1a6a37651
Removes user_id validation from Organisations
2015-08-17 17:11:17 +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
af3e356b88
dries layout admin views
...
moves common <div class='left'> to layout
2015-08-17 15:22:50 +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
Juanjo Bazán
8390165ba8
adds official scope
2015-08-17 15:22:49 +02:00
Juanjo Bazán
e29ae67f31
adds methods to add/remove official position
2015-08-17 15:22:49 +02:00
Juanjo Bazán
d80fd8e468
adds official? method to User
2015-08-17 15:22:49 +02:00
Juanjo Bazán
4a8825cf11
Merge pull request #184 from AyuntamientoMadrid/add_subnavigation
...
Adds sub navigation menu
2015-08-17 15:21:53 +02:00
Juanjo Bazán
94879fbccb
adds admin_header partial
2015-08-17 15:18:51 +02:00
Juanjo Bazán
0c86882d0d
adds proper active class to header subnav links
2015-08-17 15:13:10 +02:00
Alberto Garcia Cabeza
4b59105be5
Adds filters for topics
2015-08-17 15:00:59 +02:00
Alberto Garcia Cabeza
f485225250
Merge branch 'master' into titles_and_filters
2015-08-17 14:53:48 +02:00
Alberto Garcia Cabeza
43f8db8e3a
Adds styles for titles and filters
2015-08-17 14:53:00 +02:00
kikito
1c435eacbe
adds filters to admin/organizations
2015-08-17 14:25:43 +02:00
Juanjo Bazán
74742d5f76
adds i18n to deleted comments
2015-08-17 14:08:59 +02:00
rgarcia
f31ed2940d
adds moderation to comments and debates [ #136 ]
2015-08-17 13:39:31 +02:00
kikito
264f6318c3
Adds i18n & ul for admin menus
2015-08-17 13:23:18 +02:00
kikito
3096a73892
Moves organization verification to Admin from Moderation
2015-08-17 13:22:38 +02:00
kikito
ae21209920
Moves the layout to admin::BaseController and moderation::BaseController
2015-08-17 13:20:52 +02:00
Alberto Garcia Cabeza
9f1f64cc3a
Adds sub navigation menu
2015-08-17 12:31:05 +02:00
kikito
8ca546a431
merges master and fixes conflicts
2015-08-17 02:40:11 +02:00
kikito
543f718891
Adds phone_number to the regular user registration / account views
2015-08-17 01:16:08 +02:00
kikito
e84873d875
Modifies devise shared link to include organisations sometimes
2015-08-17 01:16:08 +02:00
kikito
9af1f2f4a9
Adds registration controller for organizations
2015-08-17 01:16:07 +02:00
kikito
de73eac2d0
Moves the registrations controller to users/registrations
...
This is necessary because rails gets confused when it has a a “root”
registration_controller and another non-root one. The non-root one uses
the views from the root.
2015-08-17 01:16:07 +02:00
kikito
9343952d52
Adds User.organization_attributes
2015-08-17 01:16:07 +02:00
rgarcia
9abe303b31
removes unused method
2015-08-16 23:05:01 +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
664f656fe3
tests featured tags administration and adding featured tags to debates
2015-08-15 19:38:42 +02:00
David Gil
8b89cc5117
adds some js to click-and-add tags to the debate's tag list input
2015-08-15 18:57:27 +02:00
Juanjo Bazán
c909db4022
Merge pull request #175 from AyuntamientoMadrid/refactoring
...
Refactoring
2015-08-15 18:53:01 +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
4751954377
refactors debate search
2015-08-15 14:57:04 +02:00
Alberto Garcia Cabeza
09d71ad84f
Merge branch 'master' into improving_debates
...
Conflicts:
app/assets/stylesheets/debates.scss
app/assets/stylesheets/participacion.scss
2015-08-15 01:45:56 +02:00
Alberto Garcia Cabeza
3ab3285ce4
Cleans scss files
2015-08-15 01:20:26 +02:00
Alberto Garcia Cabeza
510a5c8332
Improves styles for tag cloud
2015-08-15 01:13:55 +02:00
Alberto Garcia Cabeza
4d8b0a01ce
Includes count number of comments on debate show
2015-08-15 01:13:34 +02:00
Alberto Garcia Cabeza
26e2a7bcbb
Cleans style guide
2015-08-15 01:05:46 +02:00
Alberto Garcia Cabeza
f98510cea7
Improves styles for simple captcha
2015-08-15 01:05:00 +02:00
Alberto Garcia Cabeza
feb85c2aea
Adds blog link on header
2015-08-15 00:58:45 +02:00
Alberto Garcia Cabeza
7f2897aef4
Removes unused images
2015-08-15 00:57:41 +02:00
