aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Expand)Author
2017-05-12Merge branch 'master' into stagingTeddy Wing
2017-05-12Fix broken filters vj spec (queries were modified)Thomas Haddad
2017-05-12VehicleJourneys#index Temp disable filter by departure timeXinhui
2017-05-12Fix sort line transport mode alphabeticallyXinhui
2017-05-12Merge branch 'master' of github.com:af83/stif-boivRobert
2017-05-11Merge branch 'master' into stagingXinhui
2017-05-11VehicleJourneys#index disable ransack periode filterXinhui
2017-05-11Disable turbolinks for reactux rendered viewsThomas Haddad
2017-05-11Refs #3336: Fix validate button being moved out of react rendering scopeThomas Haddad
2017-05-11Remove duplicate line_spec fileXinhui
2017-05-11Fix Line display_name should display short name aka number..Xinhui
2017-05-11Refs #3357: remove delete stoppoint id when update stopareaThomas Haddad
2017-05-10Merge branch 'master' into stagingXinhui
2017-05-10Fix error 500 on workbench filter by lineXinhui
2017-05-10Refs #3245: Fix stoppoints_id order being preserved for submitThomas Haddad
2017-05-10Refs #3339: Disabled start_time input when multiple vj are selected in duplicateThomas Haddad
2017-05-10Fix time_table duplicate should also duplicate tagsXinhui
2017-05-10Refs #3311: Disable turbolinks in header link to vehicle journeysThomas Haddad
2017-05-10Fix exceptions not being shown active when reloadingThomas Haddad
2017-05-09Manual Conflict ResolutionRobert
2017-05-09Refs #3324: fixing ref#show filters on transport_modejpl
2017-05-09Merge branch 'master' of github.com:af83/stif-boivRobert
2017-05-09TimeTables convert continuous dates to periodsXinhui
2017-05-09Refs #3328: updating objectid with shorten version on VJ and JPjpl
2017-05-09Wip group continuous timetable dates into periodesXinhui
2017-05-09Refs #3327: Fix no data attr for turbolinks not usedThomas Haddad
2017-05-09Refs #3325: adding oid on tt#indexjpl
2017-05-09Refs #3323: using I18n correctly on refs#showjpl
2017-05-09Merge branch 'master' of github.com:af83/stif-boivRobert
2017-05-09minor esthetic correctionRobert
2017-05-06removed left over commentRobert
2017-05-05Merge branch 'master' of github.com:af83/stif-boivRobert
2017-05-05Hotfix for old Ruby VersionRobert
2017-05-05Merge branch 'master' of github.com:af83/stif-boivRobert
2017-05-05Refs #3297Robert
2017-05-05made a custom factory for destroy_route spexRobert
2017-05-05Refs: #3297Robert
2017-05-05Refs # 3297; behavior specedRobert
2017-05-05Refs: #3297 removed patch of inherited_resources in RoutesControllerRobert
2017-05-05made a custom factory for destroy_route spexRobert
2017-05-05Refs: #3297Robert
2017-05-05Refs # 3297; behavior specedRobert
2017-05-05Add specs for timetable reducersThomas Haddad
2017-05-05Refs #3159: updating styles on stop_areas listsjpl
2017-05-05Merge branch 'master' of github.com:af83/stif-boivRobert
2017-05-05Spourious characters (from vim misshandling) removedRobert
2017-05-05Js gardening in timetable actions & action specsThomas Haddad
2017-05-05Merge branch 'master' of github.com:af83/stif-boivRobert
2017-05-05minor INSTALL.md enhancementsRobert
2017-05-05Refs #3287: adding time to date of sync, to sync pagesjpl