Commit Graph

4721 Commits

Author SHA1 Message Date
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
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
Juanjo Bazán
acae610995 adds model specs for archived proposal 2016-09-12 18:15:18 +02:00
Alberto Garcia Cabeza
6fac3c67ff Merge branch 'voting-proposals' of github.com:consul/consul into voting-proposals 2016-09-12 18:07:22 +02:00
Alberto Garcia Cabeza
77077b28b8 Removes question and supports on successfull proposals 2016-09-12 18:06:43 +02:00
Juanjo Bazán
fa8458576c Merge branch 'archived-proposals' of github.com:consul/consul into archived-proposals 2016-09-12 17:59:51 +02:00
Alberto Garcia Cabeza
d5af06da5d Adds proposal's total votes in index/show views 2016-09-12 17:56:15 +02:00
Juanjo Bazán
aa05b0259e fixes featured proposal creation in failing spec 2016-09-12 17:37:55 +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
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
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
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
Alberto Garcia Cabeza
e8b70a48fa Adds tab in index & removes support button in index/show 2016-09-09 17:32:03 +02:00
Alberto Garcia Cabeza
41312ca2a5 Creates archived proposals method 2016-09-09 17:31:05 +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
Juanjo Bazán
e330b704c0 removes half-baked feature
archived proposals is a separate issue now
2016-09-08 17:06:16 +02:00