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

794 Commits

Author SHA1 Message Date
Blade Barringer 66083f766c Merge branch 'api-v3' into api-v3-groups 2016-01-18 18:04:20 -06:00
Blade Barringer 32a2b3121e Merge branch 'develop' into api-v3 2016-01-18 18:04:07 -06:00
Sabe Jones c6b4b24052 Merge pull request #6523 from HabitRPG/sabrecat/subscription-tweaks 
Text and visual tweaks for Gems
 2016-01-18 15:25:58 -06:00
Alys fe58129cd3 remove Completion from Octopus quest text - ref https://github.com/HabitRPG/habitrpg/issues/5631#issuecomment-172600908 2016-01-19 06:18:49 +10:00
Alys fd62e39f20 fix spelling mistake: crystaline -> crystalline 2016-01-19 04:47:50 +10:00
Kristian Tashkov f37b5a7fac Challenges join route and tests 2016-01-17 15:44:15 -06:00
Matteo Pagliazzi 8de8ca7e18 add getChallengeMemberProgress route and misc fixes 2016-01-17 12:01:57 +01:00
Matteo Pagliazzi c27f98075c Merge branch 'api-v3-groups' into api-v3-members 2016-01-17 11:24:10 +01:00
Blade Barringer 965c5dbaa7 Merge branch 'api-v3' into api-v3-groups 2016-01-16 19:46:47 -06:00
Blade Barringer 07f08de989 Merge branch 'improve_tests' into api-v3 2016-01-16 18:12:36 -06:00
Matteo Pagliazzi f447af19ae add tests for getting challenge members and fix a lot of bugs 2016-01-16 16:18:06 +01:00
Sabe Jones 23720e0a43 style(subscription): more tweaks 2016-01-15 14:10:02 -05:00
Matteo Pagliazzi e0b10d44ca Merge branch 'api-v3-groups' into api-v3-members 2016-01-15 11:22:11 +01:00
Luveluen 5315cc9055 Update character.json to separate optOut into two translation strings 
optOut is currently used to skip the class selection and to opt out of the messaging system.
that creates translation problems.

Fixes #6511
Closes #6518
 2016-01-14 20:40:07 -06:00
Georgi Gardev e761315c74 Remove tooltip for 'reverse chat messages' checkbox 
Fixes #6517
Closes #6525
 2016-01-14 20:28:08 -06:00
Sabe Jones b6b2c25358 style(modal): text and visual tweaks for Gems 2016-01-14 15:58:14 -05:00
Matteo Pagliazzi 5206469e90 add unlinkTask route and refactor user.unlink (now user.unlinkChallengesTasks) 2016-01-14 19:46:43 +01:00
Matteo Pagliazzi 2b9aa11598 Merge branch 'api-v3-groups' into api-v3-challenges-tasks 2016-01-14 18:25:59 +01:00
Sabe Jones 14a6d0dabf feat(quests): January 2016 pet 2016-01-13 17:15:02 -05:00
Matteo Pagliazzi 6f6d4edcec Merge branch 'api-v3-groups' into api-v3-members 2016-01-13 18:41:53 +01:00
Matteo Pagliazzi e2edb974d7 Merge branch 'api-v3' into api-v3-groups 2016-01-13 18:40:04 +01:00
Matteo Pagliazzi 914b2eb008 Merge branch 'develop' into api-v3 2016-01-13 18:39:44 +01:00
Sabe Jones 81842bbee1 fix(subscription): visual and wording tweaks 2016-01-12 15:29:10 -05:00
Sabe Jones 2db1ef0f7a style(subscriptions): Gem layout feedback 2016-01-12 15:00:07 -05:00
AnitaYCheng bf6ebd88f6 Modifications to settings mixin and misc last changes. 2016-01-12 15:00:07 -05:00
AnitaYCheng 2a8eb9f476 Added translation strings for conditional buy-gems modal 2016-01-12 14:58:39 -05:00
Matteo Pagliazzi 55db0a4a4b add routes to get a single user, get members for a group, get members invited to a group 2016-01-12 17:27:06 +01:00
Matteo Pagliazzi b102ff7cae Merge branch 'api-v3-groups-invites' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-groups-invites 2016-01-12 15:48:47 +01:00
Keith Holliday 1b395b39f8 Added invite limit and tests for when multiple users with an error 2016-01-12 08:43:11 -06:00
Keith Holliday 9141598a34 Updated invite route and function for new standards, and added tests. 2016-01-12 08:43:11 -06:00
Sabe Jones dba620ee7a Merge pull request #6417 from GeorgeSG/reverse-chat-option 
Add option to reverse chat order
 2016-01-11 12:55:28 -06:00
Sabe Jones 7e8f0d24c5 Merge remote-tracking branch 'origin/pr/6307' into develop 
Conflicts:
	common/dist/sprites/habitrpg-shared.css
 2016-01-11 13:48:01 -05:00
Keith Holliday ffbd4696e3 Converted posts tests to async/await syntax and updated tests 2016-01-11 12:35:46 -06:00
Alys 0d47f8d116 allow purchase of Find the Cub evilsanta2 quest scroll before completing previous quest - fixes https://github.com/HabitRPG/habitrpg/issues/6405 2016-01-12 02:58:33 +10:00
Blade Barringer c5ad006007 chore(i18n): update locales 2016-01-09 23:46:53 -06:00
Sabe Jones eadf967c9f Merge pull request #6409 from pnrich/flag-text 
add extra text to flagging confirmation dialog and to top of PM inbox -- Fix for issue #4648, parts 3 and 4
 2016-01-08 14:05:22 -06:00
Daniel Van Camp 99a694bb10 added EU version of t-shirt 2016-01-06 23:15:36 +01:00
Daniel Van Camp 0362977dbd Merge branch 'develop' into static-page-merch 2016-01-06 22:38:19 +01:00
Sabe Jones adfa248dd0 feat(content): backgrounds and Armoire 2016-01 2016-01-06 15:11:20 -05:00
Blade Barringer 8a546c7ec3 chore(i18n): update locales 2016-01-05 08:40:48 -06:00
Matteo Pagliazzi 3bc8945bcc adapt current tests and change urls to avoid conflicts 2016-01-04 22:03:21 +01:00
Matteo Pagliazzi 6680853078 finish adding challenges support for tasks (except syncing) 2016-01-04 20:48:48 +01:00
Matteo Pagliazzi d25cb70f66 wip get and create tasks plus initial user syncing 2016-01-04 19:44:39 +01:00
Blade Barringer 7cf43680e6 Merge branch 'api-v3' into api-v3-groups 2015-12-31 12:22:20 -06:00
Blade Barringer aa6f5fff23 Merge branch 'develop' into api-v3 2015-12-31 12:17:57 -06:00
Alys 5304b37102 properly fix Winter Flame Set 2015-12-31 22:09:06 +10:00
Alys e7cbb2cd16 add Winter Flame Set to locale file - fixes #6433 2015-12-31 21:49:21 +10:00
Georgi Gardev beaf0b83bb Add option to reverse order of chat messages 2015-12-30 23:47:03 +02:00
Matteo Pagliazzi 6003dad24b misc fixes, port challenge task scoring, delete chal and select winner 2015-12-29 20:57:20 +01:00
Sabe Jones 054e3cb361 feat(event): New Year's Eve 2015 2015-12-29 14:55:05 -05:00