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 |
|
Juanjo Bazán
|
11a5ed15ea
|
adds question marks to seed data
|
2016-09-08 15:45:29 +02:00 |
|
Juanjo Bazán
|
974c4d6d70
|
adds specs for proposal ballots
|
2016-09-08 12:43:06 +02:00 |
|
Juanjo Bazán
|
50ef23205f
|
avoids loading featured proposals if voting notice
|
2016-09-08 12:42:44 +02:00 |
|
kikito
|
857a4ba42b
|
Adds comment to the final part of spending_proposals_importer
|
2016-09-07 18:08:33 +02:00 |
|
Alberto Garcia Cabeza
|
cff1f43a90
|
Adds banner, styles, and updates icons font
|
2016-09-07 16:42:57 +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 |
|
Alberto Garcia Cabeza
|
22487592cf
|
Adds scope for archived proposals
|
2016-09-07 12:57:53 +02:00 |
|
Alberto Garcia Cabeza
|
b107790039
|
Adds links, texts and i18n
|
2016-09-07 12:46:29 +02:00 |
|
Alberto Garcia Cabeza
|
a527de4f92
|
Adds proposal ballots controller and views
|
2016-09-07 12:43:12 +02:00 |
|
kikito
|
b8dffc6137
|
refactor some tests to their own test in importer
|
2016-09-07 12:01:04 +02:00 |
|
Jaime Iniesta
|
3d5f7f207c
|
no need to db:create here
|
2016-09-07 11:58:10 +02:00 |
|
kikito
|
bdfd326907
|
implements some parts of the spending proposals importer
|
2016-09-07 11:53:24 +02:00 |
|
Raimond Garcia
|
9e72b91ef0
|
Merge pull request #1200 from jaimeiniesta/typos
fixes a few typos
|
2016-09-06 18:28:33 +02:00 |
|
Jaime Iniesta
|
2e6328d502
|
fixes a few typos
|
2016-09-06 18:21:15 +02:00 |
|
Juanjo Bazán
|
6542812647
|
adds simple investment show view to admin
valuators info is missing
|
2016-09-06 17:04:31 +02:00 |
|
Juanjo Bazán
|
31ef3f4c98
|
adds heading filter to index
|
2016-09-06 17:03:35 +02:00 |
|
Juanjo Bazán
|
b0358e4867
|
adds index of investments with filters to admin
|
2016-09-05 17:50:58 +02:00 |
|
Juanjo Bazán
|
3964988bb1
|
fixes specs
updates investment to have group_id & budget_id
|
2016-09-05 13:50:25 +02:00 |
|
Juanjo Bazán
|
40cdeb568e
|
adds missing associations to dev_seeds
|
2016-09-05 13:11:57 +02:00 |
|
Juanjo Bazán
|
6d06a59403
|
uses direct associations when managing investments
|
2016-09-05 13:02:08 +02:00 |
|
Juanjo Bazán
|
ee2e0b864f
|
denormalizes investments
|
2016-09-05 11:56:53 +02:00 |
|
Raimond Garcia
|
14bb9eef84
|
Merge pull request #1191 from consul/budget-public-controllers
Budget public controllers
|
2016-09-02 14:39:05 +02:00 |
|
rgarcia
|
9570d79ee0
|
ignores missing and unused budget i18n keys
|
2016-09-02 13:51:22 +02:00 |
|
rgarcia
|
1c8290faa9
|
refactors budget translations
|
2016-09-02 13:51:16 +02:00 |
|
rgarcia
|
c2c7cdb18d
|
Merge branch 'budget' into budget-public-controllers
|
2016-09-02 13:15:40 +02:00 |
|
rgarcia
|
3e0786b555
|
Merge branch 'budget' of github.com:AyuntamientoMadrid/participacion into budget
|
2016-09-02 13:15:30 +02:00 |
|
rgarcia
|
521b3e1a66
|
refactors specs file structure
|
2016-09-02 13:10:26 +02:00 |
|
rgarcia
|
9003655ccc
|
removes duplicate views
|
2016-09-02 13:10:10 +02:00 |
|
Juanjo Bazán
|
b8b71d0ab0
|
Merge branch 'master' into budget
|
2016-09-02 12:47:54 +02:00 |
|
rgarcia
|
e28c5c5010
|
fixes specs
|
2016-09-01 17:21:46 +02:00 |
|
Raimond Garcia
|
362f45378c
|
Merge pull request #1197 from consul/shut-up-sprockets
downgrades sprockets to 3.6.3 to avoid warnings
|
2016-09-01 15:30:59 +02:00 |
|
Enrique García
|
f159bc355f
|
Merge pull request #1198 from consul/admin-budget
Admin budget
|
2016-09-01 13:05:05 +02:00 |
|