Code

Deploy to Pro 🚀#1108

Code

Merged

voodoorai2000 merged 107 commits intostableAyuntamientoMadrid/consul:stablefrom masterAyuntamientoMadrid/consul:masterCopy head branch name to clipboardJan 12, 2018

+703-240

Commits

Commits on Sep 20, 2017

• Legislation process minor html fixes

  xarlybovi

  committed
  c9ce560

  Copy full SHA for c9ce560

Commits on Sep 21, 2017

• Minor refactor and implement foundation toggler

  xarlybovi

  committed
  dc2e2a0

  Copy full SHA for dc2e2a0

Commits on Nov 17, 2017

• Add Capistrano task to automate maintenance mode

  aitbw

  committed
  c643656

  Copy full SHA for c643656

Commits on Dec 18, 2017

• Add 'image_url' SEO properties to Proposal & Budget::Investment 'show' views

  aitbw

  committed
  c46639d

  Copy full SHA for c46639d

Commits on Dec 27, 2017

• Budget investments cannot be edited when budget is finished. Only milestones can be managed.

  

  iagirre

  committed
  ec8715e

  Copy full SHA for ec8715e

• Add feature specs to check that edit links and "Selected" buttons are not displayed/enabled.

  Show description for 64aaa97
  

  iagirre

  committed
  64aaa97

  Copy full SHA for 64aaa97

Commits on Jan 7, 2018

• Upgrade uglifier to version 4.1.2

  

  depfu[bot]

  authored and

  bertocq

  committed
  eed0582

  Copy full SHA for eed0582

• Merge pull request consuldemocracy#2270 from consul/depfu/upgrade/uglifier-4.1.2

  Show description for fc1b4f4
  bertocq

  authored
  fc1b4f4

  Copy full SHA for fc1b4f4

• Upgrade from factory_girl_rails to factory_bot_rails

  Show description for 581a6eb
  bertocq

  committed
  581a6eb

  Copy full SHA for 581a6eb

• Update uglifier to version 4.1.3

  

  depfu[bot]

  authored and

  bertocq

  committed
  205fd24

  Copy full SHA for 205fd24

Commits on Jan 8, 2018

• Merge pull request consuldemocracy#2273 from consul/depfu/update/uglifier-4.1.3

  Show description for c641aee
  bertocq

  authored
  c641aee

  Copy full SHA for c641aee

• Merge remote-tracking branch 'upstream/master' into upstream

  bertocq

  committed
  bdf1577

  Copy full SHA for bdf1577

• Update gemfile.lock

  bertocq

  committed
  8b672ce

  Copy full SHA for 8b672ce

• Merge pull request #1899 from xarlybovi/legislation-process-html-fixes

  Show description for bce0729
  voodoorai2000

  authored
  bce0729

  Copy full SHA for bce0729

• Merge branch 'master' of github.com:consul/consul into upstream

  voodoorai2000

  committed
  35ed298

  Copy full SHA for 35ed298

• Add destroy scenario to budget section of admin panel

  bertocq

  committed
  51e3d75

  Copy full SHA for 51e3d75

• Add destroy budget button to admin budget edit view

  bertocq

  committed
  dd3a0ad

  Copy full SHA for dd3a0ad

• Add destroy action to admin budget controller

  bertocq

  committed
  799b96c

  Copy full SHA for 799b96c

• Add budget destroy texts for admin section

  bertocq

  committed
  b1d685c

  Copy full SHA for b1d685c

• Merge pull request consuldemocracy#2202 from wairbut-m2c/aperez-social-metatags

  Show description for 05031df
  voodoorai2000

  authored
  05031df

  Copy full SHA for 05031df

• fixes conflicts with upstream

  voodoorai2000

  committed
  54d1b3f

  Copy full SHA for 54d1b3f

• Add Update scenario to admin budget feature spec

  bertocq

  committed
  53842ba

  Copy full SHA for 53842ba

