Commit Graph

696 Commits

Author SHA1 Message Date
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
rgarcia
20cb044015 adds search and filter for poll questions 2016-11-29 11:46:30 +01:00
kikito
2a2179d0f3 Merge branch 'master' into budget 2016-11-28 11:41:49 +01:00
rgarcia
ceebae644f removes question column from poll_questions 2016-11-22 11:41:10 +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
Juanjo Bazán
b8302b6fa8 adds dates to polls 2016-11-14 13:58:19 +01:00
rgarcia
5ba72f0fe3 assigns officers to booths 2016-11-14 13:58:00 +01:00
rgarcia
63ccac963a adds booth backend for index, show, create and edit actions 2016-11-14 13:57:16 +01:00
rgarcia
8dc7285681 validates user has not already voted 2016-11-14 13:52:38 +01:00
rgarcia
44df91346a validates voter in census 2016-11-14 13:51:59 +01:00
rgarcia
1ca821c520 creates polling officers from admin 2016-11-14 13:51:09 +01:00
kikito
3ce7f671fb Adds poll partial result 2016-11-11 19:08:15 +01:00
kikito
09cb25af30 Adds all_geozones to poll_questions 2016-11-07 16:27:34 +01:00
rgarcia
1a8f7e119f sets default value for password_changed_at 2016-11-02 14:51:52 +01:00
kikito
85aba10798 Initial work in Poll::Question 2016-10-28 18:02:28 +02:00
Juanjo Bazán
44691a0bd7 adds dates to polls 2016-10-20 16:14:03 +02:00
Juanjo Bazán
db7b2ef8af Merge branch 'master' into polling-views-plus 2016-10-19 13:50:08 +02:00
Marcia
1f72c5cc74 improves expired password view 2016-09-30 10:10:20 +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
48d2aaa845 validates user has not already voted 2016-09-19 18:48:18 +02:00
rgarcia
0ec3a8e8bf validates voter in census 2016-09-19 18:47:17 +02:00
Marcia
8d883b1e17 mejoras de codigo 2016-09-15 11:45:03 +02:00
rgarcia
c9b8a58e3f creates polling officers from admin 2016-09-14 13:53:35 +02:00
Juanjo Bazán
ee2e0b864f denormalizes investments 2016-09-05 11:56:53 +02:00
Juanjo Bazán
b8b71d0ab0 Merge branch 'master' into budget 2016-09-02 12:47:54 +02:00
rgarcia
6281af2a7d adds emailed_at attribute to notifications 2016-08-03 19:33:23 +02:00
rgarcia
f24a8887bb fixes conflicts with master 2016-07-19 14:49:27 +02:00
rgarcia
98040e191e fixes conflicts with fork 2016-06-20 21:33:34 +02:00
Enrique García
5417adee4a Merge pull request #1140 from consul/proposal-notifications
Proposal notifications and Direct Messages
2016-06-16 12:35:37 +02:00
rgarcia
fd67294075 adds option to receive direct messages 2016-06-14 18:20:36 +02:00
rgarcia
6e800c5120 adds email digest for proposal notifications 2016-06-14 17:53:36 +02:00
Juanjo Bazán
1b57e14a86 removes heading reference in ballot
heading info is stored per group in ballot_lines
2016-06-14 14:04:27 +02:00
Juanjo Bazán
ab008ed4e9 adds denormalization to budget::ballot::lines 2016-06-11 14:57:07 +02:00
Juanjo Bazán
b5a6828e41 adds Budget::Group model to group headings
many refactors through budget related models
2016-06-09 18:00:06 +02:00
Juanjo Bazán
a3ffbd77b2 adds missing migration file (external_link) 2016-06-09 13:51:07 +02:00
Juanjo Bazán
3fae269c40 adds missing migration file (external_link) 2016-06-09 13:30:01 +02:00
rgarcia
c3d06c8bd0 adds direct messages 2016-06-08 20:44:54 +02:00
rgarcia
ad697cd2c1 adds preference to receive proposal notifications 2016-06-06 12:55:33 +02:00
Juanjo Bazán
e4a7989b15 Merge branch 'master' into budget 2016-06-02 12:35:44 +02:00
rgarcia
f5375e813d stores a proposal notification 2016-06-01 17:23:56 +02:00
kikito
56f5983dc4 Adds budget dev_seeds 2016-05-31 12:53:11 +02:00
kikito
2409cccd8f Adds budget.price and ballot.heading_id 2016-05-24 17:38:41 +02:00
kikito
d4d16d3006 Adds responsible_name migration for investments 2016-05-24 14:34:04 +02:00
kikito
20108639cb migrates 2016-05-24 14:34:04 +02:00
kikito
cf0b7a53b0 Adds missing budget_id to investments 2016-05-24 14:33:30 +02:00
Juanjo Bazán
c48059594b removes belongs_to :heading relation from ballot 2016-05-24 13:04:12 +02:00
Juanjo Bazán
6614f365cc fixes indentation 2016-05-23 19:53:09 +02:00