kikito
|
451179fa59
|
fixes issues with valuating in specs
|
2017-01-02 08:22:11 +01:00 |
|
kikito
|
f7c505392a
|
Adds new route and matching ability for administrators
|
2016-12-28 17:42:47 +01:00 |
|
kikito
|
9d97421b0e
|
Merge branch 'master' into budgets
|
2016-12-27 14:02:12 +01:00 |
|
kikito
|
be2543cf61
|
Uncomments ability section
|
2016-12-19 19:03:46 +01:00 |
|
Alberto Miedes Garcés
|
fea2009396
|
Ability to edit geozones from admin dashboard
|
2016-12-07 22:08:22 +01:00 |
|
kikito
|
1e3a44b380
|
everyone can print budget investments
|
2016-12-07 17:46:46 +01:00 |
|
Alberto Miedes Garcés
|
6175990533
|
Admin geozones: index, create
Modified Geozone factory and seeds to be more complete
|
2016-12-04 21:19:36 +01:00 |
|
rgarcia
|
9d4f2d1aff
|
Displays budget groups
|
2016-09-10 16:22:41 +02:00 |
|
rgarcia
|
9839d7afd0
|
can add investments to ballot
|
2016-09-10 16:22:40 +02:00 |
|
Juanjo Bazán
|
0fc31b1259
|
adds budget/budget_investment indexes to valuators
|
2016-09-09 13:39:08 +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 |
|
Juanjo Bazán
|
0f7e23bec4
|
adds budget's groups & headings to admin
|
2016-08-03 20:23:41 +02:00 |
|
Juanjo Bazán
|
49bc6533e8
|
adds explicit permission to admin to read budgets
|
2016-07-29 13:39:08 +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
|
85d9dd4b84
|
integrates cancan with budgets
|
2016-07-19 14:41:55 +02:00 |
|
kikito
|
0c469bc362
|
fixes the way permissions work for proposalnotifications
|
2016-06-15 14:02:13 +02:00 |
|
rgarcia
|
00fc5b77e5
|
adds permissions in view for direct messages
|
2016-06-09 17:42:13 +02:00 |
|
rgarcia
|
fea3aef5bb
|
updates permissions for direct messages
|
2016-06-09 17:35:19 +02:00 |
|
rgarcia
|
0e86cd89d6
|
adds permissions with cancan for new, create and show
|
2016-06-08 13:46:17 +02:00 |
|
Juanjo Bazán
|
e4a7989b15
|
Merge branch 'master' into budget
|
2016-06-02 12:35:44 +02:00 |
|
kikito
|
fa6f34bf5c
|
Adds basic Budget controller / views
|
2016-05-31 19:26:56 +02:00 |
|
kikito
|
7005faabe6
|
adds admin permissions for investments
|
2016-05-30 14:13:36 +02:00 |
|
kikito
|
2a82e9e33a
|
Redoes the common balloting permissions
|
2016-05-30 14:01:47 +02:00 |
|
kikito
|
13f43d8b67
|
Adds valuator investment abilities
|
2016-05-30 13:55:12 +02:00 |
|
kikito
|
daa8783b02
|
Adds common Investment abilities
|
2016-05-30 13:53:30 +02:00 |
|
Alberto Garcia Cabeza
|
7d1bf7344a
|
Removes unused file and style
|
2016-05-23 19:05:16 +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 |
|
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 |
|
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 |
|
Raimond Garcia
|
c581aad9bf
|
Merge pull request #1018 from consul/investment-project-vote
Investment project vote
|
2016-03-29 18:57:05 +02:00 |
|
rgarcia
|
6f723a871f
|
allows only admins to delete spending proposals
|
2016-03-29 17:08:31 +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
|
decf0f2683
|
changes admin/valuator permissions
not allowed to create/destroy spending proposals anymore
|
2016-03-14 14:35:57 +01:00 |
|
Juanjo Bazán
|
142c981cdf
|
adds ability to level 2 users to delete owned sps
|
2016-03-14 12:51:58 +01:00 |
|
Juanjo Bazán
|
8fc302cb46
|
valuators can manage spending proposals
|
2016-03-04 20:19:42 +01:00 |
|
rgarcia
|
b38558f2f3
|
adds index and create of valuators
|
2016-03-01 20:10:52 +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 |
|
MaiteHdezRivas
|
5dd4633d6a
|
Merge branch 'suggest_before_creating'
Conflicts:
app/assets/javascripts/application.js
app/controllers/debates_controller.rb
app/controllers/proposals_controller.rb
config/locales/es.yml
config/routes.rb
db/schema.rb
spec/features/debates_spec.rb
spec/features/proposals_spec.rb
|
2016-01-27 13:11:23 +01:00 |
|
MaiteHdezRivas
|
7406904c51
|
adding suggest with coffescript
|
2016-01-27 12:32:44 +01:00 |
|