Commit Graph

14004 Commits

Author SHA1 Message Date
Matteo Pagliazzi 893b4d8def fix(iap): rewrite iap library code 2016-06-27 14:26:20 +02:00
Matteo Pagliazzi e1fc5355b8 Merge pull request #1 from paglias/iap_fix
chore: show how to use yields
2016-06-27 12:11:37 +02:00
Blade Barringer 16a592bf3c chore: show how to use yields 2016-06-26 20:38:14 -05:00
Matteo Pagliazzi c630bb9f96 fix(iap): wip 2016-06-26 17:04:16 +02: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
Christopher Wells fd746c19d2 Fix grammar mistakes in license file
Correct usage of "is" to "are", as "Assets and content" is plural rather than singular.

closes #7700
2016-06-21 06:42:20 -05:00
Blade Barringer d18f42fe7a fix(client): Use $state on $rootScope 2016-06-20 06:35:21 -05:00
Blade Barringer 94ddd82cae fix(lint): Correct group test file 2016-06-19 21:00:02 -05:00
Blade Barringer e920734648 feat(api): Stop alerting about new messages for large groups
closes #6706
closes #6762
2016-06-19 20:54:30 -05:00
Blade Barringer a4dba82d14 fix(client): Refresh party page when inviting users 2016-06-19 09:41:43 -05:00
Blade Barringer 851ad59fb8 fix(client): Display message about needing a party in quest modal
closes #7684
closes #7686
2016-06-19 09:25:57 -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 ef2535aadc fix: Use translatable string for mana in header
closes #7695
2016-06-19 09:00:59 -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
Matteo Pagliazzi 36ef208e18 3.14.0 v3.14.0 2016-06-19 12:33:45 +02: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
Blade Barringer ea5a148add fix(lint): Add missing semicolons 2016-06-18 12:07:30 -05:00
Blade Barringer 7c08563937 Merge branch 'velezsarain-attribute' into develop 2016-06-18 11:59:30 -05:00
Blade Barringer b20bd86f98 refactor(common): Clarify autoallocate code 2016-06-18 11:59:04 -05:00