Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,073 Commits 64 Branches 1,256 Tags
5ee33b08b934f8345fbca22c145abc2958feb103
Commit Graph

13073 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matteo Pagliazzi 5ee33b08b9 Merge branch 'api-v3-get-user-anonymized' of https://github.com/piousbox/habitrpg into piousbox-api-v3-get-user-anonymized 2016-03-25 16:04:48 +01:00
Matteo Pagliazzi d89d1e50dd Merge branch 'develop' into api-v3 2016-03-25 15:58:04 +01:00
Matteo Pagliazzi 53b2743d94 Merge branch 'TheHollidayInn-api-v3-send-private-message' into api-v3 2016-03-25 15:56:37 +01:00
Matteo Pagliazzi 15e8f881fe Merge branch 'api-v3-send-private-message' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-send-private-message 2016-03-25 15:56:28 +01:00
Matteo Pagliazzi 55b0642523 Merge pull request #6934 from TheHollidayInn/api-v3-user-delete 
[v3] Ported user delete route and added initial tests
 2016-03-25 15:51:54 +01:00
Keith Holliday d7b6e0b760 Ported refPush and added tests 2016-03-25 08:33:55 -05:00
Keith Holliday 19a63e8128 Ported sendGift route and renamed it to transferGems. Refactored user.sendMessage logic. 2016-03-25 08:33:54 -05:00
Keith Holliday 95ea73d440 Fixed route namespace and added translation strings 2016-03-25 08:33:54 -05:00
Keith Holliday e9a9079c46 Ported sendPrivateMessage route and added initial tests 2016-03-25 08:33:54 -05:00
Keith Holliday 075b31c075 Added password requirement 2016-03-25 08:32:49 -05:00
Keith Holliday 7f65707ee4 Ported user delete route and added initial tests 2016-03-25 08:32:49 -05:00
Matteo Pagliazzi be9312deb0 Merge branch 'api-v3-equip-feed-hatch2' into api-v3 2016-03-25 12:23:12 +01:00
Matteo Pagliazzi 192409a0b5 Merge branch 'api-v3' into api-v3-equip-feed-hatch2 2016-03-25 12:22:55 +01:00
Victor Piousbox 5aacd978c6 api-v3-get-user-anonymized 2016-03-24 18:23:43 +00:00
Matteo Pagliazzi 9452fd3128 Merge pull request #6945 from piousbox/api-v3-test-attach-local-to-social-auth 
[v3] working on attaching local to social auth
 2016-03-24 19:18:04 +01:00
Matteo Pagliazzi 0f1add62cf Merge pull request #6956 from HabitRPG/api-v3-shared-ops 
[Api v3] Port changeClass and disableClasses
 2016-03-24 19:17:48 +01:00
Matteo Pagliazzi 0a65e6a6f1 v3: port hatch, equip and feed ops 2016-03-24 18:59:09 +01:00
Victor Piousbox 528d805cda api-v3-test-attach-local-to-social-auth 2016-03-24 17:51:31 +00:00
Sabe Jones 2652de88ae Merge pull request #6940 from HabitRPG/sabrecat/mystery-201603 
Subscriber items 2016-03
 2016-03-24 12:33:06 -05:00
Matteo Pagliazzi 159b9eaa8d port disable classes and change class ops 2016-03-24 14:25:30 +01:00
Blade Barringer 01a7132b0b refactor: Extract play reward sound logic into function 2016-03-23 17:55:44 -05:00
Kenny Carlsen 7b708f51ba Proposed bug fix, issue #6668 - erroneous reward purchase sound 2016-03-23 17:55:41 -05:00
Sabe Jones 17b02f2867 fix(news): missing promo 2016-03-23 15:47:22 -04:00
Sabe Jones ba1cc67654 chore(news): fill out remaining Bailey 2016-03-23 15:36:24 -04:00
Sabe Jones be159adf77 fix(event): pastel skin, not hair 2016-03-23 15:36:24 -04:00
Sabe Jones 1286b6fbee fix(event): make spring hair/skin available server side 2016-03-23 15:36:24 -04:00
Sabe Jones f7027b5cf3 feat(event): subscriber items 2016-03 2016-03-23 15:36:24 -04:00
Blade Barringer 2a4a8466ca Merge pull request #6948 from MathWhiz/patch-1 
Fix ISSUE_TEMPLATE.md
 2016-03-23 11:48:13 -05:00
MathWhiz 802b8bed0a Fix ISSUE_TEMPLATE.md 
Added parentheses around two of the comments to hide them.
 2016-03-23 09:11:08 -05:00
Blade Barringer a958fefa6b Merge pull request #6946 from HabitRPG/update_pageres 
Update pageres
 2016-03-23 08:36:52 -05:00
Blade Barringer ef2a1f5929 chore: Update pageres 
Removes dependency on memoize-async, which was unpublished:
https://medium.com/@azerbike/i-ve-just-liberated-my-modules-9045c06be67c#.tlcdr5ieg
 2016-03-23 08:16:39 -05:00
Blade Barringer fd10422e0c tests: Add preliminary tests around send message and send gift 2016-03-22 21:49:27 -05:00
Blade Barringer f5d4eba292 fix: Default message to '' when not passed in sendGift route 2016-03-22 21:49:27 -05:00
Brian Murray eaea55687b Make change regarding pluralization of gem gift message easier to read and not one long line 2016-03-22 21:49:27 -05:00
Brian Murray 369386e370 Only add an 's' to months of subscription or gems given if they are not 1. 2016-03-22 21:49:22 -05:00
Blade Barringer 9b9722a7b4 chore(i18n): update locales 2016-03-22 17:40:42 -05:00
Bleu 521195ab95 fix: Unify html in translation strings 
Closes #6859
 2016-03-22 17:34:29 -05:00
Matteo Pagliazzi 23f92e2d28 Merge pull request #6923 from TheHollidayInn/api-v3-groups-reject-invite 
[v3] Added group reject invite route and initial tests
 2016-03-22 22:46:12 +01:00
Keith Holliday da08b6c814 Removed group query from route 2016-03-22 16:10:17 -05:00
MathWhiz 86516b5e20 Update presskit 2016-03-22 08:41:02 -05:00
Blade Barringer 92ac703ecc chore(i18n): update locales 2016-03-22 08:31:14 -05:00
Blade Barringer 3add287a85 Merge branch 'khipkin-fix_class_change_gear_modal' into develop 2016-03-22 08:10:55 -05:00
MathWhiz c70b40e0a3 Add pull request instructions to CONTRIBUTING.MD 2016-03-22 07:59:13 -05:00
Blade Barringer bbcef441bf Adjust template instructions 2016-03-22 07:59:13 -05:00
mathwhiz a5b7066358 Add templates for issues and pull requests 2016-03-22 07:59:06 -05:00
Matteo Pagliazzi 0bde9e2df2 Merge branch 'develop' into api-v3 2016-03-21 23:03:28 +01:00
Matteo Pagliazzi d8dab49b79 Merge pull request #6898 from HabitRPG/api-v3-buy-ops 
[v3] Port several shared ops and their linked fns
 2016-03-21 23:00:43 +01:00
Matteo Pagliazzi 85a05e0a99 Merge pull request #6938 from piousbox/api-v3-test-local-login-2 
local login test
 2016-03-21 22:50:37 +01:00
Matteo Pagliazzi f04d8d4d97 do not remove ops/fns from common/script/index.js until they have been ported everywhere 2016-03-21 22:50:18 +01:00
Victor Piousbox a03f34362c resolving conflicts 2016-03-21 21:28:07 +00:00