aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Expand)Author
2018-02-19Add direction in ReferentialVehicleJourneysController#parse_order for 'normal...5919-make-coluns-sortableAlban Peignier
2018-02-19Merge pull request #316 from af83/0000-dockerLuc Donnet
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
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 defau...Florent Peyraud
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
2018-02-16Merge pull request #313 from af83/5119_i18n_dashboardLuc Donnet
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
2018-02-14Merge pull request #312 from af83/5929-package.json--upgrade-node-to-6.13.0teddywing
2018-02-14package.json: Upgrade node ~6.12.0 -> ~6.13.0Teddy Wing
2018-02-13Merge pull request #216 from af83/5416_checksum_attributeJohan Van Ryseghem
2018-02-13Refs #5919 @0.5h; Make ReferentialVJs#index sortableZog
2018-02-13Merge pull request #301 from af83/5150-update-decoratorsteddywing
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
2018-02-13Merge pull request #287 from af83/4963-import-cron-should-abort-old-importsJohan Van Ryseghem
2018-02-13Merge pull request #289 from af83/5707_chouette_statusJohan Van Ryseghem
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 af83/4758-cron-job-to-finalise-compliance_check_...Johan Van Ryseghem
2018-02-13Merge pull request #293 from af83/5815_add_required_fields_for_ccJohan Van Ryseghem
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
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
2018-02-12Merge pull request #283 from af83/5843-bad-translationJohan Van Ryseghem
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
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
2018-02-09Fix in deploy.rb task i18n_js_export callLuc Donnet