Commit graph

14088 commits

Author SHA1 Message Date
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
Sabe Jones
480ab375e1 fix(deploy): more NODE_HOME 2016-06-29 20:15:01 +00:00
Sabe Jones
168bc952d1 3.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 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
Matteo Pagliazzi
1492a8af0d use correct identifier for apple 2016-06-27 14:32:29 +02:00
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
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 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