Commit graph

5759 commits

Author SHA1 Message Date
Phillip Thelen
18770e0083 fix task list not updating correctly 2017-02-24 19:06:26 +01:00
Phillip Thelen
03b79f5645 Merge pull request #714 from HabitRPG/checkstyle
add checkstyle and pmd
2017-02-24 11:43:53 +01:00
Phillip Thelen
c6a691ef18 remove broken seeds tests 2017-02-23 11:47:48 +01:00
Phillip Thelen
5a65b3b96b correct checking for valid subscription 2017-02-23 11:06:47 +01:00
Negue
1087c31a31 fix prior merge weirdness 2017-02-09 19:55:20 +01:00
Negue
b75949d7a1 Merge branch 'develop' of https://github.com/HabitRPG/habitica-android into task-repository
Conflicts:
	Habitica/src/main/java/com/habitrpg/android/habitica/ApiClient.java
	Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java
	Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.java
	Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PopupNotificationsManager.java
	Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PushNotificationManager.java
	Habitica/src/main/java/com/habitrpg/android/habitica/modules/ApiModule.java
	Habitica/src/main/java/com/habitrpg/android/habitica/receivers/LocalNotificationActionReceiver.java
	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeDetailActivity.java
	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.java
	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.java
	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PartyInviteActivity.java
	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.java
	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillMemberActivity.java
	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.java
	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.java
	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java
	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.java
	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.java
	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxFragment.java
	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.java
	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallegeDetailDialogHolder.java
	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengesOverviewFragment.java
	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.java
	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.java
	Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.java
	Habitica/src/main/java/com/habitrpg/android/habitica/widget/BaseWidgetProvider.java
	Habitica/src/main/java/com/habitrpg/android/habitica/widget/DailiesWidgetProvider.java
	Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetProvider.java
	Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListWidgetProvider.java
	Habitica/src/test/java/com/habitrpg/android/habitica/helpers/PopupNotificationsManagerTest.java
2017-02-07 23:53:54 +01:00
Negue
1636ccab66 Extract CheckClassSelectionUseCase / DisplayItemDropUseCase / LevelUpUseCase / NotifyUserUseCase - subscribe to Commands in ChallengeDetailActivity 2017-02-06 23:20:05 +01:00
Phillip Thelen
7e9c70fae8 fix potential crashes 2017-02-06 15:53:10 +01:00
Phillip Thelen
27f3e5645b subscription layout changes 2017-02-03 13:21:42 +01:00
Phillip Thelen
ce897ea916 fix bash syntax 2017-02-02 15:19:21 +01:00
Phillip Thelen
36d2eaafac fix travis build leaving directory 2017-02-02 14:53:21 +01:00
Phillip Thelen
2a6b24ba28 fix travis syntax 2017-02-02 14:44:10 +01:00
Phillip Thelen
b859bd9e8b fix tests 2017-02-02 14:32:05 +01:00
Phillip Thelen
bcc0396dfb don’t run server for every build matrix type 2017-02-02 13:33:27 +01:00
Phillip Thelen
402dbd5ba7 change travis config 2017-02-02 13:21:57 +01:00
Phillip Thelen
d167743a89 bump version number 2017-02-02 12:55:04 +01:00
Phillip Thelen
27e19eb1e5 optimize imports and fix code formatting 2017-02-02 12:26:20 +01:00
Phillip Thelen
0dc56f0fed add checkstyle and pmd 2017-02-02 12:24:31 +01:00
Phillip Thelen
1c85fbfa43 small design tweaks 2017-02-01 20:03:36 +01:00
Phillip Thelen
7a81e11524 fix crash in gem page 2017-02-01 17:03:12 +01:00
Phillip Thelen
67a0deee61 fix a bunch of linter errors 2017-02-01 16:58:53 +01:00
Phillip Thelen
d9167db771 update travis config 2017-02-01 15:05:33 +01:00
Phillip Thelen
18ae2edbea minor changes 2017-02-01 14:51:08 +01:00
Phillip Thelen
c99ff56288 add findbugs gradle plugin 2017-02-01 14:15:24 +01:00
Phillip Thelen
8e648ebed1 fix various memory leaks 2017-02-01 13:46:28 +01:00
Negue
cb7395bc4f add more usecases / extract them from MainActivity 2017-01-31 23:57:25 +01:00
Phillip Thelen
454a398a8d fix potential crash 2017-01-31 16:19:56 +01:00
Phillip Thelen
a30dc2e12a fix audio playback issue. Fixes #701 2017-01-30 18:48:30 +01:00
Phillip Thelen
33f1e4c22d Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Habitica/res/values/strings.xml
2017-01-30 16:24:02 +01:00
Phillip Thelen
d7c71b7f66 Merge pull request #709 from AlbRoehm/Issue_#708_hardcodedStrings_CheckInRewards
Change strings in checkInReward to make them translatable
2017-01-30 15:27:26 +01:00
Phillip Thelen
17e32c989b update dependencies 2017-01-30 15:05:40 +01:00
Phillip Thelen
d7e7d87d0e fix challenge refreshing 2017-01-30 15:05:34 +01:00
Phillip Thelen
30a88aa09d fix challenge leaving 2017-01-30 14:13:29 +01:00
Phillip Thelen
6af6c29e3d Implement subscriber features 2017-01-30 12:47:54 +01:00
Negue
6106bb2fa3 rename APIHelper to ApiClient / IApiClient interface / remove uses of ApiService / use IApiClient instead / without compose calls 2017-01-28 20:27:35 +01:00
Phillip Thelen
19d0798719 update translations 2017-01-26 19:36:04 +01:00
Phillip Thelen
7d4f4c47e8 show subscription details in account details 2017-01-26 19:35:35 +01:00
Phillip Thelen
83bb7c3b6c handle new subscriptions 2017-01-26 19:33:46 +01:00
Phillip Thelen
3734ad3197 fix crash when updating avatar widget 2017-01-26 19:33:46 +01:00
Phillip Thelen
9dc0d0ee84 move purchaseflow to activity 2017-01-26 19:33:46 +01:00
Phillip Thelen
0021404751 display subscription status 2017-01-26 19:33:46 +01:00
Phillip Thelen
b575287f85 start working on subscriptions 2017-01-26 19:33:45 +01:00
Phillip Thelen
8d1ab45424 update translations 2017-01-26 19:30:02 +01:00
AlbrechtRoehm
bf5e70f749 Change strings in checkInReward to make them translatable 2017-01-24 11:52:51 +01:00
negue
a841a4d4d8 Merge branch 'develop' into task-repository 2017-01-23 22:13:08 +01:00
Negue
b44a23c386 HabitScoreUseCase 2017-01-23 22:06:20 +01:00
Phillip Thelen
3b6e3e493e bump version number 2017-01-23 13:16:11 +01:00
Phillip Thelen
3b56a066bb update translations 2017-01-23 13:16:11 +01:00
Phillip Thelen
6387a66e0f add Airus audio theme 2017-01-23 13:16:11 +01:00
Phillip Thelen
0c44813a0e fix minor graphical issues 2017-01-23 13:16:11 +01:00