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

14619 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Keith Holliday 97bf9ee8e8 Added inital group task approval 2016-10-29 14:19:15 -05:00
Blade Barringer f5ba636579 chore(i18n): update locales 2016-10-27 22:03:58 -05:00
Sabe Jones 4dd7e49552 3.51.1 v3.51.1 2016-10-27 20:44:17 +00:00
Sabe Jones d2f673ef1e chore(news): Blog Bailey 2016-10-27 19:58:43 +00:00
Sabe Jones e198dd551a feat(content): strings for BGs/Armoire 2016-11 2016-10-26 20:28:44 +00:00
Travis 0bfc9d9516 fix: allows user to save an alias and checklistCollapsed properties of a challenge task. fixes #7875 (#8170) 2016-10-25 21:47:49 -05:00
Sabe Jones d4e20ee4aa 3.51.0 v3.51.0 2016-10-25 21:56:09 +00:00
Sabe Jones a751a367fc chore(sprites): compile 2016-10-25 21:55:40 +00:00
Sabe Jones d323be19c6 Mystery Items 2016/10 (#8169) 
* feat(content): mystery items 2016-10

* chore(news): Bailey 2016-10-25
Also ends the Enchanted Armoire A/B test.

* fix(armoire): failing tests from A/B conclusion
 2016-10-25 16:16:00 -05:00
AccioBooks be3f61a94b Remove cookies on clearing browser data (#8135) 
* remove cookies

* update cookie removal

* Remove + and add link

* Fix tests

* Add condition

* update strings
 2016-10-25 19:53:56 +10:00
Alys f1bb2db73b fix wrong variable name in Polish questDamage string 
The translators have been notified that it needs to be fixed in Transifex before the next migration of strings back to GitHub.
 2016-10-23 09:54:18 +10:00
Matteo Pagliazzi a622344d44 3.50.0 v3.50.0 2016-10-22 18:12:09 +02:00
Blade Barringer e279a3550b chore(travis): start API tests earlier 2016-10-22 08:14:10 -05:00
Blade Barringer 70aab3059c fix(client): bump version of ngInfinitScroll 
v1.0.0 could not be found in bower registry
 2016-10-22 08:14:09 -05:00
Blade Barringer c264e37182 chore(travis): pend grunt build task 
chore(travis): Move test prep to gulpfile
 2016-10-22 08:14:07 -05:00
Blade Barringer b31bc15493 chore(travis): Add grunt-cli pkg 2016-10-22 08:14:06 -05:00
Blade Barringer ba19c00617 Setup up non-API tests to not need server and mongo running 
chore(travis): Build files before running tests

chore(travis): require server for api tests
 2016-10-22 08:14:00 -05:00
Blade Barringer 93aa92de7c chore(travis): Split up build tasks 2016-10-20 22:14:37 -05:00
Blade Barringer d021680945 chore(travis): Remove grunt and mocha install step 2016-10-20 22:05:21 -05:00
Blade Barringer f9595af8a5 Re-enable armoire tests 2016-10-20 22:04:24 -05:00
Alyssa Batula d2756278c3 Only unequip Gen 1 pets/mounts when releasing pets/mounts, fixes #5366 (#8119) 
* Only unequip Gen 1 pets/mounts when releasing pets/mounts

* Changed mount declaration to match releasePets

* Check if a pet/mount is a drop type instead of checking for its name in the list of pets

* Changed references to pet and mount to petInfo and mountInfo for consistency with releasePets and releaseMounts

* Test that releasePets, releaseMounts, and releaseBoth do not unequip quest pets

* Fixed test names, and tests verify that a pet/mount is/is not a drop pet/mount on release

* Removed unneeded comments
 2016-10-20 22:00:15 -05:00
Blade Barringer 2e2dc179c4 chore: pend armoire test 2016-10-20 19:30:22 -05:00
Alys acf7b811ab fix wrong variable name in French questTaskDamage string 
The translators have been notified that it needs to be fixed in Transifex.
 2016-10-21 08:24:36 +10:00
Blade Barringer d5170251c0 fix: remove unneeded Math.random test 2016-10-20 17:11:28 -05:00
Sabe Jones c9ba9054e3 chore(npm): shrinkwrap 2016-10-20 03:44:13 +00:00
MathWhiz d4aac1ee4b Documentation - coupon 
closes #8109
 2016-10-19 21:31:07 -05:00
Blade Barringer 9615a332a5 fix(client): Allow member hp to be clickable 
fixes #8016
closes #8155
 2016-10-19 21:01:35 -05:00
Blade Barringer 417455e5ef Merge branch 'snyk-community-snyk-community-patch-1' into develop 2016-10-19 17:42:20 -05:00
Blade Barringer 136502a110 chore: update express 2016-10-19 17:41:58 -05:00
Blade Barringer 425887c1e4 chore(i18n): update locales 2016-10-19 17:40:26 -05:00
Sabe Jones cfa8a5190f 3.49.0 v3.49.0 2016-10-19 19:43:47 +00:00
Sabe Jones df5be81706 chore(sprites): compile 2016-10-19 19:10:39 +00:00
Sabe Jones 08b3491047 Taskwoods Quest Line (#8156) 
* feat(content): Gold Quest 2016-10

* chore(news): Bailey
 2016-10-19 14:04:34 -05:00
Snyk Community e73c3147c1 Fix for the ReDOS vulnerability 
habitica is currently affected by the high-severity [ReDOS vulnerability](https://snyk.io/vuln/npm:tough-cookie:20160722). 

Vulnerable module: `tough-cookie`
Introduced through: ` request`

This PR fixes the ReDOS vulnerability by upgrading ` request` to version 2.74.0

Check out the [Snyk test report](https://snyk.io/test/github/HabitRPG/habitica) to review other vulnerabilities that affect this repo. 

[Watch the repo](https://snyk.io/add) to 
* get alerts if newly disclosed vulnerabilities affect this repo in the future. 
* generate pull requests with the fixes you want, or let us do the work: when a newly disclosed vulnerability affects you, we'll submit a fix to you right away. 

Stay secure, 
The Snyk team
 2016-10-19 17:50:16 +03:00
Alys a43254000e change Indulgence Armadillo to Indulgent Armadillo 
reference for Habitica admins: https://habitica.slack.com/archives/general/p1476655925000002
 2016-10-18 17:39:52 +10:00
Blade Barringer 4e3c984baf chore(i18n): update locales 2016-10-17 17:14:59 -05:00
Sabe Jones c112e923f1 feat(content): Strings October 2016 2016-10-17 20:32:50 +00:00
Blade Barringer 540353f024 fix(client): Correct broken image on "how it works" page 2016-10-17 07:33:02 -05:00
AccioBooks 2b9b5e369e /static/features TLC (#8021) 
* Fix grammatical errors / stylistical changes

* Apps and Extentions

* and

* Sections -> Sectors

* Grammatical / Stylistic Changes

* remove extraneous .row

* add breaks in final marketing para

* revert features.jade

* Move period
 2016-10-17 07:32:25 -05:00
Thomas Gamble cb38475765 delete unread messages when a user leaves a group 
closes #7955
closes #7965
 2016-10-16 22:01:34 -05:00
Kees Cook 8bb92577b0 quest progress reporting whitespace fixes (#8106) 
Notifications of other things (HP, GP, etc) have a regular format of
"+/- NUM THING". For example:

  function gp(val, bonus) {
    _notify(_sign(val) + " " + coins(val - bonus), 'gp');
  }

However, the recent quest collection/damage notifications do not. This
attempts to regularize the reporting by adding in the "missing" space.

Signed-off-by: Kees Cook <kees@outflux.net>
 2016-10-16 21:16:42 -05:00
Blade Barringer fb26cbd26d Merge pull request #8110 from Hus274/7814 
Removing links to outdated tutorials
 2016-10-16 21:02:29 -05:00
Blade Barringer a0de5cd8f8 Merge pull request #8139 from bcpletcher/develop 
Cleaned up some CSS
 2016-10-16 20:59:22 -05:00
Blade Barringer 9fe10b1818 Merge pull request #8143 from dumindux/Issue-8115 
changed gemCost to include the amount of gems
 2016-10-16 20:58:48 -05:00
Dumindu Karunathilaka d8dd39422a changed gemCost to include the amount of gems 2016-10-15 18:10:22 +05:30
Benjamin Pletcher 3f9b710773 Cleaned up some CSS 2016-10-13 21:51:55 -04:00
Sabe Jones 8a8bab4be1 chore(npm): update shrinkwrap 2016-10-13 23:30:10 +00:00
Sabe Jones 2a0747ed72 3.48.0 v3.48.0 2016-10-13 23:23:34 +00:00
Sabe Jones a5196e94f6 chore(news): Bailey 2016-10-13 2016-10-13 23:04:32 +00:00
Sabe Jones 009ab26711 Add special spells to Seasonal Shop API (#8138) 
* WIP(shops): add spells to Seasonal API

* refactor(shops): remove superfluous if

* feat(shops): handle spell purchasing

* fix(test): proper required fields check
Also corrects a linting error.

* refactor(shops): use constants
 2016-10-13 17:53:02 -05:00