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
5759 commits 3 branches 1 tag 142 MiB
Commit graph

5759 commits

This branch
This branch
All branches
Author SHA1 Message Date
Phillip Thelen
f8b67cc25e Merge branch 'develop' of git://github.com/WhatsEmo/habitrpg-android into WhatsEmo-develop 2016-03-08 15:04:21 +01:00
Phillip Thelen
b2a7a99336 hide gems on party info page 2016-03-08 12:04:38 +01:00
Phillip Thelen
72e8e046eb Merge branch 'saranlert-quest-progress' into develop 2016-03-07 18:42:12 +01:00
Phillip Thelen
231d3751a5 Merge branch 'quest-progress' of git://github.com/saranlert/habitrpg-android into saranlert-quest-progress 
# Conflicts:
#	Habitica/src/com/magicmicky/habitrpgwrapper/lib/utils/GroupSerialization.java
 2016-03-07 18:25:16 +01:00
Phillip Thelen
7cc94e04b5 fix dailies layout 2016-03-07 18:21:59 +01:00
Brandon Cheng
61094d0f52 Merge pull request #6 from HabitRPG/develop 
Update to main branch
 2016-03-06 17:57:33 -08:00
Phillip Thelen
56b46d524a bump version number 2016-03-06 17:14:26 +01:00
Phillip Thelen
1caf6de984 fix post button 2016-03-06 17:09:34 +01:00
Phillip Thelen
7108cd1e1c fix right drawer 2016-03-06 16:58:22 +01:00
Phillip Thelen
53329ae75e allow guild editing 2016-03-06 16:49:35 +01:00
Saran Lertpradit
7880bb6a13 add quest progress 
- hp bar and rage bar for boss
- item list for collection quest
 2016-03-06 17:07:16 +07:00
Brandon Cheng
8fd5dbeab9 Merge pull request #5 from HabitRPG/develop 
Update to main branch
 2016-03-05 10:44:31 -08:00
Phillip Thelen
2f09ab00b3 fix display of elements on older androids 2016-03-05 18:08:49 +01:00
Phillip Thelen
3d12e22c81 update dependencies 2016-03-05 16:53:36 +01:00
Phillip Thelen
9d89d65419 Merge pull request #365 from camdroid/develop 
Reordered currencies to match web version
 2016-03-05 15:00:21 +01:00
Phillip Thelen
d4a49c4dd3 Merge branch 'andrewlord1990-settings_page_fixes' into develop 2016-03-05 14:57:34 +01:00
Phillip Thelen
6c44e997e2 Merge branch 'settings_page_fixes' of git://github.com/andrewlord1990/habitrpg-android into andrewlord1990-settings_page_fixes 
# Conflicts:
#	Habitica/res/values/colors.xml
 2016-03-05 14:57:23 +01:00
Phillip Thelen
db6a7e2bdb Merge branch 'develop' of github.com:HabitRPG/habitrpg-android into develop 
# Conflicts:
#	Habitica/src/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java
#	Habitica/src/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.java
 2016-03-05 14:56:24 +01:00
Phillip Thelen
ae0ff33e41 Add more guild functionality 2016-03-05 14:54:19 +01:00
Phillip Thelen
7efb1b4f72 Merge pull request #429 from saranlert/quest-invitation 
add quest invitation accept/reject
 2016-03-05 14:47:46 +01:00
