Commit graph

1837 commits

Author SHA1 Message Date
Phillip Thelen
6d8c43950f Merge branch 'develop' into chatrewrite
# Conflicts:
#	Habitica/AndroidManifest.xml
#	Habitica/src/main/java/com/habitrpg/android/habitica/HabitDatabase.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RemoteConfigManager.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/utils/DateDeserializer.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskListDeserializer.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskSerializer.java
#	Habitica/src/test/java/com/habitrpg/android/habitica/api/BaseAPITests.java
#	build.gradle
2017-06-19 12:32:30 +02:00
Phillip Thelen
60bb39e4bf update gradle plugin 2017-06-19 12:20:10 +02:00
Phillip Thelen
0f6568dc69 fix wrong type 2017-06-07 11:35:16 -07:00
Phillip Thelen
bb6565b688 fix minor issues 2017-06-07 10:51:23 -07:00
Phillip Thelen
c2269f0da0 fix widget issues 2017-06-07 09:31:36 -07:00
Phillip Thelen
ed5a5a42c2 fix various issues 2017-06-06 14:26:37 -07:00
Phillip Thelen
1f88ca56fb bump version number 2017-06-02 16:53:45 +02:00
Phillip Thelen
751146f5dc fix monthlies 2017-06-02 14:29:30 +02:00
Phillip Thelen
6d386f75c6 Merge pull request #776 from TheHollidayInn/repeatables-edit-fixes
Added syncing and corrected saving of repeatable fields
2017-06-02 12:07:07 +02:00
Phillip Thelen
4b565d24e2 change display for active filter in task list
See #770
2017-06-01 22:53:46 +02:00
Keith Holliday
d2b5336a05 Added deserialize for monthly options 2017-06-01 14:12:31 -06:00
Keith Holliday
08a61e71f7 Added syncing and corrected saving of repeatable fields 2017-06-01 12:41:16 -06:00
Phillip Thelen
af57a8d536 display long guilds list correctly. Fixes #772 2017-06-01 17:51:00 +02:00
Phillip Thelen
38c515c518 Fix various crashes 2017-06-01 15:25:23 +02:00
Phillip Thelen
d89da9664a fix launch crash 2017-05-25 18:09:22 +02:00
Phillip Thelen
9fa6dbf821 improve content loading 2017-05-25 16:21:31 +02:00
Phillip Thelen
2a193a60ad improve error reporting 2017-05-25 15:16:00 +02:00
Phillip Thelen
8949f6a625 improve party loading 2017-05-25 13:10:49 +02:00
Phillip Thelen
95a217ea3f fix various crashes 2017-05-25 12:38:23 +02:00
Phillip Thelen
e70db4f4f1 bump version number 2017-05-25 10:01:52 +02:00
Phillip Thelen
f2739bc30c fix issue with loading tasks 2017-05-25 09:51:05 +02:00
Phillip Thelen
9063705c99 add tests for UserRepository 2017-05-25 09:30:05 +02:00
Phillip Thelen
5eaea1a408 fix task list widget 2017-05-24 18:40:50 +02:00
Phillip Thelen
9babcac69a remove unused tests 2017-05-24 18:32:35 +02:00
Phillip Thelen
95cb463b4e fix typo 2017-05-24 15:43:44 +02:00
Phillip Thelen
dbfa12c830 use mock realm in tests 2017-05-24 15:38:57 +02:00
Phillip Thelen
fb18520da6 fix realm issue in tests 2017-05-24 14:01:21 +02:00
Phillip Thelen
44977a4d10 fix tests 2017-05-24 13:24:35 +02:00
Phillip Thelen
2f4c7c435b fix preference saving 2017-05-23 19:52:28 +02:00
Phillip Thelen
44f954ee61 fix some crashes 2017-05-23 19:26:33 +02:00
Phillip Thelen
52f421d71b Redo party view 2017-05-23 17:40:33 +02:00
Phillip Thelen
0431e64c19 fix crashes when loading rewards 2017-05-23 17:40:33 +02:00
Phillip Thelen
6271f5303b display party members 2017-05-23 17:40:33 +02:00
Phillip Thelen
c62227fc97 fix various crashes 2017-05-23 17:40:33 +02:00
Phillip Thelen
889ec32323 update realm 2017-05-23 17:40:33 +02:00
Phillip Thelen
3c14449dd3 fix logging out 2017-05-23 17:40:33 +02:00
Phillip Thelen
0b1209c62b fix release build 2017-05-19 15:44:21 +02:00
Phillip Thelen
1c057cb0b0 bump version number 2017-05-19 15:44:21 +02:00
Phillip Thelen
0091a50d59 Correctly delete old local data 2017-05-19 14:15:00 +02:00
Phillip Thelen
fead28b8a3 fix challenge filtering 2017-05-19 13:13:06 +02:00
Phillip Thelen
d4dfbbfbc5 fix crashes 2017-05-18 18:09:41 +02:00
Phillip Thelen
d0645de11f readd pausing dailies 2017-05-18 15:48:42 +02:00
Phillip Thelen
9f8b9b1bf0 remove unused classes 2017-05-18 14:26:45 +02:00
Phillip Thelen
57f5d59ec3 improve stability 2017-05-17 22:04:13 +02:00
Phillip Thelen
fcd5864e37 Fix equipment buying 2017-05-15 14:38:46 +02:00
Phillip Thelen
4870eaea90 remove databinding usages 2017-05-15 12:49:57 +02:00
Phillip Thelen
c21bdb0690 move things around 2017-05-15 12:13:08 +02:00
Phillip Thelen
693b0fd8fe Rework chat 2017-05-15 12:13:08 +02:00
Phillip Thelen
3316887153 bump build number 2017-05-12 14:29:33 +02:00
Phillip Thelen
00c905f323 implement nextDue 2017-05-12 13:48:11 +02:00