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
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
c4bc484afb
updates dev seeds with booths
2016-11-14 13:56:49 +01:00
rgarcia
5b7783b180
updates db schema
2016-11-14 13:56:49 +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
00721bac12
updates dev_seeds with polls
2016-11-14 13:51:09 +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
f3ad806c8b
updates dev seeds with booths
2016-09-28 11:54:29 +02:00
Marcia
4269f3810b
Merge remote-tracking branch 'upstream/master' into admin_password_expired
2016-09-27 13:26:08 +02:00
rgarcia
ac2d218707
Merge branch 'polling' into polling-views
2016-09-23 08:45:38 +02:00
Enrique García
03dca699ac
removes unused budget feature info from schema.rb
2016-09-21 15:53:38 +02:00
rgarcia
5bcd8f1e9d
fixes conflicts with poll branch
2016-09-20 11:53:40 +02:00
rgarcia
4c08058f80
updates db schema
2016-09-20 11:48:12 +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
rgarcia
0c873649c5
updates dev seed with archived proposals
2016-09-16 20:24:25 +02:00
rgarcia
4ebb4a1104
updates dev_seeds with polls
2016-09-16 13:06:39 +02:00
Alberto Garcia Cabeza
910b24936d
Merge branch 'master' into voting-proposals
...
Conflicts:
app/models/proposal.rb
app/views/proposals/_proposal.html.erb
app/views/proposals/index.html.erb
app/views/proposals/show.html.erb
spec/support/common_actions.rb
2016-09-15 13:58:53 +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
rgarcia
a6a53659ae
updates dev seeds
2016-09-10 16:22:41 +02:00
Alberto Garcia Cabeza
3bbc2862d2
Adds admin setting 'months to archive proposals'
2016-09-09 18:02:02 +02:00
Juanjo Bazán
11a5ed15ea
adds question marks to seed data
2016-09-08 15:45:29 +02:00
Alberto Garcia Cabeza
a527de4f92
Adds proposal ballots controller and views
2016-09-07 12:43:12 +02:00
Juanjo Bazán
40cdeb568e
adds missing associations to dev_seeds
2016-09-05 13:11:57 +02:00
Juanjo Bazán
ee2e0b864f
denormalizes investments
2016-09-05 11:56:53 +02:00
rgarcia
c2c7cdb18d
Merge branch 'budget' into budget-public-controllers
2016-09-02 13:15:40 +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
