krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 07:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
12,560 Commits 64 Branches 1,226 Tags
d5148a7bf01f196d77c83a028190b277b51aaf47
Commit Graph

1414 Commits

Author SHA1 Message Date
Keith Holliday
d5148a7bf0 Added quest reject route and intial tests 2016-02-02 16:38:31 -06:00
Blade Barringer
a6ed635978 Merge branch 'api-v3-groups' into sabrecat/quest-accept 2016-01-30 11:10:33 -06:00
Matteo Pagliazzi
f16b605c37 add update challenge with tests 2016-01-27 12:22:24 +01:00
Keith Holliday
c498eef21c Added initial chat delete tests 2016-01-23 23:09:22 -06:00
Sabe Jones
0ec63ca68d test(quests): invite and accept WIP 2016-01-22 16:59:34 -05:00
Sabe Jones
3bd806a0f0 test(quests): accept route WIP 2016-01-21 17:31:54 -05:00
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
Matteo Pagliazzi
ee854229c7 fix dateCompleted not remove from un-completed todos and fix tasks test 2016-01-18 15:01:46 +01: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
Blade Barringer
d02c3d321e refactor: Remove compiled spritesheet from source control 2016-01-14 18:03:14 -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
9a908785c1 new history preening, save tasks after cron 2016-01-13 23:07:08 +01: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
Matteo Pagliazzi
f83b271b30 rever new history preening 2016-01-13 11:07:52 +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
Matteo Pagliazzi
193e89a79e fix index when marking task as modified after history preening 2016-01-10 15:57:22 +01:00
Blade Barringer
c5ad006007 chore(i18n): update locales 2016-01-09 23:46:53 -06:00
Blade Barringer
502ba27b47 chore(sprites): Compile sprites 2016-01-09 23:32:17 -06:00
Nathan Maton
b26d3bef40 replaced collars 2016-01-09 23:29:54 -06:00
Matteo Pagliazzi
1d0b05a6df fix typo in history preening 2016-01-09 21:17:17 +01:00
Matteo Pagliazzi
f55e4f65f9 Merge pull request #6483 from HabitRPG/new-history-preening 
fixes for new history preening, allow only 1 history entry per day in…
 2016-01-09 21:03:18 +01:00