Commit Graph

392 Commits

Author SHA1 Message Date
Juanjo Bazán
b2c9d5e6b0 Merge branch 'master' into polls 2017-01-03 23:04:21 +01:00
Juanjo Bazán
0c1d7c15c1 adds date and officer log to recounts 2017-01-03 21:30:03 +01:00
Fernando Blat
04a3a4177d Merge branch 'master' into 1315-manage-offices_url-as-setting 2017-01-03 08:57:02 +01:00
Juanjo Bazán
55fea6c037 adds polls-related seed data 2017-01-02 19:29:43 +01:00
Juanjo Bazán
1aa845a9c6 adds published to polls 2017-01-02 18:23:24 +01:00
Juanjo Bazán
85b8f54570 adds Poll::Recount 2017-01-02 13:34:53 +01:00
Juanjo Bazán
08ea4b35eb Merge branch 'master' into polls 2017-01-02 12:14:40 +01:00
Alberto Garcia Cabeza
00581fcacc adds setting key deleted by mistake 2016-12-30 17:21:50 +01:00
Alberto Garcia Cabeza
d8b4af5add adds meta description and keywords 2016-12-30 17:17:46 +01:00
rgarcia
2a0267a1af updates db schema 2016-12-29 12:34:50 +01:00
rgarcia
365faeff31 removes physical votes from proposals 2016-12-29 12:05:29 +01:00
Fernando Blat
ca2370eb7c Manage offices url as a setting 2016-12-29 10:31:38 +01:00
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
Juanjo Bazán
15b072a983 adds date to poll_officer_assignments 2016-12-27 17:43:44 +01:00
Juanjo Bazán
d057c9457d Merge branch 'master' into signature-sheets 2016-12-23 20:23:56 +01:00
Fernando Blat
05a00df8ed Set the default from address as consul.dev 2016-12-23 15:46:39 +01:00
Fernando Blat
a07fbc5b41 Extract mailer from name and address to a setting 2016-12-23 11:28:53 +01:00
rgarcia
25729ac259 cleans up 2016-12-21 18:55:28 +01:00
rgarcia
675081141c refactors signatures 2016-12-21 18:46:31 +01:00
rgarcia
53ac18f68f updates views 2016-12-20 17:06:03 +01:00
rgarcia
25868ee5eb fixes conflicts 2016-12-20 16:55:07 +01:00
rgarcia
4eb700e3d4 refactors signature sheets 2016-12-20 16:46:08 +01:00
Alberto Garcia Cabeza
7e9b903622 adds setting signature sheets on dev_seeds 2016-12-20 14:57:43 +01:00
rgarcia
7ec6a874b6 updates seeds with signature sheet feature 2016-12-20 12:25:34 +01:00
rgarcia
7d3cb112ac updates seeds 2016-12-20 12:21:23 +01:00
rgarcia
3c682b8a9b adds signature sheets 2016-12-20 12:21:05 +01:00
Alberto Miedes Garcés
c2006526c9 Better way to set geozone codes when seeding 2016-12-13 12:40:11 +01:00
Juanjo Bazán
bdf16395d3 removes poll_id from voter
YAGNI
2016-12-07 19:11:43 +01:00
Juanjo Bazán
21c9f2c44b fixes Booth creation in dev_seeds 2016-12-07 15:09:00 +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
891516a0b9 changes officer assignments to polls via new model/relation 2016-12-06 14:33:06 +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
17a4a781bd turns on polls feature by default in seeds.rb 2016-12-02 14:26:51 +01:00
Juanjo Bazán
bd59ba3b82 adds poll/booth_assigments 2016-12-01 13:02:03 +01:00
Juanjo Bazán
9583c052f0 removes poll-booth direct association 2016-12-01 13:02:03 +01:00
rgarcia
20cb044015 adds search and filter for poll questions 2016-11-29 11:46:30 +01:00
rgarcia
f268cd0677 removes question attribute from seeds 2016-11-24 10:56:31 +01:00
kikito
f0b8cfd4a2 Time.now -> Time.current 2016-11-23 19:19:19 +01:00
rgarcia
ceebae644f removes question column from poll_questions 2016-11-22 11:41:10 +01:00
rgarcia
e12f183775 fixes typo 2016-11-19 14:03:10 +01:00
rgarcia
54d9ca3e67 updates dev seeds with successful proposals 2016-11-18 20:49:03 +01:00
rgarcia
5894a169d6 updates dev seeds with poll questions from proposals 2016-11-18 20:39:02 +01:00
rgarcia
b48ee1c7a2 updates dev seeds with comments for poll questions 2016-11-18 20:35:05 +01:00
rgarcia
665c6bbc65 updates poll dev seeds 2016-11-18 20:21:44 +01:00
rgarcia
5f6d0590e8 tmp commit refactoring answerable questions 2016-11-18 03:57:31 +01:00
rgarcia
d9ad658758 adds admin interface for poll questions 2016-11-17 09:30:42 +01:00
rgarcia
127cbcc5c7 adds dev seeds for polls and poll questions 2016-11-16 19:38:41 +01:00
rgarcia
bb3c4c6399 adds consistency to ruby code style
Keep a blank line before and after private
Keep a blank line before and after protected
Remove extra empty line at class body end
Remove extra blank line
Add final newline
Use 2 (not 3) spaces for indentation
Use 2 (not 4) spaces for indentation
Remove space before comma
Add space after comma
Remove trailing whitespaces
Remove unnecessary spacing
Use snake_case for variable names
Do not use then for multi-line if
Remove unused block argument - i
Use the new Ruby 1.9 hash syntax
Remove unused assignment to variable
Indent when as deep as case
Align attributes
Align end with def
2016-11-15 11:18:43 +01:00
kikito
13238e6a84 Merge branch 'polling' into polling-questions 2016-11-14 14:02:31 +01:00