Juanjo Bazán
60089b8986
uses author info in comment/debate cache
...
author is already preloaded and we avoid expensive touching methods
2015-09-06 12:13:39 +02:00
rgarcia
5200d76be6
caches comments
2015-09-05 22:02:51 +02:00
rgarcia
93378eea98
caches debates show
2015-09-05 22:02:50 +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
Alberto Garcia Cabeza
83b44fd53a
Improves layout, adds link to checkbox's label
2015-09-05 00:34:18 +02:00
Alberto Garcia Cabeza
128a2bc956
Updates some texts
2015-09-04 20:42:02 +02:00
kikito
55c48e3719
Fixes randomly-failing travis specs
...
The problem was that after changing page with the selects, capybara
needs to “find something which has changed on the page” in order to
“wait”. The “have_selects” did not wait because they did not change
(you change them, then the page changes, and they stay the same)
2015-09-04 17:44:32 +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
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
kikito
9f970568ac
Displays debate.created_at in debates#index
2015-09-04 12:16:11 +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
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
136c1e73ed
uses ancestry to retrieve debate comments
2015-09-03 16:32:54 +02:00
Alberto Garcia Cabeza
f20192d9d7
Improves styles for debates
2015-09-03 14:15:45 +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
7fefcb692e
Changes and updates texts
2015-09-02 23:43:08 +02:00
Juanjo Bazán
eb689d7c7e
refactors comment form
2015-09-02 17:22:21 +02:00
Juanjo Bazán
31a8c15344
removes redundant condition
2015-09-02 12:57:09 +02:00
Juanjo Bazán
8915ce7ffd
adds interface to disallow organizations votes
...
on debates
2015-09-02 12:16:55 +02:00
rgarcia
587749782d
hot fix for anonymous votes
2015-09-01 22:56:27 +02:00
Juanjo Bazán
ac7ad1d863
hides 'too many anonymous votes' layer
2015-09-01 17:49:03 +02:00
Juanjo Bazán
9f4a98d3a0
moves translation keys
2015-09-01 17:49:02 +02:00
Alberto Garcia Cabeza
bcc58ab0c4
Adds styles for too much anonymous votes
2015-09-01 17:49:02 +02:00
Alberto Garcia Cabeza
57e373a7cf
Adds styles for too much anonymous comments
2015-09-01 17:49:02 +02:00
Raimond Garcia
3c665153d4
Merge pull request #300 from AyuntamientoMadrid/flag-helper
...
Flag helper
2015-09-01 15:19:16 +02:00
kikito
9a071d2ed7
Renames @voted_values to @debate_votes in controllers
2015-09-01 13:07:03 +02:00
kikito
005fd4c09a
Replaces can? :flag/:unflag by a helper function
2015-09-01 10:34:46 +02:00
Juanjo Bazán
7246c181d5
adds cache to _debate view
2015-08-31 20:40:48 +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
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
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
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
Marko Lovic
4285ba4bb3
Add tag filter to debates page
2015-08-28 12:41:10 +02:00
kikito
a0dafc68e8
Merge branch 'master' into flag-renaming
2015-08-28 12:00:32 +02:00
Raimond Garcia
b8fe857ab1
Merge pull request #263 from AyuntamientoMadrid/include_texts
...
Include texts
2015-08-28 10:07:33 +02:00
kikito
76c2f2f021
Merge branch 'master' into flag-renaming
2015-08-27 19:06:29 +02:00
Marko Lovic
e8004ca1d3
Add to javascript to handle debates order change
2015-08-27 17:18:07 +02:00
Alberto Garcia Cabeza
900f00b443
Adds new texts on header, debates and footer
2015-08-27 16:46:47 +02:00
Marko Lovic
2d48966de3
Change variable name and references from "filter" to "order"
2015-08-27 15:24:59 +02:00
Marko Lovic
ccaca54816
Add filters to specify order of debates#index
2015-08-27 15:24:59 +02:00
kikito
909dfb4ce3
Several renamings
...
InappropiateFlag -> Flag
x.flag_as_inappropiate -> x.flag
x.undo_flag_as_inappropiate -> x.unflag
X.flagged_as_inappropiate -> x.flagged
flag-as-inappropiate-actions views & css -> flag-actions views & css
2015-08-27 10:48:49 +02:00
Juanjo Bazán
dacbe27fda
uses cache counter for debate's comments
2015-08-26 17:26:17 +02:00
kikito
015fe704e4
Fixes flagging specs by making them id-based instead of text-based
2015-08-26 13:14:42 +02:00
kikito
c183cf2cc6
merges master and fix conflicts
2015-08-25 19:31:25 +02:00
