aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2018-02-19Add direction in ReferentialVehicleJourneysController#parse_order for ↵5919-make-coluns-sortableAlban Peignier
'normal' sort. Refs #5919
2018-02-19Merge pull request #316 from af83/0000-dockerLuc Donnet
0000-docker
2018-02-19Merge branch 'master' into 0000-dockerLuc Donnet
2018-02-19Refs #5910; Re-add Checksums on PurchaseWindow#showZog
2018-02-19Refs #5910; Remove useless fields from PurchaseWindow#showZog
2018-02-19Merge pull request #305 from af83/5903-fix-VJS-editorLuc Donnet
Fix CustomField loading when no workgroup is available
2018-02-16compile et embarque les traductions pour le javascriptdockerFlorent Peyraud
2018-02-16Downgrade node version in yarn packagesLuc Donnet
2018-02-16Upgrade yarn package for node to accept 6.XLuc Donnet
2018-02-16default sidekiq redis URL to localhost for devs, and make Docker image ↵Florent Peyraud
defaut envvar value to redis host
2018-02-16allow newrelic licence parameter by envvar in docker containerFlorent Peyraud
2018-02-16add libmagic1 and libmagic-dev into docker imageFlorent Peyraud
2018-02-16Merge pull request #314 from af83/5879_compliance_control_predicatesLuc Donnet
Refs #5879 correct the predicate traductions errors
2018-02-16Merge pull request #313 from af83/5119_i18n_dashboardLuc Donnet
Refs #5119 small changes for the dashboard traductions
2018-02-14Refs #5516 #5880 add missing trauctionscedricnjanga
2018-02-14Refs #5879 correct the predicate traductions errors5879_compliance_control_predicatescedricnjanga
2018-02-14Refs #5119 small changes for the dashboard traductions5119_i18n_dashboardcedricnjanga
2018-02-14ImportResourcesDecorator: Fix `Draper::UninferrableDecoratorError`Teddy Wing
We were getting this error: Draper::UninferrableDecoratorError in ImportResources#index Showing .../stif-boiv/app/views/import_resources/index.html.slim where line #14 raised: Could not infer a decorator for ActiveRecord::Base. Extracted source (around line #14): span.status_icon = import_status(@import.status) span = t('.table_state', lines_imported: @import_resources.lines_imported , lines_in_zipfile: @import_resources.lines_in_zipfile ) - if @import_resources.present? .col-lg-12 h2 = t('.table_title') .col-lg-12 Rails.root: .../stif-boiv Application Trace | Framework Trace | Full Trace app/views/import_resources/index.html.slim:14:in `_app_views_import_resources_index_html_slim___3139942318249059519_70240694466080' when visiting this page: http://stif-boiv.dev:3000/workbenches/1/imports/18/import_resources Fix the error by inheriting from `AF83::Decorator` and having it take care of things. We don't have any other model decorators that don't inherit from `AF83::Decorator`, so this shouldn't be a problem any more. Refs #5926
2018-02-14Merge pull request #312 from af83/5929-package.json--upgrade-node-to-6.13.0teddywing
package.json: Upgrade node ~6.12.0 -> ~6.13.0
2018-02-14package.json: Upgrade node ~6.12.0 -> ~6.13.0Teddy Wing
Our dev servers got their Debian packages upgraded recently and now the project needs to use v6.13.x to align with the servers. Fixes our Jenkins builds. Refs #5929
2018-02-13Merge pull request #216 from af83/5416_checksum_attributeJohan Van Ryseghem
5416 checksum attribute
2018-02-13Refs #5919 @0.5h; Make ReferentialVJs#index sortableZog
2018-02-13Merge pull request #301 from af83/5150-update-decoratorsteddywing
5150 Update decorators
2018-02-13Must use current_release for bd:seed task in deploy.rbLuc Donnet
2018-02-13Merge pull request #300 from af83/5888-fix-i18n-in-jsLuc Donnet
5888 Fix I18n in JS
2018-02-13Merge pull request #287 from af83/4963-import-cron-should-abort-old-importsJohan Van Ryseghem
4963 import cron should abort old imports
2018-02-13Merge pull request #289 from af83/5707_chouette_statusJohan Van Ryseghem
5707 chouette status
2018-02-13Refs #5707; Add specsZog
2018-02-13Refs #5707 update the global status method to avoid unacessary db requestscedricnjanga
2018-02-13Refs #5707 Add status to the application to track 'blocked objects'cedricnjanga
2018-02-13Merge pull request #291 from ↵Johan Van Ryseghem
af83/4758-cron-job-to-finalise-compliance_check_set-validations-- 4758 cron job to finalise compliance check set validations
2018-02-13Merge pull request #293 from af83/5815_add_required_fields_for_ccJohan Van Ryseghem
5815 add required fields for cc
2018-02-12Refs #5903; Fix CustomField loading when no workgroup is available5903-fix-VJS-editorZog
2018-02-12Refs #5899 @1h; Use waiting_time in schedules computation5899-use-waiting-time-in-schedulesZog
2018-02-12Merge pull request #298 from af83/5432-fix-vjas-json-serializationteddywing
5432 Fix vj#show.rabl
2018-02-12Refs #5877; Add a condition on TableBuilderHelper::Column5877-handle-nil-objects-in-tablebuilderhelperZog
2018-02-12Refs #5150; Update decoratorsZog
2018-02-12Merge pull request #292 from af83/5709_fix_ccset_sortingJohan Van Ryseghem
5709 fix ccset sorting
2018-02-12Merge pull request #283 from af83/5843-bad-translationJohan Van Ryseghem
5843 Fix wrong translation
2018-02-12Refs #5843; Fix wrong translation5843-bad-translationZog
2018-02-12Refs #5888; Fix I18n in JS5888-fix-i18n-in-jsZog
2018-02-12Use @workgroup instead of current_workgroup in calendars#_filters. Refs #5683Alban Peignier
2018-02-12Add CHOUETTE_DEPLOY_DISABLED to disable deploy in ci taskAlban Peignier
2018-02-09Fix in deploy.rb task i18n_js_export to use release_path and not current pathLuc Donnet
2018-02-09Fix in deploy.rb task i18n_js_export callLuc Donnet
2018-02-09route_base_spec.rb: Fix checksum test as a result of factoryTeddy Wing
* The factory already creates `StopPoint`s for us, so we don't need to create any additional ones in the test. Previously this would give us eight stop points instead of three or five. * Update the checksum in the factory after generating stop points. We need to do this because otherwise the checksum will be incorrect, not taking into account the new stop points. Without this change, the checksum starts out in an inconsistent state and causes the: 1) Chouette::Route checksum behaves like checksum support doesn't change the checksum on save if the source hasn't been changed Failure/Error: expect(subject.checksum).to eq(checksum) expected: "bc0e7b37243682904bd7013108258fdc744b03e0c59ed1a30e24e112a49242c1" got: "b39d643fdd4f9d6ff62547750508af728a187de29a3d6e4295f9bb3d13559a51" (compared using ==) Shared Example Group: "checksum support" called from ./spec/models/chouette/route/route_base_spec.rb:5 # ./spec/support/checksum_support.rb:84:in `block (2 levels) in <top (required)>' test to fail. Refs #5416
2018-02-09Fix package.json for production envZog
2018-02-09Refs #5432; Fix vj#show.rablZog
2018-02-09Merge pull request #282 from af83/5824-autocomplete-stop-areas-scopeLuc Donnet
5824 autocomplete stop areas scope
2018-02-09Fix in deploy.rb task i18n_js_export callLuc Donnet
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-09 23:36:07 +0000