Commit Graph

52 Commits

Author SHA1 Message Date
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
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
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
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
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
745d07024c Remove unused permissions 2017-05-29 08:37:49 -04:00
94025c5262 Add test for BundleSavedState 2017-05-28 22:26:36 -04:00
ab09eb8a03 Update CI build script 2017-05-28 17:04:04 -04:00
e826c80ff2 Fix Android tests 2017-05-28 15:26:28 -04:00
6255fe2d12 Make generated classes work on Android Studio 2017-05-28 11:39:07 -04:00
1746920699 Rename uhabits-core package 2017-05-28 11:38:20 -04:00
c9b62669de Merge branch 'dev' into modules 2017-05-28 09:44:55 -04:00
56c5fb6c9d Write missing tests 2017-05-27 22:46:33 -04:00
d8d4c4f55e Write tests for ListHabits behaviors 2017-05-27 20:33:30 -04:00
70423ddb0a Move ListHabits controllers to uhabits-core 2017-05-27 18:52:06 -04:00
94c70485b7 Remove unit tests for uhabits-android 2017-05-27 10:31:05 -04:00
3e558be4d4 Move ListHabitsBehavior to uhabits-core 2017-05-26 22:04:59 -04:00
fa4944700c Move UI behavior to uhabits-core 2017-05-26 16:33:21 -04:00
df0cf57984 Move tests to androidTest 2017-05-25 18:41:59 -04:00
29d1de46e7 Reorganize tests 2017-05-25 15:59:03 -04:00
cb4ab3b436 Move ExportCSVTask to uhabits-core 2017-05-25 12:50:38 -04:00
370e7343d7 Move commands to uhabits-core 2017-05-25 10:00:56 -04:00
acd653db70 Create org.isoron.androidbase package 2017-05-25 09:31:54 -04:00
51ca4aa98e Move remaining model classes 2017-05-25 08:54:21 -04:00
d23b59ced2 Move some models 2017-05-25 08:24:22 -04:00