Commit Graph

204 Commits

Author SHA1 Message Date
Juanjo Bazán
ab61d94d2d changes Time.now to Time.current 2016-12-27 18:26:03 +01:00
Juanjo Bazán
5ec12e4b5b Merge branch 'master' into redux-polling 2016-12-27 18:22:06 +01:00
Amaia Castro
5e01b380cd Legislation Answer model 2016-12-27 18:21:50 +01:00
Juanjo Bazán
77c2d61c64 adds date to officer_assignment factory 2016-12-27 17:45:46 +01:00
Amaia Castro
04b23cfc7b Merge branch 'master' into legislation-module-stable 2016-12-27 16:43:43 +01:00
kikito
9d97421b0e Merge branch 'master' into budgets 2016-12-27 14:02:12 +01:00
Alberto Miedes Garcés
d4b049175c Merge branch 'master' into api-dev-0.18.11 2016-12-26 12:55:17 +01:00
kikito
8e4bd43069 Makes the selected trait also mark projects feasible and valuation_finished 2016-12-24 14:43:12 +01:00
Amaia Castro
de5df61359 Legislation question comments spec 2016-12-23 15:40:52 +01:00
kikito
430507ec1e Adds budget_lines.selected 2016-12-22 20:24:59 +01:00
Amaia Castro
d25d6c178c Legislation Questions model and basic admin 2016-12-20 18:52:43 +01:00
rgarcia
d09348ee49 adds specs 2016-12-20 16:46:20 +01:00
rgarcia
76723070e2 adds pending specs 2016-12-20 12:21:45 +01:00
Amaia Castro
a4055a1578 Legislation processes home page 2016-12-16 17:59:44 +01:00
kikito
366a3e7552 simplifies factories now that we have denormalization in investment and ballot lines 2016-12-15 18:18:31 +01:00
Amaia Castro
e4315f94c8 Merge branch 'master' into legislation-module-stable 2016-12-15 11:26:22 +01:00
Alberto Miedes Garcés
efade39412 Added specs for User 'public_activity' scope 2016-12-13 14:40:22 +01:00
Juanjo Bazán
45d26f6dee refactors poll::voter
now belongs_to booth_assignment instead of to booth
2016-12-06 20:20:18 +01:00
Juanjo Bazán
ad2dd7d267 adds officer-polls relation and spec 2016-12-06 14:51:53 +01:00
Amaia Castro
e4fe499e66 DraftVersion base model and very basic admin pages 2016-12-06 12:10:20 +01:00
Amaia Castro
369804a2ba Base Legislation::Process model and admin page 2016-12-05 13:24:23 +01:00
Alberto Miedes Garcés
c23ce8bdc6 Modified Geozone factory and seeds to be more complete 2016-12-04 21:20:06 +01:00
Juanjo Bazán
6f986f3750 adds booth_assignment factory 2016-12-02 14:27:18 +01:00
Amaia Castro
9a9f1da5a0 Renames Legislation model to LegacyLegislation
Renames the model and related stuff from Legislation 
to LegacyLegislation to avoid name clashes with 
the future Legislation module.
2016-11-30 12:00:05 +01:00
kikito
2a2179d0f3 Merge branch 'master' into budget 2016-11-28 11:41:49 +01:00
kikito
f0b8cfd4a2 Time.now -> Time.current 2016-11-23 19:19:19 +01:00
rgarcia
626a8e9154 updates specs for admin poll questions 2016-11-17 21:31:51 +01:00
kikito
219e139efb Adds poll_partial_result factory 2016-11-11 19:10:56 +01:00
kikito
fd3f00d61a Adds missing poll to poll_question factory 2016-11-07 16:27:48 +01:00
kikito
0305d2bd65 Adds time scopes and methods to poll 2016-11-02 17:49:34 +01:00
kikito
85aba10798 Initial work in Poll::Question 2016-10-28 18:02:28 +02:00
Juanjo Bazán
db7b2ef8af Merge branch 'master' into polling-views-plus 2016-10-19 13:50:08 +02:00
rgarcia
527b734e0e assigns officers to booths 2016-09-28 18:39:01 +02:00
rgarcia
2c3127b6bd adds booth backend for index, show, create and edit actions 2016-09-28 11:56:19 +02:00
rgarcia
5bcd8f1e9d fixes conflicts with poll branch 2016-09-20 11:53:40 +02:00
rgarcia
e0951a2f2d adds spacing to factories 2016-09-20 11:48:28 +02:00
rgarcia
55f4a6bbae removes officer factory 2016-09-20 11:48:21 +02:00
rgarcia
0ec3a8e8bf validates voter in census 2016-09-19 18:47:17 +02:00
rgarcia
c9b8a58e3f creates polling officers from admin 2016-09-14 13:53:35 +02:00
Juanjo Bazán
8d48eccfed adds not_archived scope to proposal 2016-09-13 12:10:31 +02:00
Juanjo Bazán
da03311f99 archived proposals can not accept votes 2016-09-12 18:47:56 +02:00
Juanjo Bazán
6d06a59403 uses direct associations when managing investments 2016-09-05 13:02:08 +02:00
rgarcia
c2c7cdb18d Merge branch 'budget' into budget-public-controllers 2016-09-02 13:15:40 +02:00
Juanjo Bazán
a9c3629de7 adds missing trait to testing factories 2016-07-28 12:37:00 +02:00
rgarcia
f21fda0898 fixes pending specs 2016-07-27 16:39:25 +02:00
rgarcia
82db8bb673 adds tmp factory hack 2016-07-27 13:04:31 +02:00
rgarcia
3c55d66591 fixes conflicts with budget 2016-07-27 11:41:46 +02:00
rgarcia
f24a8887bb fixes conflicts with master 2016-07-19 14:49:27 +02:00
Andrés Pereira
c5e6735caa Change madrid.es to consul.dev - closes #1169 2016-07-14 16:28:16 +02:00
rgarcia
f9a2f5d5dc adds specs for stats 2016-06-16 17:59:56 +02:00