|
|
436d19dfea
|
Merge branch 'dev' into feature/stackview
# Conflicts:
# uhabits-android/src/main/java/org/isoron/uhabits/widgets/HabitPickerDialog.kt
|
2018-06-16 18:06:23 -05:00 |
|
|
|
6ca4877f1f
|
BarChart: allow user to pick interval
|
2018-06-15 21:11:47 -05:00 |
|
|
|
87f069f986
|
Merge branch 'master' into dev
|
2018-06-04 19:57:02 -05:00 |
|
|
|
b94d2f2fa6
|
StackWidget: allow user to select habits
|
2018-01-27 20:34:11 -06:00 |
|
Victor Yu
|
8feb07ff1b
|
Code review changes; Made 'stack view' design available for all widgets
|
2017-11-08 21:03:06 -05:00 |
|
Victor Yu
|
268cb0bc18
|
Can make either the normal checkmark widget or stackview checkmark widget
|
2017-10-15 20:44:21 -04:00 |
|
Victor Yu
|
5a78de5a25
|
Implemented ability to choose multiple habits for stackview
|
2017-10-15 13:36:54 -04:00 |
|
Victor Yu
|
82972d6e47
|
Implemented stackwidget style for checkmark widgets
|
2017-10-15 13:36:54 -04:00 |
|
|
|
180c18f6bf
|
Merge branch 'feature/kotlin' into dev
|
2017-07-21 18:12:45 -04:00 |
|
|
|
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 |
|
|
|
217516ad59
|
Create android-pickers module
|
2017-06-05 16:38:58 -04:00 |
|
|
|
c20ca3921f
|
Rename android module to uhabits-android
|
2017-05-25 08:00:00 -04:00 |
|
