Commit Graph

82 Commits

Author SHA1 Message Date
Juanjo Bazán
113f9b32d7 Merge branch 'master' into polls 2017-01-19 16:51:19 +01:00
Juanjo Bazán
b71bcdd4b5 adds permissions to comment Investments as admin/moderator 2017-01-10 14:31:02 +01:00
kikito
4ceeb68a90 changes abilities extending valuation period 2017-01-04 15:59:36 +01:00
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
Juanjo Bazán
5ec12e4b5b Merge branch 'master' into redux-polling 2016-12-27 18:22:06 +01:00
kikito
9d97421b0e Merge branch 'master' into budgets 2016-12-27 14:02:12 +01:00
Juanjo Bazán
8b4f519d71 adds booth assignation to admin poll 2016-12-23 19:06:55 +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
d9ad658758 adds admin interface for poll questions 2016-11-17 09:30:42 +01:00
rgarcia
b104859da3 adds question comments 2016-11-16 19:41:52 +01:00
rgarcia
6fe965a9b8 adds question's show 2016-11-16 19:41:29 +01:00
kikito
3255ca700f User new answerable_by method in ability 2016-11-07 17:42:52 +01:00
kikito
d39f19abb8 Defines Poll::Question#answerable_by?(user) and uses it in abilities 2016-11-07 16:28:39 +01:00
kikito
f821d7beb7 Implements abilities for poll & poll_question 2016-11-07 10:37:22 +01:00
kikito
3eca3faacd First version of Polls Controller 2016-10-31 14:13:56 +01:00
rgarcia
2c3127b6bd adds booth backend for index, show, create and edit actions 2016-09-28 11:56:19 +02:00
rgarcia
c965e2dda1 tmp commit poll index, show and new 2016-09-23 09:13:02 +02:00
rgarcia
c9b8a58e3f creates polling officers from admin 2016-09-14 13:53:35 +02: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