Commit Graph

221 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
70b86170a2 adds booth_assignment show with officers and recounts info 2017-01-04 21:00:36 +01:00
Juanjo Bazán
0953a536af adds recounting to officing 2017-01-03 22:23:54 +01:00
Juanjo Bazán
09dac72471 adds officing's polls index 2017-01-03 22:22:52 +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
Juanjo Bazán
40f6ca5886 adds poll shift management to admin 2016-12-27 17:47:15 +01:00
kikito
9d97421b0e Merge branch 'master' into budgets 2016-12-27 14:02:12 +01:00
Juanjo Bazán
ee8c057a46 adds officer search to admin polls 2016-12-27 12:36:16 +01:00
Juanjo Bazán
f0156c5b5a adds admin search/add/remove question to poll 2016-12-26 16:19:35 +01:00
Juanjo Bazán
8b4f519d71 adds booth assignation to admin poll 2016-12-23 19:06:55 +01:00
rgarcia
3c682b8a9b adds signature sheets 2016-12-20 12:21:05 +01:00
Alberto Miedes Garcés
fea2009396 Ability to edit geozones from admin dashboard 2016-12-07 22:08:22 +01:00
kikito
8ef479bf31 Changes routes to use budgets resource instead of namespace 2016-12-06 18:01:37 +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
kikito
1fbd91383c Changes routes to use namespaced budget investments in management 2016-12-02 19:13:47 +01:00
Juanjo Bazán
f67f058b57 adds complete Booth management to admin 2016-12-02 14:28:39 +01:00
kikito
2a2179d0f3 Merge branch 'master' into budget 2016-11-28 11:41:49 +01:00
rgarcia
198b0018f7 adds admin poll question's show 2016-11-17 10:45:37 +01:00
rgarcia
d9ad658758 adds admin interface for poll questions 2016-11-17 09:30:42 +01:00
rgarcia
6fe965a9b8 adds question's show 2016-11-16 19:41:29 +01:00
rgarcia
ac58f30498 removes proposal ballots 2016-11-16 19:39:20 +01:00
kikito
1f9945d0aa Implements answering questions 2016-11-14 13:36:00 +01:00
kikito
63311d6cd1 reimplements routes for questions 2016-11-11 19:08:46 +01:00
kikito
3eca3faacd First version of Polls Controller 2016-10-31 14:13:56 +01:00
Juanjo Bazán
db7b2ef8af Merge branch 'master' into polling-views-plus 2016-10-19 13:50:08 +02:00
rgarcia
7db3683c27 adds consistency to syntax 2016-09-28 11:55:11 +02:00
rgarcia
e2a0b051e9 allow officers to be created without a poll 2016-09-25 10:21:58 +02:00
rgarcia
b5bebaa6c7 adds view placeholders for officing polls 2016-09-16 13:06:30 +02:00
rgarcia
c9b8a58e3f creates polling officers from admin 2016-09-14 13:53:35 +02:00
Raimond Garcia
9a2d45f25d Merge pull request #1219 from consul/budget-management
Budget management
2016-09-13 18:45:30 +02:00
kikito
2bc9e7be78 started working on budget manatement 2016-09-12 12:11:47 +02:00
rgarcia
22373c3ddd Review my votes page 2016-09-10 16:22:41 +02:00
rgarcia
9d4f2d1aff Displays budget groups 2016-09-10 16:22:41 +02:00
Juanjo Bazán
0fc31b1259 adds budget/budget_investment indexes to valuators 2016-09-09 13:39:08 +02:00
Juanjo Bazán
8890380804 adds investment editing to admin 2016-09-07 14:13:40 +02:00
Alberto Garcia Cabeza
a527de4f92 Adds proposal ballots controller and views 2016-09-07 12:43:12 +02:00
Juanjo Bazán
b0358e4867 adds index of investments with filters to admin 2016-09-05 17:50:58 +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
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