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
rgarcia
9c7139300b
updates poll voter dev seeds
2017-02-02 10:57:58 +01:00
kikito
05f5521e9e
fixes dev_seed error due to using deprecated summary field in Poll::Question
2017-01-31 11:45:42 +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
8b19dcfbd8
fixes typo
2017-01-28 20:29:45 +01:00
Juanjo Bazán
e07ebc7967
beautifies dev_seeds output
2017-01-28 20:17:20 +01:00
Juanjo Bazán
ee4320f4c1
removes noise from dev_seeds output
2017-01-28 20:05:01 +01:00
Juanjo Bazán
f8d3e645db
adds poll recounts to dev_seeds
2017-01-28 19:55:02 +01:00
Alberto Miedes Garcés
5b7cbccd19
Merge branch 'master' into api-dev
2017-01-26 12:39:59 +01:00
kikito
d9351b123d
prints a button to redirect to the poll when a question is answerable
2017-01-25 17:58:09 +01:00
Alberto Miedes Garcés
e3fca5c49f
Remove functionality related to votes demographic info
...
Since this was giving me too much pain and nobody actually requested
this functionality, I decided to remove it.
2017-01-25 13:37:29 +01:00
kikito
8dbc72c374
moves geozones from poll question to poll in dev_seeds
2017-01-20 18:58:19 +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
Alberto Garcia Cabeza
e18751ce5c
verifies admin in dev seeds
2017-01-14 18:14:32 +01:00
Amaia Castro
a2a61341fe
Merge branch 'master' into legislation-module-stable
2017-01-11 22:54:41 +01:00
rgarcia
4d5b885b7e
sets spending proposal's settings to nil
2017-01-10 20:13:48 +01:00
Juanjo Bazán
be0cbb9ea1
adds setting to dev_seeds values
2017-01-09 16:05:33 +01:00
rgarcia
64366ba1f6
tmp fix for heading geozones
2017-01-08 20:03:30 +01:00
Alberto Miedes Garcés
a31f6be3bd
Add proposal notifications to seeds
2017-01-07 22:16:17 +01:00
Alberto Miedes Garcés
1e95cdfce3
Fix dev_seeds
2017-01-07 21:58:29 +01:00
Alberto Miedes Garcés
861a723724
Only show public_voter if votable.total_votes are above threshold
2017-01-07 17:22:18 +01:00
Juanjo Bazán
a5b4a79f62
Merge pull request #1325 from consul/budgets-gaspar
...
Budgets - several fixes
2017-01-05 13:06:48 +01:00
rgarcia
dde1d34172
fixes conflicts with master
2017-01-05 01:56:35 +01:00
Alberto Miedes Garcés
6445fffc0d
Merge branch 'master' into api-dev-0.18.11
2017-01-04 16:21:32 +01:00
Juanjo Bazán
b2c9d5e6b0
Merge branch 'master' into polls
2017-01-03 23:04:21 +01:00
