Commits · 12878762013ad9cbbd946d59d0bd732ba9a311ea · Hannah Do (htd345) / CMPT370

Nov 17, 2022
- cancel replacing events by adding new events · 12878762
  Shaobo Xu authored 2 years ago
  
  12878762
- Delete viewevent.java · d3627bde
  Shaobo Xu (shx863) authored 2 years ago
  
  d3627bde
- Merge branch 'nbob' into 'main' · 0128bcab
  Shaobo Xu (shx863) authored 2 years ago
  
  Replace the new Event into recommand page See merge request !23
  0128bcab
- Replace the new Event into recommand page · e912eb0a
  Shaobo Xu authored 2 years ago
  
  e912eb0a
Nov 14, 2022
- Fixed bug in event acvity button · cff81c23
  Shawn Kauenhofen (sak330) authored 2 years ago
  
  cff81c23
Nov 12, 2022
- Merge branch 'hannah' into 'main' · 53a0e3a0
  Jacob Berg (jrb240) authored 2 years ago
  
  This is the Rating and Review Page See merge request !22
  53a0e3a0
- This is the Rating and Review Page · 8a774556
  Hannah Do authored 2 years ago
  
  8a774556
Nov 10, 2022
- Merge branch 'adding_restaurant_details' into 'main' · 517d9930
  Jacob Berg (jrb240) authored 2 years ago
  
  added reviews to events and resto, add resto details See merge request !21
  517d9930
Nov 09, 2022
- added reviews to events and resto, add resto details · 09a09e35
  Shawn Kauenhofen (sak330) authored 2 years ago
  
  09a09e35
Nov 07, 2022
- Merge branch 'added_second_view_holder' into 'main' · 45ebc8c1
  Jacob Berg (jrb240) authored 2 years ago
  
  Corrected CustomAdapter to have 2 types See merge request !19
  45ebc8c1
- Merge branch 'ivan' into 'main' · 9b938e96
  Ivan Xie Ng (irx521) authored 2 years ago
  
  Added new datePicker, Alert dialog and event tags in AddEventActivity.java and... See merge request !20
  9b938e96
- Corrected CustomAdapter to have 2 types · 15f6e258
  Shawn Kauenhofen (sak330) authored 2 years ago
  
  15f6e258
- Added new datePicker, Alert dialog and event tags in AddEventActivity.java and... · 10869cb2
  Ivan Xie Ng (irx521) authored 2 years ago
  
  Added new datePicker, Alert dialog and event tags in AddEventActivity.java and updated activity_add_event.xml
  10869cb2
- Update README.md, Wiki_Images/AddEventDemo.mov, Wiki_Images/CreateEventScreenshot.png · 18461f27
  Ivan Xie Ng (irx521) authored 2 years ago
  
  18461f27
- Merge branch 'sTesting' into 'main' · 7bdd39b5
  Jacob Berg (jrb240) authored 2 years ago
  
  Server testing See merge request !18
  7bdd39b5
- cleaned out more code · bb531593
  jrb240 authored 2 years ago
  
  bb531593
- cleaned out code · 7193fff3
  jrb240 authored 2 years ago
  
  7193fff3
- Java server testing material. Connection. String and object sending/receiving. Threading. · de5f5d30
  jrb240 authored 2 years ago
  
  de5f5d30
- Added Toast to login · 4f6a5929
  Shawn Kauenhofen (sak330) authored 2 years ago
  
  4f6a5929
- Merge branch 'sTesting' into 'main' · cb48170f
  Shawn Kauenhofen (sak330) authored 2 years ago
  
  Added login functionality See merge request !15
  cb48170f
- Login security is best, but not complete. New singleton that will be place as... · 3b4c3bcf
  jrb240 authored 2 years ago
  
  Login security is best, but not complete. New singleton that will be place as active on login, and on account creation. Those are not active just planned. This singleton idea may be abandoned.
  3b4c3bcf
Nov 06, 2022
- Update README.md · a663830b
  Hannah Do (htd345) authored 2 years ago
  
  a663830b
- Upload New File · 3bd8fe3f
  Hannah Do (htd345) authored 2 years ago
  
  3bd8fe3f
- Update README.md · 613adf75
  Hannah Do (htd345) authored 2 years ago
  
  613adf75
- Upload New File · 557e8578
  Hannah Do (htd345) authored 2 years ago
  
  557e8578
- Added some comments login functions, and some Review Lists to Restaurant.java,... · fda9ec33
  jrb240 authored 2 years ago
  
  Added some comments login functions, and some Review Lists to Restaurant.java, and Event.java. Review now has a user attached to them
  fda9ec33
- Changed data classes to java.io.serializable. This will allow them to be sent to the server. · 83ee54dc
  jrb240 authored 2 years ago
  
  83ee54dc
- Update README.md to include new description and mainActivity video · 3e39489f
  Shawn Kauenhofen (sak330) authored 2 years ago
  
  3e39489f
- Merge branch 'ivan' into 'main' · 089bc45c
  Ivan Xie Ng (irx521) authored 2 years ago
  
  Ivan See merge request !14
  089bc45c
- Merge branch 'main' into 'ivan' · 5d3498e2
  Ivan Xie Ng (irx521) authored 2 years ago
  
  5d3498e2
- Updated & fixed bug in add_event.xml · 87d9a217
  Ivan Xie Ng (irx521) authored 2 years ago
  
  87d9a217
- Delete mainActivityScreenshot.png · ada92018
  Shawn Kauenhofen (sak330) authored 2 years ago
  
  ada92018
- Upload New File · c8669c84
  Shawn Kauenhofen (sak330) authored 2 years ago
  
  c8669c84
- mainActivityScreenshot upload · f02d354b
  Shawn Kauenhofen (sak330) authored 2 years ago
  
  f02d354b
- Upload MainActivity video · 2d2df3a0
  Shawn Kauenhofen (sak330) authored 2 years ago
  
  2d2df3a0
- Merge branch 'Correct_bug_in_hours' into 'main' · 9db4a113
  Jacob Berg (jrb240) authored 2 years ago
  
  Corrected callGoogle Bug See merge request !13
  9db4a113
- Corrected callGoogle Bug · 585ea5d6
  Shawn Kauenhofen (sak330) authored 2 years ago
  
  585ea5d6
Nov 04, 2022
- new changes to add event · a4e16e89
  ivan authored 2 years ago
  
  a4e16e89
- Update AddEventActivity.java · 08513f4c
  Ivan Xie Ng (irx521) authored 2 years ago
  
  08513f4c
- fixed some textInput attributes · 6a64e19a
  Ivan Xie Ng (irx521) authored 2 years ago
  
  6a64e19a