Alberto Garcia Cabeza
a74f4ea030
Adds first styles for static pages
2015-08-31 21:48:50 +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
kikito
a0dafc68e8
Merge branch 'master' into flag-renaming
2015-08-28 12:00:32 +02:00
kikito
9328e1401f
Adds user admin capabilities and missing i18n entries
2015-08-28 12:00:18 +02:00
Raimond Garcia
b8fe857ab1
Merge pull request #263 from AyuntamientoMadrid/include_texts
...
Include texts
2015-08-28 10:07:33 +02:00
rgarcia
3ee68fd5d7
adds translations
2015-08-28 00:03:08 +02:00
rgarcia
01a5a0387d
adds routes
2015-08-28 00:00:03 +02:00
kikito
76c2f2f021
Merge branch 'master' into flag-renaming
2015-08-27 19:06:29 +02:00
kikito
fb9d3097cc
Finishes admin interface for debates
2015-08-27 19:05:27 +02:00
Juanjo Bazán
1d997d4929
fixes build, changes i18n ignored keys and specs
...
ref: #254
2015-08-27 18:08:56 +02:00
Juanjo Bazán
caf3e5ee74
Merge pull request #254 from mlovic/filter-debates
...
Add filters to specify order of debates on /debates page
2015-08-27 17:41:31 +02:00
Alberto Garcia Cabeza
900f00b443
Adds new texts on header, debates and footer
2015-08-27 16:46:47 +02:00
Marko Lovic
6f32801a88
Change names of debate order filters
...
* 'news' to 'created_at'
* 'votes' to 'total_votes'
* 'rated' to 'likes'
2015-08-27 15:24:59 +02:00
Marko Lovic
2d48966de3
Change variable name and references from "filter" to "order"
2015-08-27 15:24:59 +02:00
kikito
599ea9a19f
force ssl in production
2015-08-27 14:23:34 +02:00
kikito
cd982768f2
Renames the "archive" action to "ignore_flag" (+)
...
* archived_at -> ignored_flag_at
* archived? -> ignored_flag?
* archive -> ignore_flag
* pending -> pending_flag_review
* archived (scope) -> with_ignored_flag
* I18n changes
2015-08-27 11:43:58 +02:00
Raimond Garcia
c806547c1a
Merge pull request #257 from AyuntamientoMadrid/social_networks
...
Social networks
2015-08-27 10:52:10 +02:00
kikito
909dfb4ce3
Several renamings
...
InappropiateFlag -> Flag
x.flag_as_inappropiate -> x.flag
x.undo_flag_as_inappropiate -> x.unflag
X.flagged_as_inappropiate -> x.flagged
flag-as-inappropiate-actions views & css -> flag-actions views & css
2015-08-27 10:48:49 +02:00
Jose Manuel
3baef4ae79
Merge branch 'master' of github.com:AyuntamientoMadrid/participacion
2015-08-26 21:40:44 +01:00
Alberto Garcia Cabeza
ad9e2cc637
Adds styles for social share and auth
2015-08-26 20:32:48 +02:00
Raimond Garcia
9ab13abf20
Merge pull request #256 from AyuntamientoMadrid/improve_emails
...
Improve emails
2015-08-26 20:06:28 +02:00
Alberto Garcia Cabeza
33b501d98e
Improves texts for instructions emails
2015-08-26 19:43:51 +02:00
Alberto Garcia Cabeza
4382a83c30
Fixes asset host for development
2015-08-26 19:43:12 +02:00
Alberto Garcia Cabeza
86369200ba
Adds mailer layout to instructions emails
2015-08-26 19:42:51 +02:00
Alberto Garcia Cabeza
4e8b281a23
Adds styles to comment and reply emails
2015-08-26 18:51:29 +02:00
kikito
048f7c9b73
Adds bullet to dev & test, but makes it visible only on-demmand
...
The logs are always stored in log/bullet.log
If you run the specs with `BULLET=true bin/rspec`:
* Any feature test which makes bullet angry will fail
If you run rails with `BULLET=true bin/rails s`:
* It will print the bullet logs in both the rails log and the bullet log
* It will show a footer on each page with the N+1 queries etc.
2015-08-26 17:24:08 +02:00
