Commit Graph

794 Commits

Author SHA1 Message Date
Amaia Castro
5584835314 Merge branch 'legislation-module-stable' into sandbox-html 2016-12-29 09:27:07 +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
b3b6f51b7a Merge branch 'master' into polls 2016-12-28 16:29:12 +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
Alberto Garcia Cabeza
5c6dfefe0c changes color of back link on dark heading 2016-12-28 13:56:01 +01:00
Alberto Garcia Cabeza
241ddcb163 polish styles for tables, assignments and searches on polls admin 2016-12-28 13:45:36 +01:00
Juanjo Bazán
5ec12e4b5b Merge branch 'master' into redux-polling 2016-12-27 18:22:06 +01:00
Amaia Castro
573e281a8f Merge branch 'master' into legislation-module-stable 2016-12-27 18:07:11 +01:00
Alberto Garcia Cabeza
a95edee7c7 improves styles for reply and deleted comments 2016-12-27 16:29:32 +01:00
Alberto Garcia Cabeza
170ef4e680 improves styles for users avatar 2016-12-27 16:17:43 +01:00
Alberto Garcia Cabeza
f0258fb3ee improves html structure for comments 2016-12-27 14:26:20 +01:00
kikito
9d97421b0e Merge branch 'master' into budgets 2016-12-27 14:02:12 +01:00
Amaia Castro
e03522e267 Merge branch 'legislation-module-stable' into sandbox-html 2016-12-27 12:36:10 +01:00
Alberto Garcia Cabeza
daf800564a changes highlighted color on dark heading 2016-12-26 17:32:50 +01:00
Alberto Garcia Cabeza
5d656f157a improves styles for polls views 2016-12-26 17:19:48 +01:00
kikito
688f52bb62 Renames supports to allow_participation 2016-12-22 20:23:48 +01:00
Alberto Garcia Cabeza
8cbd39df69 adds styles to wrapper and new partial to filter subnav vertical 2016-12-22 18:31:26 +01:00
Alberto Garcia Cabeza
a6fbe063c9 adds styles to polls index and show views 2016-12-22 18:30:39 +01:00
Fernando Blat
0f6ece0c30 Toggle only works on column when the section is not visible 2016-12-22 17:38:02 +01:00
Martín González
8065b4d2f7 New approach for allegation toggle (needs review) 2016-12-22 16:33:26 +01:00
Martín González
294d216ac1 Responsive fixes 2016-12-22 12:04:55 +01:00
Amaia Castro
4eb6b19f90 Merge branch 'sandbox-html' into legislation-module-stable 2016-12-21 18:24:51 +01:00
Martín González
2c3539cf33 Refactor legislation process navigation 2016-12-21 17:54:57 +01:00
Amaia Castro
fe92752069 Merge branch 'sandbox-html' into legislation-module-stable 2016-12-21 15:49:37 +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
Alberto García Cabeza
21197ae7d1 Merge pull request #1297 from aspgems/fix_mobile_menu
Fixes bug in menu icon in mobile browsers.
2016-12-20 17:16:12 +01:00
Juanma
f088e89068 Fixes bug in menu icon in mobile browsers. 2016-12-20 07:34:56 +01:00
kikito
36ffa1922e Adds supports.js.coffee 2016-12-19 19:03:18 +01:00
Martín González
3c3a779f9f Add legislation draft comment page 2016-12-19 17:03:59 +01:00
Martín González
b35659086a Add legislation draft comments page 2016-12-19 16:48:03 +01:00
Martín González
e8b54f3752 Add legislation allegations draft change page 2016-12-19 15:36:28 +01:00
Alberto Garcia Cabeza
76a3c61020 improves html structure for comments on debates and proposals 2016-12-19 13:43:09 +01:00
Martín González
daba441178 Allegations page 2016-12-16 19:04:21 +01:00
Martín González
23211337ef Legislation process debate markup 2016-12-16 19:04:21 +01:00
Martín González
bbacd4546b Legislation process markup and styles 2016-12-16 19:04:20 +01:00
Alberto Garcia Cabeza
9c78b60ddc adds provisional content on booths show and officers assign 2016-12-16 18:59:15 +01:00
Alberto Garcia Cabeza
cbbc3ed1be improves styles for admin questions views 2016-12-14 17:58:21 +01:00
Alberto Garcia Cabeza
6498d1c34d improves styles for admin polls views 2016-12-14 13:52:18 +01:00
Alberto Garcia Cabeza
e7327860e4 improves headings and html structure 2016-12-14 13:51:39 +01:00