sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-07-29 18:27:18 +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
Negue
d32806ece7 fixes #367 2016-01-11 19:47:06 +01:00
Negue
0979453738 Mark messages as seen - part 2 2016-01-11 19:29:29 +01:00
Negue
dce5b19094 Merge branch 'develop' into seenMessages 2016-01-11 18:04:01 +01:00
Data5tream
cd5ab889ff Added own icon 2016-01-11 17:54:21 +01:00
Data5tream
2da4dd0e87 Added emojikeyboard to chat 2016-01-11 17:09:49 +01:00
Data5tream
7104e13897 Fix for issue #351 2016-01-11 15:38:36 +01:00
Phillip Thelen
77a7718dda Merge pull request #366 from yishanhe/fix-345 
Fix #345
 2016-01-11 14:10:06 +01:00
Phillip Thelen
2c771de119 Merge branch 'develop' of github.com:HabitRPG/habitrpg-android into develop 
# Conflicts:
#	Habitica/src/com/habitrpg/android/habitica/ui/activities/MainActivity.java
#	Habitica/src/com/habitrpg/android/habitica/ui/fragments/PreferencesFragment.java
 2016-01-11 13:57:58 +01:00
Phillip Thelen
3caa2ca6fc Merge branch 'michaldrabik-refactor' into develop 2016-01-11 13:55:58 +01:00
Phillip Thelen
86b40fb155 Fix merge fail 2016-01-11 13:55:50 +01:00
Phillip Thelen
12786109f2 Merge branch 'refactor' of git://github.com/michaldrabik/habitrpg-android into michaldrabik-refactor 
# Conflicts:
#	Habitica/src/com/habitrpg/android/habitica/ui/activities/MainActivity.java
 2016-01-11 13:36:07 +01:00
Phillip Thelen
6363273548 Merge pull request #341 from Data5tream/notification_fix 
Fix for missing notifications
 2016-01-11 13:28:51 +01:00
syi
0ddd91ba69 Fix #345 2016-01-06 12:38:54 -05:00
Data5tream
57299095fc Fix for issue #356 (most probably) 2016-01-06 13:26:02 +01:00
Data5tream
c5edb7807b Fix for issue #343 2016-01-06 12:57:46 +01:00
Cam
9fce7be410 Reordered currencies to match web version 2016-01-05 21:07:18 -05:00
Eric Schultz
d373b42fe1 Added GPLv3 to be consistent with the habitrpg 2016-01-01 11:50:11 -06:00
Data5tream
168442990f coverity test 2015-12-28 16:24:02 +01:00
Data5tream
b4c8739abe Changed to emoji-lib library which combines the other twos used before 2015-12-26 16:21:21 +01:00
Data5tream
09fe66847b Code cleanup 2015-12-26 13:11:55 +01:00
Data5tream
33d4cb7ef3 Moved databinding adapter 2015-12-26 12:50:20 +01:00
Data5tream
b7b898e6f6 Removed emojikeyboard until topic is discussed 2015-12-25 18:19:20 +01:00
Data5tream
17799bd263 Added emoji-keyboard to task-title form 2015-12-25 14:27:37 +01:00
Data5tream
0092186caa Added markdown and emoji support to party info 2015-12-25 12:55:48 +01:00
Data5tream
d65c2b491e Removed unnecessary import statement 2015-12-25 12:51:08 +01:00
Data5tream
797742931b Added binding Adapter to parse markdown in Tasks 2015-12-25 12:49:53 +01:00
Data5tream
9c488ffc10 Removed markdown parsing so Task.java isn't affected anymore 2015-12-25 12:33:33 +01:00
Data5tream
26aa291224 Made MarkdownParser static 2015-12-25 11:32:06 +01:00
Data5tream
9bf05a465a Removed unnecessary library 2015-12-24 23:25:13 +01:00
Data5tream
7e712cdbda Tried to fix ChatRecyclerViewAdapter 2015-12-24 23:05:58 +01:00
Data5tream
243ffb6d7b Updated EmojiParser 2015-12-24 22:56:28 +01:00
Data5tream
9c36b89c61 Created MarkdownParser to simplify the converting process 2015-12-24 11:29:28 +01:00
Data5tream
e7ab3aeffe Changed to external EmojiParser 2015-12-24 00:32:19 +01:00
Data5tream
213ab97b11 Added EmojiParser to parse markdown emojis 2015-12-23 16:21:48 +01:00
Data5tream
156092b91c Removed the unnecessary new-line which was added when parsing markdown 2015-12-23 13:12:15 +01:00
Data5tream
1e36ae5a68 Added markdown support to chat 2015-12-23 12:53:56 +01:00
Data5tream
ee28318698 Data is stored as strings an converted when requested 2015-12-23 12:45:02 +01:00
Data5tream
f07245998a Conversion from String to Spanned (not finished) 2015-12-23 12:25:21 +01:00
Data5tream
70e2711cb1 Markdown parser setup 2015-12-23 12:24:17 +01:00
Data5tream
bad2e6f365 Added emojis to tavern chat 2015-12-22 20:10:28 +01:00
Data5tream
4b519c893b Added emojis to tasks (including edit forms) 2015-12-22 19:58:55 +01:00
Data5tream
fa70b58e00 Initial setup 2015-12-22 19:02:53 +01:00
Data5tream
a24942cfa2 Merge remote-tracking branch 'origin/notification_fix' into notification_fix 2015-12-22 15:55:10 +01:00
Data5tream
d204cca809 Load default values into preferences in LoginActivity to avoid null objects when requesting settings for the first time 2015-12-22 15:54:43 +01:00
Data5tream
f4a17b28de Load default values into preferences in LoginActivity to avoid null objects when requesting settings for the first time 2015-12-22 15:47:23 +01:00
Data5tream
d89aded0e2 Fixed notifications being always activated 2015-12-22 15:39:55 +01:00
Negue
893c0dc599 Version 0.0.24 2015-12-22 01:48:35 +01:00
Negue
e0f86a5059 wip: mark messages as seen 2015-12-22 01:27:25 +01:00
Phillip Thelen
213a00a74a Close drawer on back button pressed. 2015-12-22 01:18:00 +01:00
Phillip Thelen
b7b659a19e expand toucharea for checklist items 2015-12-22 00:52:29 +01:00