Commit Graph

297 Commits

Author SHA1 Message Date
rgarcia
dc41e25cee sets preproduction deploy variables 2015-09-01 22:56:01 +02:00
Juanjo Bazán
e604ca656a Merge pull request #316 from AyuntamientoMadrid/secrets
Secrets
2015-09-01 21:25:45 +02:00
rgarcia
41dc30f41a adds server_name to secrets.yml.example 2015-09-01 21:22:45 +02:00
rgarcia
362c9b9e33 updates secrets.yml.example 2015-09-01 20:06:09 +02:00
Juanjo Bazán
c6c32a0795 adds translation for admin settings' keys names 2015-09-01 20:00:41 +02:00
Juanjo Bazán
174bd73b89 removes official_level_0_name setting 2015-09-01 20:00:41 +02:00
rgarcia
7af1bc526a adds preproduction environment 2015-09-01 19:54:21 +02:00
Juanjo Bazán
e2f73ef293 Merge pull request #310 from AyuntamientoMadrid/exception_notification
configures rollbar gem
2015-09-01 19:52:17 +02:00
Raimond Garcia
2b1b6b1640 Merge pull request #309 from AyuntamientoMadrid/limit-votes
Limit votes
2015-09-01 19:50:16 +02:00
rgarcia
e1d6319953 enable rollbar only in pre and pro envs 2015-09-01 19:48:35 +02:00
rgarcia
c350dcfff4 configures rollbar gem 2015-09-01 18:41:28 +02:00
Juanjo Bazán
4cfde3242a changes text 2015-09-01 17:49:03 +02:00
Juanjo Bazán
9f4a98d3a0 moves translation keys 2015-09-01 17:49:02 +02:00
Alberto Garcia Cabeza
57e373a7cf Adds styles for too much anonymous comments 2015-09-01 17:49:02 +02:00
rgarcia
0fc51bee60 adds mailer asset host for staging and production envs 2015-09-01 17:31:28 +02:00
Raimond Garcia
3c665153d4 Merge pull request #300 from AyuntamientoMadrid/flag-helper
Flag helper
2015-09-01 15:19:16 +02:00
kikito
c2faf0ef92 Merge Vote.in with Vote.for_debates 2015-09-01 13:08:32 +02:00
Juanjo Bazán
c9e688fc72 changes devise's défault email address 2015-09-01 11:45:11 +02:00
rgarcia
f34bcbc12d adds symbolic link to beta testers after deploy 2015-08-31 22:27:23 +02:00
Juanjo Bazán
5def8ba1e8 Merge pull request #296 from AyuntamientoMadrid/styling_pages
Styling pages
2015-08-31 22:01:36 +02:00
Alberto Garcia Cabeza
b0f7d74c47 Changes site language test, comment unused keys 2015-08-31 21:55:23 +02:00
Alberto Garcia Cabeza
a74f4ea030 Adds first styles for static pages 2015-08-31 21:48:50 +02:00
Juanjo Bazán
574133a50b updates environments files to use dalli store 2015-08-31 20:38:52 +02:00
Juanjo Bazán
a00abc0020 adds touch to debates on tag destroy 2015-08-31 20:26:30 +02:00
rgarcia
358f8cc392 symlink beta-testers file after a deploy 2015-08-31 14:03:08 +02:00
Juanjo Bazán
3217d262b4 Merge pull request #292 from AyuntamientoMadrid/mask_user_data
Mask user data
2015-08-30 15:22:25 +02:00
rgarcia
76daee1fb0 removes unmasked emails and phones in forms 2015-08-30 15:16:33 +02:00
rgarcia
9abd794133 validates acceptance of census terms of service 2015-08-30 12:50:17 +02:00
rgarcia
92940c9f91 adds census terms of service page 2015-08-30 12:49:47 +02:00
Juanjo Bazán
84feeba085 adds pages controller for static pages 2015-08-29 19:32:08 +02:00
Juanjo Bazán
43b333b844 admins can search officials by name or email 2015-08-29 17:02:21 +02:00
Raimond Garcia
c64bb88e12 Merge pull request #287 from AyuntamientoMadrid/admin-improvements
Admin improvements
2015-08-29 16:59:53 +02:00
Juanjo Bazán
1156fdc48e fixes i18n keys 2015-08-29 16:42:48 +02:00
Juanjo Bazán
0f1329fa85 implements organizations search for admins 2015-08-29 16:30:32 +02:00
rgarcia
092dbb56c9 adds translations 2015-08-29 16:06:30 +02:00
Juanjo Bazán
c4de2b9af5 removes nonexistent feature 2015-08-29 15:20:24 +02:00
Juanjo Bazán
99b23ba354 fixes html render of i18n text 2015-08-29 13:55:37 +02:00
Juanjo Bazán
7753bd35c8 pluralizes organización 2015-08-29 13:49:32 +02:00
Juanjo Bazán
57090cd794 updates admin texts for Tags 2015-08-29 13:49:15 +02:00
Juanjo Bazán
b6926b0213 configures active model i18n keys 2015-08-29 12:41:13 +02:00
Jose Manuel
ef1f89ab84 Merge branch 'refactored_moderator' into master 2015-08-29 02:15:26 +01:00
Jose Manuel
e21336aeff Refactored admin´s moderator controller 2015-08-29 01:39:46 +01:00
Raimond Garcia
b1117dd1af Merge pull request #275 from mlovic/filter-topic
Allow debates to be filtered by topic
2015-08-28 17:41:38 +02:00
Marko Lovic
a52d79cebd Remove unused I18n keys 2015-08-28 17:31:53 +02:00
Marko Lovic
d7c2dd3aac Add translations for debate filters 2015-08-28 16:55:19 +02:00
Enrique García
4244ff4b04 Merge pull request #266 from AyuntamientoMadrid/user_verification
User verification
2015-08-28 13:53:19 +02:00
kikito
538501d1b1 replaces hard-coded strings by i18n calls 2015-08-28 13:42:22 +02:00
kikito
cb99996317 merges master and fix conflicts 2015-08-28 13:23:30 +02:00
Raimond Garcia
7c7b47d1dd Merge pull request #249 from deivid-rodriguez/update_ruby_version
updates ruby version to 2.2.3
2015-08-28 13:19:16 +02:00
Juanjo Bazán
a0592ea16b adds ckeditor files to asset pipeline 2015-08-28 12:30:33 +02:00