Juanjo Bazán
24bde1a3ba
adds i18n files for kaminari paginator
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
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
42b441a866
fixes specs by using the correct capthca helper instead of deactivating it
2015-08-17 12:29:42 +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
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
rgarcia
a81612b226
improves consistency of error messages [ #110 ]
2015-08-16 15:57:09 +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
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
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
cc1e1aab60
fixes specs
...
for vampires
2015-08-15 01:55:39 +02:00
Alberto Garcia Cabeza
feb85c2aea
Adds blog link on header
2015-08-15 00:58:45 +02:00
Enrique García
2397344597
Merge pull request #169 from AyuntamientoMadrid/staging_deploy_fixes
...
adds fixes for staging deploys
2015-08-14 18:13:40 +02:00
Enrique García
beac5de0c3
Merge pull request #151 from manolomaldonado/capistrano
...
Capistrano recipe
2015-08-14 18:11:11 +02:00
rgarcia
76826af7dd
adds fixes for staging deploys
2015-08-14 18:09:05 +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
kikito
a59ef10e44
adds organization controller, with views and tests
2015-08-12 18:26:12 +02:00
Raimond Garcia
e49567c953
Merge pull request #154 from AyuntamientoMadrid/debates
...
Debates
2015-08-12 15:59:20 +02:00
Alberto Garcia Cabeza
d6c7528df3
Improves styles of debates show page
2015-08-12 15:26:46 +02:00
David Gil
1ee3378768
adding a few tests
2015-08-12 14:59:54 +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
Alberto Garcia Cabeza
502920c7f2
Improves styles for account page, adds user image
2015-08-12 11:53:28 +02:00
Enrique García
d243d81fea
Merge pull request #150 from AyuntamientoMadrid/votes
...
Avoid voting by not logged users
2015-08-12 10:15:06 +02:00
Manuel Maldonado
4b501ee46b
Capistrano recipe
2015-08-12 01:36:42 +02:00
Alberto Garcia Cabeza
3cddc1070a
Adds styles for not logged votes
2015-08-11 17:40:27 +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
Fernando Seror
6d20972f34
Share in social networks
...
* Add the social buttons gem to the Gemfile
* Initializer and translations for the social buttons
* Add the social buttons assets to the sprockets require
* Add the social buttons in the show debate view
* Spec to lock down the amount of social share buttons to three
2015-08-10 11:00:39 -05:00
Juanjo Bazán
8b50b60814
adds i18n files for new namespaces
2015-08-10 16:58:35 +02:00
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
