Homec4science
Diffusion Genome Privacy - SHCS App d1efb3079399

Merge branch 'mobile_app' of https://git.epfl.ch/repo/genomeprivacy into…
d1efb3079399
Actions

Authored by Franck Youssef <franck.youssef@epfl.ch> on Jul 17 2014, 16:20.

Description

Merge branch 'mobile_app' of https://git.epfl.ch/repo/genomeprivacy into mobile_app

Conflicts:
.gitignore
project/PPPClientMobile/AndroidManifest.xml
project/PPPClientMobile/res/layout/activity_add_patient.xml
project/PPPClientMobile/res/layout/activity_main.xml
project/PPPClientMobile/res/values/strings.xml
project/PPPClientMobile/src/ch/epfl/pharma/MainActivity.java
project/PPPClientMobile/src/ch/epfl/pharma/database/DatabaseHelper.java
project/PPPClientMobile/src/ch/epfl/pharma/framework/Patient.java

Details

Committed
Franck Youssef <franck.youssef@epfl.ch>Jul 17 2014, 16:20
Pushed
raisaroApr 20 2017, 12:42
Parents
R3229:d6741f458e8f: MINOR: project preferencies
R3229:d92cd7722568: MINOR: big progress in the app.
Branches
Unknown
Tags
Unknown

Event Timeline

Franck Youssef <franck.youssef@epfl.ch> committed R3229:d1efb3079399: Merge branch 'mobile_app' of https://git.epfl.ch/repo/genomeprivacy into… (authored by Franck Youssef <franck.youssef@epfl.ch>).Jul 17 2014, 16:20

Merged Changes

CommitAuthorDetailsCommitted
d6741f458e8fFranck Youssef
MINOR: project preferencies 
Jul 14 2014
faa7327c8c80Franck Youssef
MAJOR: added multiple activities. Migrated client database to sqlite. 
Jul 14 2014
192d9b637486Franck Youssef
stop tracking R.java 
Jul 8 2014
16d996005c8bFranck Youssef
fixed git ignore 
Jul 8 2014
8538d3b8cd7fFranck Youssef
Merge branch 'mobile_app' of https://git.epfl.ch/repo/genomeprivacy into… 
Jul 8 2014
42140283e34bFranck Youssef
MOBILE: sample app working on device. 
Jul 8 2014
f353594b7986Franck Youssef
DOC: how to connect Samsung device to computer 
Jul 8 2014
69ff27d2b4cdFranck Youssef
MAJOR: migration from BouncyCastle to SpongyCastle provider. 
Jul 8 2014
8f173762381dFranck Youssef
MINOR: cleanup old test classes SOAP 
Jul 8 2014
09d5fa445005Franck Youssef
MOBILE: clean start 
Jul 8 2014
4c93ed081dfcFranck Youssef
MINOR: cleanup in test app 
Jul 8 2014
b772c2ef63d1Franck Youssef
MAJOR: created sample app for Android 
Jul 8 2014
f79e55df52b3Franck Youssef
MINOR: cleanup in test app 
Jun 20 2014
2a06312ecc9cFranck Youssef
MAJOR: created sample app for Android 
Jun 20 2014

Changes (36)

