Commit Graph

298 Commits

Author SHA1 Message Date
rgarcia
f3af263e68 adds crud specs for proposals 2015-09-13 11:47:57 +02:00
kikito
5903ebe857 merges master and fix conflicts 2015-09-12 19:54:15 +02:00
kikito
c44e709f24 Refactors search form
It only appears when the page asks for it.
Also, the i18n namespace and the path used for the form are parameters
now
2015-09-12 18:32:13 +02:00
Alberto Garcia Cabeza
417757c4b0 Fixes add flags on mobile devices 2015-09-12 18:05:33 +02:00
Alberto Garcia Cabeza
747c604127 Fixes styles for mobile version 2015-09-12 18:05:15 +02:00
kikito
d300bb6bcb Refactors order_selector
Moves the information about the current order to the selector, not to
the container
2015-09-12 16:48:41 +02:00
kikito
1caf6348a9 Extract HasOrders + partial from DebatesController 2015-09-12 16:48:41 +02:00
Raimond Garcia
942b27100b Merge pull request #472 from AyuntamientoMadrid/verification-path
Verification path
2015-09-11 16:52:02 +02:00
Juanjo Bazán
1296668606 changes links to verification process 2015-09-11 16:44:00 +02:00
Raimond Garcia
050ae1265c Merge pull request #470 from AyuntamientoMadrid/filter-to-first-page-445
filters reset to page 1. Fixes #445
2015-09-11 16:41:58 +02:00
Alberto Garcia Cabeza
d364d1bf7e Fixes styles for search results and filters 2015-09-11 13:58:33 +02:00
kikito
1f28e97c2e filters reset to page 1. Fixes #445 2015-09-11 13:04:43 +02:00
Raimond Garcia
67d5b6fcc8 Merge pull request #467 from AyuntamientoMadrid/improve_design
Improve design
2015-09-10 20:49:00 +02:00
Alberto Garcia Cabeza
5dbea69586 Improves pages, debates list, mobile version 2015-09-10 19:28:46 +02:00
kikito
43bdfb940e merges master and fixes conflicts 2015-09-10 17:47:40 +02:00
Alberto Garcia Cabeza
57682e8111 Updates header styles, moves search form to header 2015-09-10 17:22:11 +02:00
kikito
2d3015703d replaces constants by class methods + private functions. Fixes broken tests 2015-09-10 13:02:21 +02:00
Alberto Garcia Cabeza
a61c006f7f Replaces bullet for bull 2015-09-09 20:33:21 +02:00
kikito
8c9f189d75 merges master and fixes conflicts 2015-09-09 19:36:23 +02:00
kikito
ada03c8474 Adds max lengths in views 2015-09-09 18:34:26 +02:00
Juanjo Bazán
30bf5023b3 adds cache to debates/_comments partial
cache does not invalidate on updates of debate other than comments_count
2015-09-09 15:00:18 +02:00
Alberto Garcia Cabeza
5b7cda2233 Adds message info on debate new form 2015-09-08 14:47:32 +02:00
rgarcia
f11220206a displays alert for conflictive debates 2015-09-07 17:17:33 +02:00
Raimond Garcia
b3b4b79f41 Merge pull request #406 from AyuntamientoMadrid/improves_styles
Improves styles
2015-09-07 16:57:20 +02:00
Alberto Garcia Cabeza
0bda3fefad Adds alerts message for flag debates 2015-09-07 16:37:58 +02:00
Alberto Garcia Cabeza
101a50a96e Improves layout styles 2015-09-07 16:36:33 +02:00
kikito
75c9e87357 Changes views so that administrators can see the debate moderation actions 2015-09-07 15:57:45 +02:00
Juanjo Bazán
69cb070ce2 adds user's votes info to cache keys 2015-09-07 13:18:30 +02:00
rgarcia
13cf1d9449 removes all comments cache 2015-09-07 10:55:23 +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
2aac7b413c Improves styles for index, header and footer 2015-09-07 00:17:21 +02:00
Juanjo Bazán
bf18da3faa adds cache for authors of debate/comment 2015-09-06 22:03:31 +02:00
Juanjo Bazán
ca8c445404 removes close button from alert for no-logged user 2015-09-06 20:40:11 +02:00
Álvaro Durán Tovar
92ae988251 adds close button to alert boxes, also adds
data-alert attribute to enable javascript
on them
2015-09-06 19:54:12 +02:00
Juanjo Bazán
31b00c32f4 removes unneeded to_a 2015-09-06 12:25:47 +02:00
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