kikito
|
50f82211a9
|
Add User has_many budget_investments
|
2016-09-09 12:20:58 +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
|
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 |
|
Alberto Garcia Cabeza
|
cff1f43a90
|
Adds banner, styles, and updates icons font
|
2016-09-07 16:42:57 +02:00 |
|
Juanjo Bazán
|
2d56415048
|
adds feature flag for admin/budgets management
|
2016-09-07 15:13:39 +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 |
|
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 |
|
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
|
6d06a59403
|
uses direct associations when managing investments
|
2016-09-05 13:02:08 +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
|
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 |
|
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 |
|
Juanjo Bazán
|
46563f8222
|
Merge pull request #1194 from consul/notifications-polish
Notifications polish
|
2016-08-04 11:29:21 +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
|
b087fe8fb7
|
refactors email digest
|
2016-08-03 19:33:37 +02:00 |
|
rgarcia
|
9d9bf488fc
|
does not create notifications for blocked or erased users
|
2016-08-02 20:52:20 +02:00 |
|
Juanjo Bazán
|
c4768e380d
|
saves querys
|
2016-07-30 09:56:13 +02:00 |
|
Juanjo Bazán
|
724ccf175c
|
adds budget show to admin
|
2016-07-29 14:52:37 +02:00 |
|
Juanjo Bazán
|
49bc6533e8
|
adds explicit permission to admin to read budgets
|
2016-07-29 13:39:08 +02:00 |
|
Juanjo Bazán
|
6fce9df451
|
adds admin creation of budgets
|
2016-07-29 13:34:41 +02:00 |
|
Juanjo Bazán
|
9014de2693
|
adds budgets_helper
|
2016-07-29 13:34:11 +02:00 |
|
Alberto Garcia Cabeza
|
3e892c6e76
|
Adds translations and improve example content
|
2016-07-28 19:21:53 +02:00 |
|
Alberto Garcia Cabeza
|
b69308b770
|
Adds example content for admin budget new
|
2016-07-28 13:04:30 +02:00 |
|
Juanjo Bazán
|
958cfb1338
|
adds budgets to admin's menu
|
2016-07-28 12:37:12 +02:00 |
|
Juanjo Bazán
|
1ad78d599e
|
adds admin budgets index
|
2016-07-28 12:36:39 +02:00 |
|
Juanjo Bazán
|
baddfdb3d1
|
adds phase scopes to budget
|
2016-07-28 12:35:22 +02:00 |
|
rgarcia
|
f21fda0898
|
fixes pending specs
|
2016-07-27 16:39:25 +02:00 |
|
rgarcia
|
7d34621c1c
|
removes duplicate code
|
2016-07-27 13:05:00 +02:00 |
|
rgarcia
|
464673a7aa
|
creates setter association for budget investments
|
2016-07-27 13:04:52 +02:00 |
|
rgarcia
|
6eab5d79a1
|
comments out budget for city proposals
|
2016-07-27 13:04:18 +02:00 |
|
rgarcia
|
3c55d66591
|
fixes conflicts with budget
|
2016-07-27 11:41:46 +02:00 |
|
rgarcia
|
7172e5a23d
|
updates link to paths
|
2016-07-27 11:33:49 +02:00 |
|
rgarcia
|
403f048f3f
|
updates calls to new method names
|
2016-07-27 11:33:41 +02:00 |
|
rgarcia
|
f7810d44dd
|
updates translations
|
2016-07-27 11:33:18 +02:00 |
|
Juanjo Bazán
|
fb810c1b90
|
Merge pull request #1188 from consul/custom-folders
Custom folders
|
2016-07-21 13:19:52 +02:00 |
|
rgarcia
|
1587222cba
|
tmp commit
|
2016-07-20 14:06:27 +02:00 |
|
Juanjo Bazán
|
f6525944d3
|
Merge pull request #1190 from consul/accesibility
Accesibility
|
2016-07-20 13:17:50 +02:00 |
|