Commit Graph

4672 Commits

Author SHA1 Message Date
kikito
08586d521b Refactors heading.budget . adds heading.budget_id 2017-01-04 13:54:07 +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
39633dce67 Fix back links in admin 2017-01-04 12:39:09 +01:00
Amaia Castro
375602d297 Display title with an * when status is draft in version chooser 2017-01-04 12:15:12 +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
Amaia Castro
6d99a24740 Fix draft versions list 2017-01-04 10:13:55 +01:00
Amaia Castro
f040759693 Show only published draft versions to users (and also drafts to admins) 2017-01-03 22:08:54 +01:00
Amaia Castro
3ba6b409aa Make markdown helper safer to use
Avoid exception if text is nil
2017-01-03 21:41:00 +01:00
Amaia Castro
a3b8d30567 Merge branch 'master' into legislation-module-stable 2017-01-03 19:38:01 +01:00
kikito
52d182f099 Removes geozone from budget heading 2017-01-03 18:51:21 +01:00
kikito
2c343788d5 Fixes typo 2017-01-03 18:11:59 +01:00
kikito
18bd44d91f do not use html in generation of unfeasibility reason 2017-01-03 18:00:35 +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
Enrique García
465a93f49c Merge pull request #1318 from ferblape/1315-manage-offices_url-as-setting
Manage offices url as a setting
2017-01-03 13:27:52 +01:00
Amaia Castro
99e3afd6ca Merge branch 'legislation-module-stable' into 13-draft-version-page 2017-01-03 09:28:26 +01:00
Fernando Blat
c47993ec91 Merge pull request #49 from medialab-prado/47-fix-bug-deleting-questions
Fix stack level too deep bug when deleting questions with answers
2017-01-03 09:23:56 +01:00
Fernando Blat
dcfb39d38d Merge pull request #44 from medialab-prado/42-integrate-admin-html-css
Integrate admin html and css from sandbox
2017-01-03 09:03:06 +01:00
Fernando Blat
04a3a4177d Merge branch 'master' into 1315-manage-offices_url-as-setting 2017-01-03 08:57:02 +01:00
Fernando Blat
76bc1a7934 Use settings helper 2017-01-03 08:55:17 +01:00
Amaia Castro
98b6dd75ea Fix stack level too deep bug when deleting questions with answers 2017-01-02 20:45:20 +01:00
Amaia Castro
1736b68044 Update subnavigation menu and accessibility page for new shortcut 2017-01-02 18:42:22 +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
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
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
Juanjo Bazán
1bdfacd683 Merge pull request #1321 from consul/budgets-melchor
Budgets melchor
2017-01-02 11:50:49 +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
kikito
51f7239d07 i18n 2017-01-02 10:52:59 +01:00
kikito
98e9e8de0f Fixes errors in specs related to changes in budget phases 2017-01-02 10:37:37 +01:00
kikito
f14f7b9a70 Adds new descriptions to budget in dev_seeds 2017-01-02 10:02:57 +01:00
kikito
4adf32d582 Changes initializer to avoid crash when migrating database from scratch 2017-01-02 10:02:34 +01:00
kikito
07a99b8e3f Modifies the phase field in Budget 2017-01-02 10:02:05 +01:00
kikito
451179fa59 fixes issues with valuating in specs 2017-01-02 08:22:11 +01:00
kikito
9effcc4041 i18n 2017-01-01 15:04:06 +01:00
kikito
9e4b2fda89 Adds phases to form 2017-01-01 15:03:58 +01:00
kikito
ecb3461a97 Renames Budget::VALID_PHASES to just PHASES 2017-01-01 13:16:22 +01:00
kikito
d80dedaad8 Adds sanitized descriptions for all phases to budget model 2017-01-01 12:51:17 +01:00
kikito
c17dcf1bab replaces array of strings with %w 2017-01-01 12:50:40 +01:00
kikito
f6e4443437 Removes sanitizable from budget, replacing it by custom impl 2017-01-01 12:34:15 +01:00
kikito
cb4803f2f9 Replaces %w by %W 2017-01-01 12:33:43 +01:00
kikito
fa50e3f215 Adds new phases to budget and fixes specs 2016-12-30 18:43:15 +01:00
kikito
181749b4f6 Removes valuating boolean from budgets 2016-12-30 18:41:35 +01:00