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

12560 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Blade Barringer
90cd322af5 Merge branch 'api-v3' into api-v3-groups 2015-12-31 15:50:46 -06:00
Blade Barringer
3a0e7149f6 Merge branch 'develop' into api-v3 2015-12-31 15:50:34 -06:00
Blade Barringer
730e5e3431 chore(lint): Add sandbox as global to test .eslintrc 2015-12-31 15:49:59 -06:00
Blade Barringer
0d75d5b541 lint: Move test eslint rules to .eslintrc in test directory 2015-12-31 15:46:47 -06: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
Blade Barringer
108f90b0bf tests(api): Add update method for api user 2015-12-31 12:15:57 -06:00
Blade Barringer
4bc96c2c99 tests(api): Update GET /user test to use async syntax 2015-12-31 12:11:40 -06:00
Blade Barringer
9428c6d997 lint: Correct linting errors in api v3 tests 2015-12-31 08:57:20 -06:00
Blade Barringer
70151fd073 lint: Fix tests that can be fixed with the eslint --fix flag 2015-12-31 08:57:20 -06:00
Blade Barringer
6f220c6869 lint: Turn on linting for v3 group tests 2015-12-31 08:57:20 -06:00
Blade Barringer
16e8104d35 chore: Move eslint modules to devDependencies 2015-12-31 07:42:15 -06:00
Blade Barringer
bf0a5cba2b fix: Remove extranous comma in eslint confi 2015-12-31 07:37:25 -06:00
Blade Barringer
a86c160370 Merge pull request #6424 from HabitRPG/api-v3-async 
Port API v3 controllers to es7 async functions
 2015-12-31 07:34:33 -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
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
Blade Barringer
790cf647e5 Merge pull request #6423 from crookedneighbor/test_with_async_and_await 
tests(api): Convert new group tests to use async and await (ES7)
 2015-12-30 17:34:56 -06:00
Blade Barringer
4563f0efb7 tests(api): Convert new group tests to use async and await (ES7) 2015-12-30 17:32:08 -06:00
Sabe Jones
050baf96d8 Merge pull request #6413 from HabitRPG/sabrecat/nye2015 
New Year's Eve 2015
 2015-12-30 16:09:45 -06: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
Matteo Pagliazzi
59b8ba0c85 add TODOs to tavern creation 2015-12-30 17:14:20 +01:00
Blade Barringer
dc3407e1af tests(api): Convert groups tests to use user['HTTP_METHOD'] syntax 2015-12-30 08:44:02 -06:00
Blade Barringer
cd9fe5f1b6 Merge branch 'api-v3' into api-v3-groups 2015-12-30 08:30:43 -06:00
Blade Barringer
ca1513aaa9 tests(api): Use new user['HTTP_METHOD'] for v3 integration tests 2015-12-30 08:25:06 -06:00
Blade Barringer
a662d4b688 Merge branch 'develop' into api-v3 2015-12-30 07:58:55 -06:00
Blade Barringer
eab15a3dd0 tests(api): Port over new integration helper from develop 2015-12-30 07:57:41 -06:00
Blade Barringer
802bb93b6c tests(api): Update integration helper in v2 to v3 changes 2015-12-29 20:37:29 -06:00
Blade Barringer
381b30fcfc Merge pull request #6415 from crookedneighbor/add_user_request_class 
Add user request class for integration tests
 2015-12-29 19:55:39 -06:00
Blade Barringer
4c74c9949c Correct linting error 2015-12-29 17:43:11 -06:00
Blade Barringer
4cf9518a5a tests(api): Convert tests to use new api user methods 2015-12-29 17:34:33 -06:00
Blade Barringer
b2336c7adf tests(api): Add http methods to user object that is returned form generateUser 2015-12-29 17:34:11 -06:00
Matteo Pagliazzi
24f1b8c71b Merge branch 'api-v3-groups' of github.com:HabitRPG/habitrpg into api-v3-groups 2015-12-29 21:37:25 +01:00
Matteo Pagliazzi
a5aeb6917e allow getGroup to optionally work for groups where the user is not a member 2015-12-29 21:36:52 +01:00
Matteo Pagliazzi
8361afc433 Merge pull request #6412 from KristianTashkov/fix-api-v3-tests 
Fix GET chat tests stopping execution of other tests in api-v3-groups branch
 2015-12-29 21:05:46 +01:00
Matteo Pagliazzi
08e0c67089 refactor pushNotifications 2015-12-29 20:57:37 +01: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
Kristian Tashkov
411bfe1bb6 Fix GET chat tests stopping execution of other tests 2015-12-29 20:51:16 +02:00
Matteo Pagliazzi
61fc490f84 port challenges\' tasks scoring 2015-12-29 18:35:34 +01:00
Matteo Pagliazzi
a44090e1ed Merge branch 'api-v3' into api-v3-groups 2015-12-29 18:17:36 +01:00
Blade Barringer
ae9ec63229 Merge branch 'develop' into api-v3 2015-12-29 08:07:04 -06:00
Blade Barringer
bce049a316 Merge branch 'develop' of github.com:HabitRPG/habitrpg into api-v3 2015-12-29 08:06:22 -06:00