 Umberto Furno
|
8b6104e0fa
|
Merge remote-tracking branch 'origin/feature_integrate_login' into feature_board_view
continuous-integration/drone/push Build is failing
Details
# Conflicts:
# app/build.gradle
# app/src/main/AndroidManifest.xml
# app/src/main/java/it/unisannio/ding/ids/wedroid/app/MainActivity.kt
# app/src/main/java/it/unisannio/ding/ids/wedroid/app/util/PreferenceReader.java
# app/src/main/java/it/unisannio/ding/ids/wedroid/app/util/PreferenceWriter.java
# app/src/main/java/it/unisannio/ding/ids/wedroid/app/util/ServicesFactory.kt
# app/src/main/java/it/unisannio/ding/ids/wedroid/app/util/SharedPreferenceHelper.kt
# app/src/main/res/layout/activity_main.xml
# app/src/main/res/values/dimens.xml
# app/src/main/res/values/strings.xml
# app/src/main/res/values/styles.xml
# build.gradle
|
2020-01-10 16:27:30 +01:00 |
|
Umberto Furno
|
7295be413d
|
integration branch
|
2020-01-09 14:41:47 +01:00 |
|
Umberto Furno
|
bb4b4a91c8
|
Resolved merge conflict
|
2020-01-08 15:39:33 +01:00 |
|
Umberto Furno
|
fda86e1f10
|
Add util and persistence
continuous-integration/drone/push Build is passing
Details
|
2019-12-28 19:09:40 +01:00 |
 Raffaele Mignone
|
27113a530f
|
fix formatting
|
2019-12-12 20:23:55 +01:00 |
 noemi3
|
d1636ac9d9
|
add shared preference
continuous-integration/drone/push Build is passing
Details
|
2019-11-29 09:51:46 +01:00 |