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

2180 Commits

Author SHA1 Message Date
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
Blade Barringer
fffa95ca09 refactor: Test against party not being private, instead of public 2016-01-12 08:11:19 -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
Matteo Pagliazzi
5244702e48 perf improvements for challenges history and migration 2016-01-11 18:29:39 +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
Matteo Pagliazzi
b1a7e44722 fixes for new history preening, allow only 1 history entry per day in challenges tasks 2016-01-09 21:02:40 +01:00
Matteo Pagliazzi
be0fe3eb4f Merge pull request #6479 from HabitRPG/new-history-preening 
New history preening
 2016-01-09 20:12:33 +01:00
Sabe Jones
1b7f17cbd2 chore(news): Bailey 2016-01-08 2016-01-08 16:28:49 -05: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
Matteo Pagliazzi
ae852f9a2e complete preening and enable for challenges too 2016-01-08 17:47:08 +01: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
Matteo Pagliazzi
f235010536 add getChallenge route and remove old code 2016-01-06 22:29:47 +01:00
Sabe Jones
adfa248dd0 feat(content): backgrounds and Armoire 2016-01 2016-01-06 15:11:20 -05:00
Matteo Pagliazzi
8ba486ec12 change tasks routes to /tasks/(user|challenge) 2016-01-06 18:40:11 +01:00
Matteo Pagliazzi
2b2dcfe7ce do not delete completed todos that belongs to a challenge 2016-01-06 12:25:53 +01:00
Matteo Pagliazzi
3a6d7bd466 fix sync of remove challenge task 2016-01-06 12:16:41 +01:00
Matteo Pagliazzi
a5b1dfd32d finish implementing tasks syncing for challenges 2016-01-05 20:19:55 +01:00
Sabe Jones
cb984d8d22 fix(event): remove NYE card 2016-01-04 18:27:52 -05: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
b73f5a8f40 add support for getting single challenges tasks 2016-01-04 19:57:20 +01:00
Matteo Pagliazzi
d25cb70f66 wip get and create tasks plus initial user syncing 2016-01-04 19:44:39 +01:00
Sabe Jones
cc00602112 fix(event): remove magic potions 2016-01-04 11:56:34 -05:00
Blade Barringer
837c27ff4c Merge pull request #6428 from GeorgeSG/fix-paypal-special-chars 
Encode special characters when sending to paypal
 2016-01-03 19:40:39 -06:00
Blade Barringer
874f319d95 fix: Corrects logic where it was possible to customize avatar 
with gem purchasable items without purchasing them.

Closes #6427
Closes #6448

lint(common): Add unnecessary quotes to make object look less weird
 2016-01-03 10:41:44 -06:00
Kristian Tashkov
5bcce0b86b Add tests for group join route 2016-01-03 18:09:17 +02:00
Blade Barringer
f80f41f764 lint: Correct linting errors in v3 tests 2016-01-03 09:47:27 -06:00
Blade Barringer
76c97dfa6e Merge branch 'api-v3' into api-v3-groups 2016-01-02 22:29:59 -06:00
Blade Barringer
37916271e8 Merge branch 'develop' into api-v3 2016-01-02 22:29:03 -06:00
Matteo Pagliazzi
743f98d67d make sure user.tasksOrder is update only when necessary 2016-01-02 17:46:31 +01:00
Matteo Pagliazzi
775766b30f allow multiple tasks to be created at once 2016-01-02 15:43:33 +01:00
Alys
23aaf78167 revert change to Bailey about Party Hats now that the code behaviour has changed 2016-01-01 16:06:52 +10:00
Alys
6a7cd0900e adjust Bailey message about party hats to clarify that they're not available to players who join from now on, and that only one hat will appear for each player 2016-01-01 11:24:15 +10:00
Kristian Tashkov
7025bbfa32 Fix basilist scroll giving logic when joining party 
closes #6416
 2015-12-31 12:32:52 -06: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
Matteo Pagliazzi
aebe2fa400 finish porting to async/away syntax 2015-12-31 11:46:21 +01:00
Georgi Gardev
430bcd2652 Encode special characters when sending to paypal 2015-12-31 02:46:56 +02:00
Sabe Jones
02f4a84146 fix(news): Winter Flame not Penguin 2015-12-30 18:38:00 -05:00
Matteo Pagliazzi
f76c9d025f remove comments 2015-12-30 23:00:54 +01:00
Matteo Pagliazzi
25b0c3be2b porh auth controller to es7 async functions 2015-12-30 22:59:36 +01:00
Sabe Jones
6c3e8e2081 feat(event): more NYE 2015-12-30 16:58:57 -05:00
Georgi Gardev
42d09bd758 Reverse order of chat messages from chat box 2015-12-30 23:47:10 +02:00
Georgi Gardev
beaf0b83bb Add option to reverse order of chat messages 2015-12-30 23:47:03 +02:00