Juanjo Bazán
|
a13f4920a1
|
adds Settings
|
2015-08-17 18:13:30 +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
|
635dfba418
|
adds kaminari config file
it is empty now, showing the defaults
|
2015-08-17 17:03:48 +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
|
2d85dd58b2
|
adds i18n for official user fields
|
2015-08-17 15:22:49 +02:00 |
|
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 |
|
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 |
|
Alberto Garcia Cabeza
|
9f1f64cc3a
|
Adds sub navigation menu
|
2015-08-17 12:31:05 +02:00 |
|
rgarcia
|
cd0a64ea3e
|
adds paranoia gem [#136]
|
2015-08-17 03:46:00 +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 |
|
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 |
|
David Gil
|
ae960bba9f
|
adds featured field to tags
|
2015-08-15 18:21:25 +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 |
|
Raimond Garcia
|
8cf8d9f857
|
Merge pull request #174 from AyuntamientoMadrid/improving_debates
Improving debates
|
2015-08-15 02:14:21 +02:00 |
|
rgarcia
|
cc1e1aab60
|
fixes specs
for vampires
|
2015-08-15 01:55:39 +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 |
|