87f069f986
Merge branch 'master' into dev
2018-06-04 19:57:02 -05:00
ce27773138
Merge branch 'hotfix/1.7.9'
2018-04-21 10:31:54 -05:00
0864f83307
Update CHANGELOG
2018-04-21 10:17:38 -05:00
624cc67d9b
Update translations
2018-04-21 10:17:31 -05:00
462bac8167
Add support for adaptive icons
...
Closes #395
2018-04-21 09:39:30 -05:00
5865eb41f7
Update notification for Android Oreo
...
- Add link to notification channel settings
- Remove snooze button
Closes #400
2018-04-21 08:50:53 -05:00
2bfd4a942d
Remove unused PebbleReceiverTest
2018-04-21 08:00:00 -05:00
b4a33cba39
Add ActiveAndroid source code to our tree and remove content providers
...
ActiveAndroid is not actively maintained anymore and contains code
related to that Content Providers that makes the application crash on
Android Oreo.
2018-04-14 10:22:31 -05:00
f02c86e61b
Bump targetSdkVersion to 27
2018-04-14 10:19:34 -05:00
5021f50e18
Bump version to 1.7.9 (36)
2018-04-14 08:11:22 -05:00
bf8c14fc03
Fix reminder tests
2017-12-06 22:23:28 -06:00
b46b7aae25
Merge branch 'feature/custom-snooze' into dev
2017-12-06 21:42:04 -06:00
357f51fd5e
SnoozeDelayPickerActivity: Fix timepicker layout
2017-12-06 21:41:42 -06:00
7f257e045b
MemoryHabitList: iterate over a copy of the list
2017-12-04 23:13:31 -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
derebaba
10be875b48
Fixed test
2017-11-15 10:57:00 +03: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
derebaba
1edd76ae8c
Added delete button to statistics screen
2017-11-02 14:21:27 +03:00
7613e6e1cb
Update to Android Studio 3.0 stable
2017-10-29 14:43:17 -05:00
5629a28823
Merge pull request #348 from llunak/fix_synchronized
...
synchronize HabitList properly
2017-10-26 19:54:51 -05:00
Luboš Luňák
b1c2ab90d3
synchronize HabitList properly
...
When the app is not running and ReminderReceiver receives ACTION_SHOW_REMINDER,
the (SQLite)HabitList will start loading its data in the background for some
reason, and if the loading takes a moment, ReminderReceiver will call
the unsynchronized HabitList.getById() before the loading finishes,
failing to find the habit for which to show the notification.
2017-10-18 15:17:31 +02: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
07c7234bfc
Merge branch 'master' into dev
2017-09-30 13:40:09 -05:00
bf3964a231
Merge branch 'hotfix/1.7.7'
2017-09-30 13:27:45 -05:00
657cde75d8
Disable signing config
2017-09-30 13:18:26 -05:00
c56b86d32c
Bump version again
...
The previous number was already in use by an alpha version
2017-09-30 13:14:42 -05:00
16f20d50a0
Fix bug that caused reminders to keep repeating every few seconds
...
Fixes #351
2017-09-30 13:11:40 -05:00
7bb88dcb97
Bump version and update CHANGELOG
2017-09-30 12:59:02 -05:00
223b8bc5ec
Merge branch 'dev' into llunak/custom_snooze
2017-09-28 07:00:51 -05:00
Luboš Luňák
e052a144bd
fix testTruncate_dayOfWeek failing with some locales
2017-09-28 06:55:13 -05:00
Luboš Luňák
318caa886c
fix csv export with locales that do not use dot as decimal separator
2017-09-28 06:55:13 -05:00
Luboš Luňák
46c61f9ea9
force US locale for tests
2017-09-28 06:55:13 -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
6c66078a65
Merge pull request #337 from llunak/export_name
...
fix name of exported files (correct the time)
2017-09-27 20:32:26 -05:00
Luboš Luňák
be9c2ff64d
fix name of exported files (correct the time)
...
This reverts part of a75a27ad
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
d1490ee771
Update Gradle and Android plugin
2017-09-24 06:05:29 -05:00
6d44b4124d
Merge pull request #333 from llunak/fix_sql
...
avoid sql error when updating sql database
2017-09-21 07:01:59 -05:00
