Commit Graph

6051 Commits

Author SHA1 Message Date
Raimond Garcia
9a2d45f25d Merge pull request #1219 from consul/budget-management
Budget management
2016-09-13 18:45:30 +02:00
Raimond Garcia
c41699fdf0 Merge pull request #1207 from consul/spending_proposals_import
Spending proposals import
2016-09-13 18:35:50 +02:00
Juanjo Bazán
2142351743 archived proposals should not appear in 'featured' 2016-09-13 12:56:49 +02:00
Juanjo Bazán
11dbc05a80 removes archived proposals from index/search pages 2016-09-13 12:56:10 +02:00
kikito
13ffd73fee UNFINISHED budget management 2016-09-13 12:33:34 +02:00
Juanjo Bazán
8d48eccfed adds not_archived scope to proposal 2016-09-13 12:10:31 +02:00
Juanjo Bazán
da03311f99 archived proposals can not accept votes 2016-09-12 18:47:56 +02:00
Juanjo Bazán
acae610995 adds model specs for archived proposal 2016-09-12 18:15:18 +02:00
Juanjo Bazán
aa05b0259e fixes featured proposal creation in failing spec 2016-09-12 17:37:55 +02:00
kikito
2bc9e7be78 started working on budget manatement 2016-09-12 12:11:47 +02:00
rgarcia
e38e89aea0 fixes specs 2016-09-10 16:22:43 +02:00
rgarcia
fdb1d4aac9 refactors specs 2016-09-10 16:22:43 +02:00
rgarcia
16794c580c groups and headings navigation 2016-09-10 16:22:43 +02:00
rgarcia
3730b0315c runs all specs 2016-09-10 16:22:43 +02:00
rgarcia
263b729ede removes delegation specs and voting via get 2016-09-10 16:22:43 +02:00
rgarcia
65f029f34c Fixes permissions and feasibility specs 2016-09-10 16:22:42 +02:00
rgarcia
4ded0350a1 removes investments from sidebar 2016-09-10 16:22:42 +02:00
rgarcia
24740578ff displays money remaining in each group 2016-09-10 16:22:42 +02:00
rgarcia
5aeec32704 simplifies spec 2016-09-10 16:22:42 +02:00
rgarcia
94d3cbb380 adds pending spec 2016-09-10 16:22:42 +02:00
rgarcia
22373c3ddd Review my votes page 2016-09-10 16:22:41 +02:00
rgarcia
1c8f4d5ff0 can remove investment projects 2016-09-10 16:22:41 +02:00
rgarcia
9839d7afd0 can add investments to ballot 2016-09-10 16:22:40 +02:00
rgarcia
53d53ea9fb moves vote specs to budget scoped folder 2016-09-10 16:22:40 +02:00
rgarcia
29cad341f5 Adds voting in selecting phase 2016-09-10 16:22:40 +02:00
Alberto Garcia Cabeza
3bbc2862d2 Adds admin setting 'months to archive proposals' 2016-09-09 18:02:02 +02:00
Alberto Garcia Cabeza
fa3b503c47 Adds specs 2016-09-09 17:32:21 +02:00
Juanjo Bazán
8aa62f8ce7 Merge branch 'budget' into admin-budgets 2016-09-09 15:13:05 +02:00
Juanjo Bazán
42c705e1e3 adds dossier editing of investments to valuation 2016-09-09 15:09:06 +02:00
Juanjo Bazán
0fc31b1259 adds budget/budget_investment indexes to valuators 2016-09-09 13:39:08 +02:00
kikito
15509da4b4 removes deprecated spending_proposal test 2016-09-09 12:39:15 +02:00
kikito
4f9ac1ae19 Removes part of spending proposal spec which was made false when replacing sps by investments 2016-09-09 12:20:37 +02:00
kikito
b7278c5ec4 Updates (deactivated) budget investment test to include user/show info 2016-09-09 12:20:09 +02:00
kikito
cb7ea79aaf Replaces spending proposals by budget investments in user/show 2016-09-09 12:19:38 +02:00
Juanjo Bazán
974c4d6d70 adds specs for proposal ballots 2016-09-08 12:43:06 +02:00
kikito
b4c7675c31 imports votes 2016-09-07 15:58:39 +02:00
Juanjo Bazán
2d56415048 adds feature flag for admin/budgets management 2016-09-07 15:13:39 +02:00
Juanjo Bazán
8890380804 adds investment editing to admin 2016-09-07 14:13:40 +02:00
kikito
c1bf89a09e adds more functionality to spending proposal importer 2016-09-07 13:02:26 +02:00
kikito
b8dffc6137 refactor some tests to their own test in importer 2016-09-07 12:01:04 +02:00
kikito
bdfd326907 implements some parts of the spending proposals importer 2016-09-07 11:53:24 +02:00
Juanjo Bazán
31ef3f4c98 adds heading filter to index 2016-09-06 17:03:35 +02:00
Juanjo Bazán
b0358e4867 adds index of investments with filters to admin 2016-09-05 17:50:58 +02:00
Juanjo Bazán
3964988bb1 fixes specs
updates investment to have group_id & budget_id
2016-09-05 13:50:25 +02:00
Juanjo Bazán
6d06a59403 uses direct associations when managing investments 2016-09-05 13:02:08 +02:00
rgarcia
c2c7cdb18d Merge branch 'budget' into budget-public-controllers 2016-09-02 13:15:40 +02:00
rgarcia
521b3e1a66 refactors specs file structure 2016-09-02 13:10:26 +02:00
rgarcia
9003655ccc removes duplicate views 2016-09-02 13:10:10 +02:00
Juanjo Bazán
b8b71d0ab0 Merge branch 'master' into budget 2016-09-02 12:47:54 +02:00
rgarcia
e28c5c5010 fixes specs 2016-09-01 17:21:46 +02:00