Juanjo Bazán
|
2a4c29c7ca
|
Merge branch 'master' into hot-score-347
|
2015-09-04 14:59:51 +02:00 |
|
kikito
|
7c3ca55de1
|
Adds the default score selector/controller. Refactors debates specs
|
2015-09-04 11:50:07 +02:00 |
|
Raimond Garcia
|
1c3654d2af
|
Merge pull request #350 from AyuntamientoMadrid/locales
Removes language switcher if only one locale
|
2015-09-04 00:43:18 +02:00 |
|
rgarcia
|
ebddcfa1d0
|
cleans up delayed_jobs for capistrano
|
2015-09-04 00:27:14 +02:00 |
|
Juanjo Bazán
|
cb6949e918
|
disables english locale in production
(temporary change until texts are ready)
|
2015-09-03 23:48:25 +02:00 |
|
rgarcia
|
2461ab3c4a
|
disables delayed jobs in dev
|
2015-09-03 23:31:14 +02:00 |
|
rgarcia
|
feaf4465f3
|
adds capistrano tasks and hooks for delayed_jobs
|
2015-09-03 23:26:28 +02:00 |
|
rgarcia
|
a5e7b1b166
|
disables asynchronous sending of devise emails in test env
|
2015-09-03 23:11:02 +02:00 |
|
rgarcia
|
71aaef3805
|
sends devise emails with delayed_jobs
|
2015-09-03 22:59:25 +02:00 |
|
rgarcia
|
8a950761d3
|
configures delayed_jobs
|
2015-09-03 22:47:54 +02:00 |
|
rgarcia
|
908a2aca55
|
comments out pending server
|
2015-09-03 22:03:59 +02:00 |
|
Raimond Garcia
|
b0098e33fb
|
Merge pull request #347 from AyuntamientoMadrid/orders
Orders
|
2015-09-03 18:58:39 +02:00 |
|
Juanjo Bazán
|
559b60e63f
|
adds random order to debates' index
|
2015-09-03 18:50:19 +02:00 |
|
Juanjo Bazán
|
dbfa35c444
|
adds 'most commented' order to debates
|
2015-09-03 18:31:16 +02:00 |
|
Juanjo Bazán
|
cd3806476f
|
removes 'most voted' order from debates
|
2015-09-03 18:20:12 +02:00 |
|
Juanjo Bazán
|
bcb1f2ba72
|
adds order by score to debates
|
2015-09-03 18:13:48 +02:00 |
|
rgarcia
|
42b54119d2
|
updating production config for multiple serversg
|
2015-09-03 17:54:54 +02:00 |
|
Juanjo Bazán
|
05a647f9e7
|
Merge pull request #345 from AyuntamientoMadrid/improve_styles
Improve styles
|
2015-09-03 16:43:10 +02:00 |
|
Alberto Garcia Cabeza
|
efeb5a7457
|
Updates texts and changes test
|
2015-09-03 14:19:45 +02:00 |
|
Alberto Garcia Cabeza
|
8559833cc0
|
Changes texts for emails
|
2015-09-03 14:11:25 +02:00 |
|
rgarcia
|
efecc697db
|
adds second server for production
|
2015-09-03 12:45:02 +02:00 |
|
Enrique García
|
aa22c82a5c
|
Merge pull request #331 from AyuntamientoMadrid/letter_verification
Letter verification
|
2015-09-03 12:38:08 +02:00 |
|
Juanjo Bazán
|
572432f2cf
|
Merge pull request #339 from AyuntamientoMadrid/remove-tag-filter-337
Remove tag filter
|
2015-09-03 11:50:53 +02:00 |
|
kikito
|
002d86884b
|
Removes the tag selector from debate#index view & refactors i18n
|
2015-09-03 11:15:05 +02:00 |
|
Alberto Garcia Cabeza
|
3f53f61b1d
|
Fixes conflicts
|
2015-09-03 00:12:59 +02:00 |
|
Alberto Garcia Cabeza
|
7fefcb692e
|
Changes and updates texts
|
2015-09-02 23:43:08 +02:00 |
|
Alberto Garcia Cabeza
|
a8cbc60b02
|
Adds new pages, includes new texts
|
2015-09-02 23:42:06 +02:00 |
|
rgarcia
|
b8e35ac95f
|
cleans up
|
2015-09-02 22:06:50 +02:00 |
|
rgarcia
|
99d779bcec
|
adds letter code verification
|
2015-09-02 21:57:03 +02:00 |
|
rgarcia
|
280028cfa4
|
adds missing translation for incorrect phone
|
2015-09-02 21:45:53 +02:00 |
|
Raimond Garcia
|
faf1b32cf5
|
Merge pull request #329 from AyuntamientoMadrid/verification
Verification
|
2015-09-02 18:58:25 +02:00 |
|
kikito
|
c7b44485b3
|
modifies example so that the dev database can be used to generate the assets of staging, preproduction and production
|
2015-09-02 16:52:29 +02:00 |
|
Juanjo Bazán
|
04127b23f9
|
Merge pull request #323 from AyuntamientoMadrid/filter-dry-282
Dries filters code
|
2015-09-02 14:24:06 +02:00 |
|
kikito
|
c3b1fa7434
|
fixes failing i18n specs
|
2015-09-02 14:15:14 +02:00 |
|
Alberto Garcia Cabeza
|
da86c5d6e0
|
Adds styles for verification account process
|
2015-09-02 12:34:08 +02:00 |
|
Juanjo Bazán
|
8915ce7ffd
|
adds interface to disallow organizations votes
on debates
|
2015-09-02 12:16:55 +02:00 |
|
rgarcia
|
b5d9a00e2e
|
adds preproduction and production to database.yml.example
|
2015-09-01 22:56:18 +02:00 |
|
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 |
|