kikito
|
13ffd73fee
|
UNFINISHED budget management
|
2016-09-13 12:33:34 +02:00 |
|
kikito
|
2bc9e7be78
|
started working on budget manatement
|
2016-09-12 12:11:47 +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
|
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
|
8890380804
|
adds investment editing to admin
|
2016-09-07 14:13:40 +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 |
|
Juanjo Bazán
|
f24886560b
|
removes unused i18n entry
|
2016-09-01 12:46:43 +02:00 |
|
Raimond Garcia
|
6a0f756a88
|
Merge pull request #1196 from consul/ckeditor-conf
Ckeditor conf
|
2016-09-01 12:44:39 +02:00 |
|
kikito
|
fb31a4782f
|
downgrades sprockets to 3.6.3 to avoid warnings
|
2016-08-30 18:35:53 +02:00 |
|
kikito
|
7ad4a21229
|
Tries to make ckeditor work correctly with the asset pipeline
Reference: https://github.com/galetahub/ckeditor/issues/519
|
2016-08-30 12:05:46 +02:00 |
|
kikito
|
345e34d422
|
adds ckeditor config
|
2016-08-29 16:49:52 +02:00 |
|
Juanjo Bazán
|
c84108ae60
|
updates rails version
(security fix)
|
2016-08-12 13:41:51 +02:00 |
|
Juanjo Bazán
|
46563f8222
|
Merge pull request #1194 from consul/notifications-polish
Notifications polish
|
2016-08-04 11:29:21 +02:00 |
|
rgarcia
|
24bc8cca20
|
runs all specs
|
2016-08-03 20:56:33 +02:00 |
|
rgarcia
|
4f4a5b68e5
|
runs all spec file
|
2016-08-03 20:50:37 +02:00 |
|
rgarcia
|
3b5e0b55c0
|
tries to fix flacky spec
|
2016-08-03 20:45:36 +02:00 |
|
Juanjo Bazán
|
0f7e23bec4
|
adds budget's groups & headings to admin
|
2016-08-03 20:23:41 +02:00 |
|
Juanjo Bazán
|
64a614c67f
|
adds geozone helper to map ids and names
|
2016-08-03 20:20:52 +02:00 |
|
rgarcia
|
5bd7fdb263
|
fixes specs
|
2016-08-03 20:05:08 +02:00 |
|
rgarcia
|
63274dfe08
|
marks notifications as emailed after rake
|
2016-08-03 19:48:43 +02:00 |
|