Commit Graph

2650 Commits

Author SHA1 Message Date
Alberto Garcia Cabeza
e0d3752f72 improves styles of budgets investments views 2017-01-05 17:23:30 +01:00
kikito
7eba0fee50 Deactivates /ballot view when not in the balloting phase 2017-01-05 15:18:16 +01:00
kikito
28e6a10382 Hides balloting controls when not in the balloting phase 2017-01-05 15:17:49 +01:00
Juanjo Bazán
a5b4a79f62 Merge pull request #1325 from consul/budgets-gaspar
Budgets - several fixes
2017-01-05 13:06:48 +01:00
kikito
5eec8c7da2 attempts to fix travis again 2017-01-05 12:32:36 +01:00
rgarcia
dde1d34172 fixes conflicts with master 2017-01-05 01:56:35 +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
kikito
cc00af31b9 Merge branch 'budgets-admin-views' into budgets-gaspar 2017-01-04 17:57:46 +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
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
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
kikito
0f174df5fe Removes geozones from budget heading views and specs 2017-01-04 12:46:11 +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
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
kikito
68d598a43d Merge branch 'master' into budgets 2017-01-02 12:10:23 +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
Alberto Garcia Cabeza
d8b4af5add adds meta description and keywords 2016-12-30 17:17:46 +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
Alberto Garcia Cabeza
f64e59bbf6 fixes ul tag on order links submenu 2016-12-29 17:44:16 +01:00
kikito
110a4091f8 Adds budget investment location 2016-12-29 17:30:21 +01:00
kikito
9d0e736878 budget description now returns html 2016-12-29 16:22:14 +01:00
kikito
34ee8c1c48 Makes Budgets editable, and makes their description editable with html 2016-12-29 16:21:42 +01:00
rgarcia
43c18d58ac fixes specs 2016-12-29 12:47:57 +01:00
kikito
55ea9f1089 replaces unicode by yes/no 2016-12-29 12:11:31 +01:00
rgarcia
365faeff31 removes physical votes from proposals 2016-12-29 12:05:29 +01:00
Fernando Blat
ca2370eb7c Manage offices url as a setting 2016-12-29 10:31:38 +01:00