aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2018-01-31Update companies.en.ymlLuc Donnet
Fix translation in companies.en.yml
2018-01-31Refs #5740; Add message in company filter when no value is availableZog
2018-01-31Refs #5717; Fix month selectionZog
2018-01-31Refs #5717; Fix TZ related issuesZog
2018-01-31Refs #5598 @1h; Add specsZog
2018-01-31Refs #5598; Enable button to view a JourneyPattern when the user is not ↵Zog
allowed to edit it
2018-01-31Add links to docZog
2018-01-31- Add a default value for the configZog
- Add a cancel button to dismiss the modal
2018-01-31Add a config file templateZog
2018-01-31Add a toolbar for devs to easily manage permissions and featuresZog
2018-01-31Refs #5647; Scope CustomField validations on workgroupZog
2018-01-31Refs #5796; Fix dropdown menu5796-fix-vjs-indexZog
2018-01-31Refs #5796: Add some legroom in the JourneyPatterns editorZog
2018-01-31Refs #5682; Fix timetables bulk update5682-add-days-to-calendarsZog
2018-01-31Refs #5682 @3h; Use same UI as for timetablesZog
2018-01-31Refs #5682; Set default value for application daysZog
2018-01-31Refs #5682; Fix warningZog
2018-01-31Refs #5682; Add application_days field to calendarsZog
2018-01-31Fix specsZog
2018-01-31Fix Reflex importZog
2018-01-31Merge pull request #264 from af83/5754-filter-journeys-on-calendarLuc Donnet
5754 Add a filter on purchase_windows on ReferentialVJs#index
2018-01-31Merge pull request #269 from ↵Luc Donnet
af83/5574-vehicle-journeys--fix-transporter-deletion-in-modal--rb 5574 vehicle journeys fix transporter deletion in modal rb
2018-01-31Refs #5754; Add a filter on calendars for ReferentialVJs#index5754-filter-journeys-on-calendarZog
2018-01-31Refs #5754; Add a filter on purchase_windows on ReferentialVJs#indexZog
2018-01-31Merge pull request #240 from ↵Luc Donnet
af83/5571-remove-pagination-on-referential-vjs-index 5571 Let the user select the number of items per page on ReferentialVehicleJourneys#index
2018-01-31Fix StopArea validation breaking the specsZog
2018-01-31Try and fix jenkins buildsZog
2018-01-31VehicleJourneys#index: Allow company deletion in 'add' modal5574-vehicle-journeys--fix-transporter-deletion-in-modal--rbTeddy Wing
While the 'x' button in the Select2 was available in the 'edit' modal for a vehicle journey, it was not in the 'add' modal. Thus, once you added an associated company, you couldn't remove it in the modal. You'd either have to cancel and create your vehicle journey again, or create it an delete the company in the 'edit' modal later. This enables the 'x' button in the 'add' modal (it previously was only enabled when `editMode` was active) and sets the proper action/reducer to remove the company. The `allowClear` attribute was changed to only work in the 'edit' modal in 0079238842263768b88b0fa0fd977824b49eabd5. That commit appears to be changing things so that certain functions work when not in 'edit' mode. The case we're concerned about is that the 'edit' modal can be opened when in 'view' mode (not 'edit' mode) in order to get more detailed information about a vehicle journey. This means the company Select2 is available in 'view' mode, and the 'x' button should not be visible in that case. But, when I tested this, even with `allowClear: true`, the 'x' button wasn't visible. This, I can only assume, is because the Select2 is in a 'disabled' state, so it's smart enough to know not to show the 'x' button. Which works great for us, because this allows us to not show the 'x' button here and still show it in the 'add' and 'edit' modals. Refs #5574
2018-01-31Merge pull request #263 from af83/5750-non-commercial-stop-areasLuc Donnet
5750 non commercial stop areas
2018-01-31Refs #5683 @2H; Fix specs and refactor action_linksZog
Note: Did not fix the missing workgroup in the calendar mailer
2018-01-31Refs #5750; Remove useless validation5750-non-commercial-stop-areasZog
2018-01-31Disable immature featureZog
2018-01-31Refs #5750; Fix validationZog
2018-01-30Refs ##5370 Set network action_link to disabled if line doesn't have onecedricnjanga
2018-01-30Make some changes to avoid unnacessaty lines of codecedricnjanga
2018-01-30Merge pull request #251 from af83/5647-scope-custom-fields-validationsLuc Donnet
Scope CustomField validations on workgroup
2018-01-30Merge pull request #254 from af83/developer-toolbarLuc Donnet
Add a toolbar for devs to easily manage permissions and features
2018-01-30Merge pull request #259 from af83/5717-fix-periods-on-timetablesLuc Donnet
5717 Fix TZ related issues
2018-01-30Merge pull request #261 from af83/5740-referentialvjs-index-company-filterLuc Donnet
5740 Add message in company filter when no value is available
2018-01-30Update companies.en.ymlLuc Donnet
Fix translation in companies.en.yml
2018-01-30Merge pull request #257 from af83/5598-fix-journey-patterns-collectionLuc Donnet
5598 Enable button to view a JourneyPattern
2018-01-30Merge branch 'master' into 5683-add_workgroup_id_to_calendarscedricnjanga
2018-01-30VehicleJourney.state_permited_attributes: Fix whitespaceTeddy Wing
Add line breaks to make this method more readable. Refs #5574
2018-01-30VehicleJourney: Allow deletion of associated companyTeddy Wing
If the state doesn't contain a company, that means it was deleted on the frontend. In that case, the backend code should correctly delete the associated company from the vehicle journey. Refs #5574
2018-01-30Fix infinity loop in spec/views/referentials/show.html.erb_spec.rb detected ↵5764-add-checksum-to-purchase-windowsLuc Donnet
only in ruby 2.3.1
2018-01-30Merge pull request #267 from af83/5763-fix-referentials-listLuc Donnet
5763 Don't truncate referentials name in merge list
2018-01-30Merge pull request #268 from af83/5764-add-checksum-to-purchase-windowsLuc Donnet
57864 Add checksum support to PurchaseWindows
2018-01-29Refs #57864; Add checksum support to PurchaseWindowsZog
2018-01-29Refs #5763; Don't truncate referentials name in merge list5763-fix-referentials-listZog
2018-01-29Refs #5750; Add a validation on VehicleJourneysZog
Ensure a time is set for all non-commercial stops