rgarcia
|
d0fa2a3ae6
|
adds capistrano task to upload beta tester list
|
2015-08-29 15:54:17 +02:00 |
|
rgarcia
|
171150bcf5
|
displays email sent flash after sign up
|
2015-08-29 15:48:03 +02:00 |
|
rgarcia
|
f92b6de22d
|
authenticates beta testers in beta site
|
2015-08-29 15:48:03 +02:00 |
|
rgarcia
|
814744e1af
|
add beta tester list to .gitignore
|
2015-08-29 15:42:52 +02:00 |
|
Raimond Garcia
|
d1d1558757
|
Merge pull request #285 from AyuntamientoMadrid/verification-namespace
Verification namespace
|
2015-08-29 12:54:57 +02:00 |
|
Juanjo Bazán
|
b6926b0213
|
configures active model i18n keys
|
2015-08-29 12:41:13 +02:00 |
|
Juanjo Bazán
|
e8463d1372
|
moves Residence model to Verification namespace
|
2015-08-29 12:38:07 +02:00 |
|
Juanjo Bazán
|
e33723635b
|
moves Email model to Verification namespace
|
2015-08-29 12:26:20 +02:00 |
|
Juanjo Bazán
|
52f57c5b39
|
fixes letter new form
|
2015-08-29 12:21:55 +02:00 |
|
Juanjo Bazán
|
e6fd62189b
|
moves Sms model to Verification namespace
|
2015-08-29 12:17:27 +02:00 |
|
Juanjo Bazán
|
50dcbcdf9b
|
moves Letter to Verification namespace
|
2015-08-29 12:07:43 +02:00 |
|
Juanjo Bazán
|
1353a1c64b
|
Merge pull request #274 from AyuntamientoMadrid/refactor-selects
Refactor selects
|
2015-08-29 11:36:38 +02:00 |
|
Juanjo Bazán
|
7fdc8e6615
|
adds more precise verification to specs
|
2015-08-29 11:30:11 +02:00 |
|
Juanjo Bazán
|
b6920cc3af
|
Merge pull request #239 from jmgcrespo/master
admin management of moderator users
|
2015-08-29 11:25:03 +02:00 |
|
Juanjo Bazán
|
55edf26a15
|
Merge pull request #283 from AyuntamientoMadrid/improve_design
Improve design
|
2015-08-29 11:08:21 +02:00 |
|
Jose Manuel
|
d963d94996
|
Restored master Gemfile.lock
|
2015-08-29 02:29:13 +01: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 |
|
Alberto Garcia Cabeza
|
ee72096890
|
fixes conflicts
|
2015-08-29 00:40:15 +02:00 |
|
Alberto Garcia Cabeza
|
f75c21f40f
|
Improve admin's styles
|
2015-08-29 00:35:08 +02:00 |
|
Alberto Garcia Cabeza
|
c0eb46288c
|
Improves header, footer and debates mobile styles
|
2015-08-29 00:34:49 +02:00 |
|
Alberto Garcia Cabeza
|
13fe1dcb9f
|
Changes bg images, adds favicon and alerts styles
|
2015-08-29 00:33:40 +02:00 |
|
kikito
|
a7929c607d
|
adds a helper to simplify the way selects and filters are rendered
|
2015-08-28 20:07:45 +02:00 |
|
kikito
|
ae98ba3572
|
merges master and fixes conflicts
|
2015-08-28 19:57:28 +02:00 |
|
Raimond Garcia
|
7847610c19
|
Merge pull request #281 from AyuntamientoMadrid/hidden_comments
Estilo y ocultación de comentarios
|
2015-08-28 19:26:44 +02:00 |
|
kikito
|
9ca71929cf
|
do not include foobar in rspec by default
|
2015-08-28 19:26:03 +02:00 |
|
kikito
|
b872d9a46d
|
fixes failing specs
|
2015-08-28 19:19:18 +02:00 |
|
kikito
|
c989607b50
|
Merge branch 'master' into hidden_comments
|
2015-08-28 18:53:44 +02: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 |
|
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 |
|