Skip to content
Snippets Groups Projects
Select Git revision
  • 2-epic-1-story-2-as-bob-i-want-to-see-the-other-evaluations-of-each-place-so-that-i-can-decide
  • bob
  • eventReview
  • fixed_bug_with_Google_call
  • gei715
  • hannah
  • irx521-main-patch-78290
  • ivan
  • main default protected
  • master
  • nbob
  • persistentReview
  • rebaseServerTestingForMerge
  • revert-9e9947ce
  • reviewFeature
  • sTesting
  • shawns
17 results
You can move around the graph by using the arrow keys.
Created with Raphaël 2.2.020Nov21201920192019171412109764131Oct3029242320191713126SepCorrected extra toast/Wolffencing and reconnected tagsmainmainCorrected conflictsMerge branch 'bob' into 'main'Merge branch 'main' into 'bob'bobbobEdit event function, but can't pull the event acticity info back to main acticitySwapped out System.exits and that about it.rebaseServerTes…rebaseServerTestingForMergeREADME file on server details updated.Update README.mdFixed infinite loop bug with the thread in MainActivity. DO NOT CALLED EXIT IN THREADS IN THE FUTURE.Attempted do update material, but still bugged. Thread only works if server has reviews to send. Reviews cannot be sent to the server with current Thread.Merge branch 'ivan' into 'main'All thread, but log in activity are buggedFound infinite loop in thread for requesting reviews from the server.Added new app top bar and button menu to open sliderivanivanUpdated RegisterActivity for validating user Input before regsitering, also added an add and remove tag from taglist,Added new Intent that send the username to the Mainpage and display Username at the top of navigation drawer.Updated new AddEventActivity to handle add and remove tags from textview, also updated Start and End Date.Merge branch 'eventReview' into 'main'Reviews for events are done. The reviews for events and restaurents have been updated to PersistentModeleventRevieweventReviewMerge branch 'persistentReview' into 'main'persistent reviews for restaurant completedpersistentReviewpersistentReviewMerge branch 'rebaseServerTestingForMerge' into 'main'Rebased and add thread back for reviews into main activity.server was not added in last commitAndroid should now be able to request reviews form the server.Android should now be able to request reviews form the server.Android function side of things have been written, but certain elements remain uncomplete due to lack of information.Restaurants missing google reviews, events crashMerge branch 'reviewFeature' into 'main'Merge branch 'main' into 'reviewFeature'reviewFeaturereviewFeatureupdate review for restaurantMerge branch 'rebaseServerTestingForMerge' into 'main'Merge branch 'main' into 'rebaseServerTestingForMerge'Server receiving for reviews and users completed. Events receiving is blank. Reviews had to be changed so that sorting can be done for app side.Checkingout MainObject sendToServer should object streaming be made to workShifting server work to git.String communication between server and androidAdded server user datatypeFix back to mian bug and add the new event to pinned listnbobnbob