Commit Graph

834 Commits

Author SHA1 Message Date
Alberto Garcia Cabeza
dadfdba1b1 adds date of birth form when manager creates new user 2017-03-20 11:59:22 +01:00
rgarcia
170cb89a5c allows admins to see budgets in reviewing and selecting phase 2017-03-15 14:50:50 +01:00
kikito
3dbdc8f455 Adds delete link to budget investment list in user activities 2017-03-06 19:24:10 +01:00
Juanjo Bazán
ba0b39a45c avoids error 500 if invalid random_seed 2017-02-07 19:29:17 +01:00
Juanjo Bazán
e93461356c quotes random seed 2017-02-07 19:05:04 +01:00
rgarcia
5f7269a070 displays unfeasible budgets link from home 2017-01-16 03:09:08 +01:00
Raimond Garcia
69c043a886 Merge pull request #1356 from consul/budget-emails
Budget emails
2017-01-15 19:15:39 +01:00
rgarcia
537de8c46c Merge branch 'master' into budget-emails 2017-01-15 18:58:20 +01:00
rgarcia
289666bb4d loads tag cloud in balloting phase 2017-01-15 12:08:41 +01:00
rgarcia
938ba40306 loads categories in sidebar for balloting phase 2017-01-15 12:06:38 +01:00
rgarcia
68bf119c18 sends unfeasible budget investment 2017-01-14 17:02:33 +01:00
rgarcia
82322ee233 sends budget investment created email 2017-01-14 16:10:43 +01:00
rgarcia
17946b292b fixes specs 2017-01-13 16:37:39 +01:00
rgarcia
b2b9954e6d allows user to support only in one heading per group 2017-01-13 15:24:57 +01:00
Juanjo Bazán
053a3e7b41 makes user page to show only active feature comments 2017-01-10 21:28:04 +01:00
Juanjo Bazán
a5338a4455 removes problematic html_safe link from flash notice
No need for it now that investments are public
2017-01-09 18:16:59 +01:00
rgarcia
f2d23b56e0 fixes conflicts with budgets 2017-01-09 13:33:01 +01:00
rgarcia
be10972406 fixes management specs 2017-01-08 13:39:01 +01:00
rgarcia
3ba57bbab2 adds valuator tags 2017-01-08 13:24:05 +01:00
rgarcia
fd28f6c2b3 adds tags to investment 2017-01-08 11:37:02 +01:00
kikito
b7a0aa3b57 Fixes i18n errors now that they are detected by i18n-tasks 2017-01-06 19:55:23 +01:00
kikito
3c9e08b06f Adds organization_name attribute to budget investments 2017-01-06 18:43:55 +01:00
kikito
b36bb7bb97 fixes permission error when entering my ballot 2017-01-05 18:25:00 +01:00
kikito
248755a801 Modifies the investment orders shown by phase 2017-01-05 17:38:36 +01:00
kikito
7eba0fee50 Deactivates /ballot view when not in the balloting phase 2017-01-05 15:18:16 +01:00
rgarcia
c3380d18fa fixes conflicts with budgets 2017-01-05 13:14:09 +01:00
kikito
635de83f86 prints the right value in budgets table 2017-01-04 18:48:01 +01:00
kikito
9c66fa0dc8 removes filter from valuation index page 2017-01-04 16:31:16 +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
kikito
9e4b2fda89 Adds phases to form 2017-01-01 15:03:58 +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
d2356c18d0 Adds toggle_selection action 2016-12-28 19:11:59 +01:00
kikito
010aeaa9ac i18n 2016-12-28 17:42:15 +01:00
kikito
9d97421b0e Merge branch 'master' into budgets 2016-12-27 14:02:12 +01:00
kikito
84418bd671 Fixes issue in has_orders concern 2016-12-25 22:58:21 +01:00
kikito
e15377b7d8 Load @assigned_heading in addition to loading @heading 2016-12-25 12:54:48 +01:00
kikito
ef0acaf20f Only creates ballot when budget balloting 2016-12-25 12:54:32 +01:00
kikito
3fd1993f74 only creates ballots when budget balloting 2016-12-25 12:54:07 +01:00
kikito
03ef20bfde Merges orders_helper functionality inside has_orders concern
Both these objects where using/setting a variable called valid_orders.
As a results, some specs where becoming flacky
(features/budgets/investments_spec.rb, balloting phase). By putting
them together, there is no `valid_orders` variable any more (everything
is @valid_orders) and the flackyness is gone.
2016-12-24 14:42:46 +01:00
Juanjo Bazán
d057c9457d Merge branch 'master' into signature-sheets 2016-12-23 20:23:56 +01:00
kikito
54bd5aeeb1 adds @budget param to apply_filters_and_search 2016-12-22 20:26:21 +01:00
kikito
260b9aa1e4 loads @investment_ids in ballot lines controller 2016-12-22 20:25:41 +01:00
kikito
15fade5660 loads ballot in budget_investments_controller 2016-12-22 20:25:17 +01:00
Alberto Miedes Garcés
d83c370c6a Remove duplicated code in Admin::BannersController 2016-12-22 17:18:27 +01:00
rgarcia
675081141c refactors signatures 2016-12-21 18:46:31 +01:00
rgarcia
4eb700e3d4 refactors signature sheets 2016-12-20 16:46:08 +01:00
rgarcia
3c682b8a9b adds signature sheets 2016-12-20 12:21:05 +01:00
kikito
a73626d712 Refactors and simplifies ballot/lines_controller.rb 2016-12-19 19:11:45 +01:00
kikito
ff13dee918 Fixes incorrect path & params in bi controller 2016-12-16 18:03:36 +01:00