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 |
|
Juanjo Bazán
|
1ad78d599e
|
adds admin budgets index
|
2016-07-28 12:36:39 +02:00 |
|
rgarcia
|
7d34621c1c
|
removes duplicate code
|
2016-07-27 13:05:00 +02:00 |
|
rgarcia
|
3c55d66591
|
fixes conflicts with budget
|
2016-07-27 11:41:46 +02:00 |
|
rgarcia
|
1587222cba
|
tmp commit
|
2016-07-20 14:06:27 +02:00 |
|
rgarcia
|
f24a8887bb
|
fixes conflicts with master
|
2016-07-19 14:49:27 +02:00 |
|
rgarcia
|
33a44fc470
|
uses a module to structure controller code
|
2016-07-19 13:49:00 +02:00 |
|
rgarcia
|
1e35ca4895
|
adds budget structure for views and controllers
|
2016-07-19 13:16:30 +02:00 |
|
Alberto Garcia Cabeza
|
d24efbad60
|
Changes .com urls examples to .consul
|
2016-07-06 12:32:07 +02:00 |
|
Alberto Garcia Cabeza
|
42722080fc
|
Changes references to Madrid
|
2016-07-05 13:47:14 +02:00 |
|
Alberto Garcia Cabeza
|
947b2bcb0d
|
Adds user invites views on management
|
2016-06-27 14:25:20 +02:00 |
|
rgarcia
|
0abc9c8376
|
adds stats for direct messages and proposal notifications
|
2016-06-16 17:42:16 +02:00 |
|
rgarcia
|
c3d06c8bd0
|
adds direct messages
|
2016-06-08 20:44:54 +02:00 |
|
kikito
|
43aec952bf
|
Adds route for ballot & ballot lines
|
2016-06-07 11:12:29 +02:00 |
|
rgarcia
|
f5375e813d
|
stores a proposal notification
|
2016-06-01 17:23:56 +02:00 |
|
kikito
|
fa6f34bf5c
|
Adds basic Budget controller / views
|
2016-05-31 19:26:56 +02:00 |
|
MaiteHdezRivas
|
3b2bfc46cf
|
Admin option to add banners and show banners
|
2016-05-19 13:18:30 +02:00 |
|
Juanjo Bazán
|
c4bf90f576
|
adds managers section to admin
|
2016-05-11 11:24:38 +02:00 |
|
Juanjo Bazán
|
325d4e0544
|
adds link to management in admin header
|
2016-04-27 17:26:19 +02:00 |
|
rgarcia
|
4bbd3d7233
|
adds summary of spending proposals by valuator
|
2016-04-26 22:06:02 +02:00 |
|
Juanjo Bazán
|
66dd511979
|
Merge pull request #1041 from consul/select-featured-debates
Select featured debates
|
2016-04-25 18:19:40 +02:00 |
|
Juanjo Bazán
|
479b48796f
|
Merge pull request #1085 from consul/retire-proposals
Retire proposals
|
2016-04-25 18:00:34 +02:00 |
|
Juanjo Bazán
|
58a5e2a283
|
authors can retire proposals now
|
2016-04-23 13:24:15 +02:00 |
|
rgarcia
|
de84480788
|
adds admin summary page for spending proposals
|
2016-04-22 15:03:46 +02:00 |
|
MaiteHdezRivas
|
3e7db9d1b5
|
Best practices code changes
|
2016-04-20 16:40:58 +02:00 |
|
Juanjo Bazán
|
83e58f0cc9
|
adds account section to management
for now it only has the option to delete account
|
2016-04-08 11:43:26 +02:00 |
|
Juanjo Bazán
|
ce477273da
|
adds managers option to delete a level 2 account
|
2016-04-08 11:03:30 +02:00 |
|
Juanjo Bazán
|
58fb6e68ea
|
cleans up routes: use blocks only when necessary
|
2016-04-06 19:25:27 +02:00 |
|
Juanjo Bazán
|
fc5f5eec8b
|
changes default order in management sps to votes
|
2016-04-06 18:45:58 +02:00 |
|
Juanjo Bazán
|
cb05231794
|
adds index/show/voting to management for sps
|
2016-04-06 12:05:43 +02:00 |
|
Juanjo Bazán
|
3c37575f88
|
adds management spending proposals index to routes
|
2016-04-06 11:04:22 +02:00 |
|
Alberto Garcia Cabeza
|
3fd8e76a79
|
Merge branch 'select_debates_which_display_as_featured' of https://github.com/MaiteHdezRivas/consul into MaiteHdezRivas-select_debates_which_display_as_featured
Conflicts:
db/schema.rb
|
2016-04-05 14:05:27 +02:00 |
|
rgarcia
|
ed1ec1c553
|
adds votes to spending proposals
|
2016-03-29 14:53:46 +02:00 |
|
MaiteHdezRivas
|
68f9a76cea
|
Mark debates as featured
|
2016-03-20 13:56:05 +01:00 |
|
Juanjo Bazán
|
c09e6f95d7
|
users can now delete their own spending proposals
via the 'my activity' page
|
2016-03-14 12:53:00 +01:00 |
|
rgarcia
|
e586a1df58
|
fixes conflicts with master
|
2016-03-08 14:31:18 +01:00 |
|
rgarcia
|
951505ce7d
|
admins can tag spending proposals
|
2016-03-08 12:40:35 +01:00 |
|
Juanjo Bazán
|
fcd6d0ce8b
|
adds dossier edition to valuators
|
2016-03-08 11:35:04 +01:00 |
|
Juanjo Bazán
|
0160ed816c
|
adds valuation namespace
|
2016-03-04 20:19:42 +01:00 |
|
Juanjo Bazán
|
23c6a04179
|
removes highlights
|
2016-03-04 18:46:27 +01:00 |
|
rgarcia
|
b38558f2f3
|
adds index and create of valuators
|
2016-03-01 20:10:52 +01:00 |
|
Juanjo Bazán
|
2cddad22d6
|
redux admin for spending proposals
adds dossier info
adds assignments to admin and valuators
|
2016-02-24 19:39:02 +01:00 |
|
kikito
|
81b5ae7089
|
Implements /cuentasegura
|
2016-02-22 13:40:49 +01:00 |
|
rgarcia
|
b41729b129
|
uses investment_projects urls
|
2016-02-21 20:58:42 +01:00 |
|
rgarcia
|
a95fb75103
|
adds participatory_budget scope
|
2016-02-21 20:57:24 +01:00 |
|
rgarcia
|
f82a590e1e
|
reverts debate links
|
2016-02-19 19:08:35 +01:00 |
|
Juanjo Bazán
|
11d6d0b6d6
|
adds spending proposal show for valuator and admin
|
2016-02-18 19:00:24 +01:00 |
|
rgarcia
|
6540092bcd
|
displays the top 3 proposals for every category
|
2016-02-16 12:17:37 +01:00 |
|
Enrique García
|
be8f6da9ea
|
Merge pull request #892 from consul/public-stats
Public stats
|
2016-02-15 13:34:00 +01:00 |
|