Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,088 Commits 64 Branches 1,256 Tags
f98efd4eb9bcecf122b2762a0e42a5ae986019b1
Commit Graph

17088 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
user f98efd4eb9 PM opt-in opt-out is ready to use 2018-04-29 04:05:31 +03:00
user 4a0856c919 Client: opt-in / opt-out functionalitonality is ready 2018-04-29 03:07:03 +03:00
user 2adc5c13e4 Server: /toggle-private-messages-opt 2018-04-28 23:44:17 +03:00
Shadi Moustafa cf274310a8 Changed Member List number in Guilds (#10268) 
* Updated README.md

Added Team Name and Collaborators

* Updated README.md

* Changed Member List number in Guilds

Changed Member List number in Guilds

* remove habitica2.bat

* Updated README.md
 2018-04-28 17:43:59 +02:00
Philip Karpiak a2ee73a2e2 Use consistent elements in footer links (fix add-on/forum link colors) (#10208) 
* Fix html element rendering of some footer links

* Unscope footer.expanded + children styles

Fixes link color cascading
 2018-04-28 17:43:40 +02:00
Brian Fenton c6c9503e22 Hiding popunder if challenge data is incomplete (#10284) 
* removing file that only contained a reference to a missing folder

* fixing typo

* using full dates to avoid moment warning in tests

* more typos

* sending an empty string to vue bootstrap tooltip (disabling it) if no challenge short name is set
 2018-04-28 17:38:38 +02:00
Asher Dale 403ac1ab7e Remove experience notification when leveling up (#10285) 2018-04-28 17:37:58 +02:00
Brian Fenton 63598f497b pinning mongodb container to recommended, supported version (#10270) 2018-04-28 17:37:19 +02:00
Asher Dale 9fcc953b18 Fix API challenges export CSV bug (Fixes #8350) (#10266) 
* Fix challenges export CSV error by checking that users still belong to challenge

* Add test for challenge csv export fix

* Update fix for challenge export CSV bug

* Update tests for challenge export CSV to be more complete

* Refactor a test: change some 'let' variables to 'const'
 2018-04-28 17:36:12 +02:00
Christos Maris 17408d01a9 Fix markdown (#10263) 
The README.md file in the website/client/ directory had a flaw.
 2018-04-28 17:35:14 +02:00
Tyler Nychka ae786f28a2 Fix locked class-specific gear after death fixes #10025 (#10212) 
* Fix locked class-specific gear after death fixes #10025

* Update to allow items next in tier but not owned

* Updated logic

* Added tests
 2018-04-28 17:34:08 +02:00
Matteo Pagliazzi 1effa16b5b load memwatch-next only if installed 2018-04-27 20:52:33 +02:00
Matteo Pagliazzi 6b7333927a make memwatch-next optional, fixes #10291 2018-04-27 19:48:04 +02:00
Matteo Pagliazzi 31b439129d update deps 2018-04-27 19:38:42 +02:00
greenkeeper[bot] 2de85b937f fix(package): update bcrypt to version 2.0.0 (#10233) 2018-04-27 19:30:09 +02:00
negue 4f963e99dc Purchase API Refactoring: Gems [Gold] (#10271) 
* remove `keyRequired` - change to `missingKeyParam` - i18n-string

* extract & convert buyGemsOperation

* fix lint
 2018-04-27 19:29:26 +02:00
Keith Holliday 58ce3a9a42 Added bulk allocation (#10283) 2018-04-27 11:07:41 -05:00
Alys e45d0c9b80 add website/raw_sprites/** to list of files ignored by nodemon (#10274) 2018-04-26 10:46:49 +02:00
Alys 84a20ef4f4 increase user count on home page from 2.5 to 3 million (#10257) 
Uses a variable for the number instead of hard-coding it in the locales files.

Removes some old, unused locales strongs and an associated variable
from when we had a million users.
 2018-04-25 10:48:04 -05:00
Alys 59a22805b9 changed message shown to muted users (after discussion with mods) 
Adjusted apidocs comment to match.
Corrected the error type for that comment.
 2018-04-25 20:40:21 +10:00
Alys 95865f5ec8 add a missing quote mark to the end of the Golden Knight's speech 2018-04-25 19:38:29 +10:00
Alys 79903d242f edit apidocs comment: CreateChallenge takes the parameter group not groupId 2018-04-25 16:23:07 +10:00
Sabe Jones 90959c18cd Merge branch 'release' into develop 2018-04-24 18:46:20 +00:00
Sabe Jones 8b2019c292 4.40.0 v4.40.0 2018-04-24 18:45:51 +00:00
Sabe Jones 9ab70ca276 chore(i18n): update locales 2018-04-24 18:44:30 +00:00
SabreCat d51aa25470 chore(sprites): compile 2018-04-24 18:38:56 +00:00
SabreCat 0b2c1e6d2e fix(pixels): Better alignment for Squirrel mounts 
Also (1) updates an artist credit to a new usename, and (2) corrects a typo in migration comments
 2018-04-24 18:37:33 +00:00
SabreCat 58ee6e9703 feat(content): Subscriber Mystery Items 2018/04 2018-04-24 18:36:19 +00:00
Keith Holliday 0044778497 4.39.2 v4.39.2 2018-04-24 08:16:35 -05:00
Matteo Pagliazzi 46d6590fec chat: use _id instead of id when finding doc (#10278) 2018-04-24 15:10:20 +02:00
Keith Holliday b10f056a73 4.39.1 v4.39.1 2018-04-23 21:04:03 -05:00
Keith Holliday eeb890466a Converted date to timestamp (#10276) 
* Converted date to timestamp

* Added existence check

* Updated test to include timestamp
 2018-04-23 21:03:24 -05:00
Keith Holliday 8d25a5d140 Added bulk spell queue (#10241) 
* Added bulk spell queue

* Removed extra comment

* Moved queue to store
 2018-04-23 20:30:55 -05:00
Sabe Jones 3b35a0a203 4.39.0 v4.39.0 2018-04-23 17:21:12 +00:00
Sabe Jones d787ad43d3 chore(i18n): update locales 2018-04-23 17:20:54 +00:00
Keith Holliday 7d7fe6047c Move Chat to Model (#9703) 
* Began moving group chat to separate model

* Fixed lint issue

* Updated delete chat with new model

* Updated flag chat to support model

* Updated like chat to use model

* Fixed duplicate code and chat messages

* Added note about concat chat

* Updated clear flags to user new model

* Updated more chat checks when loading get group

* Fixed spell test and back save

* Moved get chat to json method

* Updated flagging with new chat model

* Added missing await

* Fixed chat user styles. Fixed spell group test

* Added new model to quest chat and group plan chat

* Removed extra timestamps. Added limit check for group plans

* Updated tests

* Synced id fields

* Fixed id creation

* Add meta and fixed tests

* Fixed group quest accept test

* Updated puppeteer

* Added migration

* Export vars

* Updated comments
 2018-04-23 12:17:16 -05:00
Sabe Jones 0ec1a91774 4.38.0 v4.38.0 2018-04-19 19:29:33 +00:00
Sabe Jones adf3281bef chore(i18n): update locales 2018-04-19 19:28:43 +00:00
SabreCat ea86b35833 chore(news): Bailey 2018-04-19 19:25:45 +00:00
Alys ade14edcd7 add partial documentation for dueDate parameter in /api/v3/tasks/user and related code 2018-04-18 23:22:11 +10:00
Sabe Jones 3a1888739a Merge branch 'release' into develop 2018-04-17 20:07:12 +00:00
Sabe Jones 3b54ce4949 4.37.2 v4.37.2 2018-04-17 20:06:46 +00:00
Sabe Jones 4a8aaf7389 chore(i18n): update locales 2018-04-17 19:55:10 +00:00
SabreCat 45eec47b7f chore(news): Bailey 
Also disable some costly analytics
 2018-04-17 19:52:36 +00:00
Keith Holliday 4b9af8aa86 Added analytics to front. Fixed group plan tracking (#10262) 2018-04-17 12:43:52 -05:00
SabreCat 631bbcb786 Merge branch 'fix-hippocrite' into develop 2018-04-17 01:37:20 +00:00
Matteo Pagliazzi 76a10d6cf9 start removing inbox from some routes (#10259) 2018-04-16 18:43:09 +02:00
Keith Holliday a1c9ebd661 Prevent dropdown from closing when clicking search (#10252) 2018-04-15 19:18:40 -05:00
SabreCat 9f06d78db6 Revert "moving developer-only strings to api messages (#10188)" 
This reverts commit a42cb0e3ab. Testing hypothesis that this was causing Staging to break.
 2018-04-15 17:09:15 +00:00
Alys ac98aa9271 replace Lemoness's email address with admin in sample config file 
This is for consistency with the production server and to ensure
that contributors' screenshots in PRs match what will be seen
in production.
 2018-04-15 13:34:42 +10:00