sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-08-03 12:40:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
13615 commits 1 branch 0 tags 1.6 GiB
Commit graph

1765 commits

Author SHA1 Message Date
Matteo Pagliazzi
f69a566178 Merge branch 'develop' into api-v3 2016-04-30 16:49:44 +02:00
Victor Pudeyev
a567476bb7 V3 payments 7 stripe (#7124) 
* payments api: cancelSubscription

* some more tests for amazon payments

* promisifying amazon payments

* somehow payment stub is not working

* cleaning up tests

* renaming tests in api/v3/integration/payments

* improvements

* cleanup, lint

* fixes as per comments

* moment.zone() is back in.

* basic controller for stripe payments

* authWithUrl is in

* stripe cleanup

* making tests pass

* stripe bug fixes

* 400 error is right

* cleanup of sinon spy for fakeSend

* paypal payments

* lint of paypal

* require -> import
 2016-04-30 16:42:10 +02:00
Alys
590e185ecd fix spelling mistake: reseting to resetting 2016-04-29 18:44:49 -04:00
Matteo Pagliazzi
3364019fcc v3 and adapted v2: bugs fixes for groups, challenges and tasks 2016-04-29 11:49:12 +02:00
Victor Pudeyev
fa21577c46 V3 payments 6 (#7104) 
* payments api: cancelSubscription

* some more tests for amazon payments

* promisifying amazon payments

* somehow payment stub is not working

* cleaning up tests

* renaming tests in api/v3/integration/payments

* improvements

* cleanup, lint

* fixes as per comments

* moment.zone() is back in.
 2016-04-27 21:26:32 +02:00
Sabe Jones
7bc89aa55c fix(sprites): updateabee 2016-04-27 17:14:49 +00:00
Blade Barringer
ebe3eefcc5 chore: reorganize quest sprites 2016-04-26 21:13:06 -05:00
Blade Barringer
f415810a0f Merge branch 'markdown_rework' into develop 2016-04-26 12:53:47 -05:00
Blade Barringer
b5de787c4d refactor: Remove uneeded emoji images 2016-04-26 12:53:18 -05:00
Blade Barringer
e7315253dd feat: Switch out js-emoji for habtiica-markdown 2016-04-26 08:19:47 -05:00
Keith Holliday
ea490c9a1f Ported groups service to user new api v3 and ported dependent controllers (#7108) 
* Ported groups service to user new api v3 and ported dependent controllers

* Remove  and extra remove inviation code. Fixed group service caching and update group service tests

* Fixed test logic and added party cache support

* Added promise rejections and updated http interceptor
 2016-04-25 23:11:23 +02:00
Sabe Jones
974896ce7b feat(events): April Mystery and Floral Potions (#7107) 
* feat(events): April Mystery and Floral Potions
Also reorganizes the spritesmith folders for mounts so that head, body, and icon sprites are in separate folders.
 2016-04-25 14:17:31 -05:00
Blade Barringer
b86348dd0e refactor: Remove MOBILE_APP logic 2016-04-25 07:44:05 -05:00
Blade Barringer
ad57dedecb refactor: Swap out remarkable for habitica flavored markdown-it 2016-04-25 07:36:02 -05:00
Matteo Pagliazzi
2d87cb0d87 Merge branch 'develop' into api-v3 2016-04-22 17:43:48 +02:00
Matteo Pagliazzi
6ba1afe479 Merge branch 'api-v3' into api-v3-unlock-fix 2016-04-22 12:33:39 +02:00
Matteo Pagliazzi
1fe2220aa1 v3: improve docs and fix bugs 2016-04-22 12:15:24 +02:00
Sabe Jones
867146dc19 fix(xss): Update site to use remarkable instead of marked 
https://snyk.io/vuln/npm%3Amarked%3A20150520
https://github.com/chjj/marked/pull/592
 2016-04-21 13:23:53 -05:00
Blade Barringer
5c1d86c513 Merge branch 'develop' into MathWhiz-mount-images 2016-04-21 07:52:21 -05:00
Victor Piousbox
54a94db2de working on amazon payments 2016-04-21 03:52:29 +00:00
mathwhiz
45bc69308c mounts 2016-04-20 23:52:26 +00:00
Matteo Pagliazzi
6568fcfd5e res.respond: allow for thrid parameter (message), refactor shared ops responses and adapt tests 2016-04-21 00:52:03 +02:00
Victor Piousbox
3cba6d934b resolving conflicts 2016-04-20 22:04:31 +00:00
Sabe Jones
cdf4a384d6 fix(sprites): add Bee mount icon 2016-04-19 21:07:03 +00:00
Keith Holliday
9e3d8ba4ac Separated out buy functions into buyGear, buyArmoire, and buyPotion (#7065) 2016-04-19 16:50:04 +02:00
Matteo Pagliazzi
f44dbbbd71 Merge branch 'develop' into api-v3 2016-04-19 12:16:22 +02:00
Matteo Pagliazzi
2dd633a471 better organize common/index 2016-04-19 12:11:10 +02:00
Matteo Pagliazzi
7aa6587f2f Merge branch 'shared-code-random-drop' of https://github.com/piousbox/habitrpg into piousbox-shared-code-random-drop2 2016-04-19 12:07:18 +02:00
Alys
5d040ac442 change habitrpg.com to habitica.com in new profile edit message 2016-04-19 10:39:04 +10:00
MathWhiz
ed49a377e1 add community guidelines info to profile editing (#7086) 
* add community guidelines info to profile editing

* Update profile.jade
 2016-04-19 10:15:21 +10:00
MathWhiz
f1788080da Add list of Featured third-party Apps (#7046) 
* add list of featured third-party apps

* Add comma

* add descriptions

* add description to other

* add table

* add description to other

Conflicts:
	common/locales/en/settings.json
	website/views/options/settings.jade

* Update settings.json

* Sort extensions by name
 2016-04-19 08:21:07 +10:00
Sabe Jones
62f44771af fix(stable): rename Bumblebees throughout code 2016-04-18 21:02:24 +00:00
Matteo Pagliazzi
dea693f799 v3: start to fix unlocking 2016-04-16 20:51:16 +02:00
Victor Pudeyev
715bb5e047 shared-code-statsComputed (#7067) 
* shared-code-statsComputed

* \$w is in common/script/index.js
 2016-04-16 19:24:13 +02:00
Victor Piousbox
ab156c0e4d resolving conflicts 2016-04-15 16:55:37 +00:00
Victor Piousbox
d27bbbe994 some locales work 2016-04-15 16:46:50 +00:00
Victor Piousbox
261a5a66b1 working on promisifying amazonPayments 2016-04-15 16:46:50 +00:00
Blade Barringer
887aa478ec chore: merge in develop 2016-04-15 10:11:54 -05:00
Blade Barringer
10936d9a4d chore: Switch to custom eslint-config 2016-04-15 09:03:59 -05:00
Blade Barringer
33c0cdd569 chore(lint): lint files in preparation for eslint v2 2016-04-15 08:37:05 -05:00
Blade Barringer
1a64886f7d Merge branch 'develop' into api-v3 2016-04-15 08:04:46 -05:00
Victor Piousbox
74fc45524b working on promisifying amazonPayments 2016-04-14 22:49:24 +00:00
Matteo Pagliazzi
11b5c1b405 v3: several fixes to class system, move /logout outside of api 2016-04-14 20:05:30 +02:00
Sabe Jones
7bb6f968b4 feat(content): Pet Quest 2016-04 (#7071) 
Also renames the Be-Wilder special pet/mount rewards to "Magical Bee" from "Bumblebee".
 2016-04-13 12:15:38 -05:00
Matteo Pagliazzi
6458796a36 v3: first review of common code and task models 2016-04-12 19:30:39 +02:00
Matteo Pagliazzi
004b032084 adapt reset to v2 and remove deleted files from gulpfile 2016-04-12 18:50:02 +02:00
Keith Holliday
3970064fe5 Ported reset. Added unit tests. Added reset route. Added integration tests 2016-04-12 11:19:36 -05:00
Matteo Pagliazzi
fa32dabc92 Merge pull request #7064 from piousbox/shared-code-crit 
shared-code-crit
 2016-04-12 09:58:46 +02:00
Victor Pudeyev
2f1329254e shared-code-tags-gold-silver (#7056) 2016-04-12 09:57:57 +02:00
Victor Piousbox
2d69285080 shared-code-crit 2016-04-11 20:21:33 +00:00
Matteo Pagliazzi
463ba81468 fix(build) only require/import the main common file 2016-04-11 19:46:48 +02:00
Blade Barringer
2f715c4530 chore: Compile skill icon sprites 2016-04-11 07:59:53 -05:00
mathwhiz
5b110159a1 Add spell images 2016-04-11 07:59:39 -05:00
Matteo Pagliazzi
c6879aa5df fix(v3): cleanup of shared code 2016-04-10 18:42:59 +02:00
Keith Holliday
42ef779b46 Ported addPushDevice. Added unit tests. Added addPushDevice route. Added integration tests 2016-04-10 09:47:14 -05:00
Matteo Pagliazzi
7a24bceac9 Merge pull request #7051 from piousbox/shared-code-percent 
shared-code-percent
 2016-04-10 12:29:43 +02:00
Victor Piousbox
3c784e869a shared-code-percent 2016-04-09 21:13:16 +00:00
Victor Piousbox
1f4a0680ea shared-code-private-messages 2016-04-09 16:56:03 +00:00
Matteo Pagliazzi
6b2d1a1416 v3 adapt v2: adapt common ops 2016-04-09 16:45:43 +02:00
Blade Barringer
80c115940e fix: Correct southpole background 
closes #7039
closes #7041
 2016-04-09 09:31:18 -05:00
Blade Barringer
8ba150074a chore(i18n): update locales 2016-04-09 09:27:04 -05:00
Matteo Pagliazzi
910ea836ba Merge branch 'api-v3' into api-v3-adapt-v2 2016-04-09 15:31:09 +02:00
Matteo Pagliazzi
81fa689a11 Merge pull request #7042 from TheHollidayInn/api-v3-ops-reroll 
Ported reroll. Added unit tests. Added reroll route. Added integration tests
 2016-04-09 15:14:04 +02:00
Blade Barringer
60f99a29ed Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3 2016-04-08 21:31:53 -05:00
Blade Barringer
8a42a3a51e Merge branch 'develop' into api-v3 2016-04-08 21:31:41 -05:00
Keith Holliday
1685b7285f Ported reroll. Added unit tests. Added reroll route. Added integration tests 2016-04-08 15:56:11 -05:00
Matteo Pagliazzi
70fd869934 Merge branch 'api-v3' into api-v3-adapt-v2 2016-04-08 12:03:50 +02:00
Matteo Pagliazzi
276cbc58bb v3: fix cron middleware, remove unused code from shared 2016-04-08 11:56:51 +02:00
Victor Piousbox
9704c47293 Merge branch 'api-v3' into shared-code-webhooks 2016-04-07 21:23:38 +00:00
Victor Piousbox
4c0f9ed1c8 resolving conflicts 2016-04-07 21:23:16 +00:00
Keith Holliday
fec9ce3dbe Ported rebirth. Add unit tests. Added rebirth route. Added integration tests 2016-04-07 15:02:55 -05:00
Matteo Pagliazzi
2d3fbe9f13 v3 adapt v2: lint client only shared ops and enable members integration tests 2016-04-07 11:54:36 +02:00
Matteo Pagliazzi
81d665513c Merge branch 'api-v3-ops-revive' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-ops-revive 2016-04-06 23:24:14 +02:00
Keith Holliday
621bf9609e Ported revive. Added unit tests. Add revive route. Added integration tests 2016-04-06 15:59:42 -05:00
Keith Holliday
2bd710a882 Ported unlock. Add unit tests. Create unlock route. Add integration tests 2016-04-06 15:53:32 -05:00
Matteo Pagliazzi
b431b02012 v3 adapt v2: port tags, cast, cron, deletUser and removeMember. Fix a few bugs in v3 2016-04-06 19:28:43 +02:00
Keith Holliday
05b41bb41c Ported sell function. Add unit tests. Create sell route. Add integration tests 2016-04-06 08:27:18 -05:00
Sabe Jones
1f6eef0082 Sabrecat/armoire 201604 
* WIP(content): add sprites

* feat(content): Armoire and Backgrounds 2016-04
 2016-04-05 15:30:01 -05:00
Victor Piousbox
14b0ec8b03 shared-code-webhooks 2016-04-04 16:31:48 +00:00
Matteo Pagliazzi
382e391fd0 port updateTask, addTask, clearCompleted, taskDefaults, uuid 2016-04-04 17:18:42 +02:00
Matteo Pagliazzi
c86898c7e4 Merge branch 'api-v3-ops-release-mounts' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-ops-release-mounts 2016-04-04 11:49:06 +02:00
Matteo Pagliazzi
66959c23f5 Merge branch 'api-v3-ops-release-both' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-ops-release-both 2016-04-04 11:46:46 +02:00
Keith Holliday
c916c74775 Ported release both, added unit tests, add release both route with integration tests 2016-04-03 14:44:00 -05:00
Keith Holliday
487a26ec43 Ported release pets, added unit tests, added route with integration tests 2016-04-03 14:37:20 -05:00
Keith Holliday
24b7b4c838 Ported release mounts, add unit tests, added release mounts route with integration tests 2016-04-03 14:34:43 -05:00
Victor Piousbox
3844bafae5 shared-code-random-drop 2016-04-03 16:22:21 +00:00
Matteo Pagliazzi
de74fae0b4 v3: port coupons 2016-04-02 16:37:55 +02:00
Matteo Pagliazzi
e95837f69f Merge branch 'develop' into api-v3 2016-04-02 11:34:04 +02:00
Alys
0ba47de43d adjust cron so that it prevents a double cron when timezone decreases (timezoneOffset increases) 
* start to fix cron for when timezones change

* add some incomplete code

* change cron to identify when timezone changes and run only if both zones agree it should run - BAD - does cron an hour early one day later

* change timezone offset variable names

* improve handling of each individual timezone change possibility

* remove unnecessary casting to number

* remove duplicated code

* finish code for dangerous timezone change

* fix linting errors

* remove console.log lines and other testing code

* add a TODO comment for further actions for timezone changes in the "safe" direction
 2016-04-02 11:42:15 +10:00
Victor Piousbox
7f3feedd12 shared-code-update-stats 2016-04-01 20:50:28 +00:00
Matteo Pagliazzi
238dee7608 Merge pull request #6962 from piousbox/shared-code-user-score-task 
shared-code-user-score-task
 2016-04-01 18:28:55 +02:00
Victor Piousbox
e6e2c26a12 shared-code-user-score-task 2016-04-01 16:11:37 +00:00
Matteo Pagliazzi
aae94bf1b4 Merge branch 'api-v3-open-mystery-item' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-open-mystery-item3 2016-04-01 16:39:52 +02:00
Matteo Pagliazzi
82afc1971d Merge branch 'api-v3-ops-read-card' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-ops-read-card 2016-04-01 16:30:48 +02:00
Matteo Pagliazzi
7e093f1622 Merge branch 'api-v3-hourglass-purchase' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-hourglass-purchase2 2016-04-01 16:28:20 +02:00
Matteo Pagliazzi
519b3a1e4f Merge pull request #6988 from TheHollidayInn/api-v3-ops-purchase 
Ported purchase, add unit tests, created new user purchase route, and added tests
 2016-04-01 16:20:33 +02:00
Keith Holliday
6d9617e345 Ported read card, added unit tests, added read card route and integration tests 2016-04-01 09:17:40 -05:00
Keith Holliday
3fe88fd8d0 Ported open mystery item, added unit tests, added route, and integration tests 2016-04-01 08:23:40 -05:00
Keith Holliday
ad0bc58028 Ported purchase, add unit tests, created new user purchase route, and added tests 2016-04-01 08:14:15 -05:00
Keith Holliday
dd12443166 Ported Hourglass Purchase, add unit tests. Created new hourglass purchase route and tests 2016-04-01 08:11:26 -05:00