consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,949 Commits 1 Branch 0 Tags
547168be3fb4a541077d2bbdb71cc4bef3ec1d41
Commit Graph

1015 Commits

Author SHA1 Message Date
rgarcia
503338e47b adds view placeholders for officing 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
38efad77f3 Changes the way question#copy_attributes_from_proposal works 2016-11-11 19:11:53 +01:00
kikito
506cf0dd70 Refactors polls_controller using answerable_by. Implements more specs 2016-11-07 17:43:53 +01:00
kikito
3d22c556e8 Adds scenarios (some missing) for poll voting 2016-11-02 17:50:08 +01:00
Alberto Garcia Cabeza
7594981964 changes text 2% of census to 1% 2016-11-02 14:22:37 +01:00
rgarcia
d540be333a Makes tolk aware of french and portuguese translations 2016-10-31 11:54:26 +01:00
Juanjo Bazán
2506804393 adds fields and i18n keys to admin poll form 2016-10-27 15:52:07 +02:00
Juanjo Bazán
01d337f7e9 changes menu name 2016-10-20 16:25:02 +02:00
Juanjo Bazán
0d34765247 removes unused i18n key 2016-10-20 12:31:06 +02:00
Juanjo Bazán
db7b2ef8af Merge branch 'master' into polling-views-plus 2016-10-19 13:50:08 +02:00
Alberto Garcia Cabeza
5a78e51de2 adds styles to officing voters views 2016-10-17 16:42:50 +02:00
Alberto Garcia Cabeza
1c75dca13a adds styles for offering voters views 2016-10-14 19:00:58 +02:00
Juanjo Bazán
fb8669292e adds missing i18n keys to settings 2016-10-13 11:25:29 +02:00
rgarcia
527b734e0e assigns officers to booths 2016-09-28 18:39:01 +02:00
rgarcia
6387d28157 adds booth info to poll show 2016-09-28 12:34:24 +02:00
rgarcia
2c3127b6bd adds booth backend for index, show, create and edit actions 2016-09-28 11:56:19 +02:00
Marcia
4269f3810b Merge remote-tracking branch 'upstream/master' into admin_password_expired 2016-09-27 13:26:08 +02:00
Marcia
78c6a30424 optimize code 2016-09-27 13:07:06 +02:00
rgarcia
0795da02d8 adds poll CRU actions 2016-09-25 10:21:16 +02:00
rgarcia
ac2d218707 Merge branch 'polling' into polling-views 2016-09-23 08:45:38 +02:00
Alberto Garcia Cabeza
7781edf879 Adds content to booths index and show views 2016-09-20 12:32:23 +02:00
rgarcia
5bcd8f1e9d fixes conflicts with poll branch 2016-09-20 11:53:40 +02:00
rgarcia
88e7af70d0 displays voter name if already voted 2016-09-19 18:48:19 +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
Alberto Garcia Cabeza
5ce886bc6a Add views for admin booths 2016-09-19 18:32:21 +02:00
Alberto Garcia Cabeza
fcf7920a40 Adds booths index content 2016-09-19 17:26:48 +02:00
Alberto Garcia Cabeza
4872c7a4e8 Adds content to edit and show views 2016-09-19 13:36:42 +02:00
Alberto Garcia Cabeza
5ff3e2c599 Adds i18n and styles to admin polls index and new 2016-09-16 19:07:12 +02:00
rgarcia
b5bebaa6c7 adds view placeholders for officing polls 2016-09-16 13:06:30 +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
Alberto Garcia Cabeza
7abd31e4bf Renames variable, updates text 2016-09-15 13:47: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
Alberto Garcia Cabeza
db6f82fa4c Moves banner to a partial and includes it on debates index 2016-09-14 11:09:36 +02:00
Alberto Garcia Cabeza
076e237320 Improves proposal ballot banner, deletes unused partial 2016-09-14 10:40:16 +02:00
Raimond Garcia
9a2d45f25d Merge pull request #1219 from consul/budget-management 
Budget management
 2016-09-13 18:45:30 +02:00
Alberto Garcia Cabeza
c42877efb1 Improves styles for select heading page 2016-09-12 18:45:47 +02:00
Raimond Garcia
992425f4b3 Merge pull request #1212 from consul/budget-votes 
Budget votes
 2016-09-12 16:00:23 +02:00
Juanjo Bazán
5b1ff1584c Merge branch 'master' into budget 2016-09-12 12:29:47 +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
Alberto Garcia Cabeza
3bbc2862d2 Adds admin setting 'months to archive proposals' 2016-09-09 18:02:02 +02:00
Alberto Garcia Cabeza
e8b70a48fa Adds tab in index & removes support button in index/show 2016-09-09 17:32:03 +02:00
Juanjo Bazán
8aa62f8ce7 Merge branch 'budget' into admin-budgets 2016-09-09 15:13:05 +02:00
Juanjo Bazán
42c705e1e3 adds dossier editing of investments to valuation 2016-09-09 15:09:06 +02:00
Juanjo Bazán
0fc31b1259 adds budget/budget_investment indexes to valuators 2016-09-09 13:39:08 +02:00
kikito
fd5dd5984d fixes i18n issues 2016-09-09 13:07:01 +02:00