Commit Graph

1098 Commits

Author SHA1 Message Date
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
edeba897fb Implement SQLiteRepository 2017-06-19 09:22:48 -04:00
e4b9c50ee2 Update Gradle plugin 2017-06-19 09:22:30 -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
526830ba61 Merge branch 'hotfix/1.7.5' v1.7.5 2017-06-10 18:56:22 -04:00
fe1513bb64 Fix race conditions on SQLiteScoreList 2017-06-10 16:48:53 -04:00
e06ace9ea8 Fix ArrayIndexOutOfBoundsException on FrequencyChart 2017-06-10 15:38:21 -04:00
d727dabb2b Fix snooze button on notifications 2017-06-10 15:30:51 -04:00
d17e8fcbfb Bump version to 1.7.5 2017-06-10 15:28:12 -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
fc4b610d59 Create android-base module 2017-06-05 15:58:42 -04:00
382b52e5b2 Merge tag 'v1.7.4' into dev
1.7.4

# Conflicts:
#	app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteCheckmarkList.java
#	app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteScoreList.java
#	uhabits-core/src/main/java/org/isoron/uhabits/core/models/ScoreList.java
2017-06-05 09:20:47 -04:00
be3d7145ab Merge branch 'hotfix/1.7.4' v1.7.4 2017-06-04 17:36:17 -04:00
cf66587644 ScoreList: make getValue synchronized 2017-06-04 17:29:41 -04:00
0dc9ec2e5f Expire caches on SQLite lists 2017-06-04 17:24:18 -04:00
0a375ded96 Silently ignore missing habits 2017-06-04 17:07:07 -04:00
fa5d6f8fee Bump version 2017-06-04 17:01:40 -04:00
277738f94d Fix default color and failing tests 2017-06-04 13:14:45 -04:00
cf25229fbc Merge branch 'dev' into pull/austil 2017-06-04 12:59:15 -04:00
7652d71c94 Uninstall test APK before running tests 2017-06-04 12:46:30 -04:00
74e0dcf706 Disable PebbleReceiver tests on KitKat 2017-06-04 12:46:16 -04:00
4e1cc6dc80 Fix tests for KitKat 2017-06-04 12:21:29 -04:00
c34f9f9e9f Merge branch 'dev' of https://github.com/austil/uhabits into pull/austil 2017-06-04 11:30:10 -04:00
ed9066f393 Implement alternative checkmark algorithm
Fix failing tests
2017-06-04 10:58:00 -04:00
96e1771c25 Remove inferred tables from SQLite database 2017-06-03 10:51:17 -04:00
austil
d0d3c7eef5 More Colors - requested changes 2017-06-03 15:16:09 +02:00
6875fc0428 Move notifications and reminders to uhabits-core 2017-06-02 19:30:39 -04:00
b88b3a683d Move preferences to uhabits-core 2017-06-02 18:24:12 -04:00
d97f94075d Implement widget test 2017-06-02 15:25:24 -04:00
28f095e56a Implement additional UI tests 2017-06-02 14:45:06 -04:00
ead87519b1 UI tests: reset state programmatically 2017-06-02 13:16:15 -04:00
7cfe3355e4 Downgrade Mockito to 1.0 on AndroidTest 2017-06-01 21:55:13 -04:00
a51ecaaf24 Annotate all Android tests 2017-06-01 21:55:13 -04:00
322645da9b Update badge link 2017-05-31 21:35:07 -04:00
5eb63df633 Merge branch 'modules' into dev 2017-05-31 21:17:28 -04:00
e4b5a3ea45 Implement acceptance tests for some basic features 2017-05-31 18:24:22 -04:00
88c1e73720 Merge tag 'v1.7.3' into dev
1.7.3
2017-05-30 11:11:42 -04:00
0393e58d3b Merge tag 'v1.7.3' into dev
1.7.3
2017-05-30 10:38:07 -04:00
534e6c2d9d Merge branch 'hotfix/1.7.3' v1.7.3 2017-05-30 09:34:12 -04:00
b6501c9a29 Fix NullPointerException 2017-05-30 09:22:15 -04:00
238a1c724d Bump version and update changelog 2017-05-30 09:06:50 -04:00
34ca9d17a2 Make usage of BundleSavedState more robust 2017-05-30 09:05:05 -04:00
6ccfb53329 Add missing tests for RepetitionList and Habit 2017-05-30 08:19:28 -04:00
8a29fbf07d Merge branch 'hotfix/1.7.3' into modules
# Conflicts:
#	uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java
#	uhabits-android/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteScoreList.java
#	uhabits-core/src/main/java/org/isoron/uhabits/core/models/CheckmarkList.java
2017-05-29 22:55:08 -04:00