Commit Graph

78 Commits

Author SHA1 Message Date
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
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
5ccd546958 Merge branch 'dev' of git://github.com/TruffelNL/uhabits into dev
# Conflicts:
#	uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.kt
2017-11-14 21:45:56 -06:00
derebaba
1edd76ae8c Added delete button to statistics screen 2017-11-02 14:21:27 +03:00
ba78e563cd Merge branch 'keep_position' of git://github.com/llunak/uhabits into dev 2017-09-28 06:44:36 -05:00
Luboš Luňák
d2cc283bd5 don't reset habit position when editing it 2017-09-28 13:03:34 +02:00
Luboš Luňák
be9c2ff64d fix name of exported files (correct the time)
This reverts part of a75a27ad, where this got changed presumably by mistake.
2017-09-27 20:13:29 +02:00
bb22972eb2 Minor code style changes 2017-09-24 07:19:35 -05:00
e911fb35b6 Better explain LED lights feature 2017-09-24 07:16:59 -05:00
Luboš Luňák
4d59783809 make LED blinking for notifications configurable 2017-09-11 15:18:42 +02:00
Luboš Luňák
a680d57cac make notifications also blink the LED 2017-09-11 13:46:49 +02:00
TruffelNL
f6620be2d9 Removed an if statement
Removed the check if a summary was already shown.
2017-08-15 23:44:41 +02:00
TruffelNL
1c2abb543b Added private variables 2017-08-15 23:09:19 +02:00
TruffelNL
87cf2871a7 Added bundled notifications
Added bundled/grouped/stacked notifications as per https://github.com/iSoron/uhabits/issues/243
2017-08-15 23:02:58 +02:00
srikanth r
e041d9041b Implemented cancel to reminders of habits. 2017-08-04 23:01:41 +05:30
b2a8c9c45f Remove PebbleReceiver 2017-07-26 11:39:02 -04:00
a75a27ad42 Make the day start at 3am instead of midnight
Closes #50
2017-07-25 20:18:01 -04:00
c05f50998f Add branch and commit hash to version name 2017-07-24 00:14:46 -04:00
47e279b3b3 Update SharedPreferencesStorage 2017-07-23 20:14:12 -04:00
57dc19550d Fix errors 2017-07-22 20:05:01 -04:00
a8aa6f192c Replace Long by Timestamp 2017-07-22 16:29:08 -04:00
c7aaa98935 Convert widget providers to Kotlin 2017-07-21 18:32:13 -04:00
efcb5710c0 Convert more classes to Kotlin 2017-07-21 18:32:03 -04:00
3783fd8506 Convert RingtoneManager to Kotlin 2017-07-21 18:31:49 -04:00
6f80a9c030 Convert intents and notifications to Kotlin 2017-07-21 18:17:42 -04:00
a02376497a Convert automation and database packages to Kotlin 2017-07-21 18:17:28 -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
8ccada67d6 Import Loop DB without app restart 2017-06-23 10:24:54 -04:00
5d9563b9d8 Fix handling of null values in AndroidDatabase 2017-06-23 09:14:36 -04:00
ea640a8a17 Rebuild order after removing habit 2017-06-22 22:50:27 -04:00
6801d1d1ae Add more constraints on table Repetitions 2017-06-21 13:18:29 -04:00
1069fcfc62 Move importers to uhabits-core 2017-06-21 00:30:32 -04:00
59745fb90f Refactor Android database classes 2017-06-20 22:37:35 -04:00
6dd7e49112 Move database migrations to uhabits-core 2017-06-20 21:46:30 -04:00
ecb5352134 Implement JDBC database 2017-06-20 14:13:37 -04:00
b96385c4a7 Move models.sqlite to uhabits-core 2017-06-20 12:50:57 -04:00
96c1a046d4 Merge branch 'feature/raw-sqlite' into dev 2017-06-20 10:43:04 -04:00
00660d3e36 Make filtered MemoryHabitLists update automatically 2017-06-20 10:34:21 -04:00
PrototypeNM1
b14ca5c625 Don't list archived Habits when creating Widgets. (#309)
Fixes #283
2017-06-20 06:07:15 -04:00
71fe6137be Remove old database migrations; add missing ones 2017-06-19 12:08:06 -04:00
0a5d565030 Remove dependency: ActiveAndroid 2017-06-19 11:12:31 -04:00
6d06e06840 Simplify SQLite lists 2017-06-19 09:23:40 -04:00
af7c4e227d Fix merge 2017-06-10 19:34:44 -04:00
96ab887545 Merge tag 'v1.7.5' into dev
1.7.5
2017-06-10 18:59:28 -04:00
f8a9da59dd Simplify ListHabitsActivity 2017-06-05 22:56:08 -04:00
50a6c6d9dd Remove unused code 2017-06-05 18:11:30 -04:00
8d181a6683 Simplify ShowHabitActivity 2017-06-05 18:01:13 -04:00
217516ad59 Create android-pickers module 2017-06-05 16:38:58 -04:00