Commit graph

14071 commits

Author SHA1 Message Date
Alys
76b51b8b65 fix apidoc typo: change clear-flags to clearflags 2016-07-13 19:57:29 +10:00
Sabe Jones
0816e69fb6 fix(shrinkwrap): don't upgrade mongoose 2016-07-12 23:48:38 +00:00
Luan
bac1405a20 feat(client): Add notification badge
fixes #4365
closes #7755
2016-07-12 17:56:12 -05:00
Sabe Jones
28ebc92aa9 3.22.0 2016-07-12 20:38:05 +00:00
Sabe Jones
36f1e2dfbb chore(deploy): sprites, shrinkwrap, news 2016-07-12 20:37:04 +00:00
Sabe Jones
01052028fb feat(content): Pet Quest 2016-07 (#7780) 2016-07-12 15:23:45 -05:00
Husman
6543ff89e1 refactor(api): Remove prod check in payments library. Fill out tests
Wasn't able to mock out pushNotifications correctly and left two tests unfinished.

closes #7728
closes #7770
2016-07-12 12:43:17 -05:00
Blade Barringer
e05db11fe0 chore(i18n): update locales 2016-07-11 21:34:54 -05:00
Ross Hardy
2b30c63448 Adding new basic audio theme rosstavoTheme (#7766) 2016-07-12 12:30:44 +10:00
Husman
694cd8e555 feat: allowing the flagging of system messages
closes #7767
closes #7771
2016-07-11 21:28:43 -05:00
Alys
0631e9ba15 delete ancient code for hiding a the huge Spread the Word challenge, which has now been closed 2016-07-10 11:41:28 +10:00
Matteo Pagliazzi
1ab8dab9a3 pusher: onlkeopenaximum 1 connection per brorowser 2016-07-08 17:48:39 +02:00
Sabe Jones
485deb1a70 3.21.1 2016-07-07 22:54:00 +00:00
Sabe Jones
03cee070e9 chore(npm): update shrinkwrap 2016-07-07 22:53:08 +00:00
Sabe Jones
52ae23e9bf chore(news): misc Bailey 2016-07-07 22:40:50 +00:00
Sabe Jones
46d618327a fix(contact): clarify merch inquiries 2016-07-07 14:48:22 -05:00
Sabe Jones
cfd5455e3b 3.21.0 2016-07-05 20:58:58 +00:00
Sabe Jones
3eac65c4bd chore(npm): update shrinkwrap 2016-07-05 20:58:36 +00:00
Sabe Jones
ff3f339c2e feat(content): Armoire and BGs 2016-07 (#7762)
* feat(content): Armoire and BGs 2016-07

* fix(backgrounds): resize Dilatory Castle
Also fixes a long-overlooked issue where the Egg Hunt quest remained available long after its event ended.
2016-07-05 15:49:21 -05:00
Matteo Pagliazzi
d514109e39 Merge branch 'iap-fix' into develop 2016-07-04 17:43:26 +02:00
Matteo Pagliazzi
6120a29158 remove console.log 2016-07-04 17:42:33 +02:00
Matteo Pagliazzi
76397e64af upgrade in-app-purchase 2016-07-04 17:23:49 +02:00
Matteo Pagliazzi
8be5ba76dd add some logging 2016-07-04 16:46:41 +02:00
Matteo Pagliazzi
d4cff995e8 fix isValidated and port iOS iap code 2016-07-04 16:12:43 +02:00
Matteo Pagliazzi
dff9356778 remove redundant export for iap 2016-07-04 15:50:40 +02:00
Matteo Pagliazzi
0caeb518af Merge branch 'develop' into iap-fix 2016-07-04 15:45:56 +02:00
Matteo Pagliazzi
a2da583db8 port android iap code to v3 2016-07-04 15:45:52 +02:00
Matteo Pagliazzi
f8760a337a parse receipt object 2016-07-04 15:06:35 +02:00
Matteo Pagliazzi
e19657b8ac more logging 2016-07-04 14:58:50 +02:00
Matteo Pagliazzi
e933914548 more logging 2016-07-04 14:43:15 +02:00
Blade Barringer
01dba9a4be chore(i18n): update locales 2016-07-02 23:05:08 -05:00
Matteo Pagliazzi
0dee20f7eb 3.20.0 2016-07-02 15:18:44 +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
889c41fa18 chore(i18n): update locales 2016-07-01 20:31:28 -05:00
Blade Barringer
e077f7f150 3.19.0 2016-07-01 20:28:12 -05:00
Blade Barringer
9602a398b2 feat(api): Allow admins to revoke chat priveleges from website 2016-07-01 20:24:37 -05:00
Blade Barringer
3d49a1bcee chore: bump habitica-markdown bower package version 2016-07-01 20:22:52 -05:00
Sabe Jones
aa27d2d1aa fix(EB): consolidate extensions (#7748) 2016-07-01 19:40:32 -05:00
Sabe Jones
c871d8877c Corrected transaction descriptions (#7744)
* fix(subscriptions): Habitica not HabitRPG

* fix(subscriptions): Habitica in Amazon
2016-07-01 19:40:23 -05:00
Sabe Jones
986d583ff9 fix(news): typo 2016-07-01 19:40:05 -05:00
Sabe Jones
54c841da61 chore(news): Take This Bailey 2016-07-02 00:15:22 +00:00
Matteo Pagliazzi
32714e5d26 added some logging 2016-07-01 13:41:52 +02:00
Matteo Pagliazzi
75df284967 better error handling and fix typo 2016-07-01 12:37:29 +02:00
Blade Barringer
1bf96f9a33 fix(docs): Correct typo in chat docs 2016-06-30 22:09:30 -05:00
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