aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Removed data from master.HEADmasterChristopher Baines2012-03-14
|
* Merge branch 'dev'Christopher Baines2012-03-14
|\
| * Update for beta release.Christopher Baines2012-03-14
| |
| * Fixed database upgrade bug, and re-added data files (removed incorrectly).Christopher Baines2012-03-13
| |
| * Removed overlay test code.Christopher Baines2012-03-12
| |
| * Major progress on implementing the new search stuff.Christopher Baines2012-03-11
| |
| * Merge branch 'dev' of github.com:cbaines/SouthamptonUniversityMap into devChristopher Baines2012-03-11
| |\ | | | | | | | | | | | | | | | Conflicts: AndroidManifest.xml src/net/cbaines/suma/MapActivity.java
| | * Slight manifest change.Christopher Baines2012-03-09
| | |
| | * More search improvements.Christopher Baines2012-03-09
| | |
| * | Some changes.Christopher Baines2012-03-09
| |/
| * Merge branch 'dev-search' into devChristopher Baines2012-03-09
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gen/net/cbaines/suma/R.java res/values/strings.xml src/net/cbaines/suma/DataManager.java src/net/cbaines/suma/MapActivity.java src/net/cbaines/suma/POI.java
| | * Bumped android:minSdkVersion to 8, as implementing search stuff.dev-searchChristopher Baines2012-03-06
| | |
| | * Basic searchable stuff.Christopher Baines2012-03-06
| | |
| | * New Search stuff.Christopher Baines2012-03-06
| | |
| * | More changes for welcome dialog.Christopher Baines2012-03-09
| | |
| * | More improvements.Christopher Baines2012-03-08
| | |
| * | Beginings of a welcome dialog, and overlay improvements.Christopher Baines2012-03-08
| | |
* | | Merge branch 'dev'Christopher Baines2012-03-07
|\| | | |/ |/|
| * Bump version to 0.7.Christopher Baines2012-03-07
| |
| * Got the config file loading working for ormlite.Christopher Baines2012-03-07
| |
| * Finaly got the progress things centered...Christopher Baines2012-03-07
| |
| * More bug fixes, and commented out some of the more verbose debugging stuff.Christopher Baines2012-03-07
| |
| * Fixed a bug stoping the last item from showing.Christopher Baines2012-03-07
| |
| * Better BusActivity.Christopher Baines2012-03-07
| |
| * Small UI improvements, BusActivity still needs more work.Christopher Baines2012-03-06
| |
| * Improved Bus activity, and U6 route overlay.Christopher Baines2012-03-06
| |
| * Better BusActivity.Christopher Baines2012-03-06
| |
| * Merge branch 'dev' of https://github.com/cbaines/SouthamptonUniversityMap ↵Christopher Baines2012-03-05
| |\ | | | | | | | | | into dev
| | * Add back the building ID to the POI View.Christopher Baines2012-03-04
| | |
| * | Update the README.Christopher Baines2012-03-05
| | |
* | | Merge branch 'dev'Christopher Baines2012-03-04
|\ \ \ | | |/ | |/|
| * | Stuff for 0.6.5 release.Christopher Baines2012-03-04
| |/
| * Zoom the map in closer when the user clicks "Find my location", thanks to ↵Christopher Baines2012-03-04
| | | | | | | | Chris Gutteridge for reporting this.
| * Bug fix stoping double tapping on a disabled building overlay, working.Christopher Baines2012-03-04
| |
* | Merge branch 'dev'Christopher Baines2012-03-02
|\| | | | | | | | | | | | | | | Conflicts: gen/net/cbaines/suma/R.java src/net/cbaines/suma/BusSpecificStopView.java src/net/cbaines/suma/BusStopSpecificStopView.java src/net/cbaines/suma/MapActivity.java
| * More improvements to the toasts.Christopher Baines2012-03-02
| |
| * Updated database.Christopher Baines2012-03-02
| |
| * Transparent toasts, and more improvemens.Christopher Baines2012-03-01
| |
| * Better toasts in the BusStopActivity, many other improvements.Christopher Baines2012-03-01
| |
| * Fixed route movement, now tested.Christopher Baines2012-03-01
| |
| * Fix the bus stop movement, havent fully tested this yet as the live bus data ↵Christopher Baines2012-03-01
| | | | | | | | | | | | | | | | is not working... Conflicts: gen/net/cbaines/suma/R.java
| * Added the libs I forgot to add properly last commit, also changed versions ↵Christopher Baines2012-03-01
| | | | | | | | stuff.
| * Updated libs.Christopher Baines2012-03-01
| |
| * Better toasts implemented.Christopher Baines2012-03-01
| |
| * New Toast stuff, needs some work.Christopher Baines2012-02-29
| |
* | Fix the bus stop movement, havent fully tested this yet as the live bus data ↵Christopher Baines2012-02-29
| | | | | | | | is not working...
* | Merge branch 'dev'Christopher Baines2012-02-28
|\| | | | | | | | | | | Conflicts: src/net/cbaines/suma/BusSpecificStopView.java src/net/cbaines/suma/StopView.java
| * Next release, many improvements.Christopher Baines2012-02-28
| |
| * Fixed two bugs relating to the query on the database not being ordered?, and ↵Christopher Baines2012-02-28
| | | | | | | | implemented a new preference option.
| * Improved URI stuff, and formating.Christopher Baines2012-02-28
| |