- Ersare, Jerker - jerker@soundandvision.se - tville
- Ghezai, Aman - gusghezam@student.gu.se - amuhotmax
- Kahler, Jonas - jonas.kahler@icloud.com - TacoVox
- Karlberg, Dennis - realdkk@gmail.com - DKarlberg
- le Comte, Niklas - niklas.lecomte@hotmail.com - salkin91
- Vryashkov, Ivo - ivo.vryashkov@gmail.com - vryashkov
##Last Week Changes (After final presentation)
- Scroling on the map is not possible while distracted
- Profile button disappears while distracted
- Toasts for telling the user if he follows himself/friends and how to quit, and when the user has clicked to stop following.
- Push notifications added for messages and new friends
- Application handles the android garbage collection better and doesn't crash after being in the background for a while
This repository was created after the alpha presentation bacause we had problems with .gitignore and for that reason we dont have any commits before the 24th of march in this repo. All the things we had were added to this repo the 24th of march or later.
- Username: alfons
- Password: 1234
- Trux - Report
- Trux - Backlog (Not 100% accurate but provided for reference)
- Trux - Developer's Manual
- Trux - Client/User Manual
- Trux - JavaDoc
- TruxServer - Setup Manual
- TruxServer - JavaDoc
- Semester 2 - General Documentation + Files
- Jenkins Trux App // Trux Server
- SonarQube Trux Server
We are working in three different main branches:
- Master --> NO CHANGES IN THIS BRANCH (Edit: only when handing in...)
- Release --> We will merge down in this just as soon as we will release a version (for example BETA)
- Devel --> This is our main development branch. This branch is there to merge down each features - it will help us to synchronize the work.
- Feature --> For each feature we need to create a new feature. After the work is done we need to merge this branch down to devel.
To work with a lot of branches we need to have a "branching discipline":
- Before starting to work on a feature run git checkout devel to go to the devel branch.
- Fetch the current devel branch with git pull origin devel
- After this is done merge out with your new feature branch: git branch YOUR_BRANCHNAME
- Go to that branch and make your changes: git checkout YOUR_BRANCHNAME
- Initial commit to our server with: git push origin YOUR_BRANCHNAME
- Do your usual stuff: git add FILES and git commit -m "YOUR MESSAGE"
- Finally push everything to the server: git push origin YOUR_BRANCHNAME
- After you have done your work you want to merge down to devel. Go down to devel: git checkout devel
- Then it's time for your first merge. Be careful and propably talk to the others... Avoid working on the same files
- git merge YOUR_BRANCHNAME will merge devel with your branch.
- git push origin devel to finish the successful working day.
If you want to work on that feature the next day you need to do one more step: git branch -d YOUR_BRANCHNAME After that continue with the steps described above.
Cheers. Jonas :)
