Commit Graph

1103 Commits

Author SHA1 Message Date
Amaia Castro
2b6df62dd7 Refactor process phases pages 2017-01-04 14:02:25 +01:00
Fernando Blat
b6b33ff85b Merge pull request #51 from medialab-prado/14-base-legislation-annotations
Base Legislation Annotations
2017-01-04 13:50:37 +01:00
Fernando Blat
ad20302052 Merge pull request #48 from medialab-prado/13-draft-version-page
Draft Version page
2017-01-04 13:43:54 +01:00
Amaia Castro
ee9fa3db15 Base Legislation Annotations 2017-01-04 12:56:58 +01:00
Amaia Castro
c935373c07 Remove draft version preview buttons from edit form and add link to index 2017-01-04 10:14:58 +01:00
Amaia Castro
a3b8d30567 Merge branch 'master' into legislation-module-stable 2017-01-03 19:38:01 +01:00
Amaia Castro
d2b3a21182 Fix abilities and add specs 2017-01-03 17:48:21 +01:00
Fernando Blat
04a3a4177d Merge branch 'master' into 1315-manage-offices_url-as-setting 2017-01-03 08:57:02 +01:00
Amaia Castro
5627b18be2 Draft Version page 2017-01-02 18:05:15 +01:00
Amaia Castro
1ff6a7b69b Merge branch 'legislation-module-stable' into 42-integrate-admin-html-css 2017-01-02 18:03:55 +01:00
Amaia Castro
3de48353da Merge branch 'master' into legislation-module-stable 2017-01-02 11:56:17 +01:00
Alberto Garcia Cabeza
d8b4af5add adds meta description and keywords 2016-12-30 17:17:46 +01:00
Amaia Castro
0cd2b62e2c Integrate admin html and css from sandbox 2016-12-30 11:00:34 +01:00
Amaia Castro
f804fd8312 Merge branch 'master' into legislation-module-stable 2016-12-29 11:40:32 +01:00
Fernando Blat
ca2370eb7c Manage offices url as a setting 2016-12-29 10:31:38 +01:00
Amaia Castro
f505d6fec7 Check if debate phase is open to create answers 2016-12-28 22:02:08 +01:00
rgarcia
d0b0782c46 sets only one server to run delayed jobs 2016-12-28 21:24:56 +01:00
Amaia Castro
28689a5a7d Merge branch 'legislation-module-stable' into 27-answer-questions 2016-12-28 17:54:21 +01:00
Amaia Castro
525ad3ebd1 Merge branch 'master' into legislation-module-stable 2016-12-28 17:51:15 +01:00
Amaia Castro
646ec67595 ‘Participation not allowed’ hover for legislation questions 2016-12-28 17:37:17 +01:00
rgarcia
0a6e86ea83 increase delayed job max run time to 30 minutes 2016-12-28 11:41:41 +01:00
rgarcia
c9f62bf2b9 fixes conflicts 2016-12-28 11:41:32 +01:00
rgarcia
d554ec810a adds document counter to signature sheet 2016-12-28 11:40:20 +01:00
Amaia Castro
a6ceab6d73 Answer legislation questions 2016-12-27 19:49:03 +01:00
Amaia Castro
04b23cfc7b Merge branch 'master' into legislation-module-stable 2016-12-27 16:43:43 +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
Juanjo Bazán
d057c9457d Merge branch 'master' into signature-sheets 2016-12-23 20:23:56 +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
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
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
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
Amaia Castro
92a13b0f77 Merge branch 'master' into legislation-module-stable 2016-12-20 20:03:04 +01:00
Amaia Castro
d25d6c178c Legislation Questions model and basic admin 2016-12-20 18:52:43 +01:00
rgarcia
53ac18f68f updates views 2016-12-20 17:06:03 +01:00
Alberto Garcia Cabeza
a7aed27db4 adds styles and i18n to signature sheets admin views 2016-12-20 14:57:24 +01:00
rgarcia
2eb5dfdd4b adds translations 2016-12-20 12:21:17 +01:00
rgarcia
3c682b8a9b adds signature sheets 2016-12-20 12:21:05 +01:00