5759 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Phillip Thelen	21f5a5f1ee	improve skill casting	2017-05-12 12:15:50 +02:00
Phillip Thelen	23be622b7a	fix form issues	2017-05-11 13:11:15 +02:00
Phillip Thelen	f119bab83c	fix crash when saving tasks	2017-05-11 12:48:27 +02:00
Phillip Thelen	581fb124d7	fix test scheduler	2017-05-11 10:34:55 +02:00
Phillip Thelen	1903542adb	fix crash when editing dailies	2017-05-10 13:23:15 +02:00
Phillip Thelen	61db9a9c92	fix database loading issue	2017-05-10 13:23:05 +02:00
Phillip Thelen	46de03cae0	bump version	2017-05-10 13:22:59 +02:00
Phillip Thelen	35ae049d01	fix repeatables display	2017-05-09 14:00:33 +02:00
Phillip Thelen	ba49430cd8	Merge branch 'develop' of github.com:HabitRPG/habitrpg-android into chatrewrite ... # Conflicts: # Habitica/res/values/strings.xml # Habitica/src/main/java/com/habitrpg/android/habitica/HabitDatabase.java # Habitica/src/main/java/com/habitrpg/android/habitica/NotificationPublisher.java # Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java # Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java # Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java	2017-05-09 12:29:24 +02:00
Phillip Thelen	5991f15131	Merge pull request #743 from TheHollidayInn/add-repeatables ... Add repeatables	2017-05-09 11:04:00 +02:00
Keith Holliday	1ca55f4ea9	Merge branch 'develop' into add-repeatables	2017-05-08 10:14:46 -06:00
Phillip Thelen	df393fd42d	update guild listing	2017-05-05 19:36:25 +02:00
Phillip Thelen	2eacc25cec	fix guild display	2017-05-05 17:14:55 +02:00
Phillip Thelen	59db8329cd	fix class change message being cut off sometimes	2017-05-05 12:57:47 +02:00
Phillip Thelen	cd3bfbcd67	fix challenge list	2017-05-04 19:52:42 +02:00
Phillip Thelen	68e3ca7b65	remove dbflow	2017-05-04 12:36:39 +02:00
Keith Holliday	a516d74282	Added string resource	2017-05-02 10:47:25 -06:00
Keith Holliday	8af1982d2b	Added is completed check	2017-05-02 10:06:34 -06:00
Keith Holliday	2ca3c4db1f	Added shared preferences	2017-05-02 10:02:13 -06:00
Phillip Thelen	3c61635394	Merge branch 'realm' of github.com:HabitRPG/habitrpg-android into realm ... # Conflicts: # Habitica/AndroidManifest.xml # Habitica/res/anim/fab_slide_in.xml # Habitica/res/anim/fab_slide_out.xml # Habitica/res/layout/floating_menu_tasks.xml # Habitica/res/values-ru/strings.tutorial.xml # Habitica/res/values-ru/strings.xml # Habitica/res/values/strings.xml # Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java # Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.java # Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java # Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.java # Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java # Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskSaveEvent.java # Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/DeleteTaskCommand.java # Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.java # Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Challenge.java # Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Group.java # Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Days.java # Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java # Habitica/src/main/java/com/habitrpg/android/habitica/modules/RepositoryModule.java # Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java # Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeDetailActivity.java # Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java # Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java # Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.java # Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragment.java # Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/SubscriptionFragment.java # Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.java # Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildsOverviewFragment.java # Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.java # Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeTasksRecyclerViewFragment.java # Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/FloatingActionMenuBehavior.java # Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.java # Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.java # Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.java # Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.java # Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/LoginBackgroundView.java # Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChallengeSerializer.java # Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.java # translations/store_strings-ru.xml	2017-04-29 19:42:27 +02:00
Phillip Thelen	5033d708f0	fix crashes	2017-04-28 19:29:52 +02:00
Phillip Thelen	6b7383da12	Clear old tasks	2017-04-28 17:46:48 +02:00
Phillip Thelen	0be358d564	Merge pull request #744 from HabitRPG/create_challenges ... Create challenges	2017-04-28 11:30:54 +02:00
Phillip Thelen	3f55878786	fix buying customizations	2017-04-27 21:05:52 +02:00
Phillip Thelen	7086d30cc6	start moving social data to realm	2017-04-27 19:39:07 +02:00
Negue	ffd74efa23	Merge branch 'develop' of https://github.com/HabitRPG/habitica-android into create_challenges ... Conflicts: Habitica/res/values/strings.xml	2017-04-27 19:02:21 +02:00
Negue	b26f22c0b8	update labels	2017-04-27 18:59:52 +02:00
Phillip Thelen	5f806aac93	fix faq	2017-04-26 20:18:36 +02:00
Phillip Thelen	a893206a58	Fix item interactions	2017-04-26 20:04:05 +02:00
Phillip Thelen	277b4bec6a	fix login screen issues on some devices	2017-04-26 16:01:52 +02:00
Phillip Thelen	e35318834c	display message when device doesn't support billing	2017-04-26 15:27:27 +02:00
Phillip Thelen	964bf160c5	add special build variant for amazon	2017-04-26 15:27:27 +02:00