Commit Graph

5807 Commits

Author SHA1 Message Date
Amaia Castro
a6ceab6d73 Answer legislation questions 2016-12-27 19:49:03 +01:00
kikito
31aed877e8 i18n 2016-12-27 18:56:11 +01:00
Juanjo Bazán
b63d9ac98e removes unused key 2016-12-27 18:36:46 +01:00
Juanjo Bazán
5ec12e4b5b Merge branch 'master' into redux-polling 2016-12-27 18:22:06 +01:00
Alberto Miedes Garcés
90ff84b6ef Update API fields for Comment 2016-12-27 18:18:22 +01:00
Alberto Miedes Garcés
0e501e2edd Update API fields for Debate, User and Geozone 2016-12-27 18:18:00 +01:00
Alberto Miedes Garcés
506696df0a Call <ApiModel>::public_for_api if available 2016-12-27 18:17:02 +01:00
Alberto Garcia Cabeza
3121dd066e adds thead and button to select on budget investement index table 2016-12-27 18:02:35 +01:00
Juanjo Bazán
40f6ca5886 adds poll shift management to admin 2016-12-27 17:47:15 +01:00
Amaia Castro
04b23cfc7b Merge branch 'master' into legislation-module-stable 2016-12-27 16:43:43 +01:00
kikito
9d97421b0e Merge branch 'master' into budgets 2016-12-27 14:02:12 +01:00
Juanjo Bazán
ee8c057a46 adds officer search to admin polls 2016-12-27 12:36:16 +01:00
Alberto Miedes Garcés
2741dcf03c Temporary remove organizations from API 2016-12-26 20:45:46 +01:00
Alberto Garcia Cabeza
7f9d1dfc09 Merge branch 'polls' into polls-design 2016-12-26 18:22:07 +01:00
Alberto Garcia Cabeza
ba9ed83a3a separates answerable questions and moves callout to a partial 2016-12-26 17:22:40 +01:00
Juanjo Bazán
f0156c5b5a adds admin search/add/remove question to poll 2016-12-26 16:19:35 +01:00
Alberto Miedes Garcés
5daf59e813 Update Proposal fields exposed in API 2016-12-26 13:42:45 +01:00
Alberto Miedes Garcés
d4b049175c Merge branch 'master' into api-dev-0.18.11 2016-12-26 12:55:17 +01:00
rgarcia
1bb307580f makes translations aware of pluralisation 2016-12-26 12:03:39 +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
526a6e2097 i18n 2016-12-25 23:18:58 +01:00
kikito
4b92cf3acf Removes unused error messages from 18n 2016-12-25 12:57:46 +01:00
kikito
32710f57e1 Organization instead of organisation 2016-12-25 12:57:34 +01:00
kikito
2fab251593 adds i18n entries 2016-12-25 12:53:27 +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
37462b79cd removes unused translations 2016-12-23 18:37:39 +01:00
Fernando Blat
8c8b273de0 Settings translation 2016-12-23 15:51:20 +01:00
Fernando Blat
85ce7d7227 Devise won't read mail from Settings in test environment 2016-12-23 15:45:20 +01:00
kikito
9e0007ba35 renames i18n entry 2016-12-23 15:38:31 +01:00
Alberto Garcia Cabeza
c0c76b67c2 adds successful proposals list on admin questions index 2016-12-23 14:16:29 +01:00
Alberto Garcia Cabeza
e26b6db584 changes text on poll booths admin menu 2016-12-23 13:48:34 +01:00
Fernando Blat
a07fbc5b41 Extract mailer from name and address to a setting 2016-12-23 11:28:53 +01:00
Amaia Castro
55eb03531c Comments in legislation question page 2016-12-23 09:35:02 +01:00
kikito
cd72b7e537 Renames i18n param 2016-12-22 20:27:16 +01:00
Alberto Garcia Cabeza
151db53a9b fixes specs 2016-12-22 19:06:11 +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
Amaia Castro
368430d914 Legislation Question page 2016-12-22 16:00:28 +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
fe92752069 Merge branch 'sandbox-html' into legislation-module-stable 2016-12-21 15:49:37 +01:00
Juanjo Bazán
78db093e49 moves validation error message 2016-12-21 14:21:02 +01:00
Juanjo Bazán
bc690748fd adds dates validation to polls 2016-12-21 13:50:15 +01:00
Alberto Garcia Cabeza
6afe594e75 adds missing i18n 2016-12-21 12:45:57 +01:00
Alberto Garcia Cabeza
4e7589f406 improves accessibility on subnavigation menu 2016-12-21 12:35:48 +01:00
Fernando Blat
e872f2d626 Merge pull request #33 from medialab-prado/25-legislation-questions
Legislation Questions model and basic admin
2016-12-21 08:50:28 +01:00