Commit Graph

6051 Commits

Author SHA1 Message Date
rgarcia
9a75067d73 Do not display voting button for unselected investments 2017-05-14 18:15:04 +02:00
rgarcia
62b2f4812b fixes false positive when storing previous heading id 2017-05-14 11:38:05 +02:00
Raimond Garcia
94361eb663 Merge pull request #1537 from consul/budgets-reclassification
Removes votes from reclassified investments
2017-05-14 10:15:19 +02:00
rgarcia
1ca16d9d40 removes votes from reclassified investments 2017-05-13 13:10:04 +02:00
rgarcia
712e576e75 adds email delivery of selected and unselected investments 2017-05-12 13:57:31 +02:00
Alberto Miedes Garcés
cad66ea85a Update GraphQL and GraphiQL gem 2017-05-11 22:29:21 +02:00
Alberto Miedes Garcés
5d9054d284 Merge branch 'master' into api-dev-PRs
Conflicts:
	Gemfile.lock
	config/routes.rb
	db/dev_seeds.rb
	db/schema.rb
2017-05-11 21:59:42 +02:00
Juanjo Bazán
04b95df696 Merge pull request #1514 from consul/budgets-ballot-db-constraint
Adds DB constraint to avoid duplicate balloted investments
2017-05-10 12:29:46 +02:00
Juanjo Bazán
3b90a40476 changes copy
proposal -> investment
2017-05-10 12:20:38 +02:00
Alberto
16cb6bf365 Merge pull request #1532 from consul/selected-unfeasible-links
Selected and unfeasible links only visible if budget is balloting (or later)
2017-05-09 18:27:18 +02:00
Juanjo Bazán
1d35bdeb85 fixes specs 2017-05-09 17:52:52 +02:00
Juanjo Bazán
81c4a13305 shows links to unfeasible/selected only after budget is balloting 2017-05-09 17:36:42 +02:00
Juanjo Bazán
33e8ebf043 adds balloting_or_later? method to Budget 2017-05-09 17:27:58 +02:00
Juanjo Bazán
fce60b9d9a changes heading amount info into a link in ballot view 2017-05-09 13:14:03 +02:00
Juanjo Bazán
4ae6ec75e7 adds links in ballot view to no voted groups 2017-05-09 11:27:07 +02:00
Juanjo Bazán
c14a604618 adds explicit id 2017-05-08 20:03:22 +02:00
Juanjo Bazán
39ed526b89 displays correct heading name when reviewing ballot 2017-05-08 13:22:53 +02:00
Raimond Garcia
aad725faf6 Merge pull request #1523 from consul/budgets-polish
Budgets polish
2017-05-06 05:08:27 +02:00
rgarcia
c0488c3b3c refactors investment filters 2017-05-06 04:57:06 +02:00
rgarcia
fa825185f5 adds model specs for investment filters 2017-05-06 03:37:11 +02:00
rgarcia
8e7ca16c47 makes ballot's back link point to referer 2017-05-05 20:07:24 +02:00
Alberto Garcia Cabeza
5727969eac adds specs for unselected budget investments 2017-05-05 20:01:32 +02:00
Juanjo Bazán
fce4b75a9f Merge pull request #1520 from consul/cleanup
Cleanup
2017-05-05 10:39:18 +02:00
Juanjo Bazán
4fc187dec6 Merge pull request #1518 from consul/capybara-configuration
removes poltergeist no js_errors driver
2017-05-05 10:38:57 +02:00
rgarcia
229f9cfefc renames class to migrate spending proposals to investments 2017-05-04 20:37:28 +02:00
Juanjo Bazán
5817aa8d13 fixes link in investments index header 2017-05-04 13:17:09 +02:00
rgarcia
551421a621 removes poltergeist no js_errors driver 2017-05-04 01:48:17 +02:00
rgarcia
767a43bb0f Adds DB constraint to avoid duplicate balloted investments 2017-05-03 18:43:22 +02:00
rgarcia
8083f259c2 takes into account headings without balloted investments 2017-05-03 17:49:29 +02:00
rgarcia
2f6c1bc7bc displays the correct amount spent in review my ballot
returns the first heading with investments for a group
2017-05-03 17:06:27 +02:00
Juanjo Bazán
23c05dcac5 adds supports column to admin's budget investments list 2017-04-28 13:45:24 +02:00
Alberto Garcia Cabeza
45af9ce5aa adds budget investments numbers and chart on admin stats 2017-04-25 16:46:20 +02:00
Juanjo Bazán
2877a7c572 Merge pull request #1494 from consul/site-customization
Polish site customization
2017-04-18 11:24:41 +02:00
Alberto Garcia Cabeza
54a90bbdc9 updates texts on specs 2017-04-17 19:21:04 +02:00
Juanjo Bazán
0bc260a105 adds feature spec for price explanation visibility 2017-04-17 13:31:31 +02:00
Juanjo Bazán
3f04854626 adds missing method specs 2017-04-17 13:17:01 +02:00
Juanjo Bazán
61e5c187da shows investment price info only if phase is balloting or later 2017-04-17 13:15:17 +02:00
Raimond Garcia
ead9b58d07 Merge branch 'master' into iss-1192-test 2017-04-12 11:51:48 +02:00
Raimond Garcia
0c7332c4b7 Merge pull request #1471 from consul/activity-valuation
Log valuators activity
2017-04-12 10:36:41 +02:00
Amaia Castro
9e5324cc1b Merge branch 'master' into site-customization 2017-04-07 17:29:33 +02:00
Amaia Castro
c1de2dced4 Custom content blocks for top_links and footer 2017-04-06 17:00:05 +02:00
Amaia Castro
8143fe1037 Site customization: images uploads 2017-04-06 17:00:04 +02:00
Amaia Castro
54fab919e5 Show custom pages in public site 2017-04-06 16:59:58 +02:00
Amaia Castro
255b57cc85 Admin for custom pages 2017-04-06 16:25:07 +02:00
Alberto
6bbcc71ecb Merge branch 'master' into polls 2017-04-06 14:16:49 +02:00
Alberto
70bb08564f Merge pull request #1481 from PopulateTools/add-telegram
Add telegram
2017-04-05 18:22:38 +02:00
Enrique García
548e67fbca Merge pull request #1482 from consul/signatures
Signature sheets for budget investments
2017-04-05 14:07:36 +02:00
Amaia Castro
5ee2c9efa0 Add telegram to footer and to social share button 2017-04-05 13:07:08 +02:00
Juanjo Bazán
83e2df7410 adds signature sheets for budget investments 2017-04-05 12:59:42 +02:00
Juanjo Bazán
12c00a714d adds demographic info to signature users 2017-04-05 11:31:56 +02:00