Commit Graph

14022 Commits

Author SHA1 Message Date
eshapard 887399b815 update documentation for marking chat seen
Documentation included the chatId in the url, but the api does not use it. Adding the chatId will cause a 404 error. The api marks all chats in the guild as read; not individual chats.

closes #7742
2016-06-30 22:09:30 -05:00
Blade Barringer 4b30e7265b Merge pull request #7743 from mchlltt/develop
Fixes #5631
2016-06-30 22:00:10 -05:00
Blade Barringer 39f014c059 chore(client): Remove unused server error page
closes #7745
2016-06-30 21:41:12 -05:00
Mich Elliott 8a8eaefe2d Fix typos in questscontent 2016-06-30 14:46:43 -05:00
Travis 21696fa258 Fixing the quest name in the previous quests scroll drop for recidivate (#7739)
* Fixing the quest name in the previous quests scroll drop for recidivate

* Updating case of 'the'
2016-06-30 10:28:45 -05:00
Sabe Jones e17d5af07d fix(deploy): typo 2016-06-29 20:17:54 +00:00
Sabe Jones 480ab375e1 fix(deploy): more NODE_HOME 2016-06-29 20:15:01 +00:00
Sabe Jones 168bc952d1 3.18.0 v3.18.0 2016-06-29 19:30:59 +00:00
Sabe Jones e1dc4a5480 chore(npm): update shrinkwrap 2016-06-29 19:30:23 +00:00
Sabe Jones 52b34bb6b8 fix(bower): pin habitica-markdown 2016-06-29 19:08:25 +00:00
Sabe Jones 25100a487a chore(gulp): compile sprites 2016-06-29 19:06:01 +00:00
Sabe Jones d498f5dee3 It's dangerous to go alone. Take This gear. (#7713)
* feat(content): Take This equipment

* chore(sprites): add icons
2016-06-29 13:33:56 -05:00
Sabe Jones cabb66c5b3 Shrinkwrap dependencies (redux) (#7732)
* fix(versioning): shrinkwrap and pinning

* fix(versioning): install/shrinkwrap on 4.4.3

* fix(versioning): workaround deps/devdeps issue

* feat(npm): shrinkwrap

* fix(bower): unpin habitica-markdown
2016-06-29 13:32:35 -05:00
Sabe Jones 723bf7358b feat(customization): enable Splashy Skins (#7740) 2016-06-29 13:31:37 -05:00
Blade Barringer 6ad65c35fc 3.17.0 v3.17.0 2016-06-28 09:53:01 -05:00
Blade Barringer af4402afb0 chore(i18n): update locales 2016-06-28 09:05:51 -05:00
Blade Barringer 70253ea584 chore(tests): Don't restart test server when modifying test file 2016-06-28 09:00:45 -05:00
Blade Barringer c22bf2e38b Merge pull request #7736 from crookedneighbor/fix_post_chat
fix(client): Prevent group from freezing up when sending a chat message
2016-06-28 08:59:41 -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
Blade Barringer c9f2389765 chore(test): Unpend cancel subscription test 2016-06-26 09:49:48 -05:00
Blade Barringer 37e638a64d fix(test): Pend send email test 2016-06-26 09:27:29 -05:00
Blade Barringer 81ac45f2a7 fix(api): Grant remaining perks when canceling an Amazon subscription
* Add tests for payments lib
* Add placeholder it blocks to be filled in

closes #7660
closes #4840
2016-06-26 08:08:49 -05:00
Alys a7d4b76c58 remove bad comma from end of a locales file 2016-06-25 09:47:09 +10:00
Alys 8055db2e54 add missing gearNotOwned string 2016-06-25 09:30:04 +10: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
Alys e441f45ac5 improve texts for password reset feature
- Removes full stop from the end of the password (very misleading).
- Makes messages about the password emails more accurate.
2016-06-24 21:59:34 +10:00
Alys 3d94c2e7f1 fix error in comment in apidoc for ExportUserAvatarPng 2016-06-24 20:13:22 +10:00
Matteo Pagliazzi 430160ef0e feat(eb): update npm to v3 (#7711) 2016-06-24 10:31:19 +02:00
Sabe Jones db2ed83a58 3.16.0 v3.16.0 2016-06-23 19:48:52 +00:00
Sabe Jones 9d1f1fa321 Correct GA unsub info (#7676)
* fix(analytics): better GA category handling

* refactor(analytics): chained OR

* fix(analytics): prefer gaCategory
2016-06-23 14:29:50 -05:00
Sabe Jones cfe688daa5 feat(mystery): subscriber items 201606 (#7707)
* feat(mystery): subscriber items 201606

* chore(news): announce Android
2016-06-23 14:01:11 -05:00
Matteo Pagliazzi 7edde56dad fix(deps): add apn package 2016-06-23 17:27:20 +02:00
Blade Barringer e274f63f9d chore(i18n): update locales 2016-06-23 07:59:25 -05:00
Blade Barringer 1484090d27 Merge branch 'Hus274-7701' into develop 2016-06-23 07:55:56 -05:00
Travis 0af1ced462 fix(client): Sort gear by stat from class bonus (#7710)
* Accounting for class bonus when sorting equipment by stats. closes #7701

* Fixing unintended impact on last page and including special classes

* Addressing comments
2016-06-23 07:55:00 -05:00
Blade Barringer 2d3e5f86f7 feat(client): Display if gear gets class multiplier in notes 2016-06-23 07:53:01 -05:00
Blade Barringer d5a354b499 fix(api): Only award participating members the quest rewards (#7706) 2016-06-23 07:10:56 -05:00
Husman c7b54a0abf Addressing comments 2016-06-22 20:19:48 -07:00
Blade Barringer b27b18b323 Merge pull request #7703 from khipkin/small_api_typo
fix mistake in apidoc for Feed a pet
2016-06-22 22:04:46 -05: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
Matteo Pagliazzi 08d7727881 Push notifications (#7682)
* Fix Social Push notifications

* Fix code formatting issues

* Fix commented issues

* Fix Syntax errors

* update push notify dependency

* specify push-notify version

* change how apn key is loaded

* feat(push-notifications): improve logging

* feat(push-notifications): disable v2 push notifications

* test(push-notifications): add unit tests and improve integration ones

* fix(push-notifications): throw when required params are missing

* fix(tests): correct descriptions and remove wrong comment

* fix(push-notifications): trim APN key

* fix(apn): log feedback only if it has data

* fix(apn): load cert and key differently

* fix(tests): correctly load apn during tests

* download creds from S3 and create AWS lib

* convert s3 buffer to a string

* fix(apn): remove console.log and do not use cert twice

* invert key and cert, disable failing test

* invert key and cert
2016-06-23 00:19:37 +02:00
Matteo Pagliazzi 09c7c45cd5 fix trailing spaces 2016-06-22 12:18:42 +02:00
Matteo Pagliazzi 3924bdc7c5 Fetch entire user when resetting password 2016-06-22 11:56:39 +02:00
Sabe Jones b3c9bd9021 3.15.0 v3.15.0 2016-06-22 01:13:26 +00:00
Sabe Jones cf258676a2 feat(event): Summer Splash 2016 (#7705) 2016-06-21 19:22:50 -05:00
Kaitlin Hipkin b94872a69f fix copypasta mistake 2016-06-21 20:10:25 +02: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