Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,323 Commits 64 Branches 1,256 Tags
2be8ddb60dc2cb9ab6108e8008eec12ecb16249d
Commit Graph

694 Commits

Author SHA1 Message Date
Sabe Jones 401067bfed chore(i18n): update locales 2017-12-05 19:46:40 +00:00
Sabe Jones 9e8807c40d Armoire and Backgrounds December 2017 (#9659) 
* feat(content): Armoire and Backgrounds 2017/12

* chore(sprites): compile

* chore(news): Bailey
 2017-12-05 19:29:00 +00:00
Sabe Jones 56d09411d9 Merge branch 'release' into develop 2017-12-01 00:31:23 +00:00
Sabe Jones 5b06b28c97 chore(event): end Thunderstorm Potions 2017-12-01 00:30:06 +00:00
negue f1e200c0f5 autofix pinned seasonal gear - fixes #9448 (#9570) 
* auto-remove officialPinned item from userPinned-array on pinning

* hide event limited message if an item was already owned by the user
 2017-11-28 09:11:40 +01:00
Asif Mallik 299e88233c Fixes multiple complete and uncomplete for todos and daily (Fixes #8669) (#8971) 
* Fixed bug that allows users to complete todo and daily multiple times

* Added tests

* Fix syntax

* Fix existing tests that rely on multiple complete or uncomplete

* Undoes removal of website/client/README.md

* Change sessionOutdated string to reflect separate client needs

* Fix should update history test by changing lastCron
 2017-11-27 20:13:18 -06:00
Garrett Scott d95836b881 Translator minor changes fixes #8917 (#9297) 
* Updated userItemsNotEnough string

* Added a variable to be passed to the deleteSocialAccountText string. This variable name is `magic_word` and is set as DELETE where used

* modified incorrectDeletePhrase to use a variable rather than translatable string for the word DELETE. Updated the DELETE-user test and the user api

* Changed noSudoAccess from translatable string to static

* Changed enterprisePlansEmailSubject from a translatable string to a static string within groupPlans.vue

* Fixed test problems with translation fixes

* Added no sudo access string to api messages

* changed plain string to apiMessage for no sudo access messages
 2017-11-27 20:08:39 -06:00
Sarvesh Kakodkar b323abd225 Added confirmation step at begin button for quest (#9199) 
* Added confirmation step at begin button for quest

* Fixed the 3 errors caused by questConfirm method in travis-ci
 2017-11-27 20:05:05 -06:00
negue b3870e5f34 multiple market fixes (#9468) 
* show `selectMemberModal` to send a card, even if the user doesn't have a party yet

* market - prevent filter reset on pinning items

* hide buy amount for gear, backgrounds, mystery_set, card, rebirth_orb, fortify, armoire - fix mystery set preview in timetravelers

* purchase confirmation on gem / hourglass purchases

* fix lint
 2017-11-27 19:54:55 -06:00
kartik adur 29dc56c12f Party roster sorter: Member Modal Component (#9472) 
* modify sort options for party members

* add unittest for membersModalComponent sort

* updates as requested in PR

* removed duplicates for `class` and `background` from flavour text

* fix linting error thrown by travis ci
 2017-11-27 19:54:13 -06:00
Esben Sparre Andreasen b62f08d500 Misc. bug fixes from lgtm.com (2) (#9474) 
* Remove dead branch of ternary: `gift` is always truthy here

Problem found here:

- https://lgtm.com/projects/g/HabitRPG/habitrpg/snapshot/dist-98076885-1510577633582/files/website/server/libs/amazonPayments.js?sort=name&dir=ASC&mode=heatmap&excluded=false#x5a22f31110a55091:1

* Remove superfluous argument, preenUserHistory only takes two args

Problem found here:

- https://lgtm.com/projects/g/HabitRPG/habitrpg/snapshot/dist-98076885-1510577633582/files/website/server/libs/cron.js?sort=name&dir=ASC&mode=heatmap&excluded=false#xf16a045ecabb07f6:1

* Cleanup: remove useless assignments

Problems found here:

- https://lgtm.com/projects/g/HabitRPG/habitrpg/snapshot/dist-98076885-1510577633582/files/website/client/store/actions/shops.js?sort=name&dir=ASC&mode=heatmap&excluded=false#xf782ed2cf920441%3A1
- https://lgtm.com/projects/g/HabitRPG/habitrpg/snapshot/dist-98076885-1510577633582/files/website/client/app.vue?sort=name&dir=ASC&mode=heatmap&excluded=false#x172c1dda85e84dc8%3A1
- https://lgtm.com/projects/g/HabitRPG/habitrpg/snapshot/dist-98076885-1510577633582/files/website/client/components/settings/site.vue#x9b3afee802a3a8f8%3A1
- https://lgtm.com/projects/g/HabitRPG/habitrpg/snapshot/dist-98076885-1510577633582/files/website/client/components/selectMembersModal.vue?sort=name&dir=ASC&mode=heatmap&excluded=false#x1fbc2a3d62facd70:1
- https://lgtm.com/projects/g/HabitRPG/habitrpg/snapshot/dist-98076885-1510577633582/files/website/common/script/libs/taskClasses.js?sort=name&dir=ASC&mode=heatmap&excluded=false#x41ce0e121a4defee:1

* Fix online editor whitespace change.
 2017-11-27 19:51:25 -06:00
Paul 885f2998ae System messages flaggable (#9408) 
* Remove flag from system messages, throw an error if system messages are flagged

* Modify unflag system message test to check if flagging a system message throws an error

* Move email from nconf to top
 2017-11-27 19:45:04 -06:00
Cassidy Pignatello 96974461e5 Change badge tooltips fixes https://github.com/HabitRPG/habitica/issues/9520 (#9539) 
* updates text for costume contestant

* updates text for contributor badge

* removes unnecessary "Badge" text from contribName
 2017-11-27 19:37:18 -06:00
Joseti 9b8676f02e Changed "Donate" button to "Contribute" button (#9581) 
* Changed functionality of "donate"-button on static pages

* Changed strings to reflect change from "donate" to "contribute"
 2017-11-27 19:29:45 -06:00
Alys cd629ef7fa add missing @ before a contributor's name in quest content 2017-11-27 09:16:13 +00:00
Sabe Jones 4618fd8954 Merge branch 'release' into develop 2017-11-20 19:21:17 +00:00
Sabe Jones 7193cc6bae chore(i18n): update locales 2017-11-20 19:20:03 +00:00
Keith Holliday 20a99e526d Should do diff week fix (#9551) 
* Fixed week difference when changing year

* Added year switchover test

* Fixed start date setting
 2017-11-20 12:22:01 -06:00
Keith Holliday 9c2f5213cb Challenge fixes (#9528) 
* Added challenge member search to progress dropdown

* Added leave challenge modal

* Allowed editing for challenge leader only

* Pevented users from editing challenge task info

* Set default progress default to daily

* Removed reward filters from user challenge progress
 2017-11-17 17:13:07 -06:00
Sabe Jones c06d5107ac Merge branch 'release' into develop 2017-11-17 22:50:27 +00:00
Sabe Jones b28189fff5 chore(i18n): update locales 2017-11-17 22:30:34 +00:00
SabreCat 2a5e9c0780 feat(event): Turkey Day 2017 
and (content) November Subscriber Items
 2017-11-17 22:21:05 +00:00
Keith Holliday 67564317fb Group plan fixes (#9518) 
* Fixed group plan editing

* Added translations

* Abstracted query for group or challenge tasks
 2017-11-17 20:31:39 +11:00
Sabe Jones be5d776fb4 chore(i18n): update locales 2017-11-16 22:07:54 +00:00
Alys 8d444980de remove unneeded space from in front of a full stop 2017-11-16 19:29:38 +10:00
MathWhiz 08ccd595f2 Add quantity information when purchasing items (#9481) 2017-11-16 10:08:11 +01:00
Allister c5296d4cb0 Add variable placeholder. (#9465) 
Changes the character translation string `charactersRemaining`  in
groups.json to include a variable placeholder `<%= characters %>`
 2017-11-15 17:41:18 +01:00
Joseti 229fd06ee3 Removed "Tag list in tasks starts collapsed" settings and strings (#9406) 2017-11-15 17:37:15 +01:00
Stephanie Wu eb8f84aae0 #9354 Indicate that Orb of Rebirth is instant (#9357) 
* #9354 Indicate that Orb of Rebirth is instant

Clarified the text

* #9354 Indicate that Orb of Rebirth is instant

Reverted changes in all but locales/en
 2017-11-15 17:35:51 +01:00
Emily Ong e39b80bb9a changed to 'createChallengeCloneTasks' (#9300) 
* changed to 'createChallengeCloneTasks'

* createChallengeCloneTasks

* Added new i18n strings
 2017-11-15 17:34:33 +01:00
Sabe Jones 838b9a5822 Merge branch 'release' into develop 2017-11-15 01:03:07 +00:00
Sabe Jones 2bf0fdf4a2 chore(i18n): update locales 2017-11-15 01:00:56 +00:00
SabreCat dbc5b9f850 feat(content): Yarn Pet Quest 2017-11-15 00:53:10 +00:00
Keith Holliday c43ca62bc4 Added check for balance with respect to quantity (#9469) 2017-11-14 16:55:08 -07:00
Sabe Jones 3f92317b9e Revert "Implements repeat every X days since last completion (Fixes #6941) (#8962)" 
This reverts commit 9d69d4b863.
 2017-11-09 22:13:34 +00:00
Sabe Jones 0d2737572d Merge branch 'release' into develop 2017-11-09 17:57:48 +00:00
Sabe Jones 28149202db chore(i18n): update locales 2017-11-09 17:53:06 +00:00
Alys 4b23cd9f23 add missing string for dateEndNovember 2017-11-09 17:46:12 +00:00
Alys 8aaabdc086 add missing removeInvite string 2017-11-09 17:45:59 +00:00
SabreCat 74d8ecc732 Merge branch 'release' into develop 2017-11-09 17:24:48 +00:00
Alys 63c8a09e22 add missing string for dateEndNovember 2017-11-09 21:58:16 +10:00
Alys 865f623c99 add missing removeInvite string 2017-11-09 18:16:58 +10:00
Sabe Jones 993df72708 chore(i18n): update locales 2017-11-07 23:53:47 +00:00
SabreCat 50d3226a86 feat(content): change to Thunderstorm Hatching Potions 2017-11-07 22:02:46 +00:00
Asif Mallik 9d69d4b863 Implements repeat every X days since last completion (Fixes #6941) (#8962) 
* Implemented repeat after completion

* Added tests for repeat after completion in shouldDo.test.js

* Remove lastTicked

* Undoes removal of website/client/README.md
 2017-11-07 12:56:46 -06:00
Alys 12fd79059b adjust login messages to indicate case-sensitivity and hint about google sign-in 2017-11-04 20:34:17 +10:00
Alys 232061a629 improve wording for Brutal Smash skill 2017-11-04 20:24:35 +10:00
Alys 3fcc1c522d allow "visit the stable" text to be translated 2017-11-04 20:16:47 +10:00
Sabe Jones 286db39478 chore(i18n): update locales 2017-11-03 03:04:15 +00:00
SabreCat f8876fe055 feat(content): Backgrounds and Armoire 2017-11 
End Habitoween and Fall Festival
 2017-11-03 01:56:15 +00:00