Juanjo Bazán
5c630ac41d
adds settings area to admin
2015-08-17 18:38:57 +02:00
kikito
9e1581656a
merges master and fixes conflicts
2015-08-17 17:38:34 +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
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
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
rgarcia
a81612b226
improves consistency of error messages [ #110 ]
2015-08-16 15:57:09 +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
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
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
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
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
David Gil
2b16716ee1
add author-photo css class to author avatar
2015-08-14 21:16:53 +02:00
David Gil
bf95e55345
more explicit and versatile usage of avatar_image, changing style option by a direct size - asuming we will always use square images
2015-08-14 21:15:59 +02:00
David Gil
925921d605
adding initial.js to show Gmail-like user avatars; adding avatar_image helper to abstract from plugin options adding the two currently used styles, profile and small
2015-08-14 21:15:59 +02:00
rgarcia
101477c7da
refactors admin layout
2015-08-14 13:33:30 +02:00
rgarcia
88defaa455
adds admin layout and access links [ #163 ]
2015-08-14 12:37:44 +02:00
kikito
4e5d53f2f1
Updates the Moderation Organisation controller
2015-08-13 20:05:32 +02:00
Enrique García
d832d41209
Merge pull request #157 from AyuntamientoMadrid/tags
...
Adds styles for tag cloud
2015-08-13 12:24:32 +02:00
kikito
a59ef10e44
adds organization controller, with views and tests
2015-08-12 18:26:12 +02:00
Alberto Garcia Cabeza
8bee3abb7b
Adds styles for tag clod
2015-08-12 17:08:39 +02:00
David Gil
9a1bdb7aca
move tags helper to view, fix case when less than 5 tags were present, tag list was showing a + link
2015-08-12 16:26:41 +02:00
David Gil
06d8c96d54
Limiting max number of tags shown on debate cards ~ issue#144
2015-08-12 16:26:41 +02:00
Raimond Garcia
e49567c953
Merge pull request #154 from AyuntamientoMadrid/debates
...
Debates
2015-08-12 15:59:20 +02:00
Alberto Garcia Cabeza
ea5612c5bd
Modifies styles welcome and debates index
2015-08-12 15:27:28 +02:00
Alberto Garcia Cabeza
d6c7528df3
Improves styles of debates show page
2015-08-12 15:26:46 +02:00
David Gil
0291f574a2
add vote counters to comments
2015-08-12 14:59:21 +02:00
David Gil
19ef481917
adding counter_cache to comments children and WIPing on the issue
2015-08-12 14:58:36 +02:00
Alberto Garcia Cabeza
00af11396d
Improves styles for auth pages
2015-08-12 14:07:34 +02:00
