Raimond Garcia
|
992425f4b3
|
Merge pull request #1212 from consul/budget-votes
Budget votes
|
2016-09-12 16:00:23 +02:00 |
|
Juanjo Bazán
|
5b1ff1584c
|
Merge branch 'master' into budget
|
2016-09-12 12:29:47 +02:00 |
|
kikito
|
2bc9e7be78
|
started working on budget manatement
|
2016-09-12 12:11:47 +02:00 |
|
rgarcia
|
e38e89aea0
|
fixes specs
|
2016-09-10 16:22:43 +02:00 |
|
rgarcia
|
16794c580c
|
groups and headings navigation
|
2016-09-10 16:22:43 +02:00 |
|
rgarcia
|
4ded0350a1
|
removes investments from sidebar
|
2016-09-10 16:22:42 +02:00 |
|
rgarcia
|
24740578ff
|
displays money remaining in each group
|
2016-09-10 16:22:42 +02:00 |
|
rgarcia
|
22373c3ddd
|
Review my votes page
|
2016-09-10 16:22:41 +02:00 |
|
rgarcia
|
85d70a2cc2
|
updates group's title
|
2016-09-10 16:22:41 +02:00 |
|
rgarcia
|
9d4f2d1aff
|
Displays budget groups
|
2016-09-10 16:22:41 +02:00 |
|
rgarcia
|
1c8f4d5ff0
|
can remove investment projects
|
2016-09-10 16:22:41 +02:00 |
|
rgarcia
|
9839d7afd0
|
can add investments to ballot
|
2016-09-10 16:22:40 +02:00 |
|
rgarcia
|
29cad341f5
|
Adds voting in selecting phase
|
2016-09-10 16:22:40 +02:00 |
|
Alberto Garcia Cabeza
|
fa3b503c47
|
Adds specs
|
2016-09-09 17:32:21 +02:00 |
|
Alberto Garcia Cabeza
|
e8b70a48fa
|
Adds tab in index & removes support button in index/show
|
2016-09-09 17:32:03 +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 |
|
kikito
|
250e5de081
|
removes garbage line from view
|
2016-09-09 13:31:54 +02:00 |
|
kikito
|
cb7ea79aaf
|
Replaces spending proposals by budget investments in user/show
|
2016-09-09 12:19:38 +02:00 |
|
Juanjo Bazán
|
974c4d6d70
|
adds specs for proposal ballots
|
2016-09-08 12:43:06 +02:00 |
|
Alberto Garcia Cabeza
|
cff1f43a90
|
Adds banner, styles, and updates icons font
|
2016-09-07 16:42:57 +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
|
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 |
|
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 |
|
Juanjo Bazán
|
0f7e23bec4
|
adds budget's groups & headings to admin
|
2016-08-03 20:23:41 +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
|
6fce9df451
|
adds admin creation of budgets
|
2016-07-29 13:34:41 +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 |
|
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 |
|