SuccessChanges

Summary

  1. Small fixes to the android screen (commit: 83e85936d742c962ef8f2c39d00567e49188aafb) (details)
  2. Pull in the changes to the javascript + some small native fixes (commit: af0b2a6443c6074514a6cc77e20931202876af54) (details)
  3. Change the default view to be the diary (commit: efafa4ad4bde6708cdf1cb6c3ba157ac9c9650d2) (details)
  4. Update the trip diary javascript to support the recent changes (commit: 66b2733675a6015a2142617c32aa4c5ee0470961) (details)
Commit 83e85936d742c962ef8f2c39d00567e49188aafb by shankari
Small fixes to the android screen

- app and controller are the latest version
- change the list activity to display the diary interface instead of the sidebar
(commit: 83e85936d742c962ef8f2c39d00567e49188aafb)
The file was modifiedandroid/app/src/main/java/edu/berkeley/eecs/e_mission/ConfirmSectionListActivity.java (diff)
The file was modifiedandroid/app/src/main/assets/www/listview-js/app.js (diff)
The file was modifiedandroid/app/src/main/assets/www/listview-js/controllers.js (diff)
Commit af0b2a6443c6074514a6cc77e20931202876af54 by shankari
Pull in the changes to the javascript + some small native fixes

Native fixes are:
- Change the configuration of the activity in AndroidManifest to match the one in ionic
- Switch ConfimSectionListActivity from CordovaActivity back to a normal
  activity, since I haven't yet figured out how to display an ActionBar for a CordovaActivity
- Create a new menu item for "Diary" and use it to display the diary
- Change the database that the native code uses from movesConnect to
  TripSections.db to match the javascript
- Since we no longer start loading the result page when the auth code is
  invoked, we need to load the result page when it is launched. Restore the
  code to do so.
- Remove the connect.xml file that was checked in by mistake earlier. git log
  seems to indicate that I did this. Doh!
(commit: af0b2a6443c6074514a6cc77e20931202876af54)
The file was modifiedandroid/app/src/main/assets/www/dbHelper-tests/dbHelper.tests.js (diff)
The file was addedandroid/app/src/main/res/values/connect.sample
The file was modifiedandroid/app/src/main/assets/www/listview-js/controllers.js (diff)
The file was modifiedandroid/app/src/main/AndroidManifest.xml (diff)
The file was modifiedandroid/app/src/main/res/menu/options_menu.xml (diff)
The file was modifiedandroid/app/src/main/java/edu/berkeley/eecs/e_mission/ModeClassificationHelper.java (diff)
The file was modifiedandroid/app/src/main/assets/www/dbHelperTest.html (diff)
The file was modifiediOS/CFC_Tracker/CFC_Tracker/Cordova/www/listview.html (diff)
The file was modifiedupdate_cordova_sources.sh (diff)
The file was modifiedandroid/app/src/main/assets/www/listview-js/app.js (diff)
The file was removedandroid/app/src/main/res/values/connect.xml
The file was modifiediOS/CFC_Tracker/CFC_Tracker/Cordova/www/listview-js/controllers.js (diff)
The file was modifiedandroid/app/src/main/assets/www/listview-js/dbHelper.js (diff)
The file was modifiedandroid/app/src/main/java/edu/berkeley/eecs/e_mission/ConfirmSectionListActivity.java (diff)
The file was modifiediOS/CFC_Tracker/CFC_Tracker/Cordova/www/dbHelper-tests/dbHelper.tests.js (diff)
The file was modifiediOS/CFC_Tracker/CFC_Tracker/Cordova/www/dbHelperTest.html (diff)
The file was modifiedandroid/app/src/main/assets/www/listview.html (diff)
The file was modifiediOS/CFC_Tracker/CFC_Tracker/Cordova/www/listview-js/dbHelper.js (diff)
The file was removedandroid/app/src/main/assets/www/TripSections.db
The file was modifiedandroid/app/src/main/java/edu/berkeley/eecs/e_mission/cordova/DiaryActivity.java (diff)
The file was modifiediOS/CFC_Tracker/CFC_Tracker/Cordova/www/listview-js/app.js (diff)
The file was modifiediOS/CFC_Tracker/CFC_Tracker/MasterNavController.m (diff)
Commit efafa4ad4bde6708cdf1cb6c3ba157ac9c9650d2 by shankari
Change the default view to be the diary

Changes that enable the action bar for the cordova view, so make that the
default view. Also change the DisplayResultSummaryActivity to have the cordova
configuration.

At this point, the diary view is the main view on both android and ios
(commit: efafa4ad4bde6708cdf1cb6c3ba157ac9c9650d2)
The file was modifiedandroid/app/src/main/java/edu/berkeley/eecs/e_mission/ConfirmSectionListActivity.java (diff)
The file was modifiedandroid/app/src/main/AndroidManifest.xml (diff)
The file was modifiedandroid/app/src/main/java/edu/berkeley/eecs/e_mission/cordova/DiaryActivity.java (diff)
The file was modifiedandroid/app/src/main/res/menu/options_menu.xml (diff)
The file was modifiediOS/CFC_Tracker/CFC_Tracker/Cordova/config.xml (diff)
The file was modifiedandroid/app/src/main/res/xml/config.xml (diff)
Commit 66b2733675a6015a2142617c32aa4c5ee0470961 by shankari
Update the trip diary javascript to support the recent changes

- Set display name using OSM
- Beautify dbHelper
- Include trip in modeUpdate
- Save user classification

This is the original pull request
https://github.com/e-mission/e-mission-phone-cordova-plugins/pull/9
(commit: 66b2733675a6015a2142617c32aa4c5ee0470961)
The file was modifiedandroid/app/src/main/assets/www/listview-js/dbHelper.js (diff)
The file was modifiediOS/CFC_Tracker/CFC_Tracker/Cordova/www/listview-js/controllers.js (diff)
The file was modifiediOS/CFC_Tracker/CFC_Tracker/Cordova/www/listview-js/dbHelper.js (diff)
The file was modifiedandroid/app/src/main/assets/www/listview-js/controllers.js (diff)
The file was modifiediOS/CFC_Tracker/CFC_Tracker/Cordova/www/listview.html (diff)
The file was modifiedandroid/app/src/main/assets/www/listview.html (diff)
The file was removediOS/CFC_Tracker/CFC_Tracker/Cordova/www/TripSections.db
The file was modifiedupdate_cordova_sources.sh (diff)