Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,188 Commits 64 Branches 1,256 Tags
7ef2c34177fe327d581cd4c86dfc821b8e7b2f7e
Commit Graph

1917 Commits

Author SHA1 Message Date
Blade Barringer e68c75c802 chore(i18n): update locales 2016-08-17 10:24:04 -05:00
Camellia Peng 12f1aae2dd Update email check exist (#7899) 
* throw a 401 error if user tries to update his/her email to an email that exists already

* Make error message generic so we don't violate users' privacy.  Added test case.

* Syntax fixes

* select only the _id field when searching for users with the same email.  Return found document as javascript object.
 2016-08-15 07:52:53 -05:00
Blade Barringer 5a47f2a19f chore(i18n): update locales 2016-08-14 14:08:50 -05:00
Blade Barringer c7a2b69b32 chore(i18n): update locales 2016-08-13 07:03:50 -05:00
Blade Barringer b1d06671c8 chore(i18n): update locales 2016-08-12 08:57:45 -05:00
Kaitlin Hipkin 55111a6ddc New Party Loading Messages (#7862) 
* add basic party loading message code; doesn't work yet

* fixup party loading messages, remove rpg-style messages

* move party-loading messages back into groups.json

* party-loading message logic returns a string instead of a number
 2016-08-12 08:53:03 -05:00
Blade Barringer 8a4109b9d7 chore(i18n): update locales 2016-08-11 13:01:23 -05:00
Phillip Thelen 679378331d add client and OS info to amplitude events 
closes #7865
 2016-08-11 08:58:13 -05:00
Blade Barringer d50cedfd31 chore(i18n): update locales 2016-08-10 12:18:55 -05:00
Blade Barringer 420cebd93b fix: Correct purchase call to use purchaseType, not identifier 2016-08-10 08:58:01 -05:00
Sabe Jones 64c8e4d16d fix(content): item type handling 2016-08-10 05:18:30 +00:00
Blade Barringer 2d553417b4 fix(api): Correct identifier for magic hatching potions 2016-08-09 22:21:54 -05:00
Sabe Jones 9e16f9dffc chore(sprites): compile 2016-08-09 23:40:22 +00:00
Sabe Jones 72f1114d85 refactor(content): concatenate notes 2016-08-09 23:19:53 +00:00
Sabe Jones 051763bc49 Thunderstorm Hatching Potions (#7885) 
* feat(premium): Thunderstorm Potions

* chore(news): Thunderstorm Bailey

* fix(test): allow addlNotes key
 2016-08-09 17:37:39 -05:00
Sabe Jones b25ab8ca75 chore(sprites): compile 2016-08-03 20:27:49 +00:00
Sabe Jones 29498976ee feat(content): Armoire and BGs 201608 (#7868) 
Plus: beta shops API fixes and front page user count update
 2016-08-03 14:55:12 -05:00
Oziris 4244c7519e Add Dewin's new Theme (#7795) 
* Add files via upload

* Add string for new theme

* Added 'dewinTheme'

* Added 'dewinTheme'

* Delete Boss Battles Background Music.mp3

* Delete Boss Battles Background Music.ogg

* Delete Settings Page Background Music.mp3

* Delete Settings Page Background Music.ogg

* Add audio files with correct names

* Delete Boss Battles_Background_Music.mp3

* Delete Boss Battles_Background_Music.ogg

* Add files via upload
 2016-08-02 10:03:01 +10:00
Sabe Jones 9a338ef1de End Summer Splash 2016 (#7857) 
* chore(event): end Summer Splash 2016

* fix(event): disable Seasonal Shop buys
 2016-08-01 17:47:46 -05:00
Matteo Pagliazzi 60f34dafb0 Deprecate API v2 (was Revert "Revert "Deprecate API v2"") (#7802) 
* Revert "Revert "Deprecate API v2""

* fix path in shops controller
 2016-08-01 22:36:10 +02:00
Sabe Jones 2a3e3fb9d3 fix(gear): buy false takeThis gear (#7855) 2016-08-01 15:16:34 -05:00
Sabe Jones 6ce917a0f3 feat(content): Naming Day 2016 (#7853) 2016-07-31 18:56:20 -05:00
Sabe Jones 1ab3725b54 fix(path): correct i18n import 2016-07-26 22:11:35 +00:00
Sabe Jones 1c56648ea4 chore(sprites): compile 2016-07-26 19:42:36 +00:00
Phillip Thelen 24d25026cf Add API calls for shop inventories (#7810) 
* Add API call for market inventory

* changes to shop api calls

* optimize shop categories

* add API call for quests

* add api call for time travelers shop

* fic buying items in shops

* fix linting errors

* shop adjustments for iOS app

* add tests to shops

* fix syntax issues

* Code formatting

* correct indentation

* add tests for api routes

* fix time travelers and seasonal

* Increase test coverage for shop routes

* refactor: Pull out trinket count in time traveler route

* refactor: Clarify instructions for seasonal shop script

* lint: Remove extra new line

* Adjust shops common test
 2016-07-26 14:36:55 -05:00
Sabe Jones aa00893f6c feat(content): July 2016 Subscriber (#7833) 2016-07-26 14:20:50 -05:00
Ryan Castner 60367459e8 Fixes #7826 updating blog and adding tumblr links, as well as a developer link. One additional change was made in layout.jade not mentioned in ticket request which also referenced the old blog url, updated to point to new blog url. (#7828) 2016-07-26 21:28:15 +10:00
Sabe Jones b5f7adfe09 chore(news): Comic-Con announcements 2016-07-19 19:04:28 +00:00
Matteo Pagliazzi 590adb3438 Revert "Deprecate API v2" (#7801) 2016-07-17 18:15:25 +02:00
Matteo Pagliazzi 45c31a2bcf Deprecate API v2 (#7761) 
* deprecate api-v2

* remove v2 test helpers

* remove unused string
 2016-07-16 19:56:18 +02:00
Blade Barringer a9c234a6d2 chore(i18n): update locales 2016-07-15 10:53:18 -05:00
Blade Barringer 30e55c16cd chore(i18n): Update locales 2016-07-15 09:06:39 -05:00
Sabe Jones 6487860646 chore(news): Staff Spotlight 2016-07-15 03:08:12 +00:00
Oziris a19f538b90 Update questsContent.json (#7783) 
Fixed an issue with text format in the Axolotl rage effect.
 2016-07-13 22:56:40 +10: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
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
Sabe Jones 46d618327a fix(contact): clarify merch inquiries 2016-07-07 14:48:22 -05: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
Blade Barringer 01dba9a4be chore(i18n): update locales 2016-07-02 23:05:08 -05:00
Blade Barringer 889c41fa18 chore(i18n): update locales 2016-07-01 20:31:28 -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 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
Blade Barringer af4402afb0 chore(i18n): update locales 2016-06-28 09:05:51 -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