Raimond Garcia
|
c41699fdf0
|
Merge pull request #1207 from consul/spending_proposals_import
Spending proposals import
|
2016-09-13 18:35:50 +02:00 |
|
Raimond Garcia
|
9fb387def1
|
Merge pull request #1215 from consul/budget-styles
Budget styles
|
2016-09-13 13:02:46 +02:00 |
|
Alberto Garcia Cabeza
|
a4693788f1
|
Updates custom icons font
|
2016-09-12 18:46:04 +02:00 |
|
Alberto Garcia Cabeza
|
c42877efb1
|
Improves styles for select heading page
|
2016-09-12 18:45:47 +02:00 |
|
Raimond Garcia
|
992425f4b3
|
Merge pull request #1212 from consul/budget-votes
Budget votes
|
2016-09-12 16:00:23 +02:00 |
|
Juanjo Bazán
|
5b1ff1584c
|
Merge branch 'master' into budget
|
2016-09-12 12:29:47 +02:00 |
|
Alberto García Cabeza
|
cebc83f97c
|
Merge pull request #1204 from jaimeiniesta/fix-spec
Fixes failing spec for badges
|
2016-09-12 12:25:27 +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
|
85d70a2cc2
|
updates group's title
|
2016-09-10 16:22:41 +02:00 |
|
rgarcia
|
a6a53659ae
|
updates dev seeds
|
2016-09-10 16:22:41 +02:00 |
|
rgarcia
|
9d4f2d1aff
|
Displays budget groups
|
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 |
|
Raimond Garcia
|
a69475bf99
|
Merge pull request #1211 from consul/admin-budgets
Admin budgets
|
2016-09-09 15:53:25 +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 |
|
Juanjo Bazán
|
e82582a018
|
Merge pull request #1210 from consul/budget-account-activity
Budget account activity
|
2016-09-09 13:33:56 +02:00 |
|
kikito
|
250e5de081
|
removes garbage line from view
|
2016-09-09 13:31:54 +02:00 |
|
kikito
|
fd5dd5984d
|
fixes i18n issues
|
2016-09-09 13:07:01 +02:00 |
|
kikito
|
15509da4b4
|
removes deprecated spending_proposal test
|
2016-09-09 12:39:15 +02:00 |
|
kikito
|
50f82211a9
|
Add User has_many budget_investments
|
2016-09-09 12:20:58 +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 |
|
kikito
|
f456400218
|
Removes duplicated relationship between budget and investment
|
2016-09-09 12:17:05 +02:00 |
|
kikito
|
857a4ba42b
|
Adds comment to the final part of spending_proposals_importer
|
2016-09-07 18:08:33 +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
|
f8a5f02cc9
|
adds i18n to budgets setting
|
2016-09-07 15:08:03 +02:00 |
|
Juanjo Bazán
|
9c2f5e3944
|
Merge pull request #1205 from jaimeiniesta/docs-typos
fixes typos in docs
|
2016-09-07 14:30:50 +02:00 |
|
Jaime Iniesta
|
56b7474f68
|
fixes typos in docs
|
2016-09-07 14:21:44 +02:00 |
|
Juanjo Bazán
|
8890380804
|
adds investment editing to admin
|
2016-09-07 14:13:40 +02:00 |
|
Jaime Iniesta
|
9c48a46f0a
|
adjusts style for badge in featured proposals
|
2016-09-07 13:22:52 +02:00 |
|
Jaime Iniesta
|
8af944ce56
|
Fixes failing spec for badges.
spec/features/official_positions_spec.rb:56 was failing because the expected
badge was not being shown in featured proposals.
|
2016-09-07 13:13:06 +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 |
|