rgarcia
|
9a75067d73
|
Do not display voting button for unselected investments
|
2017-05-14 18:15:04 +02:00 |
|
Raimond Garcia
|
207b300d3e
|
Merge pull request #1538 from consul/reclassification-polish
fixes false positive when storing previous heading id
|
2017-05-14 12:06:31 +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 |
|
Alberto
|
b6eaaea62e
|
Merge pull request #1535 from consul/sidebar-msg
Proper message in sidebar depending on user's ballot status
|
2017-05-12 19:49:05 +02:00 |
|
Raimond Garcia
|
1787caf23a
|
Merge pull request #1536 from consul/budgets-mailer
WIP Budgets mailer
|
2017-05-12 19:38:15 +02:00 |
|
decabeza
|
962dd097b7
|
fixes i18n
|
2017-05-12 19:12:19 +02:00 |
|
decabeza
|
e8be4508fd
|
improves i18n of budgets mailers
|
2017-05-12 18:50:03 +02:00 |
|
Tom Demeyer
|
03042025c3
|
more dutch
|
2017-05-12 17:20:41 +02:00 |
|
Juanjo Bazán
|
0395970b24
|
uses proper i18n key
|
2017-05-12 14:06:16 +02:00 |
|
rgarcia
|
712e576e75
|
adds email delivery of selected and unselected investments
|
2017-05-12 13:57:31 +02:00 |
|
decabeza
|
6217dbae63
|
adds new i18n on budget investment unselected mailer
|
2017-05-12 12:47:57 +02:00 |
|
decabeza
|
7a803999bd
|
adds missing td tag on budget investment created mailer
|
2017-05-12 12:43:52 +02:00 |
|
decabeza
|
53d3282d8b
|
adds budget mailer for selected and unselected
|
2017-05-12 12:43:30 +02:00 |
|
Juanjo Bazán
|
224eb03ca2
|
shows right message depending on voting status in budget group
|
2017-05-12 12:03:42 +02:00 |
|
Alberto Miedes Garcés
|
3c7f60d625
|
Fix initializer
|
2017-05-11 22:42:43 +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
|
aca9866d4e
|
Merge pull request #1534 from consul/budget-text
changes add button text to vote
|
2017-05-11 17:33:53 +02:00 |
|
decabeza
|
cd4d37470b
|
removes bold on links and make consistent text
|
2017-05-11 17:24:39 +02:00 |
|
decabeza
|
36078ab604
|
adds link and move to top sidebar message
|
2017-05-11 17:24:05 +02:00 |
|
decabeza
|
ebdb265388
|
changes add button text to vote
|
2017-05-11 13:36:29 +02:00 |
|
Juanjo Bazán
|
b62eb8cd85
|
Merge pull request #1533 from consul/budgets-design
improves ballot list on sidebar
|
2017-05-11 13:17:40 +02:00 |
|
decabeza
|
57d5e40fbb
|
improves ballot list on sidebar
|
2017-05-11 13:12:26 +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 |
|
Alberto
|
2ed7d46eea
|
Merge pull request #1530 from consul/links-to-groups
Make heading amount info a link
|
2017-05-09 18:26:59 +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 |
|
Raimond Garcia
|
ea3057bc04
|
Merge pull request #1529 from consul/go-vote
Add links in ballot view to no voted groups
|
2017-05-09 13:11:52 +02:00 |
|
Juanjo Bazán
|
4ae6ec75e7
|
adds links in ballot view to no voted groups
|
2017-05-09 11:27:07 +02:00 |
|
Tom Demeyer
|
f0132123a6
|
add creditor section in nl.yml
|
2017-05-09 09:56:10 +02:00 |
|
Juanjo Bazán
|
c14a604618
|
adds explicit id
|
2017-05-08 20:03:22 +02:00 |
|
Juanjo Bazán
|
f09f7823f6
|
Merge pull request #1528 from consul/seo-canonical
adds rel canonical on main sections
|
2017-05-08 17:29:39 +02:00 |
|
Alberto Garcia Cabeza
|
b29a353ce5
|
adds rel canonical on main sections
|
2017-05-08 15:06:18 +02:00 |
|
Juanjo Bazán
|
37a403adc5
|
Merge pull request #1527 from consul/budgets-ballot
improves ballot page when shows several groups
|
2017-05-08 14:41:55 +02:00 |
|
Alberto Garcia Cabeza
|
c0afb94cfa
|
improves ballot page when shows several groups
|
2017-05-08 14:33:07 +02:00 |
|
Raimond Garcia
|
aa43d43b73
|
Merge pull request #1525 from consul/ballot-reviewing
Display correct heading name when reviewing ballot
|
2017-05-08 13:50:18 +02:00 |
|
Raimond Garcia
|
ba82cd8861
|
Merge pull request #1526 from consul/order-groups
Order alphabetically ballot groups
|
2017-05-08 13:50:07 +02:00 |
|
Juanjo Bazán
|
216b60f22e
|
orders groups in ballot view
|
2017-05-08 13:27:17 +02:00 |
|
Juanjo Bazán
|
39ed526b89
|
displays correct heading name when reviewing ballot
|
2017-05-08 13:22:53 +02:00 |
|
Juanjo Bazán
|
27ebe738ad
|
Merge pull request #1515 from consul/budget-seeds
Updates budget dev seeds
|
2017-05-06 21:28:36 +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 |
|
Alberto
|
551f1f9fe2
|
Merge pull request #1524 from consul/budgets-back-link
Makes ballot's back link point to referer
|
2017-05-05 20:55:43 +02:00 |
|