Commit Graph

20144 Commits

Author SHA1 Message Date
Marko Lovic
a52d79cebd Remove unused I18n keys 2015-08-28 17:31:53 +02:00
rgarcia
fe9586bc29 adds password protection for staging and production servers 2015-08-28 17:27:14 +02:00
Marko Lovic
c11b611b1a Combine debates topic and order filters 2015-08-28 17:23:36 +02:00
kikito
088144dcd1 Refactor debates order select using js-location-changer 2015-08-28 17:17:21 +02:00
kikito
934512ad7a made the locale switcher use less js, more ruby & html 2015-08-28 17:02:06 +02:00
Marko Lovic
d7c2dd3aac Add translations for debate filters 2015-08-28 16:55:19 +02:00
rgarcia
b9333c7bbe adds hotfix for invalid census api response 2015-08-28 16:43:14 +02:00
kikito
57917f850c do not use js-classes for stying 2015-08-28 15:59:38 +02:00
Enrique García
9664dbb975 Merge pull request #272 from AyuntamientoMadrid/fix-replies
adds comments labels per comment
2015-08-28 15:46:08 +02:00
Marko Lovic
e35550dafa Remove order_selector partial
Most of the logic was pulled out into DebatesHelper so having
the partial no longer makes sense.
2015-08-28 15:43:09 +02:00
Juanjo Bazán
c38f958d23 Merge pull request #273 from AyuntamientoMadrid/census-api-271
Rename UserApi to CensusApi. Fixes #271
2015-08-28 15:42:57 +02:00
kikito
ffad7fbc86 Rename UserApi to CensusApi. Fixes #271 2015-08-28 15:38:22 +02:00
Juanjo Bazán
fc8687a707 adds comments labels per comment
fixes #265
2015-08-28 14:30:52 +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
3720551e78 fixes badly done merge 2015-08-28 13:41:51 +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
Marko Lovic
4285ba4bb3 Add tag filter to debates page 2015-08-28 12:41:10 +02:00
Raimond Garcia
25bb693d90 Merge pull request #268 from AyuntamientoMadrid/ckeditor-rails
adds ckeditor files to asset pipeline
2015-08-28 12:36:50 +02:00
rgarcia
7053297f09 adds missing digest to images 2015-08-28 12:30:36 +02:00
Juanjo Bazán
a0592ea16b adds ckeditor files to asset pipeline 2015-08-28 12:30:33 +02:00
Juanjo Bazán
b04f257498 Merge pull request #267 from AyuntamientoMadrid/flag-renaming
Admin users/comments/debates
2015-08-28 12:20:56 +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
kikito
697d629aab Adds comfirmed_hide_at to users 2015-08-28 10:59:30 +02:00
kikito
a5e48693fe Implements admin interface for Comments incl. filters 2015-08-28 10:56:43 +02:00
Raimond Garcia
b8fe857ab1 Merge pull request #263 from AyuntamientoMadrid/include_texts
Include texts
2015-08-28 10:07:33 +02:00
rgarcia
9cce254c8d adds specs 2015-08-28 00:03:16 +02:00
rgarcia
3ee68fd5d7 adds translations 2015-08-28 00:03:08 +02:00
rgarcia
e3d6331452 adds migrations 2015-08-28 00:02:01 +02:00
rgarcia
974d004bc4 fixes ambiguous db query 2015-08-28 00:01:26 +02:00
rgarcia
5ced63b639 adds views changes for verified accounts 2015-08-28 00:00:59 +02:00
rgarcia
01a5a0387d adds routes 2015-08-28 00:00:03 +02:00
rgarcia
e83b423fd4 adds user verification extensions 2015-08-27 23:59:47 +02:00
rgarcia
18ae62708c adds date helper 2015-08-27 23:58:54 +02:00
rgarcia
f7d22f64b6 adds letter verification 2015-08-27 23:58:31 +02:00
rgarcia
570f67195c adds email verification 2015-08-27 23:57:04 +02:00
rgarcia
3fc8d830f1 adds verified users concept 2015-08-27 23:56:10 +02:00
rgarcia
671399bb89 adds sms verification 2015-08-27 23:54:57 +02:00
rgarcia
9ec3f96db1 adds sms api 2015-08-27 23:54:16 +02:00
rgarcia
07180bcd04 adds residence verification 2015-08-27 23:53:49 +02:00
rgarcia
61b7ff5e21 adds user api 2015-08-27 23:52:00 +02:00
rgarcia
6cbb325f5f adds SOAP gem 2015-08-27 23:50:38 +02:00
Alberto Garcia Cabeza
413a034e23 Adds styles for deleted comments 2015-08-27 20:21:26 +02:00
kikito
76c2f2f021 Merge branch 'master' into flag-renaming 2015-08-27 19:06:29 +02:00
kikito
e07ae71fff Refactors query-parameter-related tests 2015-08-27 19:05:50 +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