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

9193 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matteo Pagliazzi a7b648102b Merge pull request #407 from HabitRPG/add-flag-to-chat 
Add flag to chat
 2014-12-23 18:35:55 +01:00
Blade Barringer 8e0358f7c7 Merge branch 'add-flag-to-chat' of github.com:HabitRPG/habitrpg into add-flag-to-chat 2014-12-23 10:08:01 -06:00
Blade Barringer 84db289957 Merge branch 'develop' into add-flag-to-chat 2014-12-23 10:07:42 -06:00
thehindenburg 0dfa770fe4 update winter 2013 to winter 2014 to satisfy new naming conventions 2014-12-22 21:13:59 -08:00
Verabird 42cb93c673 Add variables for medium-length date display 2014-12-22 22:23:11 -05:00
Alice Harris d34b116732 update formatting for gear style guidelines 2014-12-23 06:43:05 +10:00
Alice Harris d6354007f1 update formatting for gear style guidelines 2014-12-23 06:42:10 +10:00
Alice Harris 9d7bf26988 update formatting for gear style guidelines 2014-12-23 06:38:21 +10:00
Alice Harris 36a552b4a3 update formatting for gear style guidelines 2014-12-23 06:34:57 +10:00
Alice Harris e30ff2eebb create style guide for gear/equipment descriptions based on ShilohT's suggestions in https://github.com/HabitRPG/habitrpg-shared/pull/372 2014-12-23 06:28:34 +10:00
Verabird c4143c7805 added variable for date display and checking line ending issue 2014-12-22 15:19:53 -05:00
Matteo Pagliazzi 4c785e8459 fix(flag-chat): correct url for tavern flags 2014-12-22 21:09:27 +01:00
Blade Barringer 6f410f59ce Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into add-flag-to-chat 2014-12-22 13:28:01 -06:00
Blade Barringer 37b9e5012a Added links to user modals 2014-12-22 13:22:42 -06:00
Matteo Pagliazzi d079ebbee9 chore(i18n): update locales 2014-12-22 20:09:45 +01:00
Matteo Pagliazzi 2d4c5e7b98 feat(flag-chat): fetch author and add some group variables 2014-12-22 20:02:22 +01:00
Matteo Pagliazzi 7aff280a71 feat(flag-chat): add some variables 2014-12-22 19:56:11 +01:00
Matteo Pagliazzi 652ce10e22 feat(flag-chat): start implemnting email 2014-12-22 19:48:03 +01:00
Sabe Jones 07fbcbcb08 Revert "fix(phantom): downgrade to node 0.10.22 due to CERT error, see" 
This reverts commit dc18569e78.
 2014-12-21 20:53:03 -06:00
Sabe Jones 883d472b94 Merge pull request #4395 from SabreCat/Bailey 
Wonderland Bailey 1
 2014-12-21 15:47:51 -06:00
Sabe Jones be62f4bb7f Merge pull request #403 from SabreCat/Bailey 
Promo art
 2014-12-21 15:47:36 -06:00
Sabe Jones eb0d19fa29 chore(grunt): grunt full 2014-12-21 15:45:13 -06:00
Sabe Jones 833ff90a59 chore(news): Wonderland Bailey 1 2014-12-21 15:41:32 -06:00
Sabe Jones 0ec9e5b1e1 feat(news): Promo images 2014-12-21 15:40:07 -06:00
Sabe Jones ef02e059c7 chore(grunt): grunt full 2014-12-21 15:24:55 -06:00
Sabe Jones 5979aa3b9a Merge pull request #4394 from SabreCat/hair 
Wintery Hair Colors for Wonderland 2015
 2014-12-21 15:17:47 -06:00
Sabe Jones 649e207769 Merge pull request #402 from SabreCat/winter2015/hair 
Wintery Hair Colors for Wonderland 2015
 2014-12-21 15:16:10 -06:00
