Juanjo Bazán
616efbffed
uses path instead of url for proposal improvement link
2017-06-23 13:12:46 +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
bae9d105fa
Add phase and publications enabled column flags to Legislative Process table
2017-06-13 22:50:38 +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
2c82eec0fd
Remove target and how_to_participate columns from legislation_processes table, no longer used
2017-06-11 00:04:50 +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
Bertocq
ae27eba2b5
Add summary column to Legislative Processes table
2017-06-07 18:42:07 +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
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
decabeza
f4c1c556af
adds telegram setting and include on footer
2017-05-16 18:03:48 +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
Juanjo Bazán
04b95df696
Merge pull request #1514 from consul/budgets-ballot-db-constraint
...
Adds DB constraint to avoid duplicate balloted investments
2017-05-10 12:29:46 +02:00
rgarcia
a11f739956
updates budget dev seeds
2017-05-03 19:32:07 +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
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
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
6bbcc71ecb
Merge branch 'master' into polls
2017-04-06 14:16:49 +02:00
Amaia Castro
5ee2c9efa0
Add telegram to footer and to social share button
2017-04-05 13:07:08 +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
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