Permalink
Switch branches/tags
Nothing to show
Commits on Jul 26, 2012
  1. Cleaned up project after merge

    Nick King committed Jul 26, 2012
  2. Merge branch 'master' of git://github.com/whalenrp/vandy-mobile-sched…

    Nick King committed Jul 26, 2012
    …uler
    
    Conflicts:
    	VandyMobileScheduler/bin/res/drawable/vandymobile_pixelated_big.png
    	VandyMobileScheduler/build.xml
    	VandyMobileScheduler/gen/com/vmat/BuildConfig.java
    	VandyMobileScheduler/gen/com/vmat/R.java
    	VandyMobileScheduler/out/production/MobileMeetups/MobileMeetups.apk
    	VandyMobileScheduler/out/production/MobileMeetups/MobileMeetups.apk.res
    	VandyMobileScheduler/out/production/MobileMeetups/MobileMeetups.apk.unaligned
    	VandyMobileScheduler/out/production/MobileMeetups/classes.dex
    	VandyMobileScheduler/project.properties
    	VandyMobileScheduler/src/com/vmat/TeamsOpenHelper.java
    	VandyMobileScheduler/src/com/vmat/TwitterActivity.java
  3. added a line for maven builds to the gitignore

    Nick King committed Jul 26, 2012
  4. Reorganized project so that it works on other peoples' computers in E…

    Nick King committed Jul 26, 2012
    …clipse. Also deleted the local.properties file since it's not supposed to be commited to version control
Commits on Jul 24, 2012
Commits on Jul 23, 2012
  1. Merge branch 'updates'

    lanekelly committed Jul 23, 2012
    Conflicts:
    	AndroidManifest.xml
    	gen/com/vmat/R.java
    	project.properties
    	src/com/vmat/MainActivity.java
  2. corrected a syntax error

    lanekelly committed Jul 23, 2012
  3. empty commit

    lanekelly committed Jul 23, 2012
Commits on Jul 20, 2012
  1. Added actionbar functionality

    JBad committed Jul 20, 2012
Commits on Jul 19, 2012
  1. Twitter

    JBad committed Jul 19, 2012
Commits on Jul 18, 2012
  1. nothing changed

    JBad committed Jul 18, 2012
Commits on Jul 17, 2012
Commits on Jul 16, 2012
  1. Added Google Play button.

    lanekelly committed Jul 16, 2012
  2. Added in correct tagline views

    lanekelly committed Jul 16, 2012
  3. Cleaned up imports

    whalenrp committed Jul 16, 2012
  4. Resolved merge conflicts

    whalenrp committed Jul 16, 2012
  5. Alarms reset on boot, dialog shows on alarm trigger, alarms update on…

    whalenrp committed Jul 16, 2012
    … timechanges from server sync
Commits on Jul 12, 2012
  1. Forgot to uncomment crucial piece of code. Also removed all unused

    lanekelly committed Jul 12, 2012
    imports from project (Eclipse is awesome)
  2. merged with teams branch

    lanekelly committed Jul 12, 2012
  3. Finished basic Teams pane

    lanekelly committed Jul 12, 2012
  4. Now using custom row layouts

    lanekelly committed Jul 12, 2012
Commits on Jul 11, 2012
  1. Added some UI fixes

    whalenrp committed Jul 11, 2012