WhatsEmo
a1c6efc229 Attempt to fix CI Build Error 2016-03-01 14:20:03 -08:00
Andrew Lord
219c086e42 Removed resetting of old account details preferences file (both preferences pages are now contained in the same file). 2016-02-28 14:34:40 +00:00
Andrew Lord
13153f2ba2 Update the Material Dialogs dependency, the app won't build with the previous version. 2016-02-28 14:25:34 +00:00
Andrew Lord
d370c0ab44 Remove old preferences_account_details. 2016-02-27 23:25:37 +00:00
Andrew Lord
5f06092ac3 Leave the onPreferenceTreeClick methods returning super call as they were before. 2016-02-27 23:10:56 +00:00
Andrew Lord
2e147db4b1 Added toolbar to the settings page and handle the up button from account settings page. 2016-02-27 23:05:23 +00:00
Andrew Lord
823f6a93bf Fixed material styling on the preferences pages. 2016-02-27 22:46:32 +00:00
Andrew Lord
e15edfa674 Switching preferences pages working correctly. 2016-02-27 22:26:05 +00:00
WhatsEmo
9313a00783 Cleared some merge conflicts 2016-02-27 13:35:37 -08:00
WhatsEmo
46a3ce995f Merge branch 'develop' of https://github.com/HabitRPG/habitrpg-android into develop 2016-02-27 13:17:12 -08:00
Andrew Lord
5d76167df0 Back navigation wasn't working properly in settings due to it being a PreferenceFragment which extends from Fragment, whereas the activity is an AppCompatActivity so looks in the support library fragment manager when handling the back key. Switching to use the support-v7 preference library and PreferenceFragmentCompat then allows this to work. This commit has the time preference working (works slightly differently with support library preferences). Switching to account page not working yet and styling of main settings page needs some fixes. 2016-02-27 20:20:33 +00:00
Andrew Lord
c0dc652033 Mark the Settings and About options in navigation drawer as not selectable. This means they won't be automatically marked after you select them, you should do this for all navigation drawer options that start a new activity instead of switching the fragment. Fixes #444 2016-02-27 18:40:28 +00:00
Saran Lertpradit
5345600252 add database migration 2016-02-27 01:17:12 +07:00
Phillip Thelen
ad3d3e223c Merge branch 'Data5tream-emojis' into develop 2016-02-26 14:33:29 +01:00
Phillip Thelen
6e763fea5f fix merge conflicts 2016-02-26 14:33:05 +01:00
Phillip Thelen
1469e6fe54 Merge branch 'emojis' of git://github.com/Data5tream/habitrpg-android into Data5tream-emojis 
# Conflicts:
#	Habitica/AndroidManifest.xml
#	Habitica/res/layout/activity_task_form.xml
#	Habitica/res/layout/tavern_chat_new_entry_item.xml
#	Habitica/src/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
#	Habitica/src/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.java
#	Habitica/src/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.java
 2016-02-26 14:02:15 +01:00
Phillip Thelen
6fbe313376 Merge branch 'develop' of git://github.com/WhatsEmo/habitrpg-android into WhatsEmo-develop 
# Conflicts:
#	Habitica/res/values/strings.xml
 2016-02-26 13:39:37 +01:00
Phillip Thelen
6f63c80fd3 Merge branch 'develop' of github.com:HabitRPG/habitrpg-android into develop 2016-02-26 12:51:13 +01:00
Phillip Thelen
467c314896 display list of guilds the user is a member of 2016-02-26 12:51:06 +01:00
Brandon Cheng
768ee38eb3 Merge pull request #3 from WhatsEmo/HabitRPG-develop 
Habit rpg develop
 2016-02-20 00:48:35 -08:00
WhatsEmo
c74d183235 Something to help 2016-02-20 00:29:45 -08:00
WhatsEmo
8f6b5ab6d3 Merge remote-tracking branch 'origin/develop' into develop 
Conflicts:

	Habitica/src/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.java
 2016-02-20 00:20:37 -08:00
WhatsEmo
2a03191def GitHub Glitched 
All these updates were already made
 2016-02-20 00:19:21 -08:00
Saran Lertpradit
222fb7e411 add quest interaction 
-list of quest participants in party view
-buttons to accept/reject/etc.. quest
 2016-02-19 01:18:24 +07:00
WhatsEmo
60527b5e2c Added checks for null Users 2016-02-17 17:42:24 -08:00
WhatsEmo
75ae0cdafd Added CheckBox for Due Dates 2016-02-17 17:06:08 -08:00
Phillip Thelen
33c3e77b00 Create PULL_REQUEST_TEMPLATE.md 2016-02-18 01:30:44 +01:00
Phillip Thelen
e7e27b5842 Merge branch 'develop' of git://github.com/WhatsEmo/habitrpg-android into WhatsEmo-develop 
# Conflicts:
#	Habitica/res/values/strings.xml
 2016-02-17 23:07:27 +01:00
Phillip Thelen
8067b6bcd3 add translations 2016-02-17 22:16:11 +01:00
Phillip Thelen
7ca6a1e963 bump version number 2016-02-17 22:16:11 +01:00