• Redirect admin to budget lists after editing a budget

  bertocq

  committed
  03e1481

  Copy full SHA for 03e1481

• Reduce rubocop's Metrics/LineLength max to 100 chars by common agreement

  bertocq

  committed
  4ca0a48

  Copy full SHA for 4ca0a48

• Refactor commmon budget creation to a shared one at budget feature spec

  bertocq

  committed
  377a514

  Copy full SHA for 377a514

• Move level two user creation to a shared let on budget feature

  bertocq

  committed
  506293f

  Copy full SHA for 506293f

• Add drafting phase scenario to budget feature spec for list & show checks

  bertocq

  committed
  2026f53

  Copy full SHA for 2026f53

• Increase admin budget feature spec for drafting phase

  bertocq

  committed
  63694b5

  Copy full SHA for 63694b5

• Increase budget model spec for drafting phase

  bertocq

  committed
  1f0eb49

  Copy full SHA for 1f0eb49

• Add drafting phase trait to budget factory

  bertocq

  committed
  9739576

  Copy full SHA for 9739576

• Add description_drafting column to budgets table

  bertocq

  committed
  d0937d7

  Copy full SHA for d0937d7

• Add drafting phase to budget model & translations

  bertocq

  committed
  f9803ce

  Copy full SHA for f9803ce

• Add budget_published? helper method to BudgetHelper

  Show description for 03f4fce
  bertocq

  committed
  03f4fce

  Copy full SHA for 03f4fce

• Return 404 status for non-published Budget access

  Show description for 76e05d5
  bertocq

  committed
  76e05d5

  Copy full SHA for 76e05d5

• Avoid listing non-published Budgets to the public

  Show description for 4916f9a
  bertocq

  committed
  4916f9a

  Copy full SHA for 4916f9a

• Removed external_url input

  MariaCheca

  committed
  5161988

  Copy full SHA for 5161988

• Changed location attribute label text

  MariaCheca

  committed
  385db76

  Copy full SHA for 385db76

• Remove deprecated reference to FactoryGirl in factories

  bertocq

  committed
  fe732ff

  Copy full SHA for fe732ff

• Changed tests

  MariaCheca

  committed
  d8a6bb0

  Copy full SHA for d8a6bb0

• Updated dev_seeds

  MariaCheca

  committed
  cd53884

  Copy full SHA for cd53884

• Move admin creation into shared let on spec

  bertocq

  committed
  0f5999f

  Copy full SHA for 0f5999f

• Login as admin before visiting drafting budget on spec

  bertocq

  committed
  beee890

  Copy full SHA for beee890

Commits on Jan 9, 2018

• Avoid creating a budget in drafting phase to test results access

  bertocq

  committed
  2c3d8e9

  Copy full SHA for 2c3d8e9

• Make customization engine spec less prone to flaky failures

  bertocq

  committed
  7c7f903

  Copy full SHA for 7c7f903

• Merge remote-tracking branch 'upstream/master' into upstream

  bertocq

  committed
  45b994a

  Copy full SHA for 45b994a

• Merge pull request consuldemocracy#2285 from consul/feature/2278#budget_draft_phase

  Show description for bcec5f7
  bertocq

  authored
  bcec5f7

  Copy full SHA for bcec5f7

• Merge pull request consuldemocracy#2284 from consul/feature/2276#admin_budget_edit_redirect

  Show description for 01c41c7
  bertocq

  authored
  01c41c7

  Copy full SHA for 01c41c7

• Merge branch 'master' into feature/2275#destroy_budgets

  bertocq

  authored
  6e96c8c

  Copy full SHA for 6e96c8c

• Merge pull request consuldemocracy#2283 from consul/feature/2275#destroy_budgets

  Show description for 5f1d222
  bertocq

  authored
  5f1d222

  Copy full SHA for 5f1d222

• Merge remote-tracking branch 'upstream/master' into upstream

  bertocq

  committed
  a6a5f68

  Copy full SHA for a6a5f68

