aboutsummaryrefslogtreecommitdiffstats
path: root/app
AgeCommit message (Collapse)Author
2018-04-27Add Chouette favicon6627-add-chouette-faviconTeddy Wing
Adds a favicon to the site to respond to these errors: ActionController::RoutingError (No route matches [GET] "/favicon.ico"): Using `favicon_link_tag` allows us to get the image from the asset pipeline, which makes it easier to update if necessary, since browsers tend to cache the default `/favicon.ico` indeterminably (source: http://api.rubyonrails.org/classes/ActionView/Helpers/AssetTagHelper.html#method-i-favicon_link_tag). According to some Stack Overflow posts I've been reading, it looks like it's advisable to put the `favicon.ico` file in both `/assets/images/` and `/public/`: - https://stackoverflow.com/questions/15687506/actioncontrollerroutingerror-no-route-matches-get-favicon-ico-in-rails#15688041 - https://stackoverflow.com/questions/11071445/favicon-in-ruby-on-rails-application This way, you can serve the favicon from the asset pipeline, but if any requesters try to get `/favicon.ico`, the server will respond with the image instead of an error. To be honest, when I was testing locally, I couldn't get the icon in `/public` to display, both without a `link` tag and with the following `link` tag: / application.html.slim / ... link href='/favicon.ico' rel='shortcut icon' As a result, I'm adding the image to `/public` with fingers crossed that it's going to work if requested. I generated the `favicon.ico` file with a 256x256px PNG supplied by Cyrielle in the Redmine ticket and the following ImageMagick command: $ convert -resize x16 -gravity center -crop 16x16+0+0 \ Logo_Chouette-256x256.png -flatten -colors 256 favicon.ico (Copied from: https://stackoverflow.com/questions/3185677/converting-gifs-pngs-and-jpgs-to-ico-files-using-imagemagick) Refs #6627
2018-04-27Refs #6572; Fix specsZog
2018-04-27Refs #6572; Hide useless filtersZog
2018-04-27Ref #6572; Fix filters on referential#showZog
2018-04-27Refs #6572; Fix referentials policiesZog
2018-04-27Refs #6572; Don't show Cleanup operationsZog
2018-04-27Refs #6572; Fix dashboardZog
2018-04-27Refs #6572; Update Referentil status after Netex importZog
2018-04-27Refs #6572; Refactor policyZog
2018-04-27Refs #6572; Fix browse policyZog
2018-04-27Refs #6572; Update policiesZog
disable all actions for non-ready referentials
2018-04-27Refs #6572; Updte wordingZog
2018-04-27Refs #6572; Update filters on referentials listZog
2018-04-27Refs #6572; New Referential#Show for noredy referentialsZog
2018-04-27Refs #6572; Use new statesZog
2018-04-27Refs #6572; Define 4 different states on ReferentialsZog
With according methods and scopes
2018-04-27Refs #6845; Fix IE :shrug:6845-fix-ieZog
2018-04-27Merge branch '6833-clone-by-command'Alban Peignier
2018-04-26Use less strict expressions in sed command (to support old syntax of PG 9.4 ↵Alban Peignier
dump for example). Refs #6833
2018-04-26Replace AF83::SchemaCloner by a dump/sed/restore command. Refs #6833Alban Peignier
2018-04-26Replace AF83::SchemaCloner by a dump/sed/restore command. Refs #6833Alban Peignier
2018-04-26Fix `Attachment` Custom FieldZog
2018-04-26Merge pull request #537 from af83/6836-fix-checksumsAlban Peignier
Fix checksum for new journeys. Refs #6836
2018-04-26Refs #6836; Fix checksum for new journeys6836-fix-checksumsZog
2018-04-26Merge pull request #535 from af83/6829-fix-vjs-editorAlban Peignier
Fix Purchase Windows assignment in VJs editor. Fixes #6829
2018-04-26Merge pull request #534 from af83/6828-fix-purchase-windows-bounding-datesAlban Peignier
Fix PurchaseWindow#bounding_dates. Fixes #6828
2018-04-26Merge pull request #533 from af83/6826-fix-times-interpolationAlban Peignier
Fix times interpolation with day offsets. Fixes #6826
2018-04-26Merge pull request #532 from af83/6667-fix-json_serilizationAlban Peignier
Fix Metadata serialization. Refs #6667
2018-04-26Refs #6621; Don't apply the filters on the return coursesZog
2018-04-26StopAreas#index: Filter by registration numberTeddy Wing
The input that filters by name and objectid now also needs to filter by registration number. Refs #6681
2018-04-26Refs #6829; Fix Purchase Windows assignment in VJs editor6829-fix-vjs-editorZog
2018-04-26Refs #6828; Fix PurchaseWindow#bounding_dates6828-fix-purchase-windows-bounding-datesZog
2018-04-26Refs #6826; Fix times interpolation with day offsets6826-fix-times-interpolationZog
2018-04-26Refs #6667; Fix Metdata serialization6667-fix-json_serilizationZog
2018-04-26Refs #6819; Fix CustomFields in React views6819-fix-vjs-custom-fieldsZog
2018-04-26Truncate Referential#slug. Refs #6811Alban Peignier
2018-04-26:fire: log6486-fix-bumpy-frontZog
2018-04-26Refs #6486; Fix bumpy frontZog
2018-04-26AutocompleteLinesController: Don't error if no `q` param is passedTeddy Wing
Previously the action would respond with a 500 error if no `q` parameter was given in the request. Instead, respond with a 200 and fix the error that occurs as a result of assuming that `params[:q]` exists in `AutocompleteLinesController#collection`. Refs #5889
2018-04-26ReferentialVehicleJourneys: Use display name in line filter drop-downTeddy Wing
Previously we had been showing the `name` field for the initial value of an already selected line. However, that doesn't show all the information that's normally given in the drop-down options. We instead have to use the `#display_name` method to get the full display that people are used to seeing in the drop-down. This also means we can no longer `pluck`, as more fields are required to assemble the display name. Instead, just do a simple `find` for the record. Refs #5889
2018-04-26ReferentialVehicleJourneys: Fix line drop-down placeholderTeddy Wing
After adding the `initvalue` data attribute, the placeholder was no longer rendered. Fix this by: 1. Removing all elements from the collection to ensure that boolean options don't get added by default to the select (https://github.com/plataformatec/simple_form/blob/84e4465/lib/simple_form/inputs/collection_input.rb#L36-L41) 2. Not setting an `initSelection` on the Select2 config if the initial selection fields are empty. This finally gets the placeholder to display correctly again. Refs #5889
2018-04-26ReferentialVehicleJourneys: Show selected line in drop-downTeddy Wing
Previously we weren't showing the currently-selected line filter in the drop-down label. If a line is selected, get its ID and name and use those to pre-fill the select. Using Select2's `initSelection` option to configure this instead of putting `selected: ` in the Rails field definition. That would have looked like this: collection: [[@filtered_line.name, @filtered_line.id]], selected: params[:q] && params[:q][:route_line_id_eq], But doing it that way wasn't possible because this is an AJAX-populated Select2. Since we already have a way to use `initSelection`, this was the quickest and easiest way to go, but apparently Select2 v4.0 deprecated this option, instead doing it with a data adapter. Couldn't really be bothered right now to figure out how to set that up as it seemed like a lot of work for not much payoff right now. Also, I was a little disappointed in Select2's docs regarding this. From what I understood, it looks like you basically need to create your own custom data adapter to do this, which sounds like a pain, and I'm not sure if I would have to mess with the rest of our existing Select2 configuration setup in order to integrate that. Refs #5889
2018-04-26Fix CustomField specsZog
2018-04-26Merge pull request #471 from af83/6491-timetable-confirm-modal-cancelAlban Peignier
Fix cancel button actions in confirm modal. Refs #6491
2018-04-25Refs #6620; Do not show the 'chrono' on the last stopZog
2018-04-25Refs #6620; Show 'chrono' icon in computed journeysZog
2018-04-25Refs #6575 Add Workbench outputs to dashboard6575-dashboard-workbench-outputscedricnjanga
2018-04-26Apply uniq on routing_constraint_zones checksumsAlban Peignier
2018-04-26Fixes problems in ReferentialCloning specs. Refs #5372Alban Peignier
2018-04-26Update both checksum_source and checksum into ↵Alban Peignier
ChecksumSupport#update_checksum_without_callbacks