Juanjo Bazán
24bde1a3ba
adds i18n files for kaminari paginator
2015-08-17 15:22:49 +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
f827e860e4
adds official-related fields to User model
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
fab31c9c2e
Merge pull request #185 from AyuntamientoMadrid/moderation-136
...
Moderates comments and debates
2015-08-17 14:09:14 +02:00
Juanjo Bazán
74742d5f76
adds i18n to deleted comments
2015-08-17 14:08:59 +02:00
rgarcia
fa6fa39cb6
removes unused method [ #136 ]
2015-08-17 13:55:27 +02:00
rgarcia
d9a31b7158
adds specs for moderation [ #136 ]
2015-08-17 13:39:58 +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
42b441a866
fixes specs by using the correct capthca helper instead of deactivating it
2015-08-17 12:29:42 +02:00
rgarcia
cd0a64ea3e
adds paranoia gem [ #136 ]
2015-08-17 03:46:00 +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
1f2f318e83
Turns on devise scoped views
...
That way we can have users/registrations & organizations/registrations
2015-08-17 01:16:07 +02:00
kikito
9343952d52
Adds User.organization_attributes
2015-08-17 01:16:07 +02:00
Raimond Garcia
8c6081c163
Merge pull request #181 from AyuntamientoMadrid/adds-kaminari
...
adds kaminari to Gemfile
2015-08-16 23:12:40 +02:00
Juanjo Bazán
2864af087c
Merge pull request #180 from AyuntamientoMadrid/test_coverage
...
Test coverage
2015-08-16 23:11:18 +02:00
Juanjo Bazán
055c66b32f
adds kaminari to Gemfile
...
related: #80
2015-08-16 23:07:43 +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
Juanjo Bazán
7a53b000c9
Merge pull request #179 from AyuntamientoMadrid/cleanup
...
fixes spacing
2015-08-16 23:02:14 +02:00
rgarcia
bea38226fe
fixes spacing
2015-08-16 22:45:43 +02:00
Juanjo Bazán
57530926a1
Merge pull request #178 from AyuntamientoMadrid/error_messages-110
...
improves consistency of error messages [#110 ]
2015-08-16 19:37:21 +02:00
rgarcia
a81612b226
improves consistency of error messages [ #110 ]
2015-08-16 15:57:09 +02:00
Raimond Garcia
e4406e5916
Merge pull request #177 from AyuntamientoMadrid/fix-captcha-edit-debate
...
Bug Fix
2015-08-16 14:22:43 +02:00
Juanjo Bazán
7cc7efb2c7
uses timezone aware method instead of Date
2015-08-16 00:22:17 +02:00
Juanjo Bazán
e2e1783418
adds spec
...
checks failed debate create/update and inclusion of featured tags
2015-08-16 00:01:30 +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
b62729aac6
removes spanish fixed text from test factory
2015-08-15 22:19:01 +02:00
Juanjo Bazán
c3974de2ff
fixes locales
2015-08-15 22:16:47 +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
