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

670 Commits

Author SHA1 Message Date
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
Tyler Smith 065238525c Removing extra class in favor of .lead 2016-02-02 10:22:17 -08:00
Sabe Jones 0fcdc49adb chore(event): end Winter Wonderland 2016-02-01 17:01:17 -05:00
Alys ea57808176 remove instructions for Beeminder users to read a warning about deleting completed To-Dos (warning is no longer needed) 2016-01-31 18:25:37 +10:00
Sabe Jones 91c6ce27c5 feat(event): Habit Birthday 2016 
Also adds AWS Elastic Beanstalk local config file to .gitignore.
 2016-01-28 17:16:01 -05:00
Sabe Jones d7782584db chore(news): Bailey 20160126 2016-01-26 20:31:43 -05:00
Tyler Smith ff2ebe46b8 Fixing jade and angular syntax miscues 2016-01-26 07:59:31 -08:00
Tyler Smith 588fdc6cad Properly chaining classes in jade 2016-01-26 07:52:35 -08:00
Tyler Smith fd157785f4 Adding text-center to container rather than individual elements 2016-01-25 17:42:50 -08:00
Tyler Smith 77cfc99b59 Adding user details to the removal modal 2016-01-25 17:37:18 -08:00
Sabe Jones f872547264 chore(news): Bailey 2016-01-20 2016-01-20 16:32:12 -05:00
Sabe Jones 016b080836 Merge branch 'anowlcalledjosh/add-task-fix' into develop 2016-01-20 14:27:21 -05:00