Commit Graph

87 Commits

Author SHA1 Message Date
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
2f7509b94e Update test images (KitKat) 2017-07-21 19:31:37 -04:00
a5720e8d7f BaseViewTest: increase tolerance 2017-07-21 19:30:46 -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
122b300c50 Update view test images (KitKat) 2017-07-18 16:10:41 -04:00
Jude Ibe (Toochukwu)
02f9660fda Socket.io depreciated function
Kept socket.io to previous version in gradle.
2017-07-14 10:20:51 -05:00
bb282da92d Fix tests 2017-06-23 16:25:25 -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
1976160ae8 Move tests to uhabits-core 2017-06-20 22:20:46 -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
edeba897fb Implement SQLiteRepository 2017-06-19 09:22:48 -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
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
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
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