kikito
2fab251593
adds i18n entries
2016-12-25 12:53:27 +01:00
kikito
8e4bd43069
Makes the selected trait also mark projects feasible and valuation_finished
2016-12-24 14:43:12 +01:00
kikito
03ef20bfde
Merges orders_helper functionality inside has_orders concern
...
Both these objects where using/setting a variable called valid_orders.
As a results, some specs where becoming flacky
(features/budgets/investments_spec.rb, balloting phase). By putting
them together, there is no `valid_orders` variable any more (everything
is @valid_orders) and the flackyness is gone.
2016-12-24 14:42:46 +01:00
Juanjo Bazán
d057c9457d
Merge branch 'master' into signature-sheets
2016-12-23 20:23:56 +01:00
rgarcia
ddeca6f06d
fixes specs
2016-12-23 19:05:25 +01:00
rgarcia
37462b79cd
removes unused translations
2016-12-23 18:37:39 +01:00
kikito
767c537883
Fixes 1 spec in investments_spec
2016-12-23 18:37:14 +01:00
kikito
bbb8ac830c
Fixes erroneous i18n param in view
2016-12-23 18:37:02 +01:00
kikito
de1ade0eb8
Fixes erroneous link in view
2016-12-23 18:36:42 +01:00
kikito
0cb0775872
Uses selected instead of valuation_finished in investment_spec
2016-12-23 18:36:19 +01:00
kikito
56b19b257d
Uses add_to_ballot in a bunch of specs
2016-12-23 18:35:25 +01:00
kikito
4589ba5f0b
Fixes incorrect implementation of add_to_ballot common action
2016-12-23 18:34:42 +01:00
Juanjo Bazán
08049db169
Merge pull request #1303 from ferblape/extract-mailer-from-to-setting
...
Extract mailer from name and address to a setting
2016-12-23 16:08:06 +01:00
Fernando Blat
8c8b273de0
Settings translation
2016-12-23 15:51:20 +01:00
Fernando Blat
05a00df8ed
Set the default from address as consul.dev
2016-12-23 15:46:39 +01:00
Fernando Blat
85ce7d7227
Devise won't read mail from Settings in test environment
2016-12-23 15:45:20 +01:00
kikito
9e0007ba35
renames i18n entry
2016-12-23 15:38:31 +01:00
kikito
0578fb5479
Fixes errors when adding investments to ballots in specs
2016-12-23 15:38:21 +01:00
kikito
615217e36e
Fixes errors in header view
2016-12-23 15:37:55 +01:00
kikito
a589d8a76d
Simplifies ballot.add_investment using automatic denormalization
2016-12-23 15:37:32 +01:00
kikito
21f396faaa
Fixes budget model specs using :selected & automatic line denormalization
2016-12-23 15:23:31 +01:00
kikito
f125941bbf
Tweaks unselected error in ballot/line
2016-12-23 15:22:19 +01:00
Fernando Blat
a07fbc5b41
Extract mailer from name and address to a setting
2016-12-23 11:28:53 +01:00
Juanjo Bazán
d0f6db97d8
Merge pull request #1301 from amiedes/patch
...
Remove duplicated code in Admin::BannersController
2016-12-22 21:50:59 +01:00
kikito
b5c25cb6ce
Starts working on the budget/ballot_spec
2016-12-22 20:28:07 +01:00
kikito
bb1258f2b2
Fixes view
2016-12-22 20:27:46 +01:00
kikito
44758c9278
Fixes spec
2016-12-22 20:27:29 +01:00
kikito
cd72b7e537
Renames i18n param
2016-12-22 20:27:16 +01:00
kikito
eb648b7269
Adds missing parameters to partials
2016-12-22 20:27:01 +01:00
kikito
7acedb30f6
fixes parenthesis
2016-12-22 20:26:39 +01:00
kikito
54bd5aeeb1
adds @budget param to apply_filters_and_search
2016-12-22 20:26:21 +01:00
kikito
260b9aa1e4
loads @investment_ids in ballot lines controller
2016-12-22 20:25:41 +01:00
kikito
15fade5660
loads ballot in budget_investments_controller
2016-12-22 20:25:17 +01:00
kikito
430507ec1e
Adds budget_lines.selected
2016-12-22 20:24:59 +01:00
kikito
688f52bb62
Renames supports to allow_participation
2016-12-22 20:23:48 +01:00
Alberto Miedes Garcés
d83c370c6a
Remove duplicated code in Admin::BannersController
2016-12-22 17:18:27 +01:00
rgarcia
25729ac259
cleans up
2016-12-21 18:55:28 +01:00
rgarcia
0deba76db1
adds specs
2016-12-21 18:46:38 +01:00
rgarcia
675081141c
refactors signatures
2016-12-21 18:46:31 +01:00
Juanjo Bazán
76126dd9ee
Merge pull request #1299 from consul/accessibility-menu
...
Accessibility menu
2016-12-21 13:25:38 +01:00
Alberto Garcia Cabeza
5d96a75657
adds icon rel on apple-touch-icon image
2016-12-21 12:51:59 +01:00
Alberto Garcia Cabeza
6afe594e75
adds missing i18n
2016-12-21 12:45:57 +01:00
Alberto Garcia Cabeza
a8b32e509c
moves more information link to top-links partial
2016-12-21 12:36:11 +01:00
Alberto Garcia Cabeza
4e7589f406
improves accessibility on subnavigation menu
2016-12-21 12:35:48 +01:00
rgarcia
b10dbd7cb5
adds specs
2016-12-20 18:00:36 +01:00
Juanjo Bazán
880f7e2083
Merge pull request #1298 from consul/update-fundation-rails
...
updates foundation rails gem
2016-12-20 17:50:39 +01:00
Alberto Garcia Cabeza
149f4f2ccb
updates foundation rails gem
2016-12-20 17:17:44 +01:00
Alberto García Cabeza
21197ae7d1
Merge pull request #1297 from aspgems/fix_mobile_menu
...
Fixes bug in menu icon in mobile browsers.
2016-12-20 17:16:12 +01:00
rgarcia
53ac18f68f
updates views
2016-12-20 17:06:03 +01:00
rgarcia
25868ee5eb
fixes conflicts
2016-12-20 16:55:07 +01:00
