Dev#1

Open

luke-lai wants to merge 282 commits into

Lukefrom

This pull request is big! We're only showing the most recent 250 commits

Commits on Nov 13, 2017

Commits on Nov 14, 2017

added sign up screen
hwhh
committed
new login and sign up screens
hwhh
committed
Adding functionality for adding event
hwhh
committed
Adding functionality for adding event
hwhh
committed
updated the login stuff
hwhh
committed
Changed splash background
Hailey Pun
committed

Commits on Nov 15, 2017

Commits on Nov 16, 2017

Commits on Nov 17, 2017

fixing some things
hwhh
committed
Updating the event listerner
hwhh
committed

Commits on Nov 18, 2017

Events are being pulled from db
hwhh
committed

Commits on Nov 20, 2017

maps update in realtime
hwhh
committed
added groups
hwhh
committed

Commits on Nov 21, 2017

updating event page
hwhh
committed
Temp change in build.gradle
Hailey Pun
committed
updated the add event
Hailey Pun
committed
updating event page
hwhh
committed
updating event page
hwhh
committed
updating event page
hwhh
committed
Merge branch 'UIFeatures' into dev
Hailey Pun
committed
updating event page
hwhh
committed

Commits on Nov 22, 2017

Commits on Nov 23, 2017

updated the contributions
hwhh
committed
fixed the login stuff
hwhh
committed
Merge branch 'MakingGroups' into fixed_location
hwhh
committed

Commits on Nov 24, 2017

merged
hwhh
committed
merged
hwhh
committed
had to update the target sdk
hwhh
committed

Commits on Nov 26, 2017

Merge branch 'MakingGroups' of /Users/henryhargreaves/Documents/University/Year_3/CMPS121/GroupProject/CMPS121GroupProject with conflicts.
hwhh
committed

Commits on Nov 29, 2017

Commits on Nov 30, 2017

Commits on Dec 1, 2017

adding in the view friends and fixing bugs
hwhh
committed

Commits on Dec 2, 2017

Merge branch 'MakingGroups' of https://github.com/hwhh/CMPS121GroupProject into joining_events
Mattheo28
committed
Adding buttons to search results
hwhh
committed
added new buttons
Hailey Pun
committed
adding in the view friends and fixing bugs
hwhh
committed
Updated buttons
Hailey Pun
committed

Commits on Dec 4, 2017

Reformat new group page
Hailey Pun
committed
Edit
Hailey Pun
committed
Edit
Hailey Pun
committed
adding in the view friends and fixing bugs
hwhh
committed
Profile page set up
Hailey Pun
committed
Start of being able to join events
Mattheo28
committed
edited manifest
Hailey Pun
committed
Merge branch 'UIFix' into MakingGroups
Hailey Pun
committed
adding in the view friends and fixing bugs
hwhh
committed
Merge remote-tracking branch 'origin/UIFix' into MakingGroups
hwhh
committed
Update
Hailey Pun
committed
Changed 'leaving event' function in databaseAPI
Mattheo28
committed
Merge branch 'MakingGroups' of https://github.com/hwhh/CMPS121GroupProject into MakingGroups
Hailey Pun
committed
Merge branch 'MakingGroups' of https://github.com/hwhh/CMPS121GroupProject into MakingGroups
hwhh
committed
adding in the view friends and fixing bugs
hwhh
committed
Merge branch 'MakingGroups' of https://github.com/hwhh/CMPS121GroupProject into joining_events
Mattheo28
committed
merging henry's branch
Mattheo28
committed
View group page
Hailey Pun
committed
Merge branch 'MakingGroups' into UIFix
Hailey Pun
committed
Merge remote-tracking branch 'origin/joining_events' into MakingGroups
hwhh
committed
adding in the view friends and fixing bugs
hwhh
committed
merged
hwhh
committed
Merge branch 'MakingGroups' into UIFix
Hailey Pun
committed
made viewgroup
Hailey Pun
committed
Edit profile and view group
Hailey Pun
committed
Edited user profile
Hailey Pun
committed
merged
hwhh
committed
Merge branch 'MakingGroups' of https://github.com/hwhh/CMPS121GroupProject into joining_events
Mattheo28
committed
merged
hwhh
committed
Changed some UI settings
Hailey Pun
committed

Commits on Dec 5, 2017

Commits on Dec 6, 2017

