Commit Graph

6458 Commits

Author SHA1 Message Date
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
b3b6f51b7a Merge branch 'master' into polls 2016-12-28 16:29:12 +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
Juanjo Bazán
3122e885ba Merge pull request #1313 from consul/polls-styles
polls styles
2016-12-28 14:15:56 +01:00
Alberto Garcia Cabeza
4ab9a417fb updates specs 2016-12-28 14:04:28 +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
f08cbed080 adds missing i18n 2016-12-28 13:48:39 +01:00
Alberto Garcia Cabeza
241ddcb163 polish styles for tables, assignments and searches on polls admin 2016-12-28 13:45:36 +01:00
Alberto Garcia Cabeza
69ab67a81f hides table if there are no officers 2016-12-28 12:53:04 +01:00
Alberto Garcia Cabeza
8e3f80628d improves callout officer not found 2016-12-28 12:52:36 +01:00
Alberto Garcia Cabeza
c2b6cda406 improves styles of search forms 2016-12-28 12:49:02 +01:00
Alberto Garcia Cabeza
a511480ce2 improves styles for admin menu 2016-12-28 12:41:04 +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
f5b032cfbe Merge branch 'master' into polls 2016-12-28 12:16:55 +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
Juanjo Bazán
454ae678e6 adds spec for user#poll_officer? 2016-12-27 18:51:38 +01:00
Juanjo Bazán
402d709930 adds menu item to main bar for poll officers 2016-12-27 18:48:36 +01:00
Juanjo Bazán
3fc4896529 adds unsettled geozones menu item to admin menu 2016-12-27 18:37:04 +01:00
Juanjo Bazán
b63d9ac98e removes unused key 2016-12-27 18:36:46 +01:00
Alberto Miedes Garcés
9896804070 Fixes typo in spec 2016-12-27 18:30:35 +01:00
Juanjo Bazán
7b6713f8bb fixes typo in method call 2016-12-27 18:26:27 +01:00
Juanjo Bazán
ab61d94d2d changes Time.now to Time.current 2016-12-27 18:26:03 +01:00
Juanjo Bazán
5ec12e4b5b Merge branch 'master' into redux-polling 2016-12-27 18:22:06 +01:00
Amaia Castro
5e01b380cd Legislation Answer model 2016-12-27 18:21:50 +01:00
Alberto Miedes Garcés
90ff84b6ef Update API fields for Comment 2016-12-27 18:18:22 +01:00
Alberto Miedes Garcés
0e501e2edd Update API fields for Debate, User and Geozone 2016-12-27 18:18:00 +01:00
Alberto Miedes Garcés
506696df0a Call <ApiModel>::public_for_api if available 2016-12-27 18:17:02 +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
3ad648dd63 display correct submenu in admin menu 2016-12-27 17:47:54 +01:00