|
|
71d559d6d9
|
Merge branch 'dev' into feature/stackview
|
2018-02-04 09:52:16 -06:00 |
|
|
|
b94d2f2fa6
|
StackWidget: allow user to select habits
|
2018-01-27 20:34:11 -06:00 |
|
|
|
b46b7aae25
|
Merge branch 'feature/custom-snooze' into dev
|
2017-12-06 21:42:04 -06:00 |
|
|
|
ecf3086aef
|
Merge branch 'add-delete-button-to-stats' of git://github.com/derebaba/uhabits into pull/delete-button
|
2017-11-15 21:42:30 -06:00 |
|
|
|
2a4a7c975f
|
Add action to show reminder right now (for developers)
|
2017-11-14 22:35:37 -06:00 |
|
|
|
e91f1c3fa4
|
Merge branch 'dev' into feature/custom-snooze
|
2017-11-14 22:20:32 -06:00 |
|
|
|
9d48b4bcdb
|
Simplify code; change notification actions to Yes/No/Later
|
2017-11-14 22:07:52 -06:00 |
|
|
|
7f1a35ebe5
|
Merge branch 'dev' of git://github.com/rsri/uhabits into pull/cancel_notification
|
2017-11-14 21:54:16 -06:00 |
|
Victor Yu
|
8feb07ff1b
|
Code review changes; Made 'stack view' design available for all widgets
|
2017-11-08 21:03:06 -05:00 |
|
derebaba
|
1edd76ae8c
|
Added delete button to statistics screen
|
2017-11-02 14:21:27 +03: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 |
|
|
|
a201273781
|
Refactoring
|
2017-10-10 21:31:31 -05:00 |
|
|
|
223b8bc5ec
|
Merge branch 'dev' into llunak/custom_snooze
|
2017-09-28 07:00:51 -05:00 |
|
|
|
e911fb35b6
|
Better explain LED lights feature
|
2017-09-24 07:16:59 -05:00 |
|
Luboš Luňák
|
cec05ccbca
|
when asking for snooze delay, first show a list of common options
|
2017-09-15 13:06:37 +02:00 |
|
Luboš Luňák
|
43e802fb8e
|
implement custom snooze for notifications
|
2017-09-15 12:00:42 +02:00 |
|
Luboš Luňák
|
4d59783809
|
make LED blinking for notifications configurable
|
2017-09-11 15:18:42 +02:00 |
|
srikanth r
|
e041d9041b
|
Implemented cancel to reminders of habits.
|
2017-08-04 23:01:41 +05:30 |
|
|
|
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 |
|
|
|
fc4b610d59
|
Create android-base module
|
2017-06-05 15:58:42 -04:00 |
|
|
|
c34f9f9e9f
|
Merge branch 'dev' of https://github.com/austil/uhabits into pull/austil
|
2017-06-04 11:30:10 -04:00 |
|
|
|
c9b62669de
|
Merge branch 'dev' into modules
|
2017-05-28 09:44:55 -04:00 |
|
|
|
c20ca3921f
|
Rename android module to uhabits-android
|
2017-05-25 08:00:00 -04:00 |
|
