Phillip Thelen
6c86a83023
Merge pull request #628 from HabitRPG/avatar_transformations
...
Show avatar transformations
2016-09-20 13:22:28 +02:00
Phillip Thelen
18a24cff9b
Merge pull request #619 from vlad-vassilovski/fix-pet-and-mount-counts
...
Fix #617 , #618 : Correct profile's pet/mount counts
2016-09-20 12:58:12 +02:00
Phillip Thelen
4804f67eb9
Merge pull request #630 from DrStrangepork/develop
...
Fixed typo
2016-09-20 12:52:13 +02:00
Rick Kasten
eb496daa4b
Fixed typo
2016-09-19 02:09:50 -04:00
Negue
206a8be548
Show avatar transformations (snowball, shiny seed, seafoam and spooky sparkles)
2016-09-16 18:23:31 +02:00
Vlad Vassilovski
71fce3d021
Fix #617 , #618 : Correct profile's pet/mount counts
...
The profile's mounts tamed count wrongly ignores mounts with null value.
Also, null/nonexistent pet/mount collections have counts showing as "#".
Both counts should instead be shown as 0 for such null collections.
This fix matches the web app, which does the following:
1. Mounts tamed count = sum mount entries with any value (true, null)
2. Nonexistent pet/mount collections have counts showing as 0
Fix #617 , #618
2016-09-15 20:49:21 -04:00
Negue
ecb10bf5d6
fixes #608 , fixes #616 , fixes #618 , fixes #621 , fixes #622 , fixes #623 , fixes #624
2016-09-13 18:53:47 +02:00
Phillip Thelen
09a99ab367
Merge pull request #609 from jjbillings/tag-api-tests
...
Tag api tests
2016-09-09 10:33:20 +02:00
jjbillings
b48bb6e3e8
Refactored to getUser method
2016-09-05 12:23:31 -05:00
Phillip Thelen
c27fcb4aa8
Merge pull request #610 from jjbillings/add-material-icons
...
Change icon color
2016-09-05 14:04:12 +02:00
Phillip Thelen
4e15428d5a
Merge pull request #601 from SirLoading/skill-feedback
...
Skill feedback
2016-09-05 13:57:15 +02:00
Phillip Thelen
b6ebd58d11
fix pet count calculation
2016-09-04 18:51:35 +02:00
Phillip Thelen
b3f7405d90
display tasks for broken tasksOrder lists
...
Fixes #603
2016-09-04 16:01:23 +02:00
Phillip Thelen
ad7a1b7566
allow users to accept party invites
2016-09-04 15:28:21 +02:00
Phillip Thelen
cfced48f0d
Add google login
2016-09-02 19:27:32 +02:00
Phillip Thelen
f1949f3422
fix mapping for premium pets
2016-09-02 19:27:32 +02:00
Phillip Thelen
be96d29c98
Merge pull request #582 from TheHollidayInn/facebook-register-from-login-page-fix
...
Fixed issue with displaying onboarding when user registers with facebook from the login screen
2016-09-02 19:26:35 +02:00
jjbillings
0f271e6a5a
Add icon files to git
2016-08-30 08:52:46 -05:00
jjbillings
e9b15f089f
Change chat message menu icon colors
2016-08-29 19:26:27 -05:00
jjbillings
7ca7f3aa76
Add tests for update/delete tags
2016-08-29 12:24:11 -05:00
Jack Billings
3691246b52
Merge pull request #11 from HabitRPG/develop
...
Sync from main repo
2016-08-23 20:23:26 -05:00
Sir Loading
f84abbae04
moved skill feedback to skill event
2016-08-23 10:36:36 +02:00
Phillip Thelen
23353cce9b
Merge pull request #600 from jjbillings/delete-tags
...
Delete and edit tags - Issues: 496, 507
2016-08-22 18:34:58 +02:00
Phillip Thelen
ae643b4664
Merge pull request #602 from HabitRPG/debug
...
have debug and store version without uninstall the other
2016-08-22 18:25:50 +02:00
Phillip Thelen
035c7098da
update build tools in travis
2016-08-22 11:00:06 +02:00
jjbillings
2b1f63ccd2
Sync from main repo
...
# Conflicts:
# Habitica/res/values/strings.xml
Conflicts resolved
2016-08-21 19:45:54 -05:00
Jack Billings
c36c889544
Merge pull request #9 from HabitRPG/develop
...
Sync from main repo
2016-08-21 19:39:12 -05:00
Phillip Thelen
9de0f1b91b
update translations
2016-08-21 20:37:43 +02:00
Negue
f58141c5ac
have debug and store version without uninstall the other
2016-08-21 16:19:20 +02:00
jjbillings
ed97d8f502
Fix deleted tags still being used to filter. Also fix TaskForm checkboxes not synchronizing with edited/deleted tags
2016-08-19 14:28:38 -05:00
jjbillings
1a246610f2
Move handling to update tag handling to another method.
2016-08-19 12:34:22 -05:00
Phillip Thelen
51ce4ec529
allow users to send messages from inbox
2016-08-19 18:54:11 +02:00
Phillip Thelen
1f759aeffd
imporove qr code display
2016-08-19 16:20:01 +02:00
Phillip Thelen
c20d79120b
update support libraries
2016-08-19 13:51:46 +02:00
Phillip Thelen
a954f481d9
Merge pull request #595 from TheHollidayInn/invites-qr-code
...
Invites qr code
2016-08-19 12:54:20 +02:00
jjbillings
67d6626382
Merge branch 'develop' of https://github.com/jjbillings/habitrpg-android into delete-tags
...
# Conflicts:
# Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
Resolved conflicts.
2016-08-18 10:18:15 -05:00
Jack Billings
4e44a855c4
Merge pull request #7 from HabitRPG/develop
...
Sync from main repo
2016-08-18 10:10:11 -05:00
Phillip Thelen
41eb99d188
fix mapping error
2016-08-18 16:34:04 +02:00
Phillip Thelen
9aadfe62f8
fix shop display issue on old devices
2016-08-18 16:05:13 +02:00
Phillip Thelen
8b8ba0cf4d
fix translations
2016-08-18 13:50:08 +02:00
Sir Loading
bd2ec3e28e
add #334 - updated skill feedback with HP and XP
2016-08-18 13:37:52 +02:00
Jack Billings
d4cf036434
Sync fork with main repo
...
Merge from main repo
2016-08-17 14:46:42 -05:00
jjbillings
3b3d607d95
Remove unused imports
2016-08-17 14:42:31 -05:00
jjbillings
f850fe7d68
Clean up code, fix keyboard dismissing issues
2016-08-17 14:34:55 -05:00
jjbillings
d2e7b0fe26
Update String resources
2016-08-17 13:11:52 -05:00
jjbillings
68538c58d6
Add tag update functionality
2016-08-17 12:52:00 -05:00
Keith Holliday
bc0fbc8f78
Fixed issue with displaying onboarding when user registers with facebook from the login screen
2016-08-17 11:58:58 -05:00
Sir Loading
bfdb5ac72f
add better feedback on skills casted
2016-08-17 18:38:36 +02:00
jjbillings
36c1990449
Add AlertDialog for editing/deleting tag
2016-08-16 20:32:08 -05:00
Keith Holliday
9762dc3a04
Fixed styles. Made QR code purple. Encoded url to QR code. Made QR code larger
2016-08-16 20:17:18 -05:00