Sabe Jones 1ff25dfd5b Merge pull request #401 from SabreCat/winter2015/gear 
Winter Wonderland 2015 Gear
 2014-12-21 15:09:51 -06:00
Sabe Jones 784850f934 Merge pull request #400 from SabreCat/winter2015/npcs 
Winter 2015 NPCs
 2014-12-21 15:08:46 -06:00
Sabe Jones bb89a10356 feat(event): Wintery Hair Colors 2014-12-21 13:58:47 -06:00
Sabe Jones d0a97fb20f feat(event): Wintery Hair Colors 
Also removes an accidental duplication of a prior hair resource.
 2014-12-21 13:55:23 -06:00
Sabe Jones e62cb74ad0 fix(event): head, not helm 2014-12-21 12:43:44 -06:00
Sabe Jones 8ec9f79188 feat(event): Winter Wonderland 2015 gear 2014-12-21 12:37:37 -06:00
Sabe Jones 8d645bcafd chore(grunt): grunt full 
Also flips Ian NPC to standard spritesmith instead of animated GIF.
 2014-12-21 10:57:02 -06:00
Sabe Jones c8aadf296e feat(event): Winter NPCs 2014-12-21 10:44:08 -06:00
Tyler Renelle 492260d74a refactor(coupons): coupons cleanup using async.auto 2014-12-20 17:58:00 -07:00
Matteo Pagliazzi b2bbfdfe09 Merge pull request #4392 from crookedneighbor/fix-moment-in-tests 
Updated moment calls to use number, period to fix the depreciation error
 2014-12-20 17:15:19 +01:00
Matteo Pagliazzi 8b3c6f94bf fix(loggly): send more infos about cron errors 2014-12-20 16:20:40 +01:00
Alice Harris 4a7dcfc2bb merge changes for smash (Brutal Smash) from brandonjreid's PR https://github.com/HabitRPG/habitrpg-shared/pull/331 2014-12-20 21:13:43 +10:00
Alice Harris e9c8f66562 merge backStab change by brandonjreid from https://github.com/HabitRPG/habitrpg-shared/pull/331 2014-12-20 16:03:37 +10:00
Alice Harris fbc5a258f6 stop backStab and fireball (Burst of Flames) changing the task value 2014-12-20 13:35:10 +10:00
Blade Barringer 95951a4706 Updated moment calls to use number, period to fix the deprecation error 2014-12-19 19:41:22 -06:00
Alice Harris 44a7448a96 compiled dist/habitrpg-shared.js 2014-12-20 11:18:13 +10:00
Alice Harris 9f77819d94 add pickpocket change from PR by brandonjreid: https://github.com/HabitRPG/habitrpg-shared/pull/331/files#diff-652dbbf3d459e90a3de1a122c063bb6bL502 2014-12-20 11:07:47 +10:00
Alice Harris afef118200 Merge toolsOfTrade changes from 'ShilohT-skillbalancing' into rebalancing-2014-12 2014-12-20 09:46:30 +10:00
Alice Harris 621615a6f9 Merge fireball (Burst of Flames) changes from 'ShilohT-skillbalancing' into rebalancing-2014-12 2014-12-20 09:42:26 +10:00
Alice Harris 6961e3608a Merge branch 'skillbalancing' of https://github.com/ShilohT/habitrpg-shared into ShilohT-skillbalancing 2014-12-20 09:29:52 +10:00
Alice Harris 95a6aa5586 Merge branch 'rebalancing-2014-12' of https://github.com/HabitRPG/habitrpg-shared into rebalancing-2014-12 
Conflicts:
	dist/habitrpg-shared.js
 2014-12-20 08:48:21 +10:00
Matteo Pagliazzi 739d8885a3 fix(emails): remove unused variable 2014-12-19 19:59:12 +01:00
Matteo Pagliazzi 7c0b25d58a pass base_url to emails as variable 2014-12-19 19:46:05 +01:00