Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
aa9212a
Fix .gitignore for .idea - API Key working for #11
linuxwebexpert May 15, 2017
2344fc2
Lockdown module installed, configured
linuxwebexpert May 16, 2017
5ec97c0
Updated npm modules to use AmigoCloud-JS via git
linuxwebexpert May 16, 2017
5227e13
Made Satellite view the default and reordered maps
linuxwebexpert May 16, 2017
9595fe8
Removed DEV/TEST Key and Replaced with Prod Key
linuxwebexpert May 16, 2017
b519456
Merge pull request #106 from vta/google_maps_issue_11
linuxwebexpert May 16, 2017
3572f37
Working Google & ESRI Maps with generic Leaflet
linuxwebexpert May 17, 2017
e7db43e
Replaced AmigoCloud-JS w/ Leaflet + Google || ESRI
linuxwebexpert May 17, 2017
c3c652d
Reset Google API to staging key
linuxwebexpert May 17, 2017
5b1a06c
Verified AmigoCloud disabled - Added Google Places
linuxwebexpert May 18, 2017
5d0ad0f
UI / UX CSS style fixes - moving to remove Mapbox
linuxwebexpert May 18, 2017
8b54aec
Merge pull request #107 from vta/google_maps_issue_11
linuxwebexpert May 18, 2017
1a0015c
Merge pull request #108 from vta/google_places
linuxwebexpert May 18, 2017
ebb9470
Comparing branches to resolve new issues
linuxwebexpert May 26, 2017
afd6171
Fixed issue #109 with color routes for Google Maps
linuxwebexpert Jun 1, 2017
994ce56
Updated & tested AmigoCloud, Google and ESRI maps
linuxwebexpert Jun 1, 2017
aa2496e
Remove console debugging
linuxwebexpert Jun 1, 2017
1ff2870
Remove lockdown.json due to conflicts with master
linuxwebexpert Jun 1, 2017
27d7aad
Removed lockdown.json from cache
linuxwebexpert Jun 1, 2017
d030c16
Merge branch 'master' into map_route_colors-#109
linuxwebexpert Jun 1, 2017
b925745
Resolved issue with pop-ups for route stops
linuxwebexpert Jun 2, 2017
e82e059
Code cleanup and working Google Maps - Fixes #109
linuxwebexpert Jun 2, 2017
81d9dc4
Removed tiny triangles and locate button
linuxwebexpert Jun 2, 2017
dc449f8
Merge pull request #110 from vta/map_route_colors-#109
3vivekb Jun 2, 2017
cee4c9f
Work in progress on Gmaps issue
linuxwebexpert Jun 14, 2017
d39337e
Testing and debugging issue #112
linuxwebexpert Jun 14, 2017
3cee114
Rebuilt L.modeify.map object for issue #112
linuxwebexpert Jun 14, 2017
96b6a57
Testing and debuging Google Maps resize #112
linuxwebexpert Jun 14, 2017
8148aec
Testing and debug Google Maps issue #112
linuxwebexpert Jun 14, 2017
dadf6c1
Testing and debuging issue #112 on mobile
linuxwebexpert Jun 14, 2017
2a95542
Testing fixes for #112 zooming and redraw route
linuxwebexpert Jun 14, 2017
a799ae0
Merge pull request #115 from vta/gmaps_resize-#112
3vivekb Jun 14, 2017
f905ac4
Testing and debugging #111
linuxwebexpert Jun 14, 2017
b7acd1c
Testing fixes for issues #111 and #24
linuxwebexpert Jun 14, 2017
5c530fd
Disabling Help Me Choose as it's unused
linuxwebexpert Jun 14, 2017
7dcbab8
Moving issue #111 to backlog, need to verify issue
linuxwebexpert Jun 14, 2017
2fa289c
CSS cleanup
linuxwebexpert Jun 14, 2017
a94488f
Merge pull request #117 from vta/disable_help-#111
3vivekb Jun 15, 2017
78e4261
Fixes issue #98 and permits URL copy & paste
linuxwebexpert Jun 20, 2017
207a037
Fixes issue #113 with collapsed & renamed layers
linuxwebexpert Jun 20, 2017
0ac160c
Testing fixes for issue #114 draggable mobile maps
linuxwebexpert Jun 20, 2017
3d9aa41
Testing fixes for issue #114 dragging mobile maps
linuxwebexpert Jun 20, 2017
8c4e60d
Testing fixes for issue #114
linuxwebexpert Jun 20, 2017
de51707
Testing fixes for #114
linuxwebexpert Jun 20, 2017
c4054ca
Testing fix for #114
linuxwebexpert Jun 20, 2017
b25a48f
Testing fixes for #114
linuxwebexpert Jun 20, 2017
7741ade
Testing draggable enabled for issue #114
linuxwebexpert Jun 20, 2017
a99cf8c
More testing of issue #114
linuxwebexpert Jun 20, 2017
200e8e8
Testing issue #114
linuxwebexpert Jun 20, 2017
addd0dc
More testing of issue #114
linuxwebexpert Jun 20, 2017
06ea68c
More testing
linuxwebexpert Jun 20, 2017
6fe1024
More testing of issue #114
linuxwebexpert Jun 20, 2017
4fa8f05
More testing of layers and dragging
linuxwebexpert Jun 20, 2017
30965fa
Modified CSS Z-index - testing issue #114
linuxwebexpert Jun 21, 2017
191d9c2
Fixes for issue #114 Google Android Maps
linuxwebexpert Jun 21, 2017
1076664
Tested with BrowserStack on most platforms
linuxwebexpert Jun 21, 2017
608f19d
Merge pull request #122 from vta/geocode_places-#98
3vivekb Jun 21, 2017
1ccdc57
Adding UTF Grid and Utils for issue #114
linuxwebexpert Jun 21, 2017
63629b3
Fixing failed to require issue for utf-grid
linuxwebexpert Jun 21, 2017
d75f240
Resolving Leaflet issues for Android
linuxwebexpert Jun 21, 2017
419c266
Merge pull request #124 from vta/ios_maps-#118
3vivekb Jun 21, 2017
f08a621
Fixes issue #114 - tested with BrowserStack
linuxwebexpert Jun 23, 2017
53151a5
Merge pull request #125 from vta/drag_maps-#114
3vivekb Jun 23, 2017
f8cc240
Final checkin for #114 - layers control image
linuxwebexpert Jun 23, 2017
19a1207
Merge branch 'drag_maps-#114'
3vivekb Jun 23, 2017
42281bd
Redeployed fresh to verify, fixed one install bug
3vivekb Jun 23, 2017
f27e327
Popups and bus stops - #127 w/CSS layers & Leaflet
linuxwebexpert Jun 27, 2017
2221380
Merge pull request #131 from vta/bus_stops-#127
3vivekb Jun 27, 2017
c7b2260
Updated README - BrowserStack testing integration
linuxwebexpert Jun 29, 2017
4e23723
Merge pull request #132 from vta/browser_stack-#119
3vivekb Jun 29, 2017
7c9e140
Update README.md
3vivekb Jun 29, 2017
7c170c7
Update README.md
3vivekb Jun 29, 2017
074220e
add waffle.io badge
waffle-iron Jul 2, 2017
cb9a606
Merge branch 'master' into master
linuxwebexpert Jul 2, 2017
91f3f7d
Update README.md
linuxwebexpert Jul 2, 2017
d986d26
Merge pull request #133 from waffle-iron/master
linuxwebexpert Jul 2, 2017
0c285e6
BrowserStack image for README file
linuxwebexpert Jul 2, 2017
bc8c799
Merge branch 'master' of https://github.com/vta/modeify
linuxwebexpert Jul 2, 2017
d7f4d91
Updated images for BrowserStack
linuxwebexpert Jul 2, 2017
3727a8b
Updated badges to match our GitHub / Waffle config
linuxwebexpert Jul 2, 2017
1ad4658
Clean-up of Waffle.io badges for README
linuxwebexpert Jul 2, 2017
65fbb5c
Added runmodeify.sh script needed by Supervisor
Jul 6, 2017
91c334d
Remove BETA for final release
linuxwebexpert Jul 13, 2017
4927814
Merge pull request #134 from vta/remove_beta-#119
3vivekb Jul 13, 2017
f0082c0
Merge branch 'master' of https://github.com/vta/modeify
Jul 14, 2017
1185b7f
Add new api key just for geocoding
3vivekb Jul 19, 2017
f41c3cf
Missed a parameter call
3vivekb Jul 19, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ lib-cov
*.mk
*.obj
*.ai
*.idea
.idea
*.iml
lockdown.json

