Commit Graph

3632 Commits

Author SHA1 Message Date
Juanjo Bazán
1b57e14a86 removes heading reference in ballot
heading info is stored per group in ballot_lines
2016-06-14 14:04:27 +02:00
Juanjo Bazán
4fcf138045 refactors investment adding to ballots 2016-06-14 14:03:21 +02:00
Juanjo Bazán
56a358a638 adds funds and feasibility validations to lines 2016-06-11 15:01:51 +02:00
Juanjo Bazán
ab008ed4e9 adds denormalization to budget::ballot::lines 2016-06-11 14:57:07 +02:00
Enrique García
e849357e57 Merge pull request #1144 from consul/groups-model
adds Budget::Group model to group headings
2016-06-10 11:40:47 +02:00
Juanjo Bazán
b5a6828e41 adds Budget::Group model to group headings
many refactors through budget related models
2016-06-09 18:00:06 +02:00
Juanjo Bazán
3fae269c40 adds missing migration file (external_link) 2016-06-09 13:30:01 +02:00
Juanjo Bazán
e4a7989b15 Merge branch 'master' into budget 2016-06-02 12:35:44 +02:00
Juanjo Bazán
824a969c0e fixes admin menu spec 2016-06-02 12:21:13 +02:00
Juanjo Bazán
c614edf9ef Merge pull request #1141 from consul/design-admin
Design admin
2016-06-02 12:06:49 +02:00
Alberto Garcia Cabeza
d147cce459 Fixes localization specs 2016-06-02 11:26:40 +02:00
Alberto Garcia Cabeza
31cb29d8c5 Fixes specs 2016-06-01 21:46:17 +02:00
Alberto Garcia Cabeza
9e31eeefad Cleans admin.scss 2016-06-01 18:10:14 +02:00
Alberto Garcia Cabeza
5bd7bbee4f Improves styles for management section 2016-06-01 18:07:58 +02:00
Alberto Garcia Cabeza
b71c61e405 Improves styles for moderation section 2016-06-01 17:30:01 +02:00
Raimond Garcia
abd1e7edd0 Merge pull request #1139 from tomdemeyer/master
Tests run fine in under 2.3.0
2016-06-01 17:17:54 +02:00
Tom Demeyer
ea3d15996c Tests run fine in under 2.3.0
These two tests fail: 
rspec ./spec/features/legislation_spec.rb:40 # Legislation Annotations Update
rspec ./spec/features/admin/spending_proposals_spec.rb:146 # Admin spending proposals Index Filtering by valuator
Seem not to be ruby issues.
2016-06-01 14:13:15 +02:00
Alberto Garcia Cabeza
fb6dbdf2f9 Improves all pages for admin section 2016-06-01 13:23:57 +02:00
Juanjo Bazán
9db7b2f7c0 Merge pull request #1136 from consul/budget-dev-seed
Adds budget dev_seeds
2016-05-31 21:16:08 +02:00
Alberto Garcia Cabeza
00fd9da0f9 Improves admin dashboard 2016-05-31 17:25:30 +02:00
Alberto Garcia Cabeza
56bb06b168 Improves general layout for admin 2016-05-31 17:10:08 +02:00
kikito
56f5983dc4 Adds budget dev_seeds 2016-05-31 12:53:11 +02:00
Juanjo Bazán
65e007ef85 Merge pull request #1135 from consul/budget-permissions
Budget permissions
2016-05-30 14:36:47 +02:00
kikito
7005faabe6 adds admin permissions for investments 2016-05-30 14:13:36 +02:00
kikito
2a82e9e33a Redoes the common balloting permissions 2016-05-30 14:01:47 +02:00
kikito
13f43d8b67 Adds valuator investment abilities 2016-05-30 13:55:12 +02:00
kikito
daa8783b02 Adds common Investment abilities 2016-05-30 13:53:30 +02:00
Juanjo Bazán
6646ce56e5 Merge pull request #1134 from consul/more-budget-model-specs
More budget model specs
2016-05-27 17:43:51 +02:00
kikito
bb7f82a72f Fixes hidden bug when calculating amount_available 2016-05-27 15:12:54 +02:00
kikito
b6e47bc14a Adds missing scope to investments 2016-05-27 15:12:39 +02:00
kikito
4dd293f487 Adds a ballot spec for amount_available 2016-05-27 15:11:58 +02:00
kikito
a0b6e99f09 adds specs for budged model 2016-05-27 13:02:48 +02:00
Enrique García
1975018d6a Merge pull request #1132 from Hilfe/fix-readme
Fixes readme
2016-05-25 17:55:36 +02:00
Hilfe
f293886176 Fixes readme 2016-05-25 17:45:30 +02:00
Juanjo Bazán
4d67335e3d updates dependencies 2016-05-25 16:36:20 +02:00
Juanjo Bazán
f5a32617cb Merge pull request #1129 from consul/budget-model-specs
Budget model specs
2016-05-24 18:11:11 +02:00
kikito
11a5140cf0 Implements missing specs & removes deprecated ones 2016-05-24 17:40:07 +02:00
kikito
3e39272b3b Fixes implementation of amount_available moving it to the ballot 2016-05-24 17:39:49 +02:00
kikito
dc686f1bf7 Adds price to budget factory 2016-05-24 17:39:15 +02:00
kikito
2409cccd8f Adds budget.price and ballot.heading_id 2016-05-24 17:38:41 +02:00
kikito
9876583c1a deactivates test 2016-05-24 15:31:23 +02:00
kikito
fc35522467 uses a string in the factories 2016-05-24 14:36:45 +02:00
kikito
673cfc8249 Implements some basic budget investment specs 2016-05-24 14:36:45 +02:00
kikito
d663e4c594 Adds/improves factories 2016-05-24 14:34:04 +02:00
kikito
d4d16d3006 Adds responsible_name migration for investments 2016-05-24 14:34:04 +02:00
kikito
60cf683a0b Adds valuator_assignments 2016-05-24 14:34:04 +02:00
kikito
20108639cb migrates 2016-05-24 14:34:04 +02:00
kikito
fdc8636e12 Adds simple Budget specs 2016-05-24 14:33:30 +02:00
kikito
cf0b7a53b0 Adds missing budget_id to investments 2016-05-24 14:33:30 +02:00
Enrique García
10625532d0 Merge pull request #1126 from consul/ballot-model-specs
Ballot model specs
2016-05-24 14:12:42 +02:00