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

681 Commits

Author SHA1 Message Date
Matteo Pagliazzi f44dbbbd71 Merge branch 'develop' into api-v3 2016-04-19 12:16:22 +02:00
Matteo Pagliazzi c2b8cad886 v3: fix v3 proxied ops in v2, logout 2016-04-16 19:56:33 +02:00
Sabe Jones 881cf0292d chore(news): mobile and Beguilement Bailey 2016-04-15 18:46:02 +00:00
Sabe Jones c608ac9ecc fix(news): Erratum 2016-04-15 11:53:58 -05:00
Blade Barringer 1a64886f7d Merge branch 'develop' into api-v3 2016-04-15 08:04:46 -05:00
Sabe Jones ffb3ed0aa4 chore(news): annouce Android update 2016-04-14 23:48:45 +00:00
Ubuntu 13edca4588 chore(news): add skill icon announcement 2016-04-13 21:25:31 +00:00
Matteo Pagliazzi 925881b2a0 misc fixes and enable dev endpoints for easier live testing 2016-04-13 22:55:39 +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
Blade Barringer ecb9e09ad8 fix: Add missing sprite class for skills icon in rewards column 
closes #4276
closes #6950
 2016-04-11 08:00:42 -05:00
Blade Barringer b4eb386047 chore: Change spells file name to skills 2016-04-11 08:00:10 -05:00
Sabe Jones b7d801a603 fix(news): typo 2016-04-08 16:17:51 -05:00
Ubuntu 7118e68cf0 chore(news): Beguilement Strike Bailey 2016-04-08 19:06:09 +00:00
Blade Barringer 74dace9b5a chore: Re-enable New Relic 
closes #7011
 2016-04-05 20:08:31 -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
Sabe Jones 3281894d83 chore(news): World Boss Bailey 2016-03-31 19:54:13 -04:00
Sabe Jones a07aed331c fix(world-boss): add chat message, Bailey handling, animation 2016-03-31 19:38:43 -04:00
Sabe Jones f51653b7a5 WIP(world-boss): partial build 2016-03-31 17:29:21 -04:00
Sabe Jones 4fa8c6dfbd chore(news): Bailey 2016-03-30 2016-03-30 15:39:12 -04:00
Blade Barringer a9d227b490 Merge branch 'develop' into wheelchair 2016-03-28 21:12:52 -05:00
Nick Bunn 0f9cf57613 feat: Add wheelchair to avatar customization 2016-03-24 07:57:13 -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 f7027b5cf3 feat(event): subscriber items 2016-03 2016-03-23 15:36:24 -04:00
Sabe Jones b5f91a657f feat(event): Spring Fling complete 2016-03-18 16:56:16 -04:00
Sabe Jones 10a8476aaf WIP(event): Spring Fling cont'd 2016-03-17 13:10:05 -04:00
Sabe Jones b4b0d7e89c chore(news): mobile updates Bailey 2016-03-17 00:09:42 -04:00
Blade Barringer 3f16cd4fbf refactor: Adjust stat allocation modal 2016-03-16 22:07:00 -05:00
Josh Holland a639038a41 Move stat allocation to a mixin to avoid code duplication 2016-03-16 22:07:00 -05:00
Josh Holland 952d9ec929 Quick allocation of attribute points from level-up modal 
Resolves #6720.
 2016-03-16 22:06:54 -05:00
Kaitlin Hipkin a0f65f8b25 emojis now properly displayed in challenge won modal 2016-03-16 20:12:52 -05:00
Kaitlin Hipkin ae92a98037 challenge title on challenge winner's profile supports markdown w/o emojis 2016-03-16 20:12:49 -05:00
Sabe Jones a9e0a4dfaf chore(news): announce badges and Spring Plot 2016-03-15 15:42:15 -04:00
Sabe Jones beb86ea4bd Merge branch 'khipkin/party-badges' into develop 
Conflicts:
	common/dist/sprites/spritesmith-main-10.png
	common/dist/sprites/spritesmith-main-11.png
	common/dist/sprites/spritesmith-main-5.css
	common/dist/sprites/spritesmith-main-5.png
	common/dist/sprites/spritesmith-main-6.png
	common/dist/sprites/spritesmith-main-7.png
	common/dist/sprites/spritesmith-main-8.png
	common/dist/sprites/spritesmith-main-9.png
 2016-03-15 14:57:38 -04:00
Sabe Jones d608fdb437 fix(news): Pfeffernusse typo 2016-03-10 16:59:39 -06:00
Sabe Jones d153df7805 feat(content): snail pet quest WIP 2016-03-09 15:34:57 -05:00
Kaitlin Hipkin fe178a62d9 move party up/on achievs about beast/mount achievs on profile 2016-03-08 21:03:57 -05:00
Kaitlin Hipkin 2ade78fc34 show party up/on achievs on user's profile achievements section 2016-03-08 20:57:19 -05:00
Kaitlin Hipkin d2d3b9deab award party {up,on} achiev when party reaches {2,4} members 2016-03-08 20:55:18 -05:00
Sabe Jones ea6abbfabc feat(content): Armoire and BGs 2016-03 2016-03-01 15:59:25 -05:00
Alys 91fc6186e5 Merge pull request #6736 from delftswa2016/fix-perks-buygems 
Fixed perk amounts when buying subscription through gem
 2016-02-28 18:32:39 +10:00
Sabe Jones bf002a2d1e chore(news): add bang 2016-02-25 14:06:06 -05:00
Sabe Jones 86824c5304 fix(news): add byline 2016-02-24 17:25:49 -05:00
Sabe Jones ca57fad0b9 feat(time-travel): add Phoenixes 
Also adds Bailey news for the above and the subscriber set.
 2016-02-24 17:23:42 -05:00
kogelnikp db595564b3 fixed perk amounts when buying subscription through gem 
set SettingsCtrl as ng-controller for modal buy-gems window to show perk
amounts when buying subscriptions through gem button
 2016-02-18 23:43:25 +01:00
Sabe Jones bafdfc4ed5 chore(news): Bailey 20160217 2016-02-17 20:59:11 -05:00
Alys ffb5cfd46e Merge pull request #6582 from tylerxo/remove_modal_username 
Adds user details to the removal modal
 2016-02-18 06:39:31 +10:00
Sabe Jones 884e3573a6 fix(deploy): junk commit for Heroku 2016-02-08 17:25:01 -05:00
Sabe Jones e1b13db6e8 feat(quests): pets 201602 
Also enables the Valentine's Day card for selection in the Market.
 2016-02-08 16:20:05 -05:00
Sabe Jones d8e9b781c8 feat(content): BGs and Armoire 201602 2016-02-02 16:02:50 -05:00