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

12146 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matteo Pagliazzi 5b012750bb convert spells to es6 2016-03-02 12:46:06 +01:00
Alys f69a29c152 improve group invitation code and tests 2016-03-02 09:26:55 +10:00
Sabe Jones 2516eae8d3 Merge pull request #6799 from HabitRPG/sabrecat/armoire-201603 
Armoire and BGs 2016-03
 2016-03-01 15:34:50 -06:00
Sabe Jones ea6abbfabc feat(content): Armoire and BGs 2016-03 2016-03-01 15:59:25 -05:00
Blade Barringer ae56dd5c2e Merge pull request #6796 from crookedneighbor/refactor_remove_unused_common_src_files 
refactor: Remove unused common script src files
 2016-03-01 09:21:58 -06:00
Blade Barringer c96ddaeebe refactor: Remove unused common script src files 2016-03-01 08:49:25 -06:00
Matteo Pagliazzi 531d3969f4 fix cluster.fork 2016-03-01 09:15:13 +01:00
Alys 01b12cd8b4 Merge pull request #6793 from Sinble/develop 
Change Menu Names
 2016-03-01 15:43:27 +10:00
Nick Bunn b6255e9240 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into menu_name_change 2016-02-29 20:23:24 -06:00
Nick Bunn 251dd3cb8e Changed submenu from Hall of Heroes to Hall of Contributors 2016-02-29 20:23:05 -06:00
Alys 3464914655 Revert "remove common/script/src" 
This reverts commit 7c5572608f.
 2016-03-01 05:30:44 +10:00
Matteo Pagliazzi 7c5572608f remove common/script/src 2016-02-29 16:35:35 +01:00
Matteo Pagliazzi cbb29eac55 update gitignore for elastic beanstalk 2016-02-29 16:28:08 +01:00
Josh Holland fae0bbc8f6 Add Moonstone Chain quest art 2016-02-28 19:37:07 -06:00
Nick Bunn 075ed9f172 updated menu names for better description 2016-02-28 16:10:26 -06:00
Josh Holland e2ca21f935 Add Message in a Bottle quest art 2016-02-28 17:12:57 +00:00
Alys 6cd861dcdc Merge pull request #6742 from murraybd/develop 
Display attribute info in Character Build
 2016-02-28 19:39:20 +10:00
Alys c8b5cf95be Merge pull request #6764 from querry43/add-missing-docker-depends 
adding two deps to dockerfile required for karma
 2016-02-28 19:11:01 +10:00
Alys ccfff7270f Merge pull request #6763 from querry43/tests-in-docker 
TEST_DB_URI env override
 2016-02-28 19:04:58 +10: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
Alys cc5f794f3d prevent party inviter's email address being used as a Reply-To 2016-02-27 18:48:41 +10:00
Matteo Pagliazzi 82c4f91317 put newrelic behind a flag 2016-02-25 21:05:42 +01:00
Sabe Jones bf002a2d1e chore(news): add bang 2016-02-25 14:06:06 -05:00
Sabe Jones 3270cbf89f fix(events): revert missed sprite and quest availability 2016-02-24 19:49:17 -05:00
Matt Harrington 46e13fecad TEST_DB_URI env override 2016-02-25 00:08:24 +00:00
Sabe Jones d2a487aea1 Merge pull request #6761 from HabitRPG/sabrecat/mystery-201602 
Mystery Items 201602
 2016-02-24 17:01:18 -06: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
Matt Harrington f129df2e03 adding two deps required for karma 2016-02-24 05:22:31 +00:00
Sabe Jones 5c1d379f41 feat(subscription): mystery items 201602 2016-02-23 17:00:55 -05:00
Matteo Pagliazzi d3e1a415a8 require newrelic as the first thing on startup 2016-02-21 22:39:55 +01:00
Matteo Pagliazzi f4d66c7384 config newrelic 2016-02-21 22:30:25 +01:00
Matteo Pagliazzi 4dfb24af6e enable newrelic 2016-02-21 22:02:37 +01:00
Brian Murray 45a938c12d put the atrribute allocation td building in a loop to clean up the code per Alys 2016-02-19 21:46:23 -08:00
Brian Murray 04d0bcadb7 in profile.jade in the character build section display detailed info about the attribute 2016-02-19 19:22:05 -08:00
Brian Murray 7822e2aaec end sureRest sentence with a period 2016-02-19 19:15:32 -08: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
Alys c95950c679 recompile spritesheets 2016-02-18 20:07:35 +10:00
Alys 8d106d6d78 Merge branch 'fix_gryphons' of https://github.com/taldin/habitrpg into taldin-fix_gryphons 
Conflicts:
	common/dist/sprites/spritesmith-main-5.css
	common/dist/sprites/spritesmith-main-5.png
 2016-02-18 18:56:40 +10:00
Alys f631712a45 deemphasise the warning that spritesheets might be too large for mobile safari - ref https://github.com/HabitRPG/habitrpg/pull/6683#issuecomment-185462180 2016-02-18 18:52:09 +10:00
Alys 3563244cdc change number of users from 1,000,000 to 1,100,000 2016-02-18 12:42:47 +10: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
Matteo Pagliazzi 5ca45df602 Revert "tests for deleting old todos" 
This reverts commit d9dd031e7f.
 2016-02-15 22:12:21 +01:00
Matteo Pagliazzi e6b425d713 Revert "delete completed todos 30/90 days after completion" 
This reverts commit 0a9391ea75.
 2016-02-15 22:11:03 +01:00
Sabe Jones f7c9769aab chore(event): revert Valentine's 2016-02-15 14:48:39 -05:00
Blade Barringer d0ac43592f chore(i18n): update locales 2016-02-14 21:13:40 -06:00
Sabe Jones 00f98d90b6 Merge pull request #6705 from HabitRPG/sabrecat/chat-cutoff 
No chat notifs from big Guilds
 2016-02-12 13:22:10 -06:00
Sabe Jones b4b64dcf19 fix(performance): no chat notifs from big Guilds 2016-02-12 13:18:30 -05:00
Sabe Jones a74279f629 Merge pull request #6702 from HabitRPG/sabrecat/fix-newbie-guild 
Don't send chat notifs for Newbies Guild
 2016-02-11 20:48:17 -06:00