Commit graph

  • e62c6b567c update translations Phillip Thelen 2016-09-15 18:23:46 +0200
  • 8f955b59a0 fix analytics error Phillip Thelen 2016-09-23 19:59:02 +0200
  • 03a3417cfc refactor analytics handling Phillip Thelen 2016-09-23 19:43:51 +0200
  • dbe956b200 update build tools for travis Phillip Thelen 2016-09-23 19:21:04 +0200
  • fc6513ccad Merge branch 'refs/heads/pr/613' into develop Phillip Thelen 2016-09-23 19:17:08 +0200
  • 1eda351768 Merge remote-tracking branch 'origin/develop' into develop Phillip Thelen 2016-09-23 19:10:03 +0200
  • 94b2bdba41 Add toast feedback for widgets Phillip Thelen 2016-09-23 19:07:29 +0200
  • 258215fee9 Merge pull request #620 from DanielKaparunakis/FirstDayOfTheWeek Phillip Thelen 2016-09-23 19:06:21 +0200
  • 739f90dd41 Merge remote-tracking branch 'refs/remotes/origin/widgets' into develop Phillip Thelen 2016-09-23 17:15:46 +0200
  • 872b68f55d temporarily disable "Add Task" widget Phillip Thelen 2016-09-23 17:15:22 +0200
  • faf4b77d6d Make habit button work Phillip Thelen 2016-09-23 17:02:13 +0200
  • 497d574e36 Refactor: Rebase First Day of the Week feature Daniel Kaparunakis 2016-09-22 22:49:49 -0500
  • 4f759f1140 Feature: Add better case labels to the FirstDayOfTheWeekHelper class Daniel Kaparunakis 2016-09-22 22:26:27 -0500
  • f1db752ca2 Feature: Add sensible default for first day of the using locale Daniel Kaparunakis 2016-09-18 23:46:28 -0500
  • 3634980116 Feature: Refactor the order of days in dailies Daniel Kaparunakis 2016-09-16 12:29:27 -0500
  • e02b52aac9 Fix: Correct default value for first day of the week. Daniel Kaparunakis 2016-09-10 18:26:51 -0500
  • 64e012a88a Feature: Add logic to files where calendar views occur Daniel Kaparunakis 2016-09-10 18:21:14 -0500
  • 94ed87ba6e Feature: Add first day of the week option for all calendars Daniel Kaparunakis 2016-09-08 09:37:57 -0500
  • 44b6de04be Start working on habit button widget Phillip Thelen 2016-09-22 16:02:01 +0200
  • 3ed0be06d0 Finish dailies widget Phillip Thelen 2016-09-22 13:07:06 +0200
  • 90ff59a17c Fix: Re-add code lost to Git conflicts. Daniel Kaparunakis 2016-09-21 00:00:24 -0500
  • 6132ad561c Merge remote-tracking branch 'upstream/develop' into develop Daniel Kaparunakis 2016-09-20 23:18:08 -0500
  • 9cee9d79e8 update gradle plugin Phillip Thelen 2016-09-20 16:46:34 +0200
  • 6c86a83023 Merge pull request #628 from HabitRPG/avatar_transformations Phillip Thelen 2016-09-20 13:22:28 +0200
  • 18a24cff9b Merge pull request #619 from vlad-vassilovski/fix-pet-and-mount-counts Phillip Thelen 2016-09-20 12:58:12 +0200
  • 4804f67eb9 Merge pull request #630 from DrStrangepork/develop Phillip Thelen 2016-09-20 12:52:13 +0200
  • eb496daa4b Fixed typo Rick Kasten 2016-09-19 02:09:50 -0400
  • d10cfec978 list dailies in widget Phillip Thelen 2016-09-18 00:21:38 +0200
  • 96c61ed7cb Fix: Fix persistence for language settings after process dies. Daniel Kaparunakis 2016-09-16 14:28:16 -0500
  • 2efb6ee0bb Feature: Add content reload to language switcher setting's calls Daniel Kaparunakis 2016-09-16 12:45:08 -0500
  • 206a8be548 Show avatar transformations (snowball, shiny seed, seafoam and spooky sparkles) Negue 2016-09-16 18:23:31 +0200
  • 71fce3d021 Fix #617, #618: Correct profile's pet/mount counts Vlad Vassilovski 2016-09-09 23:09:32 -0400
  • 776b6d58fd start working on dailies widget Phillip Thelen 2016-09-13 21:03:12 +0200
  • ecb10bf5d6 fixes #608, fixes #616, fixes #618, fixes #621, fixes #622, fixes #623, fixes #624 Negue 2016-09-13 18:53:47 +0200
  • 256d9e3ea9 Continue work on widgets Phillip Thelen 2016-09-12 21:11:35 +0200
  • a8201a936a Merge branch 'develop' of https://github.com/HabitRPG/habitrpg-android into profile-achievements Negue 2016-09-12 15:15:00 +0200
  • ed592f8d37 remove StaticGridView again (no longer used) Negue 2016-09-12 14:41:15 +0200
  • fc7ab5c319 Initial version for Avatar Stats Widget Phillip Thelen 2016-09-09 21:19:51 +0200
  • 09a99ab367 Merge pull request #609 from jjbillings/tag-api-tests Phillip Thelen 2016-09-09 10:33:20 +0200
  • 3e27fe90e3 Dialog with OK-Button, Count-Bubble on an Achievement-Icon Negue 2016-09-08 19:19:32 +0200
  • 85d0ac004d update to new api-result, list achievements in 3 columns, show achievement dialog Negue 2016-09-08 17:22:59 +0200
  • 6840009e93 first implementation of achievements as grid (auto break newline) Negue 2016-09-06 21:33:17 +0200
  • 4b63b63b0d Refactor: Fix logic for language discovery at registration Daniel Kaparunakis 2016-09-06 00:10:51 -0500
  • d2d8cb597f Refactor: Modify LanguageHelper class to simplify switch block Daniel Kaparunakis 2016-09-05 23:24:06 -0500
  • b48bb6e3e8 Refactored to getUser method jjbillings 2016-09-05 12:23:31 -0500
  • c27fcb4aa8 Merge pull request #610 from jjbillings/add-material-icons Phillip Thelen 2016-09-05 14:04:12 +0200
  • 4e15428d5a Merge pull request #601 from SirLoading/skill-feedback Phillip Thelen 2016-09-05 13:57:15 +0200
  • 22ccb1bcf7 Feature: Add logic to SetupActivity to set language at registration Daniel Kaparunakis 2016-09-04 22:50:04 -0500
  • b6ebd58d11 fix pet count calculation Phillip Thelen 2016-09-04 18:51:35 +0200
  • b3f7405d90 display tasks for broken tasksOrder lists Phillip Thelen 2016-09-04 16:01:23 +0200
  • ad7a1b7566 allow users to accept party invites Phillip Thelen 2016-09-04 15:28:21 +0200
  • cfced48f0d Add google login Phillip Thelen 2016-09-02 19:27:23 +0200
  • f1949f3422 fix mapping for premium pets Phillip Thelen 2016-08-23 12:19:41 +0200
  • be96d29c98 Merge pull request #582 from TheHollidayInn/facebook-register-from-login-page-fix Phillip Thelen 2016-09-02 19:26:35 +0200
  • 548fa9af6b Feature: Complete logic for the SharedPreferences change listener Daniel Kaparunakis 2016-09-01 23:05:49 -0500
  • 0f271e6a5a Add icon files to git jjbillings 2016-08-30 08:52:46 -0500
  • 624d37ec96 Feature: Remove unnecessary languages & add values to the resource files Daniel Kaparunakis 2016-08-29 23:54:15 -0500
  • e9b15f089f Change chat message menu icon colors jjbillings 2016-08-29 19:26:27 -0500
  • 7ca7f3aa76 Add tests for update/delete tags jjbillings 2016-08-29 12:24:11 -0500
  • d072885e6e Feature: Add ListPreference for language switcher to settings activity Daniel Kaparunakis 2016-08-29 00:04:26 -0500
  • 3691246b52 Merge pull request #11 from HabitRPG/develop Jack Billings 2016-08-23 20:23:26 -0500
  • f84abbae04 moved skill feedback to skill event Sir Loading 2016-08-23 10:36:36 +0200
  • 23353cce9b Merge pull request #600 from jjbillings/delete-tags Phillip Thelen 2016-08-22 18:34:58 +0200
  • ae643b4664 Merge pull request #602 from HabitRPG/debug Phillip Thelen 2016-08-22 18:25:50 +0200
  • 035c7098da update build tools in travis Phillip Thelen 2016-08-22 11:00:06 +0200
  • 2b1f63ccd2 Sync from main repo jjbillings 2016-08-21 19:45:54 -0500
  • c36c889544 Merge pull request #9 from HabitRPG/develop Jack Billings 2016-08-21 19:39:12 -0500
  • 9de0f1b91b update translations Phillip Thelen 2016-08-21 20:37:43 +0200
  • f58141c5ac have debug and store version without uninstall the other Negue 2016-08-21 16:19:20 +0200
  • ed97d8f502 Fix deleted tags still being used to filter. Also fix TaskForm checkboxes not synchronizing with edited/deleted tags jjbillings 2016-08-19 14:28:38 -0500
  • 1a246610f2 Move handling to update tag handling to another method. jjbillings 2016-08-19 12:34:22 -0500
  • 51ce4ec529 allow users to send messages from inbox Phillip Thelen 2016-08-19 18:54:11 +0200
  • 1f759aeffd imporove qr code display Phillip Thelen 2016-08-19 16:20:01 +0200
  • c20d79120b update support libraries Phillip Thelen 2016-08-19 13:51:46 +0200
  • a954f481d9 Merge pull request #595 from TheHollidayInn/invites-qr-code Phillip Thelen 2016-08-19 12:54:20 +0200
  • 67d6626382 Merge branch 'develop' of https://github.com/jjbillings/habitrpg-android into delete-tags jjbillings 2016-08-18 10:18:15 -0500
  • 4e44a855c4 Merge pull request #7 from HabitRPG/develop Jack Billings 2016-08-18 10:10:11 -0500
  • 41eb99d188 fix mapping error Phillip Thelen 2016-08-18 16:34:04 +0200
  • 9aadfe62f8 fix shop display issue on old devices Phillip Thelen 2016-08-18 16:05:13 +0200
  • 8b8ba0cf4d fix translations Phillip Thelen 2016-08-18 11:09:57 +0200
  • bd2ec3e28e add #334 - updated skill feedback with HP and XP Sir Loading 2016-08-18 13:37:52 +0200
  • d4cf036434 Sync fork with main repo Jack Billings 2016-08-17 14:46:42 -0500
  • 3b3d607d95 Remove unused imports jjbillings 2016-08-17 14:42:31 -0500
  • f850fe7d68 Clean up code, fix keyboard dismissing issues jjbillings 2016-08-17 14:34:55 -0500
  • d2e7b0fe26 Update String resources jjbillings 2016-08-17 13:11:52 -0500
  • 68538c58d6 Add tag update functionality jjbillings 2016-08-17 12:52:00 -0500
  • bc0fbc8f78 Fixed issue with displaying onboarding when user registers with facebook from the login screen Keith Holliday 2016-07-24 17:33:20 -0500
  • bfdb5ac72f add better feedback on skills casted Sir Loading 2016-08-17 18:38:36 +0200
  • 36c1990449 Add AlertDialog for editing/deleting tag jjbillings 2016-08-16 20:32:08 -0500
  • 9762dc3a04 Fixed styles. Made QR code purple. Encoded url to QR code. Made QR code larger Keith Holliday 2016-08-16 20:17:18 -0500
  • fdf00b66aa fix(avatarView): currentLayers is null on the first call negue 2016-08-17 01:33:53 +0200
  • 71f796e02b add debug info to figure out mapping issue Phillip Thelen 2016-08-16 18:43:08 +0200
  • bd8df11057 fix crash in avatar customization Phillip Thelen 2016-08-16 18:42:55 +0200
  • 1aa5da182b update translations Phillip Thelen 2016-08-16 18:42:46 +0200
  • abc83a38c2 fix incorrect string identifier Phillip Thelen 2016-08-13 15:00:51 +0200
  • 43a63794bc Merge pull request #591 from jjbillings/guild-search-bar Phillip Thelen 2016-08-16 18:20:46 +0200
  • 4904cbc7b9 Restyled popup for QR Keith Holliday 2016-08-15 22:30:59 -0500
  • 5abcc1bb7d Move guild search bar to toolbar jjbillings 2016-08-14 14:11:07 -0500
  • bde5288443 Merge pull request #5 from HabitRPG/develop Jack Billings 2016-08-14 13:28:23 -0500
  • e98c5aa77b Merge pull request #596 from HabitRPG/refresh-avatar Phillip Thelen 2016-08-13 14:59:22 +0200