Commit Graph

184 Commits

Author SHA1 Message Date
Raimond Garcia
f68d86a2e5 Merge pull request #1824 from rockandror/user-recomendations
User recomendations
2017-09-29 19:02:03 +02:00
Senén Rodero Rodríguez
92c774cdeb Merge with master 2017-09-28 13:36:20 +02:00
Senén Rodero Rodríguez
5815389cb8 Rename map settings keys 2017-09-27 14:49:07 +02:00
Senén Rodero Rodríguez
6c1d1c2cde Add map settings to backend. Install leaflet assets to render maps. 2017-09-27 14:46:02 +02:00
David Rodríguez
69aaa7de12 Fixes unintended new line 2017-09-19 22:01:47 +02:00
David Rodríguez
e2c311a624 Adds an unverified user to dev seeds
Useful if you want to test the verification process.
2017-09-19 22:01:47 +02:00
rgarcia
37be890fbe Fixes dev seeds
Poll::Questions now have a validation for a `poll_id`
2017-09-19 19:39:47 +02:00
BertoCQ
87c99018e7 Merge branch 'master' into user-recomendations 2017-09-14 23:45:56 +02:00
Bertocq
7a2e5a4ecb Verify poll officer user on dev seeds 2017-09-11 16:48:45 +02:00
Raimond Garcia
2519f232ab Merge branch 'master' into user-recomendations 2017-09-05 17:15:42 +02:00
taitus
e1a7f9c58c Add community to Global Settings 2017-09-05 12:54:32 +02:00
Alberto
3cc904311a Merge branch 'master' into user-recomendations 2017-09-04 19:53:21 +02:00
decabeza
5949f7abf0 uppercase all consul name 2017-09-01 12:51:31 +02:00
Bertocq
3103fc3459 Verify seeds valuator user 2017-08-25 13:00:05 +02:00
taitus
fe3bb7a389 Add recommended tab on proposals and debates index. 2017-08-01 16:31:44 +02:00
taitus
01a41b4706 Add Settings flag recommendations 2017-08-01 16:28:01 +02:00
Bertocq
361e0efe00 Remove Poll Recount model and all usages 2017-07-23 23:29:24 +02:00
Bertocq
631f396e75 Fix dev_seeds to comply with budget related uniqueness names 2017-07-06 11:16:53 +02:00
Eduardo Martinez Echevarria
331976e3b5 Make explicit the creation of legislation processes as published in db/seeds 2017-06-30 15:08:23 +02:00
Raimond Garcia
22d28d9c79 Merge branch 'master' into issue#1575-tag-administration 2017-06-29 19:09:54 +02:00
Bertocq
c96d58df75 Add population value to dev seed budget headings 2017-06-27 23:28:22 +02:00
Eduardo Martinez Echevarria
ae9030e6c5 Change categories creation on dev_seeds removing reference to featured attribute 2017-06-23 17:34:55 +02:00
Juanjo Bazán
9ab0f9cf8b Merge branch 'master' into amiedes-api-dev-PRs-2 2017-06-14 12:46:58 +02:00
Bertocq
d99a4da246 Some style corrections on dev_seeds, along with abreviations and removal of unused blocks 2017-06-14 12:00:37 +02:00
Bertocq
9a97d09cab Add new phase/publication enabled flags on seeds and legislation process factory 2017-06-13 23:47:53 +02:00
Bertocq
0c27f1ffde Rename Legislation Process final_publication_date field to more descriptive result_publication_date 2017-06-13 22:04:36 +02:00
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
02d31953be Remove Target field from Legislative Process from views, i18n, factories and specs 2017-06-10 23:16:13 +02:00
Bertocq
d624a08abc Remove How To Participate field from Legislative Process from views, i18n, factories and specs 2017-06-10 23:11:55 +02:00
Bertocq
8d0e76bcd3 Add summary field to Legislative Processes factory and at dev_seed 2017-06-07 19:02:54 +02:00
Juanjo Bazán
16edbf15a2 Merge pull request #1620 from consul/medialab-legislation
Adds Collaborative Legislation
2017-06-07 18:06:15 +02:00
Bertocq
cf8bc486e4 Rename proposal_improvement_url to proposal_improvement_path to truly describe the value that the variable holds 2017-05-31 12:51:01 +02:00
Bertocq
af48ece30c Add proposal_improvement_url Setting variable to both seed file and correspondent translation 2017-05-31 10:59:31 +02:00
rgarcia
1a46b4d4cb fixes conflicts with master 2017-05-31 10:36:38 +02:00
Bertocq
9e74249b02 Always use Time.current (aliases internally to Time.zone.now)
Some specs where breaking close to midnight because 30.years.ago uses zone.now and Time.now.utc.to_date doesn't.
Also this will make all codebase consistent in the way time is deal with
2017-05-24 07:54:57 +02:00
decabeza
a92a9ffe34 fixes dev seeds 2017-05-23 18:34:46 +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
48a22a0edc updates dev seeds with budget results 2017-05-19 14:04:46 +02:00
decabeza
f4c1c556af adds telegram setting and include on footer 2017-05-16 18:03:48 +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
a11f739956 updates budget dev seeds 2017-05-03 19:32:07 +02:00
Juanjo Bazán
d988acb18b Merge pull request #1483 from consul/polls
Polls
2017-04-07 13:06:10 +02:00
Alberto Garcia Cabeza
3d45c0ca1a adds telegram handle to dev seeds and admin settings 2017-04-06 18:34:50 +02:00
Alberto
6bbcc71ecb Merge branch 'master' into polls 2017-04-06 14:16:49 +02:00
Amaia Castro
5caa31dba1 Merge branch 'master' into legislation-module-stable 2017-03-25 13:34:49 +01:00
rgarcia
8c19802dc6 updates dev seeds for valuators 2017-03-24 15:41:57 +01:00
Amaia Castro
483d7c6e2b Merge branch 'master' into legislation-module-stable 2017-03-17 18:08:22 +01:00
Alberto Garcia Cabeza
8f13c0e2ec adds setting to add per page code on <head> and <body> 2017-03-16 17:04:36 +01:00
Raimond Garcia
3dd33c4247 Merge pull request #1388 from consul/recounting
Creation of Partial Results for Poll Officers
2017-02-02 16:39:24 +01:00
Juanjo Bazán
c4a1c47feb changes poll questions in dev_seeds to have different answers 2017-02-02 11:53:57 +01:00