Commit Graph

478 Commits

Author SHA1 Message Date
357f51fd5e SnoozeDelayPickerActivity: Fix timepicker layout 2017-12-06 21:41:42 -06:00
0dc46d02a4 Minor style changes 2017-11-15 21:54:30 -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
0077d35ff9 Automatically dismiss summary notification 2017-11-14 23:03:46 -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
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
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
819a8d341f Merge branch 'llunak/custom_snooze' into dev 2017-10-09 19:16:57 -05:00
b8f7d4fad2 Add missing test screenshots 2017-10-04 21:43:34 -05:00
dea4e069c5 Add test screenshots for Oreo 2017-10-04 21:27:43 -05:00
223b8bc5ec Merge branch 'dev' into llunak/custom_snooze 2017-09-28 07:00:51 -05:00
ba78e563cd Merge branch 'keep_position' of git://github.com/llunak/uhabits into dev 2017-09-28 06:44:36 -05:00
acb94db6d6 Introduce failing test for bug #339 2017-09-28 06:40:06 -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
e970473876 make notification snooze popup follow night mode setting 2017-09-15 13:06:42 +02: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
aac59367dc properly handle the activity window of the snooze time dialog 2017-09-15 12:01:44 +02:00
Luboš Luňák
0421ca0549 make snooze time dialog follow night mode setting 2017-09-15 12:00:51 +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
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
dccf5eae47 Only use signing configuration if env variables are defined 2017-08-02 11:19:25 -04:00
b2a8c9c45f Remove PebbleReceiver 2017-07-26 11:39:02 -04:00
125a574ff9 Merge branch 'master' into dev 2017-07-26 10:37:08 -04:00
a75a27ad42 Make the day start at 3am instead of midnight
Closes #50
2017-07-25 20:18:01 -04:00
4126f01ef1 Reactivate proguard 2017-07-25 18:09:48 -04:00
864636705d Implement tests for Preferences 2017-07-24 09:54:51 -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
60c62b8609 Temporarily disable proguard 2017-07-23 13:50:33 -04:00
e5bc06c138 Increase time limit 2017-07-23 13:37:49 -04:00
89400e281e Move version numbers from build.gradle to gradle.properties 2017-07-23 10:03:09 -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
882ddba324 Fix acceptance tests 2017-07-22 09:28:30 -04:00