kikito
|
1a855b2a90
|
Fixes error which prevented executing cap -T
|
2015-09-07 13:03:11 +02:00 |
|
Raimond Garcia
|
5b671ce623
|
Merge pull request #387 from AyuntamientoMadrid/improve_design
Improve design
|
2015-09-07 01:08:58 +02:00 |
|
Alberto Garcia Cabeza
|
6825409744
|
Comments unused keys
|
2015-09-07 00:23:10 +02:00 |
|
Alberto Garcia Cabeza
|
eedd919424
|
Improves styles and texts for devise pages
|
2015-09-07 00:16:54 +02:00 |
|
Alberto Garcia Cabeza
|
a7e593c039
|
Updates texts
|
2015-09-07 00:15:39 +02:00 |
|
Juanjo Bazán
|
9104242eed
|
adds pending filter to admin/users
|
2015-09-06 21:58:34 +02:00 |
|
Juanjo Bazán
|
bc90812d37
|
adds pending filter to admin/comments
|
2015-09-06 21:45:41 +02:00 |
|
Juanjo Bazán
|
1a7806150a
|
adds pending filter to admin/debates
|
2015-09-06 21:42:22 +02:00 |
|
rgarcia
|
554d58b620
|
comments out custom capistrano asset task
|
2015-09-06 17:04:25 +02:00 |
|
rgarcia
|
c6886cfad6
|
fixes typo
|
2015-09-06 13:42:31 +02:00 |
|
rgarcia
|
994af94253
|
enables rollbar in staging env
|
2015-09-06 13:38:19 +02:00 |
|
Raimond Garcia
|
17ebb07daf
|
Merge pull request #367 from AyuntamientoMadrid/blog
adds nicer blog url
|
2015-09-05 20:26:22 +02:00 |
|
Juanjo Bazán
|
ae872b88ac
|
updates blog link
|
2015-09-05 20:15:31 +02:00 |
|
Juanjo Bazán
|
b020795d3d
|
adds search to debates index
|
2015-09-05 15:20:46 +02:00 |
|
Alberto Garcia Cabeza
|
54eeff41b7
|
Adds search form to sidebar
|
2015-09-05 14:01:59 +02:00 |
|
Juanjo Bazán
|
1b51738be6
|
updates blog link
|
2015-09-05 12:29:05 +02:00 |
|
Raimond Garcia
|
8c678c88e8
|
Merge pull request #364 from AyuntamientoMadrid/error_pages
Error pages
|
2015-09-05 00:49:53 +02:00 |
|
Alberto Garcia Cabeza
|
83b44fd53a
|
Improves layout, adds link to checkbox's label
|
2015-09-05 00:34:18 +02:00 |
|
Raimond Garcia
|
ded656837e
|
Merge pull request #358 from AyuntamientoMadrid/deploy-stable-to-prod
changes branch for production deployments
|
2015-09-04 22:25:43 +02:00 |
|
Alberto Garcia Cabeza
|
128a2bc956
|
Updates some texts
|
2015-09-04 20:42:02 +02:00 |
|
Juanjo Bazán
|
a8f7611b01
|
changes branch for production deployments
|
2015-09-04 18:56:40 +02:00 |
|
Raimond Garcia
|
d62b30c487
|
Merge pull request #353 from AyuntamientoMadrid/hot-score-347
Hot score 347
|
2015-09-04 17:24:42 +02:00 |
|
Alberto Garcia Cabeza
|
2e8669c4c9
|
Changes some texts
|
2015-09-04 15:06:05 +02:00 |
|
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 |
|