Path
Aproject/PPPClientMobile/.classpath
Pproject/PPPClientMobile/.project
Copied from project/GenomicPrivacy(android)/GenomicPrivacy/.project
Pproject/PPPClientMobile/ic_launcher-web.png
Copied from project/GenomicPrivacy(android)/GenomicPrivacy/ic_launcher-web.png
A(dir)project/PPPClientMobile/libs/
Aproject/PPPClientMobile/libs/android-support-v4.jar
Pproject/PPPClientMobile/proguard-project.txt
Copied from project/GenomicPrivacy(android)/GenomicPrivacy/proguard-project.txt
Aproject/PPPClientMobile/project.properties
A(dir)project/PPPClientMobile/res/drawable-hdpi/
Pproject/PPPClientMobile/res/drawable-hdpi/ic_launcher.png
Copied from project/GenomicPrivacy(android)/GenomicPrivacy/res/drawable-hdpi/ic_launcher.png
Pproject/PPPClientMobile/res/drawable-mdpi/ic_launcher.png
Copied from project/GenomicPrivacy(android)/GenomicPrivacy/res/drawable-mdpi/ic_launcher.png
A(dir)project/PPPClientMobile/res/drawable-xhdpi/
Pproject/PPPClientMobile/res/drawable-xhdpi/ic_launcher.png
Copied from project/GenomicPrivacy(android)/GenomicPrivacy/res/drawable-xhdpi/ic_launcher.png
Pproject/PPPClientMobile/res/drawable-xxhdpi/ic_launcher.png
Copied from project/GenomicPrivacy(android)/GenomicPrivacy/res/drawable-xxhdpi/ic_launcher.png
Pproject/PPPClientMobile/res/menu/login.xml
Copied from project/GenomicPrivacy(android)/GenomicPrivacy/res/menu/jajajaj.xml
Pproject/PPPClientMobile/res/menu/main.xml
Copied from project/PPPClientMobile/res/menu/add_patient.xml
P(dir)project/PPPClientMobile/res/values-large/
Copied from project/GenomicPrivacy(android)/GenomicPrivacy/res/values-large
Pproject/PPPClientMobile/res/values-large/styles.xml
Copied from project/GenomicPrivacy(android)/GenomicPrivacy/res/values-large/styles.xml
P(dir)project/PPPClientMobile/res/values-sw600dp/
Copied from project/GenomicPrivacy(android)/GenomicPrivacy/res/values-sw600dp
Pproject/PPPClientMobile/res/values-sw600dp/dimens.xml
Copied from project/GenomicPrivacy(android)/GenomicPrivacy/res/values-sw600dp/dimens.xml
P(dir)project/PPPClientMobile/res/values-sw720dp-land/
Copied from project/GenomicPrivacy(android)/GenomicPrivacy/res/values-sw720dp-land
Pproject/PPPClientMobile/res/values-sw720dp-land/dimens.xml
Copied from project/GenomicPrivacy(android)/GenomicPrivacy/res/values-sw720dp-land/dimens.xml
A(dir)project/PPPClientMobile/res/values-v11/
Pproject/PPPClientMobile/res/values-v11/styles.xml
Copied from project/GenomicPrivacy(android)/GenomicPrivacy/res/values-v11/styles.xml
A(dir)project/PPPClientMobile/res/values-v14/
Pproject/PPPClientMobile/res/values-v14/styles.xml
Copied from project/GenomicPrivacy(android)/GenomicPrivacy/res/values-v14/styles.xml
A(dir)project/PPPClientMobile/res/values-w820dp/
Aproject/PPPClientMobile/res/values-w820dp/dimens.xml
Aproject/PPPClientMobile/res/values/strings_activity_login.xml
Aproject/PPPClientMobile/res/values/strings_activity_settings.xml
Aproject/PPPClientMobile/res/values/styles.xml
A(dir)project/PPPClientMobile/res/xml/
Aproject/PPPClientMobile/res/xml/pref_data_sync.xml
Aproject/PPPClientMobile/res/xml/pref_general.xml
Aproject/PPPClientMobile/res/xml/pref_headers.xml
Aproject/PPPClientMobile/res/xml/pref_notification.xml
Pproject/PPPClientMobile/src/ch/epfl/pharma/AddPatient.java
Copied from project/PPPClientMobile/src/ch/epfl/pharma/AddPatientActivity.java

R3229:d1efb3079399

View Options

project/PPPClientMobile/.classpath

Loading...
View Options

project/PPPClientMobile/.project

Loading...
View Options

project/PPPClientMobile/ic_launcher-web.png

Loading...
View Options

project/PPPClientMobile/libs/android-support-v4.jar

Loading...
View Options

project/PPPClientMobile/proguard-project.txt

Loading...
View Options

project/PPPClientMobile/project.properties

Loading...
View Options

project/PPPClientMobile/res/drawable-hdpi/ic_launcher.png

Loading...
View Options

project/PPPClientMobile/res/drawable-mdpi/ic_launcher.png

Loading...
View Options

project/PPPClientMobile/res/drawable-xhdpi/ic_launcher.png

Loading...
View Options

project/PPPClientMobile/res/drawable-xxhdpi/ic_launcher.png

Loading...
View Options

project/PPPClientMobile/res/menu/login.xml

Loading...
View Options

project/PPPClientMobile/res/menu/main.xml

Loading...
View Options

project/PPPClientMobile/res/values-large/styles.xml

Loading...
View Options

project/PPPClientMobile/res/values-sw600dp/dimens.xml

Loading...
View Options

project/PPPClientMobile/res/values-sw720dp-land/dimens.xml

Loading...
View Options

project/PPPClientMobile/res/values-v11/styles.xml

Loading...
View Options

project/PPPClientMobile/res/values-v14/styles.xml

Loading...
View Options

project/PPPClientMobile/res/values-w820dp/dimens.xml

Loading...
View Options

project/PPPClientMobile/res/values/strings_activity_login.xml

Loading...
View Options

project/PPPClientMobile/res/values/strings_activity_settings.xml

Loading...
View Options

project/PPPClientMobile/res/values/styles.xml

Loading...
View Options

project/PPPClientMobile/res/xml/pref_data_sync.xml

Loading...
View Options

project/PPPClientMobile/res/xml/pref_general.xml

Loading...
View Options

project/PPPClientMobile/res/xml/pref_headers.xml

Loading...
View Options

project/PPPClientMobile/res/xml/pref_notification.xml

Loading...
View Options

project/PPPClientMobile/src/ch/epfl/pharma/AddPatient.java

Loading...
c4science · Help