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
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
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
3f98ab74b0
Makes tag checking more efficient in Debates#index
...
1) Only loads the tags if params[:tag] is present
2) Only checks for existence of the tag, instead of loading them all
and getting their names
2015-09-03 11:18:39 +02:00
kikito
e0f8f8d8de
Removes Debate.search & uses Debate.tagged_by when appropriate
...
Using `params` was wrong here because if given an inexistent tag,
@tag_filter was nil but the debates were still filtered by it (so the
listing and what the page title said were different)
2015-09-03 11:17:21 +02:00
kikito
002d86884b
Removes the tag selector from debate#index view & refactors i18n
2015-09-03 11:15:05 +02:00
Enrique García
1c9cfb5a48
Merge pull request #333 from AyuntamientoMadrid/favicon
...
adds favicon to other layouts
2015-09-03 10:18:19 +02:00
Juanjo Bazán
27ed66ea71
Merge pull request #336 from AyuntamientoMadrid/cleanup
...
Cleanup
2015-09-03 09:35:04 +02:00
rgarcia
10127f546e
upgrade before_filter to new syntax
2015-09-03 01:40:24 +02:00
rgarcia
4897d5df4e
makes spaces consistent
2015-09-03 01:29:46 +02:00
rgarcia
29ae0c68f8
removes unnecessary comments
2015-09-03 01:29:13 +02:00
rgarcia
ae0ad77197
reorders before_actions
2015-09-03 01:28:46 +02:00
