Juanjo Bazán
25d9343bef
Merge pull request #560 from AyuntamientoMadrid/consistent_schema
...
adds resilient locked_until default
2015-09-26 22:51:34 +02:00
rgarcia
545f5b591b
adds resilient locked_until default
2015-09-26 14:13:10 +02:00
Juanjo Bazán
39d1c3d504
fixes i18n error
2015-09-25 13:47:42 +02:00
Alberto García Cabeza
453aec53fd
Merge pull request #555 from AyuntamientoMadrid/hide-admin-restored
...
Hide admin restored
2015-09-25 13:40:31 +02:00
Juanjo Bazán
4227d3136c
Merge pull request #552 from AyuntamientoMadrid/newrelic
...
upgrade newrelic gem version
2015-09-25 13:40:05 +02:00
Juanjo Bazán
0dc9224ce6
ignores in moderation the admin restored comments
2015-09-25 13:24:34 +02:00
Juanjo Bazán
13fc4e5a3d
ignores in moderation the admin restored debates
2015-09-25 13:24:22 +02:00
Juanjo Bazán
03342e164b
ignores in moderation the admin restored proposals
2015-09-25 13:24:12 +02:00
Juanjo Bazán
f1eeecc2b9
Merge pull request #554 from AyuntamientoMadrid/census_text
...
Changes census error text
2015-09-25 13:06:09 +02:00
Alberto Garcia Cabeza
e73fe1b713
Changes census error text
2015-09-25 12:24:14 +02:00
Juanjo Bazán
bbc8d0003c
Merge pull request #553 from AyuntamientoMadrid/admin_texts
...
Updates admin and moderation texts
2015-09-25 10:27:39 +02:00
Alberto Garcia Cabeza
8dd027d974
Updates admin and moderation texts
2015-09-25 09:40:51 +02:00
rgarcia
6658e489a4
upgrade newrelic gem version
2015-09-24 18:37:47 +02:00
Raimond Garcia
0aef9b4083
Merge pull request #550 from AyuntamientoMadrid/admin-info
...
adds extra info for proposals in admin listing
2015-09-24 14:08:46 +02:00
Juanjo Bazán
ba081f73c1
adds spec
2015-09-24 13:58:01 +02:00
Juanjo Bazán
0854f6cd83
adds extra info for proposals in admin listing
2015-09-24 13:44:38 +02:00
Juanjo Bazán
5617f9869e
Merge pull request #545 from AyuntamientoMadrid/verification_postal_codes
...
Verification postal codes
2015-09-24 13:09:14 +02:00
Raimond Garcia
66eaf72f83
Merge pull request #547 from AyuntamientoMadrid/admin-descriptions
...
refactors /admin listings to include descriptions
2015-09-24 13:05:56 +02:00
Raimond Garcia
3b68a6a94c
Merge pull request #549 from AyuntamientoMadrid/fix-mailers
...
Fix mailers
2015-09-24 13:05:16 +02:00
Alberto Garcia Cabeza
058d6f6ffc
Fixes moderation tables
2015-09-24 12:55:39 +02:00
Juanjo Bazán
b979f871dd
removes unused method
2015-09-24 12:42:21 +02:00
Juanjo Bazán
74bc73b5a9
Merge pull request #548 from AyuntamientoMadrid/admin-api
...
moves the admin api inside of the /admin namespace
2015-09-24 12:41:59 +02:00
Juanjo Bazán
3f46b27371
Fixes comment notifications mailers
...
It was not commendable independent so avery email related with a comment on a proposal was not being sent. Removes dependency on debates and makes it commentable independent.
2015-09-24 12:41:11 +02:00
Alberto Garcia Cabeza
7dfdce8c07
Improves styles for admin buttons and selects
2015-09-24 12:40:16 +02:00
Juanjo Bazán
5df7917c24
moves all mailer i18n keys to one place
2015-09-24 12:39:42 +02:00
Juanjo Bazán
08a1968fd2
adds mailer helper
2015-09-24 12:38:21 +02:00
Juanjo Bazán
536b0ce3f5
makes commenting commentable independent
2015-09-24 12:37:39 +02:00
kikito
adc8275f5a
moves the admin api inside of the /admin namespace
2015-09-24 12:11:51 +02:00
Juanjo Bazán
376babc768
refactors /admin listings to include descriptions
2015-09-24 11:25:01 +02:00
rgarcia
1dee45337b
fixes specs
2015-09-23 21:08:21 +02:00
rgarcia
3098fe3baa
adds specs
2015-09-23 20:55:28 +02:00
rgarcia
ddb2ab1c2a
adds translations
2015-09-23 20:55:04 +02:00
rgarcia
1d1b7b86d2
adds validation for postal codes in Madrid
2015-09-23 20:54:56 +02:00
rgarcia
1a6ee424d0
refactors postal code validation
2015-09-23 20:09:39 +02:00
Enrique García
471b14835e
Merge pull request #544 from AyuntamientoMadrid/js-party
...
refactors stats and optimizes js
2015-09-23 19:42:55 +02:00
Juanjo Bazán
8c99c6a5f0
refactors stats and optimizes js
...
JS libraries for stats (d3, c3, etc.) only load now when needed (stats/show)
2015-09-23 19:37:24 +02:00
Juanjo Bazán
7b9c050df2
adds has_many proposals to user
2015-09-23 17:09:41 +02:00
Juanjo Bazán
599ddbb575
updates social-share-button version
2015-09-23 17:07:33 +02:00
Juanjo Bazán
b921ac9d33
adds proposal url to social buttons
2015-09-23 16:55:44 +02:00
Enrique García
44f19085a9
Merge pull request #539 from AyuntamientoMadrid/activities
...
Activities
2015-09-23 12:40:02 +02:00
rgarcia
6ccef97d4e
adds valid postal codes
2015-09-23 12:34:19 +02:00
rgarcia
ea9ea77219
adds consistent indentation
2015-09-23 12:34:00 +02:00
Enrique García
be092dce0d
Merge pull request #543 from AyuntamientoMadrid/media-icon
...
moves social media icon to public
2015-09-23 12:33:43 +02:00
Juanjo Bazán
9969884a50
minirefactors
2015-09-23 12:32:36 +02:00
Juanjo Bazán
651c3e184f
moves social media icon to public
2015-09-23 12:25:42 +02:00
Enrique García
09655fdb16
Merge pull request #542 from AyuntamientoMadrid/fix-ap-520
...
uses @import for everything in application.scss
2015-09-23 12:14:15 +02:00
kikito
9afbb4804a
uses @import for everything in application.scss
2015-09-23 11:58:39 +02:00
kikito
6e185fd62e
uses :back in proposals/show
2015-09-22 18:07:49 +02:00
Enrique García
4697cabbd9
Merge pull request #538 from AyuntamientoMadrid/share_proposal
...
Adds social share for supported proposals
2015-09-22 17:32:45 +02:00
Juanjo Bazán
02b1e30205
logs activity: restore admin actions
...
on User/Proposal/Debate/Comment
2015-09-22 17:24:13 +02:00
