Commit graph

  • aa6f898e1e fix removing due dates Phillip Thelen 2016-03-08 15:39:44 +0100
  • f8b67cc25e Merge branch 'develop' of git://github.com/WhatsEmo/habitrpg-android into WhatsEmo-develop Phillip Thelen 2016-03-08 15:04:21 +0100
  • b2a7a99336 hide gems on party info page Phillip Thelen 2016-03-08 12:04:38 +0100
  • 72e8e046eb Merge branch 'saranlert-quest-progress' into develop Phillip Thelen 2016-03-07 18:42:12 +0100
  • 231d3751a5 Merge branch 'quest-progress' of git://github.com/saranlert/habitrpg-android into saranlert-quest-progress Phillip Thelen 2016-03-07 18:25:16 +0100
  • 7cc94e04b5 fix dailies layout Phillip Thelen 2016-03-07 18:21:59 +0100
  • 61094d0f52 Merge pull request #6 from HabitRPG/develop Brandon Cheng 2016-03-06 17:57:33 -0800
  • 56b46d524a bump version number Phillip Thelen 2016-03-06 17:14:26 +0100
  • 1caf6de984 fix post button Phillip Thelen 2016-03-06 17:09:34 +0100
  • 7108cd1e1c fix right drawer Phillip Thelen 2016-03-06 16:58:22 +0100
  • 53329ae75e allow guild editing Phillip Thelen 2016-03-06 16:49:35 +0100
  • 7880bb6a13 add quest progress Saran Lertpradit 2016-03-06 17:07:16 +0700
  • 8fd5dbeab9 Merge pull request #5 from HabitRPG/develop Brandon Cheng 2016-03-05 10:44:31 -0800
  • 2f09ab00b3 fix display of elements on older androids Phillip Thelen 2016-03-05 18:08:49 +0100
  • 3d12e22c81 update dependencies Phillip Thelen 2016-03-05 16:53:36 +0100
  • 9d89d65419 Merge pull request #365 from camdroid/develop Phillip Thelen 2016-03-05 15:00:21 +0100
  • d4a49c4dd3 Merge branch 'andrewlord1990-settings_page_fixes' into develop Phillip Thelen 2016-03-05 14:57:34 +0100
  • 6c44e997e2 Merge branch 'settings_page_fixes' of git://github.com/andrewlord1990/habitrpg-android into andrewlord1990-settings_page_fixes Phillip Thelen 2016-03-05 14:57:23 +0100
  • db6a7e2bdb Merge branch 'develop' of github.com:HabitRPG/habitrpg-android into develop Phillip Thelen 2016-03-05 14:56:24 +0100
  • ae0ff33e41 Add more guild functionality Phillip Thelen 2016-03-05 14:54:19 +0100
  • 7efb1b4f72 Merge pull request #429 from saranlert/quest-invitation Phillip Thelen 2016-03-05 14:47:46 +0100
  • a1c6efc229 Attempt to fix CI Build Error WhatsEmo 2016-03-01 14:20:03 -0800
  • 219c086e42 Removed resetting of old account details preferences file (both preferences pages are now contained in the same file). Andrew Lord 2016-02-28 14:34:40 +0000
  • 13153f2ba2 Update the Material Dialogs dependency, the app won't build with the previous version. Andrew Lord 2016-02-28 14:25:34 +0000
  • d370c0ab44 Remove old preferences_account_details. Andrew Lord 2016-02-27 23:25:37 +0000
  • 5f06092ac3 Leave the onPreferenceTreeClick methods returning super call as they were before. Andrew Lord 2016-02-27 23:10:56 +0000
  • 2e147db4b1 Added toolbar to the settings page and handle the up button from account settings page. Andrew Lord 2016-02-27 23:05:23 +0000
  • 823f6a93bf Fixed material styling on the preferences pages. Andrew Lord 2016-02-27 22:46:32 +0000
  • e15edfa674 Switching preferences pages working correctly. Andrew Lord 2016-02-27 22:26:05 +0000
  • 9313a00783 Cleared some merge conflicts WhatsEmo 2016-02-27 13:35:37 -0800
  • 46a3ce995f Merge branch 'develop' of https://github.com/HabitRPG/habitrpg-android into develop WhatsEmo 2016-02-27 13:17:12 -0800
  • 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. Andrew Lord 2016-02-27 20:20:33 +0000
  • 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 Andrew Lord 2016-02-27 18:40:28 +0000
  • 5345600252 add database migration Saran Lertpradit 2016-02-27 00:58:41 +0700
  • ad3d3e223c Merge branch 'Data5tream-emojis' into develop Phillip Thelen 2016-02-26 14:33:29 +0100
  • 6e763fea5f fix merge conflicts Phillip Thelen 2016-02-26 14:33:05 +0100
  • 1469e6fe54 Merge branch 'emojis' of git://github.com/Data5tream/habitrpg-android into Data5tream-emojis Phillip Thelen 2016-02-26 14:02:15 +0100
  • 6fbe313376 Merge branch 'develop' of git://github.com/WhatsEmo/habitrpg-android into WhatsEmo-develop Phillip Thelen 2016-02-26 13:39:37 +0100
  • 6f63c80fd3 Merge branch 'develop' of github.com:HabitRPG/habitrpg-android into develop Phillip Thelen 2016-02-26 12:51:13 +0100
  • 467c314896 display list of guilds the user is a member of Phillip Thelen 2016-02-26 12:51:06 +0100
  • 768ee38eb3 Merge pull request #3 from WhatsEmo/HabitRPG-develop Brandon Cheng 2016-02-20 00:48:35 -0800
  • c74d183235 Something to help WhatsEmo 2016-02-20 00:29:45 -0800
  • 8f6b5ab6d3 Merge remote-tracking branch 'origin/develop' into develop WhatsEmo 2016-02-20 00:20:37 -0800
  • 2a03191def GitHub Glitched WhatsEmo 2016-02-20 00:19:21 -0800
  • 222fb7e411 add quest interaction Saran Lertpradit 2016-02-19 00:31:31 +0700
  • 60527b5e2c Added checks for null Users WhatsEmo 2016-02-17 17:42:24 -0800
  • 75ae0cdafd Added CheckBox for Due Dates WhatsEmo 2016-02-17 17:06:08 -0800
  • 33c3e77b00 Create PULL_REQUEST_TEMPLATE.md Phillip Thelen 2016-02-18 01:30:44 +0100
  • e7e27b5842 Merge branch 'develop' of git://github.com/WhatsEmo/habitrpg-android into WhatsEmo-develop Phillip Thelen 2016-02-17 23:07:27 +0100
  • 8067b6bcd3 add translations Phillip Thelen 2016-02-17 22:06:34 +0100
  • 7ca6a1e963 bump version number Phillip Thelen 2016-02-17 21:10:35 +0100
  • e5f7df449e Merge pull request #422 from dbarnett/update_mp Phillip Thelen 2016-02-17 22:07:39 +0100
  • a362af8ef7 Merge pull request #414 from ExperimentMonty/bugfix/skill-unlock-level Phillip Thelen 2016-02-17 22:00:59 +0100
  • e67a5d9a82 Merge pull request #374 from HabitRPG/seenMessages negue 2016-02-15 19:58:55 +0100
  • f9140bd216 Merge branch 'develop' into seenMessages Negue 2016-02-15 19:54:19 +0100
  • 99bff54292 Get IAP Price & Add Support Text Negue 2016-02-15 19:31:17 +0100
  • 85b0fb2460 Update to show new MP value on task completion David Barnett 2016-02-13 18:51:34 -0800
  • 836dbde5c5 Syncing for due dates fixed WhatsEmo 2016-02-11 12:14:46 -0800
  • ee265021be Implement More Information on Bug Reports WhatsEmo 2016-02-11 00:21:50 -0800
  • b6ede481ec Added note about TasksFragment WhatsEmo 2016-02-10 11:37:26 -0800
  • 34170adc6d Tags Implementation. WhatsEmo 2016-02-10 11:08:08 -0800
  • 460dae79e1 Merge pull request #1 from HabitRPG/develop Brandon Cheng 2016-02-10 00:50:12 -0800
  • f089626349 Change skill unlock level text to 11 John Montgomery 2016-02-09 08:56:56 -0500
  • 231629ce6d Merge pull request #412 from schrockblock/feature/eschrock/on-stop-crash Phillip Thelen 2016-02-09 13:30:10 +0100
  • a8cc82e0ea Merge pull request #407 from Vorgone/partyfragment Phillip Thelen 2016-02-09 12:40:11 +0100
  • b01b0bff2a Merge pull request #401 from saranlert/class-optout-mp Phillip Thelen 2016-02-09 12:38:03 +0100
  • 1f34c8c8a7 Merge pull request #394 from dbarnett/edittext Phillip Thelen 2016-02-09 12:36:29 +0100
  • 1096c9ef2c Merge pull request #406 from Vorgone/fixbuild Phillip Thelen 2016-02-09 12:35:21 +0100
  • 6de4943f8e fix blank state after restart Elliot 2016-02-07 14:16:04 -0600
  • c00be08606 fix null pointer with savedInstanceState Elliot 2016-02-07 14:11:10 -0600
  • e8c80d3989 Add null check to tablayout in PartyFragment.java Alex Hart 2016-02-05 14:58:05 -0600
  • 39ee50591a Fix for broken travis build Alex Hart 2016-02-05 14:00:51 -0600
  • 6099c2c080 minor fixes Phillip Thelen 2016-02-03 13:56:43 +0100
  • 7832e4e81b Add amplitude support Phillip Thelen 2016-02-02 21:19:07 +0100
  • d74ad6040e Fix avatar margin Phillip Thelen 2016-02-02 20:30:25 +0100
  • b922cf23f4 fix tutorial display for tasks Phillip Thelen 2016-02-02 18:47:10 +0100
  • c7dded48ed MP shouldn't be visible if user opt-out class system Saran Lertpradit 2016-02-02 23:37:46 +0700
  • d1584d8727 improve initial fragment loading Phillip Thelen 2016-02-02 16:10:22 +0100
  • da3bdd50a3 prevent header overlapping Phillip Thelen 2016-02-02 15:25:48 +0100
  • 95c377ea54 Show setup after registration Phillip Thelen 2016-02-02 14:59:28 +0100
  • 2c982d5fb0 Add Intro before login Phillip Thelen 2016-01-28 14:09:10 +0100
  • 905568821f improve tutorial display Phillip Thelen 2016-01-27 17:23:19 +0100
  • cda0a1d56c Display tutorial messages Phillip Thelen 2016-01-27 16:55:23 +0100
  • e59326e141 display FAQ Articles Phillip Thelen 2016-01-22 18:13:41 +0100
  • b03bc629be Merge pull request #389 from patheticpat/party-memberlist Phillip Thelen 2016-01-31 15:42:58 +0100
  • 3b624f2b0f Merge pull request #391 from patheticpat/patch-1 Phillip Thelen 2016-01-31 15:42:42 +0100
  • b2b0b5a7bd Merge pull request #399 from abscondment/stopped-activities Phillip Thelen 2016-01-31 15:41:42 +0100
  • c25de06d08 Fix some crashes in stopped BaseFragments. Brendan Ribera 2016-01-31 01:30:22 -0800
  • cb800fe7e8 Fix crash in stopped ChatListFragments. Brendan Ribera 2016-01-31 00:48:37 -0800
  • 83caf8921d Add inputType=textCapSentences to most EditText widgets David Barnett 2016-01-27 10:59:29 -0800
  • 3b0c2e0b86 Merge remote-tracking branch 'HabitRPG/develop' into develop Saran Lertpradit 2016-01-28 23:23:12 +0700
  • 34321b60b7 Fix crash with checklist items Phillip Thelen 2016-01-27 13:29:51 +0100
  • ec3ea26d8e fix rounding in bars Phillip Thelen 2016-01-26 21:55:03 +0100
  • 4f8ab2f8f8 Fix crashes Phillip Thelen 2016-01-26 21:54:57 +0100
  • 548b47435d improve sync when app is reopened Phillip Thelen 2016-01-26 16:32:06 +0100
  • 1a96430491 Add version to about screen Phillip Thelen 2016-01-26 16:31:58 +0100
  • d6b6e897c1 Force content loading on fragment launch Phillip Thelen 2016-01-26 15:40:57 +0100
  • 513334575c Improve Date parsing Phillip Thelen 2016-01-26 13:03:27 +0100
  • af5927c0e8 Fix the Google Play badge in README.md Michael Kaiser 2016-01-26 10:21:33 +0100
  • 007be89c5e Don't animate health bar in party member list Michael Kaiser 2016-01-25 18:09:02 +0100