Raimond Garcia
|
a92de7c0d3
|
Merge pull request #354 from AyuntamientoMadrid/improve_design
Improve design
|
2015-09-04 15:27:35 +02:00 |
|
Alberto Garcia Cabeza
|
a75cbefe8d
|
Styles for header,footer,filters, alerts and pages
|
2015-09-04 15:19:50 +02:00 |
|
Alberto Garcia Cabeza
|
e0959f3e28
|
Improves account checkboxes and edit debate button
|
2015-09-04 15:07:41 +02:00 |
|
Alberto Garcia Cabeza
|
4e92b5c3ce
|
Adds back link on verification pages
|
2015-09-04 15:06:38 +02:00 |
|
Alberto Garcia Cabeza
|
2e8669c4c9
|
Changes some texts
|
2015-09-04 15:06:05 +02:00 |
|
Raimond Garcia
|
be420db68d
|
Merge pull request #352 from AyuntamientoMadrid/turbolink-ckeditor
Fixes CKeditor & Turbolinks issue
|
2015-09-04 14:11:34 +02:00 |
|
Juanjo Bazán
|
742eed1925
|
adds check for CKEditor presence
|
2015-09-04 14:04:46 +02:00 |
|
Juanjo Bazán
|
f9067fe201
|
Fixes CKeditor & Turbolinks issue
Closes #330
|
2015-09-04 13:16:25 +02:00 |
|
Juanjo Bazán
|
53bf3ac14f
|
Merge pull request #349 from dbillionlabs/better_asset
Smaller, better, no reason for the image being so big
|
2015-09-04 12:30:44 +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
|
6e1fa05595
|
Merge branch 'master' of github.com:AyuntamientoMadrid/participacion
|
2015-09-04 00:27:29 +02:00 |
|
rgarcia
|
ebddcfa1d0
|
cleans up delayed_jobs for capistrano
|
2015-09-04 00:27:14 +02:00 |
|
Juanjo Bazán
|
53781873f6
|
updates dependencies
|
2015-09-03 23:53:42 +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 |
|
Juanjo Bazán
|
5af7bc1aee
|
removes language switcher if only one locale
|
2015-09-03 23:47:55 +02:00 |
|
Juanjo Bazán
|
356e987145
|
Merge pull request #348 from AyuntamientoMadrid/delayed_jobs
Adds delayed jobs
|
2015-09-03 23:45:27 +02:00 |
|
David Fernández
|
a0ffd4f718
|
Smaller, better, no reason for the image being so big?
|
2015-09-03 23:42:26 +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
|
d0d33cc517
|
sends custom emails with delayed jobs
|
2015-09-03 22:48:29 +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 |
|
Enrique García
|
858adf891f
|
Merge pull request #346 from AyuntamientoMadrid/ancestry
Ancestry
|
2015-09-03 17:19:08 +02:00 |
|
Juanjo Bazán
|
dfc1ccb108
|
renames helper method
|
2015-09-03 17:13:19 +02:00 |
|
Juanjo Bazán
|
05a647f9e7
|
Merge pull request #345 from AyuntamientoMadrid/improve_styles
Improve styles
|
2015-09-03 16:43:10 +02:00 |
|
Juanjo Bazán
|
358028c3e6
|
Fixes conflicts. Merge branch 'master' into ancestry
|
2015-09-03 16:37:28 +02:00 |
|
Juanjo Bazán
|
bf017a8557
|
removes children_count from Comment
|
2015-09-03 16:33:29 +02:00 |
|
Juanjo Bazán
|
b7518fe98f
|
updates dev_seeds.rb
|
2015-09-03 16:33:13 +02:00 |
|
Juanjo Bazán
|
136c1e73ed
|
uses ancestry to retrieve debate comments
|
2015-09-03 16:32:54 +02:00 |
|
Alberto Garcia Cabeza
|
efeb5a7457
|
Updates texts and changes test
|
2015-09-03 14:19:45 +02:00 |
|
Alberto Garcia Cabeza
|
f20192d9d7
|
Improves styles for debates
|
2015-09-03 14:15:45 +02:00 |
|
Alberto Garcia Cabeza
|
3255995ea1
|
Adds new styles for pages
|
2015-09-03 14:15:01 +02:00 |
|
Alberto Garcia Cabeza
|
8559833cc0
|
Changes texts for emails
|
2015-09-03 14:11:25 +02:00 |
|
Alberto Garcia Cabeza
|
4631b39d25
|
Updates custom icons fonts
|
2015-09-03 14:10:01 +02:00 |
|
Enrique García
|
86783db3c3
|
Merge pull request #344 from AyuntamientoMadrid/fixes_specs
fixes specs for exact link texts
|
2015-09-03 14:04:04 +02:00 |
|
rgarcia
|
28fd82c06e
|
fixes specs for exact link texts
|
2015-09-03 13:17:26 +02:00 |
|
rgarcia
|
efecc697db
|
adds second server for production
|
2015-09-03 12:45:02 +02:00 |
|
Raimond Garcia
|
f640a74e0a
|
Merge pull request #327 from AyuntamientoMadrid/exact-capybara
Exact capybara
|
2015-09-03 12:39:23 +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
|
1d180e3545
|
Merge pull request #340 from AyuntamientoMadrid/tag-cloud-338
Fixes tag cloud
|
2015-09-03 12:10:11 +02:00 |
|
kikito
|
e2b405083c
|
merges master and fixes conflicts
|
2015-09-03 12:02:16 +02:00 |
|
kikito
|
b23bd2c94d
|
Fixes tag cloud
* Makes order work
* Limits it to the first 20 in Debates#index
Fixes #338
|
2015-09-03 11:50:58 +02:00 |
|