Commit Graph

4151 Commits

Author SHA1 Message Date
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
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
rgarcia
d0b0782c46 sets only one server to run delayed jobs 2016-12-28 21:24:56 +01:00
Juanjo Bazán
7ec6c76298 Merge pull request #1316 from consul/signature-sheets-polish
Only stores alphanumeric characters of a signature's document number
2016-12-28 20:50:28 +01:00
rgarcia
25f34cdab9 Only stores alphanumeric characters of a signature's document number 2016-12-28 20:01:17 +01:00
Martín González
fa3d188a09 Add draft editor markup and styles 2016-12-28 18:59:12 +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
Juanjo Bazán
c1a6f7d445 Merge pull request #1314 from consul/comments-html
html for comments
2016-12-28 16:28:19 +01:00
Amaia Castro
2693393eb0 Answer question through ajax 2016-12-28 16:21:58 +01:00
Martín González
d49c5c2b16 Push draft index admin 2016-12-28 15:52:52 +01:00
Martín González
e79260a8ff Add legislation debate question markup and styles 2016-12-28 15:40:21 +01:00
Alberto Garcia Cabeza
3b28b56c5c improves html structure for comments 2016-12-28 14:36:06 +01:00
Martín González
02e2a9ed55 Legislation process debate markup and styles 2016-12-28 14:23:11 +01:00
Martín González
819638f856 Refine legislation index markup 2016-12-28 14:00:51 +01:00
Martín González
1e189cd709 Legislation info admin page 2016-12-28 13:56:19 +01:00
Martín González
1dd17b493a Simplify markup 2016-12-28 12:33:19 +01:00
Martín González
0e12f5cd9b Legislation admin index markup 2016-12-28 12:32:31 +01:00
Juanjo Bazán
5ffce7fb05 Merge pull request #1312 from consul/signature-sheets-polish
Signature sheets polish
2016-12-28 12:16:15 +01:00
rgarcia
122446ef62 find or create signatures in case of a timeout 2016-12-28 11:41:52 +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
113c4551aa makes signatures aware of spaces between numbers and letter 2016-12-28 11:40:36 +01:00