Keith Holliday
|
61d9eb73f5
|
Fixed issue with filtercommand running on async thread
|
2017-03-29 13:40:15 -06:00 |
|
Negue
|
57e9dd9272
|
first control / layout design
|
2017-03-28 22:53:28 +02:00 |
|
Steven Conner
|
c2e009f011
|
Merge branch 'develop' into fix-qrcode-screen
|
2017-03-28 09:55:45 -07:00 |
|
Negue
|
b20e14e022
|
Merge branch 'develop' of https://github.com/HabitRPG/habitica-android into create_challenges
|
2017-03-27 18:37:01 +02:00 |
|
Negue
|
a189179c05
|
init activity
|
2017-03-27 18:36:00 +02:00 |
|
Phillip Thelen
|
acd5c01ff7
|
Add new welcome screen
|
2017-03-27 15:33:57 +02:00 |
|
Phillip Thelen
|
4aec7339ae
|
more build time improvements
|
2017-03-25 23:38:11 +01:00 |
|
Phillip Thelen
|
3bc606b857
|
improve build times
|
2017-03-25 19:55:00 +01:00 |
|
Phillip Thelen
|
0716687a76
|
improve login screen
|
2017-03-25 14:15:43 +01:00 |
|
Phillip Thelen
|
a3ef5ef242
|
redesign intro and login
|
2017-03-24 17:30:58 +01:00 |
|
Phillip Thelen
|
9ce581fbff
|
Merge branch 'challenge_filter' into develop
|
2017-03-23 14:13:50 +01:00 |
|
Phillip Thelen
|
0a7c60e83f
|
Merge branch 'develop' into challenge_filter
# Conflicts:
# Habitica/res/values/strings.xml
|
2017-03-23 14:13:13 +01:00 |
|
Phillip Thelen
|
7d491fbdba
|
New intro
|
2017-03-23 14:12:28 +01:00 |
|
Phillip Thelen
|
9c78d519f5
|
update to android studio 2.3
|
2017-03-23 14:12:28 +01:00 |
|
Phillip Thelen
|
2d5680ed80
|
Merge pull request #727 from HabitRPG/leave_challenge
leave / remove tasks on deleting a challenge
|
2017-03-23 14:10:21 +01:00 |
|
Phillip Thelen
|
0872c2bcd4
|
Merge pull request #724 from dinesh3434/leave-party
Leave party Confirmation
|
2017-03-23 14:09:15 +01:00 |
|
Steven Conner
|
ab1674f75a
|
changed button on qrcodescreen to say close instead of ok
|
2017-03-21 19:55:20 -07:00 |
|
Steven Conner
|
b3e3ffa0bf
|
fix qrcode layout
|
2017-03-21 19:45:36 -07:00 |
|
Negue
|
afc0a92e37
|
leave / remove tasks on deleting a challenge
|
2017-03-09 21:15:57 +01:00 |
|
Dinesh
|
e8a9104ae3
|
revert pull.md
|
2017-03-08 13:32:57 +05:30 |
|
Dinesh
|
857318604a
|
Merge branch 'leave-party' of https://github.com/dinesh3434/habitica-android into leave-party
|
2017-03-08 13:18:40 +05:30 |
|
Dinesh
|
8c5e31038c
|
leave-party-string
|
2017-03-08 12:56:59 +05:30 |
|
Dinesh
|
8cf6cbd1b9
|
leave-party (added strings)
|
2017-03-08 12:24:42 +05:30 |
|
Phillip Thelen
|
d6681bd1f5
|
bump version code
|
2017-03-06 20:43:45 +01:00 |
|
Phillip Thelen
|
7dc8bf9b9f
|
How to boolean logic?
|
2017-03-06 20:43:35 +01:00 |
|
Negue
|
644a8486b1
|
move ErrorResponse to separate File
|
2017-03-06 16:14:45 +01:00 |
|
Negue
|
07601ac084
|
Merge branch 'develop' of https://github.com/HabitRPG/habitica-android into task-repository
Conflicts:
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/SubscriptionFragment.java
|
2017-03-06 15:40:46 +01:00 |
|
Negue
|
b7915fd0b6
|
ApiClient & ApiClientImpl (renames) - lower field names
|
2017-03-06 15:21:08 +01:00 |
|
Phillip Thelen
|
82e51292f5
|
bump build number
|
2017-03-06 12:12:52 +01:00 |
|
Phillip Thelen
|
0ba7272cea
|
fix another crash in subscription view
|
2017-03-06 12:12:31 +01:00 |
|
Dinesh
|
01948f0d6d
|
lave-party
|
2017-03-05 19:30:30 +05:30 |
|
Dinesh
|
1e75eebf88
|
Leave Party Dialog Working
|
2017-03-05 19:11:52 +05:30 |
|
Dinesh Thanigaivelu
|
3c8664def8
|
Leave Party Dialog working
|
2017-03-05 19:04:22 +05:30 |
|
Dinesh Thanigaivelu
|
437288ab1c
|
Dialog popup working
|
2017-03-05 18:34:25 +05:30 |
|
Phillip Thelen
|
4c2f678322
|
bump version number
|
2017-03-05 11:05:15 +01:00 |
|
Phillip Thelen
|
c7903652d4
|
fix potential crash in subscription view
|
2017-03-05 11:05:00 +01:00 |
|
Phillip Thelen
|
7b540c567f
|
update translations
|
2017-03-05 11:04:44 +01:00 |
|
Phillip Thelen
|
688f2035a6
|
fix potential crash
|
2017-03-01 16:21:01 +01:00 |
|
Negue
|
497c535bac
|
Merge branch 'develop' of https://github.com/HabitRPG/habitica-android into challenge_filter
|
2017-03-01 13:46:49 +01:00 |
|
Negue
|
16e32a7ec3
|
"my challenges" - filter
|
2017-03-01 13:45:43 +01:00 |
|
Phillip Thelen
|
165d141060
|
update translations
|
2017-02-27 10:49:13 +01:00 |
|
Phillip Thelen
|
8e5343f63f
|
fix potential crash
|
2017-02-27 09:39:21 +01:00 |
|
Phillip Thelen
|
d0a0b845e4
|
update translations
|
2017-02-26 12:07:23 +01:00 |
|
Phillip Thelen
|
dc5beef190
|
basic group plan support
|
2017-02-26 12:07:16 +01:00 |
|
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 |
|