rgarcia
|
dde1d34172
|
fixes conflicts with master
|
2017-01-05 01:56:35 +01:00 |
|
rgarcia
|
517483f244
|
fixes typo
|
2017-01-05 01:24:25 +01:00 |
|
rgarcia
|
6688832f8c
|
updates dependencies
|
2017-01-05 01:02:07 +01:00 |
|
Juanjo Bazán
|
91da171f54
|
Merge pull request #1326 from consul/budgets-views
budgets views
|
2017-01-04 21:03:33 +01:00 |
|
Alberto Garcia Cabeza
|
a42c1387cf
|
fixes specs
|
2017-01-04 19:38:49 +01:00 |
|
Alberto Garcia Cabeza
|
8b1e8fed5b
|
improves styles for budgets views
|
2017-01-04 19:18:41 +01:00 |
|
Alberto Garcia Cabeza
|
9c2857e75b
|
changes budget color
|
2017-01-04 19:17:58 +01:00 |
|
Alberto Garcia Cabeza
|
ef1300abbc
|
removes unused scss
|
2017-01-04 19:17:51 +01:00 |
|
kikito
|
635de83f86
|
prints the right value in budgets table
|
2017-01-04 18:48:01 +01:00 |
|
kikito
|
0835a7aba6
|
fixes valuation subtitle in budget investments index
|
2017-01-04 18:24:15 +01:00 |
|
Amaia Castro
|
bc1905e5d9
|
Validate date ranges for legislation process
Only validates start and end dates for the whole process or a phase, not overlap between phases, as they are permitted, at least for now.
|
2017-01-04 18:13:28 +01:00 |
|
kikito
|
cc00af31b9
|
Merge branch 'budgets-admin-views' into budgets-gaspar
|
2017-01-04 17:57:46 +01:00 |
|
Alberto Garcia Cabeza
|
32c11c0981
|
removes unused i18n keys
|
2017-01-04 17:36:03 +01:00 |
|
Alberto Garcia Cabeza
|
fa7d6c18fd
|
fixes back links on valuation budgets
|
2017-01-04 17:33:59 +01:00 |
|
Alberto Garcia Cabeza
|
74a361690d
|
improves styles for valuation budgets
|
2017-01-04 17:33:09 +01:00 |
|
kikito
|
8aa982725e
|
Renames "Vote" to "Give support" during the support phase
|
2017-01-04 17:10:56 +01:00 |
|
Alberto Garcia Cabeza
|
02359c8e2a
|
improves styles for admin budgets edit
|
2017-01-04 17:04:37 +01:00 |
|
Alberto Garcia Cabeza
|
46d96e5a18
|
improves styles for admin budgets show
|
2017-01-04 17:02:27 +01:00 |
|
kikito
|
e9acf295b8
|
removes filter specs after removing filtering from valuation
|
2017-01-04 17:00:56 +01:00 |
|
kikito
|
9c66fa0dc8
|
removes filter from valuation index page
|
2017-01-04 16:31:16 +01:00 |
|
kikito
|
4ceeb68a90
|
changes abilities extending valuation period
|
2017-01-04 15:59:36 +01:00 |
|
Juanjo Bazán
|
6e5492de22
|
Merge pull request #1323 from ferblape/1322-fix-initializer
Don't fetch setting in dev mode
|
2017-01-04 14:50:01 +01:00 |
|
Amaia Castro
|
2b6df62dd7
|
Refactor process phases pages
|
2017-01-04 14:02:25 +01:00 |
|
kikito
|
b289e21992
|
Refactors valid_heading
|
2017-01-04 13:56:54 +01:00 |
|
kikito
|
f5dcb51d37
|
Adds valid_heading validation to budget line. Renames validation methods.
|
2017-01-04 13:56:42 +01:00 |
|
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 |
|