1. 12 Dec, 2015 1 commit
  2. 09 Dec, 2015 2 commits
  3. 06 Dec, 2015 3 commits
  4. 04 Dec, 2015 2 commits
  5. 03 Dec, 2015 1 commit
  6. 02 Dec, 2015 6 commits
  7. 01 Dec, 2015 1 commit
    • Nina Sanchez's avatar
      Fixed EditMenu · 21e2585f
      Nina Sanchez authored
      Clicking brings to edit screen
      Add menu item adds to the database
      Expandables are the categories
      21e2585f
  8. 21 Nov, 2015 9 commits
    • Shinryu's avatar
    • Kryzl Deanne Pascual's avatar
      Merge remote-tracking branch 'origin/master' · df3c2863
      Kryzl Deanne Pascual authored
      Conflicts:
      
      	RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/AddEditProfile.class
      
      	RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/Admin.class
      
      	RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/Cart.class
      
      	RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/Customer.class
      
      	RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/EditBill.class
      
      	RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/EditMenu.class
      
      	RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/Kitchen.class
      
      	RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/Login.class
      
      	RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/MainActivity.class
      
      	RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/R$id.class
      
      	RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/R$layout.class
      
      	RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/R$menu.class
      
      	RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/R$string.class
      
      	RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/R$style.class
      
      	RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/Register.class
      
      	RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/SelectAccount.class
      
      	RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/Settings.class
      
      	RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/ViewProfile.class
      
      	RestaurantOrderingSystem/gen/com/cs123grpE/restaurantorderingsystem/R.java
      	RestaurantOrderingSystem/res/layout/activity_add_edit_profile.xml
      df3c2863
    • Kryzl Deanne Pascual's avatar
      Edited Add/Edit Profile screen · 0f975aef
      Kryzl Deanne Pascual authored
      Added TextView and EditText for Category
      Added IDs to EditTexts
      0f975aef
    • Shinryu's avatar
    • Shinryu's avatar
      Fixed superNotCalledException error on EditMenu · 78f1e2a4
      Shinryu authored
      Added tags content for ViewProfile
      78f1e2a4
    • Shinryu's avatar
      Fixed ExpandableListView android:id format · 60ea4b41
      Shinryu authored
      60ea4b41
    • Shinryu's avatar
      Added Menu Item click to Profile · 466c6ac8
      Shinryu authored
      466c6ac8
    • Kryzl Deanne Pascual's avatar
      Added Cart and Kitchen screens · 3a70302a
      Kryzl Deanne Pascual authored
      3a70302a
    • Nina Sanchez's avatar
      Working system · e6117b14
      Nina Sanchez authored
      e6117b14
  9. 16 Nov, 2015 1 commit