Commit Graph

5383 Commits

Author SHA1 Message Date
Alberto Garcia Cabeza
f0258fb3ee improves html structure for comments 2016-12-27 14:26:20 +01:00
kikito
9d97421b0e Merge branch 'master' into budgets 2016-12-27 14:02:12 +01:00
Alberto Garcia Cabeza
ae7458024d closes missing aside tag 2016-12-27 13:57:27 +01:00
Alberto Garcia Cabeza
bb64dab5b9 adds type date on advanced search date min and date max 2016-12-27 13:51:19 +01:00
Alberto Garcia Cabeza
736099fa51 adds id to advanced search href link and form 2016-12-27 13:37:24 +01:00
Juanjo Bazán
ee8c057a46 adds officer search to admin polls 2016-12-27 12:36:16 +01:00
Amaia Castro
e03522e267 Merge branch 'legislation-module-stable' into sandbox-html 2016-12-27 12:36:10 +01:00
Amaia Castro
eed8f1dd83 Set admin layout for admin sandbox templates 2016-12-27 12:32:07 +01:00
Alberto Garcia Cabeza
0d5d082e68 fixes specs 2016-12-26 19:15:05 +01:00
Alberto Garcia Cabeza
7f9d1dfc09 Merge branch 'polls' into polls-design 2016-12-26 18:22:07 +01:00
Alberto Garcia Cabeza
219754e02e maintains answers centered on questions show 2016-12-26 17:36:50 +01:00
Alberto Garcia Cabeza
aac501bfda improves styles for polls questions views 2016-12-26 17:23:17 +01:00
Alberto Garcia Cabeza
ba9ed83a3a separates answerable questions and moves callout to a partial 2016-12-26 17:22:40 +01:00
Alberto Garcia Cabeza
d231a0188c improves layout for polls index 2016-12-26 17:20:26 +01:00
Juanjo Bazán
f0156c5b5a adds admin search/add/remove question to poll 2016-12-26 16:19:35 +01:00
rgarcia
b8e175d306 adds formatting to document numbers 2016-12-26 12:18:36 +01:00
rgarcia
ba88f4d7cd takes into account asincronos processing 2016-12-26 12:04:14 +01:00
rgarcia
af7d71ccfd Merge branch 'signature-sheets' of github.com:AyuntamientoMadrid/participacion into signature-sheets 2016-12-26 11:14:56 +01:00
kikito
adaa4731aa Uses complete path for partial 2016-12-25 12:57:15 +01:00
kikito
f1a550bdb0 Allows rendering budget investment header when the @heading variable is not set up 2016-12-25 12:57:01 +01:00
kikito
2815b28cd1 changes header message to include assigned heading link 2016-12-25 12:56:31 +01:00
kikito
9af8eb8d52 Changes i18n namespace for errors 2016-12-25 12:55:39 +01:00
kikito
03ef20bfde Merges orders_helper functionality inside has_orders concern
Both these objects where using/setting a variable called valid_orders.
As a results, some specs where becoming flacky
(features/budgets/investments_spec.rb, balloting phase). By putting
them together, there is no `valid_orders` variable any more (everything
is @valid_orders) and the flackyness is gone.
2016-12-24 14:42:46 +01:00
Juanjo Bazán
d057c9457d Merge branch 'master' into signature-sheets 2016-12-23 20:23:56 +01:00
Juanjo Bazán
8b4f519d71 adds booth assignation to admin poll 2016-12-23 19:06:55 +01:00
rgarcia
ddeca6f06d fixes specs 2016-12-23 19:05:25 +01:00
kikito
bbb8ac830c Fixes erroneous i18n param in view 2016-12-23 18:37:02 +01:00
kikito
de1ade0eb8 Fixes erroneous link in view 2016-12-23 18:36:42 +01:00
kikito
615217e36e Fixes errors in header view 2016-12-23 15:37:55 +01:00
Alberto Garcia Cabeza
c0c76b67c2 adds successful proposals list on admin questions index 2016-12-23 14:16:29 +01:00
Amaia Castro
55eb03531c Comments in legislation question page 2016-12-23 09:35:02 +01:00
kikito
bb1258f2b2 Fixes view 2016-12-22 20:27:46 +01:00
kikito
eb648b7269 Adds missing parameters to partials 2016-12-22 20:27:01 +01:00
kikito
7acedb30f6 fixes parenthesis 2016-12-22 20:26:39 +01:00
kikito
688f52bb62 Renames supports to allow_participation 2016-12-22 20:23:48 +01:00
Alberto Garcia Cabeza
6dd3320425 improves styles to polls questions views 2016-12-22 18:31:51 +01:00
Alberto Garcia Cabeza
8cbd39df69 adds styles to wrapper and new partial to filter subnav vertical 2016-12-22 18:31:26 +01:00
Alberto Garcia Cabeza
a6fbe063c9 adds styles to polls index and show views 2016-12-22 18:30:39 +01:00
Amaia Castro
243429aa41 Set title for process and draft versions pages 2016-12-22 17:34:47 +01:00
Amaia Castro
f68b6a2f32 Question title for page and share links 2016-12-22 17:27:59 +01:00
Fernando Blat
aefa875ae2 Merge pull request #35 from medialab-prado/30-legislation-question-page-details
Legislation Question page
2016-12-22 16:42:55 +01:00
Amaia Castro
dee971fcc3 Merge branch 'master' into legislation-module-stable 2016-12-22 16:36:10 +01:00
Martín González
8065b4d2f7 New approach for allegation toggle (needs review) 2016-12-22 16:33:26 +01:00
Amaia Castro
368430d914 Legislation Question page 2016-12-22 16:00:28 +01:00
Martín González
294d216ac1 Responsive fixes 2016-12-22 12:04:55 +01:00
Amaia Castro
36399277ec Legislation Process page 2016-12-22 11:23:49 +01:00
rgarcia
675081141c refactors signatures 2016-12-21 18:46:31 +01:00
Amaia Castro
4eb6b19f90 Merge branch 'sandbox-html' into legislation-module-stable 2016-12-21 18:24:51 +01:00
Martín González
2c3539cf33 Refactor legislation process navigation 2016-12-21 17:54:57 +01:00
Amaia Castro
fe92752069 Merge branch 'sandbox-html' into legislation-module-stable 2016-12-21 15:49:37 +01:00