Commit Graph

4173 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
39633dce67 Fix back links in admin 2017-01-04 12:39:09 +01:00
Amaia Castro
375602d297 Display title with an * when status is draft in version chooser 2017-01-04 12:15:12 +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
6d99a24740 Fix draft versions list 2017-01-04 10:13:55 +01:00
Amaia Castro
f040759693 Show only published draft versions to users (and also drafts to admins) 2017-01-03 22:08:54 +01:00
Amaia Castro
3ba6b409aa Make markdown helper safer to use
Avoid exception if text is nil
2017-01-03 21:41:00 +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
Enrique García
465a93f49c Merge pull request #1318 from ferblape/1315-manage-offices_url-as-setting
Manage offices url as a setting
2017-01-03 13:27:52 +01:00
Amaia Castro
99e3afd6ca Merge branch 'legislation-module-stable' into 13-draft-version-page 2017-01-03 09:28:26 +01:00
Fernando Blat
c47993ec91 Merge pull request #49 from medialab-prado/47-fix-bug-deleting-questions
Fix stack level too deep bug when deleting questions with answers
2017-01-03 09:23:56 +01:00
Fernando Blat
dcfb39d38d Merge pull request #44 from medialab-prado/42-integrate-admin-html-css
Integrate admin html and css from sandbox
2017-01-03 09:03:06 +01:00
Fernando Blat
04a3a4177d Merge branch 'master' into 1315-manage-offices_url-as-setting 2017-01-03 08:57:02 +01:00
Fernando Blat
76bc1a7934 Use settings helper 2017-01-03 08:55:17 +01:00
Amaia Castro
98b6dd75ea Fix stack level too deep bug when deleting questions with answers 2017-01-02 20:45:20 +01:00
Amaia Castro
1736b68044 Update subnavigation menu and accessibility page for new shortcut 2017-01-02 18:42:22 +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
d29a9fe761 Match js calendar date format in admin process form text fields 2017-01-02 13:22:33 +01:00
Martín González
bc72e72e8f Refactor legislation processes filter styles 2017-01-02 12:43:00 +01:00
Amaia Castro
3de48353da Merge branch 'master' into legislation-module-stable 2017-01-02 11:56:17 +01:00
Enrique García
30d89be2d8 Merge pull request #1320 from consul/meta-tags
Meta description and keywords tags
2017-01-02 11:45:58 +01:00
Alberto Garcia Cabeza
00581fcacc adds setting key deleted by mistake 2016-12-30 17:21:50 +01:00
Alberto Garcia Cabeza
d8b4af5add adds meta description and keywords 2016-12-30 17:17:46 +01:00
Juanjo Bazán
c5c1bef7cc Merge pull request #1319 from consul/signature-sheets-cleanup
Signature sheets cleanup
2016-12-30 12:58:41 +01:00
Amaia Castro
2b56b59ed9 Additional info in process page 2016-12-30 12:28:28 +01:00
Amaia Castro
ab12ffe98f Titles for legislation admin pages 2016-12-30 12:03:11 +01:00
rgarcia
13d9f6c294 removes obsolete spec 2016-12-30 11:55:44 +01:00
Amaia Castro
f44fff3289 Provide title for processes index page 2016-12-30 11:51:51 +01:00
Amaia Castro
30ec5bdcb5 Build one option for the questions form when creating a new question 2016-12-30 11:22:39 +01:00
Amaia Castro
4c309b5243 Refactor css classes 2016-12-30 11:22:28 +01:00
Amaia Castro
0cd2b62e2c Integrate admin html and css from sandbox 2016-12-30 11:00:34 +01:00
Amaia Castro
8c5b4d8c74 Merge pull request #37 from medialab-prado/sandbox-html
Legislation Processes HTML [WIP]
2016-12-30 10:52:29 +01:00
rgarcia
43c18d58ac fixes specs 2016-12-29 12:47:57 +01:00
rgarcia
2a0267a1af updates db schema 2016-12-29 12:34:50 +01:00
rgarcia
365faeff31 removes physical votes from proposals 2016-12-29 12:05:29 +01:00
Amaia Castro
f804fd8312 Merge branch 'master' into legislation-module-stable 2016-12-29 11:40:32 +01:00
Martín González
99a0e79354 Add toggle content style 2016-12-29 11:24:53 +01:00
Martín González
28b452f994 Add debate toggles 2016-12-29 10:45:12 +01:00
Fernando Blat
e230bd947b Merge pull request #43 from medialab-prado/41-force-processes-order
Force processes order
2016-12-29 10:34:52 +01:00
Fernando Blat
ca2370eb7c Manage offices url as a setting 2016-12-29 10:31:38 +01:00
Amaia Castro
5b3dcd7886 Force processes order 2016-12-29 09:59:29 +01:00
Amaia Castro
5584835314 Merge branch 'legislation-module-stable' into sandbox-html 2016-12-29 09:27:07 +01:00
Fernando Blat
bbcf5aa0f4 Merge pull request #40 from medialab-prado/27-answer-questions
Answer legislation questions
2016-12-29 07:38:34 +01:00
Amaia Castro
f505d6fec7 Check if debate phase is open to create answers 2016-12-28 22:02:08 +01:00
Juanjo Bazán
ff1dc631f1 Merge pull request #1317 from consul/delayed-jobs-config
sets only one server to run delayed jobs
2016-12-28 21:55:22 +01:00