• Updates Changelog

  voodoorai2000

  committed
  69d0dc5

  Copy full SHA for 69d0dc5

• Update unreleased section of changelog

  bertocq

  committed
  a770961

  Copy full SHA for a770961

• Merge pull request consuldemocracy#2280 from consul/2277-budgets_new_form

  Show description for 9685919
  MariaCheca

  authored
  9685919

  Copy full SHA for 9685919

• Updated changelog

  MariaCheca

  committed
  1d82c6a

  Copy full SHA for 1d82c6a

• Merge remote-tracking branch 'consul/master' into upstream

  MariaCheca

  committed
  0ff1ad5

  Copy full SHA for 0ff1ad5

• Fix drafting budget access on spec

  bertocq

  committed
  4626548

  Copy full SHA for 4626548

• Update budget link from welcome page

  

  voodoorai2000

  authored and

  bertocq

  committed
  5a75273

  Copy full SHA for 5a75273

• Merge pull request #1104 from AyuntamientoMadrid/demo

  Show description for 55a37dd
  bertocq

  authored
  55a37dd

  Copy full SHA for 55a37dd

• Merge pull request consuldemocracy#2223 from wairbut-m2c/iagirre-prevent-edition-if-budget-final-phase

  Show description for c27e6ab
  MariaCheca

  authored
  c27e6ab

  Copy full SHA for c27e6ab

• Updated changelog

  MariaCheca

  committed
  27ce8c9

  Copy full SHA for 27ce8c9

• Merge remote-tracking branch 'consul/master' into upstream

  MariaCheca

  committed
  368e27a

  Copy full SHA for 368e27a

• added csv download link to budget_investments (issue 1625)

  raul-fuentes

  committed
  95c1aa4

  Copy full SHA for 95c1aa4

• added test to csv download and style corrections

  raul-fuentes

  committed
  56f4c3c

  Copy full SHA for 56f4c3c

• fixed test

  raul-fuentes

  committed
  d7cc5d1

  Copy full SHA for d7cc5d1

• more style corrections

  raul-fuentes

  committed
  4f096a0

  Copy full SHA for 4f096a0

• final details

  raul-fuentes

  committed
  b3461b2

  Copy full SHA for b3461b2

• changes made at the request of voodoorai2000

  raul-fuentes

  committed
  29018e3

  Copy full SHA for 29018e3

• Disable drafting budgets scenario for listing, not applicable on this fork

  bertocq

  committed
  a66bd3c

  Copy full SHA for a66bd3c

• Add feature proposals flag to dev seeds

  bertocq

  committed
  c5edbe0

  Copy full SHA for c5edbe0

• Update README.md and translate to README_ES.md

  Show description for dea67bb
  bertocq

  committed
  dea67bb

  Copy full SHA for dea67bb

• Merge pull request #2147 from wairbut-m2c/investments_csv_exporter

  Show description for 26f10d4
  voodoorai2000

  authored
  26f10d4

  Copy full SHA for 26f10d4

• Updates Changelog

  voodoorai2000

  committed
  3cd6ba2

  Copy full SHA for 3cd6ba2

• Recovered budget investments code

  MariaCheca

  committed
  bd4649a

  Copy full SHA for bd4649a

• Merge branch 'master' into aperez-capistrano-maintenance-task

  voodoorai2000

  authored
  50884f7

  Copy full SHA for 50884f7

• Merge pull request #1932 from wairbut-m2c/aperez-capistrano-maintenance-task

  Show description for 9d19062
  voodoorai2000

  authored
  9d19062

  Copy full SHA for 9d19062

• Update Changelog

  voodoorai2000

  committed
  c3344c6

  Copy full SHA for c3344c6

• Fixy wrong curly braces closure

  bertocq

  committed
  7b36e38

  Copy full SHA for 7b36e38

• Fix all budget investment price translations to Price instead of Cost

  bertocq

  committed
  c4e0178

  Copy full SHA for c4e0178

