Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,179 Commits 64 Branches 1,256 Tags
02545ae439ab4bc6970c7dee656d79fc40cbf5e9
Commit Graph

152 Commits

Author SHA1 Message Date
Kaitlin Hipkin 55111a6ddc New Party Loading Messages (#7862) 
* add basic party loading message code; doesn't work yet

* fixup party loading messages, remove rpg-style messages

* move party-loading messages back into groups.json

* party-loading message logic returns a string instead of a number
 2016-08-12 08:53:03 -05:00
Phillip Thelen 679378331d add client and OS info to amplitude events 
closes #7865
 2016-08-11 08:58:13 -05:00
Husman 725c3b36f3 feat: allowing modification of challenge tasks after challenge creation. fixes #7320 
closes #7877
 2016-08-11 08:48:39 -05:00
Blade Barringer 89822222fe Merge pull request #7881 from Hus274/7716 
fix: shows user correct challenge when showing won challenge modal
 2016-08-11 08:07:16 -05:00
Blade Barringer fed1eb8c21 fix(client): set state chagne to scroll to top 
closes #7880
fixes #4326
 2016-08-11 07:59:12 -05:00
Josh Holland cdeb498c0b Align guild gems box with other page elements (#7829) 
* Align guild gems box with other page elements

Fixes #7796.

* Fix issues caused by aligning guild gems box

* Remove unnecessary comment

* Connect gem total box and plus/add gems button

When the add gems button is displayed, set border-radius on touching
corners between the two buttons to 0, so that they are displayed as a
unit rather than two separate buttons.
 2016-08-11 07:45:21 -05:00
Blade Barringer a5b2e53914 fix(client): Add client redirect for coupon url 2016-08-10 12:12:56 -05:00
Matteo Pagliazzi 689a321a9b enable pusher for all users 2016-08-09 20:05:04 +02:00
Husman acc9e8ca7f fix: shows user correct challenge when showing won challenge modal 2016-08-07 16:27:18 -07:00
Matteo Pagliazzi 6dfa93dab2 correct pusher inactivity timeout 2016-08-08 00:08:54 +02:00
Matteo Pagliazzi 3efd900a3f correctly check for Pusher being enabled 2016-08-07 22:23:00 +02:00
Matteo Pagliazzi ff4a3adf7e feat(pusher): disconnect after 30m of inactivity 2016-08-07 22:20:45 +02:00
Sabe Jones 77c276fefe feat(analytics): Facebook "Pixel" (#7871) 2016-08-05 13:40:25 -05:00
Blade Barringer 093c5a72df Merge branch 'develop' into Ozzystrasza-tavern_default_prize 2016-08-05 12:22:41 -05:00
Philip Karpiak bea4bf80e9 Fix #6708 - guild message maximizes width in Firefox 2016-08-04 18:02:55 -04:00
Ozzystrasza 063995d5e4 Test prize amount before changing to 1 2016-08-01 20:26:43 -03:00
Phillip Thelen 24d25026cf Add API calls for shop inventories (#7810) 
* Add API call for market inventory

* changes to shop api calls

* optimize shop categories

* add API call for quests

* add api call for time travelers shop

* fic buying items in shops

* fix linting errors

* shop adjustments for iOS app

* add tests to shops

* fix syntax issues

* Code formatting

* correct indentation

* add tests for api routes

* fix time travelers and seasonal

* Increase test coverage for shop routes

* refactor: Pull out trinket count in time traveler route

* refactor: Clarify instructions for seasonal shop script

* lint: Remove extra new line

* Adjust shops common test
 2016-07-26 14:36:55 -05:00
Luan bac1405a20 feat(client): Add notification badge 
fixes #4365
closes #7755
 2016-07-12 17:56:12 -05:00
Husman 694cd8e555 feat: allowing the flagging of system messages 
closes #7767
closes #7771
 2016-07-11 21:28:43 -05:00
Matteo Pagliazzi 1ab8dab9a3 pusher: onlkeopenaximum 1 connection per brorowser 2016-07-08 17:48:39 +02:00
Matteo Pagliazzi 0880850408 Real-time Chat (#7664) 
* feat(realtime-chat): add Pusher library to the server

* feat(realtime-chat): only for private groups

* feat(realtime-chat): add authentication endpoint for Pusher

* feat(realtime-chat): client proof of concept

* fix typo in apidoc

* feat(realtime-chat): redo authentication and write integration tests

* remove firebase code

* fix client side tests

* fix line ending in bower.json

* feat(realtime chat): use presence channels for parties, send events & disconnect clients if user leaves or is removed from party, automatically update UI

* pusher: enable all events in the background

* fix pusher integration tests
 2016-07-02 15:17:24 +02:00
Blade Barringer 39f014c059 chore(client): Remove unused server error page 
closes #7745
 2016-06-30 21:41:12 -05:00
Blade Barringer f8e1e51c21 fix(client): Prevent group from freezing up when sending a chat message 2016-06-28 08:13:09 -05:00
Blade Barringer 24287df702 fix(client): msg notification properly leaves after visiting party page 
closes #7393
closes #7735
closes #7445
 2016-06-28 07:37:27 -05:00
Travis 30cf4f5a96 fix(client): Stop duplicating completed todos (#7709) 
* Deduping completed tasks on load. closes #7708

* Addressing paglias' comment
 2016-06-24 07:57:15 -05:00
Blade Barringer 2d3e5f86f7 feat(client): Display if gear gets class multiplier in notes 2016-06-23 07:53:01 -05:00
Husman c7b54a0abf Addressing comments 2016-06-22 20:19:48 -07:00
Husman 2d327ca6ea Fixing unintended impact on last page and including special classes 2016-06-22 19:58:36 -07:00
Husman cc476a0dee Accounting for class bonus when sorting equipment by stats. closes #7701 2016-06-22 19:28:44 -07:00
Blade Barringer cfacf039df refactor(client): assign tasks data to tasks variable on initial sync 2016-06-21 07:34:44 -05:00
Blade Barringer 138217fe6a fix(client): Load completed todos on sync 
closes #7392
closes #7673
 2016-06-21 07:31:19 -05:00
Blade Barringer d18f42fe7a fix(client): Use $state on $rootScope 2016-06-20 06:35:21 -05:00
Blade Barringer a4dba82d14 fix(client): Refresh party page when inviting users 2016-06-19 09:41:43 -05:00
Blade Barringer 7fd3ad3731 fix: Do a hard redirect after creating party 
closes #7694
 2016-06-19 09:06:21 -05:00
Blade Barringer 09ecc0eada Merge branch 'Hus274-7689' into develop 2016-06-19 08:38:37 -05:00
Blade Barringer 941ff10cdc fix: Prevent message from displaying if no new messages exist 2016-06-19 08:38:07 -05:00
Husman b62fbab6f8 Mark private messages as read when entering the inbox and syncing while in the inbox. closes #7689 2016-06-18 19:42:11 -07:00
Blade Barringer e28946bcfb fix(client): Allow users to reject invites to new parties 
closes #7691
 2016-06-18 20:21:27 -05:00
Blade Barringer 813aa2cf38 chore(client): Remove unused clearCompleted user.ops function 2016-06-18 12:23:40 -05:00
Husman 1a19605ee6 fix: Update client to remove completed todos immediately 
closes #7549
closes #7685
 2016-06-18 12:23:28 -05:00
Matteo Pagliazzi a424892dd3 Fix auth if localStorage is missing or corrupted (#7674) 
* fix(auth): correctly redirect to logout page if localstorage is corrupted

* fix(auth): do not break site if localStorage has invalid JSON

* fix(karma): use $window instead of windo

* disable failing karma tests

* fix(tests): Provide mockwindow for tests

* fix(tests): Call habitrpgShared without $window
 2016-06-17 12:14:41 +02:00
Husman 4a3e0eb884 Removing accepted guild invitations from the local copy of the user object so the notification goes away without having to refresh. #7600 2016-06-12 16:03:44 -07:00
Husman 9b12d46741 feat: Add group by button to equipment page 
Closes #7636
Closes #7651

This commit creates a new button on the equipment page that allows the user to group their equipment type (body location) instead of simply by class.
 2016-06-12 09:40:25 -05:00
Shervin Sarain 539547b39e prevent sync from clearing selected tags (#7631) 
* prevent sync from clearing selected tags

* improved tag selection bugfix
 2016-06-11 19:57:20 +02:00
MathWhiz 57bb4d8c10 Fix webhooks (#7622) 
* fix userServices.js

* comply with eslint

* Remove conversion to string
 2016-06-10 12:42:48 +02:00
Matteo Pagliazzi efeb2c1c8e implement tips for loading screen (#7632) 
* implement tips for loading screen

* fix typo in tip 22
 2016-06-10 12:25:09 +02:00
Blade Barringer b97d7cc9f9 feat: Disable spells on client when they cannot be cast 
Closes #7110
Closes #6867
 2016-06-09 08:58:57 -05:00
Blade Barringer 17b6999c81 Merge pull request #7621 from crookedneighbor/party_page 
Fetch Party when going to party page
 2016-06-07 21:43:38 -05:00
Sabe Jones 9df3e88842 fix(coupons): POST apply, not GET 2016-06-08 01:52:21 +00:00
Matteo Pagliazzi 5e01b3d129 fix sticky header not working 2016-06-07 21:12:31 +02:00