Issue fixed
Hailey Pun
committed
Upload and download pic working
Hailey Pun
committed
dding
hwhh
committed
added the inviting
hwhh
committed
added the inviting
hwhh
committed
added the inviting
hwhh
committed
Merge branch 'addingInvites' of https://github.com/hwhh/CMPS121GroupProject into joining_events
Mattheo28
committed
added the inviting
hwhh
committed
Merge branch 'addingInvites' of https://github.com/hwhh/CMPS121GroupProject into joining_events
Mattheo28
committed
Uploadable and downloadable pics
Hailey Pun
committed
added the inviting
hwhh
committed
Merge branch 'addingInvites' into UIFix2
Hailey Pun
committed
added the inviting
hwhh
committed
Changed buttons
Hailey Pun
committed
added the inviting
hwhh
committed
fixing join
Mattheo28
committed
Merge branch 'addingInvites' of https://github.com/hwhh/CMPS121GroupProject into joining_events
Mattheo28
committed
merging
Mattheo28
committed
merging
Mattheo28
committed
added the inviting
hwhh
committed
Merge branch 'addingInvites' of https://github.com/hwhh/CMPS121GroupProject into profile_edit
Mattheo28
committed
Deleted ImageStorage class
Hailey Pun
committed
added the inviting
hwhh
committed
fixed event joining, creating and listview
Mattheo28
committed
Changes to buttons
Hailey Pun
committed
Merge branch 'profile_edit' into UIFix2
Hailey Pun
committed
added the inviting
hwhh
committed
Merge branch 'UIFix2' of https://github.com/hwhh/CMPS121GroupProject into addingInvites
hwhh
committed
UI brush up
Hailey Pun
committed
Font change
Hailey Pun
committed
added the inviting
hwhh
committed
minor button fix
Hailey Pun
committed

Commits on Dec 7, 2017

added the inviting
hwhh
committed
added the inviting
hwhh
committed
Merge branch 'joining_events' of https://github.com/hwhh/CMPS121GroupProject into addingInvites
hwhh
committed
Merge branch 'UIFix2' of https://github.com/hwhh/CMPS121GroupProject into addingInvites
hwhh
committed
added the inviting
hwhh
committed
added the inviting
hwhh
committed
Layout fix
Hailey Pun
committed
Layout fix
Hailey Pun
committed
Merged with addingInvites
Mattheo28
committed
start attempt for notifications
Mattheo28
committed
start attempt for notifications
Mattheo28
committed
Fixed page
Hailey Pun
committed
Fixed page
Hailey Pun
committed
start attempt for notifications
Mattheo28
committed
start attempt for notifications
Mattheo28
committed
merging
Mattheo28
committed
merging
Mattheo28
committed
Fixed button
Hailey Pun
committed
"hello world" notification works in background
Mattheo28
committed
adding advanced queires
hwhh
committed
Merge branch 'UIFix2' of https://github.com/hwhh/CMPS121GroupProject into UIFix3
hwhh
committed
Merge branch 'UIFix3' of https://github.com/hwhh/CMPS121GroupProject into merging
Mattheo28
committed
completed merging with UIFix3
Mattheo28
committed
adding advanced queires
hwhh
committed
Merge branch 'merging' of https://github.com/hwhh/CMPS121GroupProject into UIFix3
hwhh
committed
adding personalised notifications
Mattheo28
committed
Merge branch 'UIFix3' of https://github.com/hwhh/CMPS121GroupProject into merging
Mattheo28
committed

Commits on Dec 8, 2017

update
Hailey Pun
committed
adding advanced queires
hwhh
committed
adding advanced queires
hwhh
committed
Merge branch 'UIFix4' of https://github.com/hwhh/CMPS121GroupProject into UIFix3
hwhh
committed
Update
Hailey Pun
committed
all my shit is done.
hwhh
committed
all my shit is done. mk2
hwhh
committed

Commits on Dec 10, 2017

all my shit is done. mk2
hwhh
committed
Edited event info page
Hailey Pun
committed
all my shit is done. mk2
hwhh
committed
all my shit is done. mk2
hwhh
committed
Merge branch 'UIFix3' into UICustomise
Hailey Pun
committed
Fixed button
Hailey Pun
committed
Changes
Hailey Pun
committed
More changes
Hailey Pun
committed
UI clean up
Hailey Pun
committed
adding personalised notifications
Mattheo28
committed
Merge branch 'UIFix3' of https://github.com/hwhh/CMPS121GroupProject into merging
Mattheo28
committed
personalised notifications work
Mattheo28
committed
notifications take you to notifications page and get removed when clicked
Mattheo28
committed
Merge branch 'UICustomise' of https://github.com/hwhh/CMPS121GroupProject into notifications
Mattheo28
committed
updated UI
Mattheo28
committed

Commits on Dec 11, 2017

code clean up
Mattheo28
committed