Commit Graph

4747 Commits

Author SHA1 Message Date
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
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
kikito
0a603b9e80 i18n 2016-12-28 19:17:52 +01:00
kikito
d2356c18d0 Adds toggle_selection action 2016-12-28 19:11:59 +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
kikito
64ca1f18c6 Extracts code to partial. Adds remote links 2016-12-28 17:43:21 +01:00
kikito
f7c505392a Adds new route and matching ability for administrators 2016-12-28 17:42:47 +01:00
kikito
010aeaa9ac i18n 2016-12-28 17:42:15 +01:00
Amaia Castro
646ec67595 ‘Participation not allowed’ hover for legislation questions 2016-12-28 17:37:17 +01:00
kikito
3dcd7b444a adds valuation_finished_feasible scope 2016-12-28 17:29:49 +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
kikito
b6dfd7178d Merge branch 'budgets-select' of github.com:consul/consul into budgets-select 2016-12-28 12:18:17 +01:00
Alberto Garcia Cabeza
d8cc888d60 changes table headings and selected button css 2016-12-28 12:17:08 +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
rgarcia
d554ec810a adds document counter to signature sheet 2016-12-28 11:40:20 +01:00
kikito
93047ed68e Merge branch 'budgets-select' of github.com:consul/consul into budgets-select 2016-12-28 11:12:39 +01:00
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
kikito
6e5de228fd fixes failing spec due to merge with master 2016-12-27 18:52:37 +01:00
Amaia Castro
5e01b380cd Legislation Answer model 2016-12-27 18:21:50 +01:00
Amaia Castro
573e281a8f Merge branch 'master' into legislation-module-stable 2016-12-27 18:07:11 +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
48fa7ab919 Merge pull request #1309 from consul/accesibility
accesibility
2016-12-27 16:49:16 +01:00
Amaia Castro
04b23cfc7b Merge branch 'master' into legislation-module-stable 2016-12-27 16:43:43 +01:00
Alberto Garcia Cabeza
5bf09ec569 replaces span tag to div on comments votes 2016-12-27 16:33:06 +01:00