Commit Graph

1584 Commits

Author SHA1 Message Date
Amaia Castro
2b6df62dd7 Refactor process phases pages 2017-01-04 14:02:25 +01:00
Alberto Garcia Cabeza
e1367d4463 improves table of admin budgets index 2017-01-04 13:52:04 +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
Fernando Blat
8350143496 Don't fetch setting if table doesn't exist 2017-01-04 13:37:55 +01:00
Amaia Castro
ee9fa3db15 Base Legislation Annotations 2017-01-04 12:56:58 +01:00
kikito
0f174df5fe Removes geozones from budget heading views and specs 2017-01-04 12:46:11 +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
Juanjo Bazán
b2c9d5e6b0 Merge branch 'master' into polls 2017-01-03 23:04:21 +01:00
Juanjo Bazán
0953a536af adds recounting to officing 2017-01-03 22:23:54 +01:00
Juanjo Bazán
09dac72471 adds officing's polls index 2017-01-03 22:22:52 +01:00
Juanjo Bazán
8d52224121 removes unused routes/files 2017-01-03 22:17:27 +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
kikito
5ac2d9ccc9 started working on tags for budget investments. Error in investments/show because paths are hard 2017-01-03 17:13:28 +01:00
Fernando Blat
04a3a4177d Merge branch 'master' into 1315-manage-offices_url-as-setting 2017-01-03 08:57:02 +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
Juanjo Bazán
08ea4b35eb Merge branch 'master' into polls 2017-01-02 12:14:40 +01:00
kikito
68d598a43d Merge branch 'master' into budgets 2017-01-02 12:10:23 +01:00
Amaia Castro
3de48353da Merge branch 'master' into legislation-module-stable 2017-01-02 11:56:17 +01:00
kikito
51f7239d07 i18n 2017-01-02 10:52:59 +01:00
kikito
4adf32d582 Changes initializer to avoid crash when migrating database from scratch 2017-01-02 10:02:34 +01:00
kikito
9effcc4041 i18n 2017-01-01 15:04:06 +01:00
Alberto Garcia Cabeza
d8b4af5add adds meta description and keywords 2016-12-30 17:17:46 +01:00
Amaia Castro
0cd2b62e2c Integrate admin html and css from sandbox 2016-12-30 11:00:34 +01:00
Alberto Garcia Cabeza
f32a77bae9 removes unused i18n keys 2016-12-30 01:13:04 +01:00
Alberto Garcia Cabeza
73e3ea3560 fixes specs 2016-12-29 19:16:20 +01:00
Alberto Garcia Cabeza
84e44dc529 updates i18n 2016-12-29 17:53:16 +01:00
Alberto Garcia Cabeza
ca8ba4675e adds create button for logged and verified users 2016-12-29 17:50:06 +01:00
kikito
110a4091f8 Adds budget investment location 2016-12-29 17:30:21 +01:00
kikito
34ee8c1c48 Makes Budgets editable, and makes their description editable with html 2016-12-29 16:21:42 +01:00
kikito
55ea9f1089 replaces unicode by yes/no 2016-12-29 12:11:31 +01:00
Amaia Castro
f804fd8312 Merge branch 'master' into legislation-module-stable 2016-12-29 11:40:32 +01:00
Fernando Blat
ca2370eb7c Manage offices url as a setting 2016-12-29 10:31:38 +01:00
Amaia Castro
f505d6fec7 Check if debate phase is open to create answers 2016-12-28 22:02:08 +01:00
rgarcia
d0b0782c46 sets only one server to run delayed jobs 2016-12-28 21:24:56 +01:00
kikito
0a603b9e80 i18n 2016-12-28 19:17:52 +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
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
Alberto Garcia Cabeza
241ddcb163 polish styles for tables, assignments and searches on polls admin 2016-12-28 13:45:36 +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
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
d554ec810a adds document counter to signature sheet 2016-12-28 11:40:20 +01:00