sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-07-31 11:10:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
5753 commits 3 branches 1 tag 142 MiB
Commit graph

5753 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Daniel Kaparunakis
d072885e6e Feature: Add ListPreference for language switcher to settings activity 
This commit adds the Language entries & language values arrays so
that the list preference can reference them in the settings activity.
It also adds said ListPreference XML element to be used as a language
switcher.
 2016-08-29 00:04:26 -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
negue
fdf00b66aa fix(avatarView): currentLayers is null on the first call 2016-08-17 01:33:53 +02:00
Phillip Thelen
71f796e02b add debug info to figure out mapping issue 2016-08-16 18:43:08 +02:00
Phillip Thelen
bd8df11057 fix crash in avatar customization 2016-08-16 18:42:55 +02:00
Phillip Thelen
1aa5da182b update translations 2016-08-16 18:42:46 +02:00
Phillip Thelen
abc83a38c2 fix incorrect string identifier 2016-08-16 18:21:08 +02:00
Phillip Thelen
43a63794bc Merge pull request #591 from jjbillings/guild-search-bar 
Guild Search Bar - Issue #513
 2016-08-16 18:20:46 +02:00
Keith Holliday
4904cbc7b9 Restyled popup for QR 2016-08-15 22:30:59 -05:00
jjbillings
5abcc1bb7d Move guild search bar to toolbar 2016-08-14 14:11:07 -05:00
Jack Billings
bde5288443 Merge pull request #5 from HabitRPG/develop 
merge from main repo
 2016-08-14 13:28:23 -05:00
Phillip Thelen
e98c5aa77b Merge pull request #596 from HabitRPG/refresh-avatar 
fix avatar refresh after changing equipment
 2016-08-13 14:59:22 +02:00
Phillip Thelen
0c030106a1 Merge pull request #587 from HabitRPG/full-profile 
WIP fullprofile: show avatar / stats / attributes / equipment
 2016-08-13 14:58:59 +02:00
Negue
b85eef9700 fix avatar refresh after changing equipment 2016-08-13 01:50:57 +02:00
Negue
98d13ca147 use APIHelper in ContentCache, get language from user.preferences, use common card-styles, 2016-08-12 22:17:02 +02:00
Keith Holliday
9ed527378c Quried the user from the database rather than the api 2016-08-12 14:37:07 -05:00
Keith Holliday
4bc2ace8f2 Added configure method for avaterview. Added dialgoue in preferences for qr code 2016-08-12 14:27:06 -05:00
jjbillings
50e10de08f Add "Delete Tag" and remove them from the drawer 2016-08-12 14:26:46 -05:00
jjbillings
ed84dcee85 Add "Edit" mode to tag filter - only UI so far. 2016-08-12 12:32:59 -05:00