Merge branch 'SHCS_url' of https://git.epfl.ch/repo/genomeprivacy into SHCS_url
Conflicts:
.gitignore
project/PPPClient/src/database/DBconnectorClient.java
project/PPPCommons/src/database/DBConnection.java
Description
Description
Details
Details
- Committed
Franck Youssef <franck.youssef@epfl.ch> Aug 28 2014, 16:24 - Pushed
raisaro Apr 20 2017, 12:42 - Parents
- R3229:cb36b03addb8: added mobile app /gen to gitignore.
R3229:a18b6fa30de2: Parsing hacked in order to avoid Request for Change at SHCS. - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| cb36b03addb8 | Franck Youssef | added mobile app /gen to gitignore. | Jul 28 2014 | |||
| 16a2f1e72460 | Franck Youssef | Parsing hacked in order to avoid Request for Change at SHCS. | Jul 28 2014 | |||
| ce693d7c39d4 | Franck Youssef | modif requested from Vallet. | Jul 23 2014 | |||
| 0a7d469ac312 | Franck Youssef | use URL to call web service. Cannot test: services not online. | Jul 21 2014 | |||
| 762c7435b506 | Franck Youssef | Removed old crypto | Jul 21 2014 | |||
| 9a8167eeb45c | Franck Youssef | code cleanup | Jul 21 2014 | |||
| 9a8fff335330 | Franck Youssef | MS_ACCESS: working version with local database. | Jul 21 2014 | |||
| 5684e1ecab64 | Franck Youssef | client database methods cleanup | Jul 21 2014 |