.DS_Store
.env
Expand All @@ -32,4 +34,4 @@ coverage
deployment

assets/robots.txt
sftp-config.json
sftp-config.json
6 changes: 0 additions & 6 deletions .idea/vcs.xml

This file was deleted.

7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
[![Stories in Ready](https://badge.waffle.io/vta/modeify.png?label=ready&title=Ready)](https://waffle.io/vta/modeify)
# Modified TripPlanner

[![Ready](https://badge.waffle.io/vta/modeify.png?label=ready&title=Ready)](https://waffle.io/vta/modeify)
[![In Progress](https://badge.waffle.io/vta/modeify.png?label=in%20progress&title=In%20Progress)](https://waffle.io/vta/modeify)
[![Testing](https://badge.waffle.io/vta/modeify.png?label=tests%20passed&title=Testing)](https://waffle.io/vta/modeify)
[![BrowserStack](assets/images/application/browserstack.png)](https://www.browserstack.com)
<!--[![Build status][travis-image]][travis-url]-->
<!--[![Test coverage][coveralls-image]][coveralls-url]-->
<!--[![Code Climate][code-climate-image]][code-climate-url]-->
Expand All @@ -17,7 +20,7 @@

# Intermodal Tripplanner

####The changes include
The changes include
- Ported to OTP /plan API
- Modified UI
- Added real-time locations of vehicles
Expand Down
15 changes: 15 additions & 0 deletions assets/css/L.Control.Locate.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions assets/css/bootstrap-datetimepicker.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions assets/css/font-awesome.min.css

Large diffs are not rendered by default.

Loading