Commit Graph

338 Commits

Author SHA1 Message Date
kikito
1701111bf5 Merge branch 'api-dev-PRs' of https://github.com/amiedes/consul into amiedes-api-dev-PRs-2 2017-06-13 12:07:28 +02:00
Bertocq
2c82eec0fd Remove target and how_to_participate columns from legislation_processes table, no longer used 2017-06-11 00:04:50 +02:00
Bertocq
ae27eba2b5 Add summary column to Legislative Processes table 2017-06-07 18:42:07 +02:00
decabeza
5e0d5fc8c3 Merge branch 'legislation-module-stable' of https://github.com/medialab-prado/consul into medialab-legislation 2017-05-22 18:43:49 +02:00
rgarcia
ed5a1cecbb adds budget results 2017-05-19 14:04:46 +02:00
rgarcia
a63ca9649e cleans up 2017-05-17 20:32:05 +02:00
rgarcia
42f62e5c36 stores reclassified votes 2017-05-17 15:13:28 +02:00
rgarcia
1ca16d9d40 removes votes from reclassified investments 2017-05-13 13:10:04 +02:00
Alberto Miedes Garcés
5d9054d284 Merge branch 'master' into api-dev-PRs
Conflicts:
	Gemfile.lock
	config/routes.rb
	db/dev_seeds.rb
	db/schema.rb
2017-05-11 21:59:42 +02:00
rgarcia
767a43bb0f Adds DB constraint to avoid duplicate balloted investments 2017-05-03 18:43:22 +02:00
Juanjo Bazán
a4bfe9c50c adds ballot_lines counter to investments 2017-04-28 13:19:43 +02:00
Juanjo Bazán
8654517743 changes budget name max length 2017-04-27 17:04:25 +02:00
Raimond Garcia
ead9b58d07 Merge branch 'master' into iss-1192-test 2017-04-12 11:51:48 +02:00
Amaia Castro
9e5324cc1b Merge branch 'master' into site-customization 2017-04-07 17:29:33 +02:00
Amaia Castro
c1de2dced4 Custom content blocks for top_links and footer 2017-04-06 17:00:05 +02:00
Amaia Castro
8143fe1037 Site customization: images uploads 2017-04-06 17:00:04 +02:00
Amaia Castro
255b57cc85 Admin for custom pages 2017-04-06 16:25:07 +02:00
Alberto Miedes Garcés
468b88da6f Merge branch 'master' into iss-1192-test 2017-03-09 13:12:43 +01:00
Raimond Garcia
f7c783b019 Merge pull request #1414 from consul/indexes
adds polls related indexes and foreign keys
2017-02-12 16:57:07 +01:00
Juanjo Bazán
5923d7103c adds polls related indexes and foreign keys 2017-02-12 14:59:18 +01:00
kikito
4889dc4527 Adds several migrations for new fields related with failed census calls 2017-02-12 14:22:46 +01:00
Amaia Castro
b298fb7316 Show annotation context in annotation page
Only works with quotes within the same html node for now
2017-02-10 15:35:42 +01:00
Juanjo Bazán
7dc267935e adds field to track former users ids 2017-02-09 18:48:26 +01:00
Juanjo Bazán
d7000e399f logs user info in officer_assignments
In case user is no longer a poll officer, info on who did what is
stored in officer_assignment
2017-02-08 15:50:13 +01:00
Juanjo Bazán
e44349d1c1 adds poll_white_results and poll_blank_results 2017-02-03 18:12:32 +01:00
Juanjo Bazán
f060969422 adds changes logging to poll partial results 2017-02-02 16:26:21 +01:00
Juanjo Bazán
f2dcd65471 adds date and booth/officer trace fields to poll partial results 2017-02-02 11:53:57 +01:00
kikito
4c54d9da55 Removes summary from poll_questions table 2017-01-30 18:41:23 +01:00
Juanjo Bazán
72ac75abeb adds final recounting to poll officers' zone 2017-01-30 17:44:39 +01:00
Juanjo Bazán
4a55840ec9 adds date to poll final recounts 2017-01-30 17:44:39 +01:00
Juanjo Bazán
2859975e81 adds scopes for final/voting_days officer_assignments 2017-01-30 17:44:39 +01:00
Juanjo Bazán
01d115dd7a adds poll::final_recounts 2017-01-30 17:44:39 +01:00
rgarcia
ea701e9963 fixes conflicts with polls 2017-01-29 00:44:56 +01:00
rgarcia
6c34599e1e adds officer residence check and user voting 2017-01-29 00:36:20 +01:00
Juanjo Bazán
cf6ca50a3b adds optional officer_assignment_id to poll::voters 2017-01-27 18:39:25 +01:00
Alberto Miedes Garcés
6101848f7a Run pending migration 2017-01-27 11:54:02 +01:00
Amaia Castro
53d13d8524 Create a new comment instead of a new annotation with the same ranges 2017-01-25 16:04:10 +01:00
Juanjo Bazán
5806d86e33 changes poll_voters to optionally reference an answer
adds indexes for poll_voters
2017-01-25 12:57:00 +01:00
Juanjo Bazán
6bc4f5b307 adds Poll::Answer model for web users
PartialResults is kept for booth results
2017-01-25 12:46:44 +01:00
Juanjo Bazán
900563e31c adds poll_id and stats fields to poll_voters 2017-01-25 12:03:48 +01:00
kikito
063c94822d Removes all_geozones from poll_questions table 2017-01-20 17:47:49 +01:00
kikito
d53c867ba4 Adds geozone_restricted to polls 2017-01-20 17:45:11 +01:00
kikito
67c287dc14 Migrates geozones from poll questions to polls 2017-01-20 16:50:03 +01:00
Juanjo Bazán
113f9b32d7 Merge branch 'master' into polls 2017-01-19 16:51:19 +01:00
Amaia Castro
00b488fe84 Merge branch 'master' into legislation-module-stable 2017-01-17 10:46:33 +01:00
rgarcia
68bf119c18 sends unfeasible budget investment 2017-01-14 17:02:33 +01:00
Amaia Castro
a2a61341fe Merge branch 'master' into legislation-module-stable 2017-01-11 22:54:41 +01:00
Amaia Castro
b8f034d896 Legislation annotations/comments page 2017-01-09 09:29:15 +01:00
kikito
3c9e08b06f Adds organization_name attribute to budget investments 2017-01-06 18:43:55 +01:00
Alberto Miedes Garcés
98db33f623 Track email digests 2017-01-05 23:31:11 +01:00