• Merge pull request #1103 from AyuntamientoMadrid/upstream

  Show description for f17e02a
  bertocq

  authored
  f17e02a

  Copy full SHA for f17e02a

• Remove TODO's from code, write reminder action on related issue

  bertocq

  committed
  baa3c52

  Copy full SHA for baa3c52

Commits on Jan 10, 2018

• Add test scenarios to check investment price showing rules

  bertocq

  committed
  1d6c303

  Copy full SHA for 1d6c303

• Remove deprecated investment test scenario for price explanation

  bertocq

  committed
  f350b99

  Copy full SHA for f350b99

• Increase Budget model spec for new publishing_prices phase

  bertocq

  committed
  cb1151f

  Copy full SHA for cb1151f

• Refactor Budget's on hold phases to constant, plus alignments

  bertocq

  committed
  d8ceff1

  Copy full SHA for d8ceff1

• Add publishing prices phase to budget model, plus translation texts

  bertocq

  committed
  922318b

  Copy full SHA for 922318b

• Add description publishing prices column to budgets table

  bertocq

  committed
  6772f94

  Copy full SHA for 6772f94

• Increase budget factory with publishing_price trait & description value

  bertocq

  committed
  3bc683e

  Copy full SHA for 3bc683e

• Rename should_show_price_info? to should_show_price_explanation? at Budget::Investment & usage

  bertocq

  committed
  f3a7de5

  Copy full SHA for f3a7de5

• Increase Budget Investment model spec for should_show_price & explantion methods

  bertocq

  committed
  3563b87

  Copy full SHA for 3563b87

• Add published_prices? helper method and phases constant at Budget model

  bertocq

  committed
  21d6ce5

  Copy full SHA for 21d6ce5

• Refactor price & explanation showing logic at Investment model

  bertocq

  committed
  3340917

  Copy full SHA for 3340917

• Restored missing code

  MariaCheca

  committed
  eda673a

  Copy full SHA for eda673a

• Removed unnecessary code

  MariaCheca

  committed
  a06abf7

  Copy full SHA for a06abf7

• Added translations to link text

  MariaCheca

  committed
  bc36328

  Copy full SHA for bc36328

• Improved tests

  MariaCheca

  committed
  02f7e42

  Copy full SHA for 02f7e42

• Fix indentations and lines lenght

  bertocq

  committed
  760b7ca

  Copy full SHA for 760b7ca

• Merge pull request consuldemocracy#2298 from consul/investments_fix

  Show description for c6bc69c
  MariaCheca

  authored
  c6bc69c

  Copy full SHA for c6bc69c

• Improve investment links at budget list with target blank

  bertocq

  committed
  88741b9

  Copy full SHA for 88741b9

• Merge remote-tracking branch 'upstream/master' into upstream

  bertocq

  committed
  e8e0ab3

  Copy full SHA for e8e0ab3

• Fix to_not to not_to on spec

  bertocq

  committed
  db051be

  Copy full SHA for db051be

• Remove redundant curly braces around a hash parameter

  bertocq

  committed
  3026115

  Copy full SHA for 3026115

• Avoid using instance variables on specs, let let let!

  bertocq

  committed
  2e8f820

  Copy full SHA for 2e8f820

• Merge pull request consuldemocracy#2296 from consul/feature/2278#budget_price_show_phase

  Show description for 71e045f
  bertocq

  authored
  71e045f

  Copy full SHA for 71e045f

• Update unreleased section of changelog

  bertocq

  committed
  1fee0eb

  Copy full SHA for 1fee0eb

• Merge remote-tracking branch 'upstream/master' into upstream

  bertocq

  committed
  0349dbc

  Copy full SHA for 0349dbc

• Merge remote-tracking branch 'upstream/master' into upstream

  bertocq

  committed
  c5f16ff

  Copy full SHA for c5f16ff

Commits on Jan 11, 2018

• Merge pull request #1109 from AyuntamientoMadrid/upstream

  Show description for 2b8908a
  bertocq

  authored
  2b8908a

  Copy full SHA for 2b8908a