Alinson Xavier
|
6a3e430a5e
|
Merge pull request #438 from vyu1/dev
Add name (Victor Yu) to developer list
|
2018-09-18 19:04:27 -05:00 |
|
Victor Yu
|
07efa8b321
|
Add name (Victor Yu) to developer list
|
2018-09-17 23:31:50 -04:00 |
|
Alinson S Xavier
|
87f069f986
|
Merge branch 'master' into dev
|
2018-06-04 19:57:02 -05:00 |
|
Alinson Xavier
|
2db4c06fe8
|
Merge branch 'master' into dev
# Conflicts:
# app/src/androidTest/java/org/isoron/uhabits/espresso/MainTest.java
# app/src/androidTest/java/org/isoron/uhabits/models/sqlite/SQLiteCheckmarkListTest.java
# app/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.java
# app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteCheckmarkList.java
# app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteScoreList.java
# app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteStreakList.java
# app/src/main/java/org/isoron/uhabits/models/sqlite/records/CheckmarkRecord.java
# uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java
# uhabits-android/src/main/res/values-id/strings.xml
# uhabits-android/src/test/java/org/isoron/uhabits/receivers/ReminderControllerTest.java
|
2017-07-18 22:54:52 -04:00 |
|
Alinson Xavier
|
c20ca3921f
|
Rename android module to uhabits-android
|
2017-05-25 08:00:00 -04:00 |
|