Commit graph

13985 commits

Author SHA1 Message Date
Husman
997fd569e2 Fixing tests 2016-06-22 17:56:24 -07:00
Husman
e167e41731 Fixing edit task issue according to blade's comments 2016-06-22 17:14:12 -07:00
Husman
874b0d203f Merge remote-tracking branch 'origin/7688' into 7688 2016-06-22 17:13:32 -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
Husman
1a6f08545b Working with updated _edit model 2016-06-21 20:39:26 -07:00
Sabe Jones
b3c9bd9021 3.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
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 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
Husman
db3a8cf7c3 Fixed mispelling 2016-06-18 18:30:31 -07:00
Husman
f35c4df022 Improving cancel task edit functionality. closes #7688 2016-06-18 18:26:01 -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
Blade Barringer
7cf28f6f2a refactor(tests): Rewrite stat autoallocation tests 2016-06-18 11:58:02 -05:00
Blade Barringer
757792bcdf chore(i18n): update locales 2016-06-18 07:25:41 -05:00
Blade Barringer
007ac4abfd chore(i18n): update locales 2016-06-18 07:15:30 -05:00
Blade Barringer
b2c5c8d8e7 fix(locales): Correct string key
fixes #7683
2016-06-18 07:10:32 -05:00
Sabe Jones
4b98295977 3.13.0 2016-06-18 00:44:54 +00:00
Sabe Jones
8cb0d91f77 chore(news): misc announce 2016-06-17 23:35:23 +00:00
Blade Barringer
ca32cac6fe chore(dependency): Pin to version of eslint that is not broken 2016-06-17 17:36:48 -05:00
Blade Barringer
8919efbbdd Merge pull request #7681 from thompsnm/develop
Separate call to upgrade npm so that it occurs before any other installs
2016-06-17 17:20:32 -05:00
Alys
7a10d61281 fix inconsistencies in apidoc for member routes (#7679) 2016-06-17 13:10:49 +02:00
Alys
76e86bda86 fix error in API docs - flag chat had been documented as like 2016-06-17 20:25:14 +10: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
Nathan Thompson
a87647995d Separate call to upgrade npm so that it occurs before any other installs 2016-06-17 00:53:08 -06:00
Blade Barringer
5a3082bd88 fix(docs): correct apidoc param for task alias|id 2016-06-16 12:55:56 -05:00
Blade Barringer
b7b61e6251 Shortname (#7655)
* feat: Add alias property to task model
2016-06-16 12:28:45 -05:00
Blade Barringer
c34c21192b Merge pull request #7657 from Hus274/7600
Removing accepted guild invitations from the local copy of the user o…
2016-06-16 07:20:43 -05:00
Alys
27b7173f6c change pet names to initial upper case in "Unlocks purchasable Petname eggs..." fixes #5631 2016-06-16 16:20:17 +10:00
Travis
1de2c839c8 Adding ticks back into gifted gems receive message #7540 (#7671)
* Adding ticks back into gifted gems receive message #7540

* Removing raw string concatenation and fixing tests
2016-06-15 22:29:04 -05:00
Blade Barringer
3d7d41c517 Merge pull request #7672 from Hus274/7629
Fixing quest naming according to @lemoness #7629
2016-06-15 22:23:32 -05:00
Blade Barringer
d067403959 chore: Add migration file for fixing invalid emails 2016-06-15 21:46:17 -05:00