Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,428 Commits 64 Branches 1,256 Tags
2eb6cab2bee2b5dbda038621f81993d523dadb5a
Commit Graph

11428 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Blade Barringer 2eb6cab2be Merge pull request #6014 from ahstro/toggle-chevrons 
Toggle chevron direction
 2015-10-30 23:13:51 -05:00
Blade Barringer add761e58e Remove extraneous div 2015-10-30 23:05:19 -05:00
Blade Barringer 4a9b0f1d12 Merge branch 'Thrashmandicoot-merchant-button-fix' into develop 2015-10-30 22:50:26 -05:00
Blade Barringer 898850fd6e Adjust wording of market message. 2015-10-30 22:50:04 -05:00
Blade Barringer 92271c2049 Clean up view for market. 2015-10-30 22:49:13 -05:00
Thrashmandicoot 76de8af848 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into merchant-button-fix 2015-10-30 20:02:16 -07:00
Thrashmandicoot 1051ff0006 Fix inline-styling to be class styling 2015-10-30 20:01:22 -07:00
Thrashmandicoot c2222a42c7 Add 70% width styling for item sales 2015-10-30 20:01:06 -07:00
Alys 154fcb4f8c make daysMissed have a negative value for a lastCron in the future so that setting your PC time backwards doesn't trigger cron 2015-10-31 13:00:42 +10:00
Alys 34c51fc710 revert recent cron change (better code incoming; what WAS I thinking) 2015-10-31 10:59:41 +10:00
Blade Barringer ad6fbef85c Move chat tests to new infrastructure 2015-10-30 14:47:14 -05:00
Sabe Jones 68660b3043 Merge pull request #6140 from HabitRPG/sabrecat/habitoween 
WIP: Habitoween
 2015-10-30 14:46:44 -05:00
Sabe Jones dca0d7c3f3 fix(event): Keep NPCs burnt out 2015-10-30 15:36:17 -04:00
Alys 161069cfec prevent cron running if the lastCron date is in the future 2015-10-31 04:12:43 +10:00
Blade Barringer 003524a19b Update npm 2015-10-30 10:28:10 -05:00
Blade Barringer 724bc6e861 Compiled css for sprites 2015-10-30 10:10:12 -05:00
Matteo Pagliazzi e82d4e59d8 put.nvmrc back 2015-10-30 15:29:56 +01:00
Matteo Pagliazzi e145439b0b starts cleaning up the repo 2015-10-30 15:27:33 +01:00
Blade Barringer e8fa22bf93 chore(i18n): update locales 2015-10-30 09:25:43 -05:00
Blade Barringer 47168cfdc1 Merge pull request #6145 from crookedneighbor/test_updates 
Update Tests to test server error messages against translation strings
 2015-10-30 09:21:49 -05:00
Blade Barringer 6f18470b65 Update readme 2015-10-30 09:04:19 -05:00
Blade Barringer aa111b3c1a Update tests to assert against translation strings 2015-10-30 09:01:57 -05:00
Matteo Pagliazzi 75e85c085d fix typo in package.json 2015-10-30 14:18:14 +01:00
Matteo Pagliazzi 0131ba3e45 reert all the deps upgrades 2015-10-30 14:16:35 +01:00
Matteo Pagliazzi 413a06c8d3 disable newrelic 2015-10-30 13:34:18 +01:00
Thrashmandicoot f979dd9c0f Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into merchant-button-fix 2015-10-30 03:55:23 -07:00
Matteo Pagliazzi 715dd28e24 chore(newrelic): upgrade to ~1.23.0 2015-10-30 11:51:18 +01:00
Thrashmandicoot 64ea4e42e7 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into merchant-button-fix 2015-10-30 03:43:35 -07:00
Thrashmandicoot 0e52a62ad2 dynamic images for merchant, finishes refactor 2015-10-30 03:43:13 -07:00
Matteo Pagliazzi 2097004676 chore(node): upgrade to ^4.2.1 2015-10-30 10:44:13 +01:00
Thrashmandicoot e1b26a884c Add display for selling items, needs right img 2015-10-30 02:27:36 -07:00
Thrashmandicoot ebbc72e9c2 Refactor sellForGold, add displayPotion/item 2015-10-30 02:26:41 -07:00
Sabe Jones d3a6ff5b2d fix(front-page): Remove extra script tag 
Why did I even do that?
 2015-10-29 17:07:41 -04:00
Alys 1923a3a467 change on-hover text for Mystery Item gift box to just mention wiki page 2015-10-30 06:59:54 +10:00
Alys 11ae4a9b87 change on-hover text for Mystery Item gift box to link to wiki page and remove statement about finding exact date on wiki 2015-10-30 06:30:11 +10:00
Matteo Pagliazzi 4051cdf06d add requirejs to devDeps as it is a required peerDependency 2015-10-29 19:56:50 +01:00
Matteo Pagliazzi 332df1d646 Merge pull request #6136 from HabitRPG/upgrade-stack 
Upgrade stack
 2015-10-29 19:28:51 +01:00
Sabe Jones 27d1e9c788 feat(event): Habitoween 
Swaps out basic fall costume NPCs for their Halloween versions. Removes "broken" NPC sprites not needed after World Boss.
 2015-10-29 14:15:18 -04:00
Matteo Pagliazzi 82f5897c41 Merge pull request #6138 from crookedneighbor/mongo3 
Update travis to use mongo 3 and npm v3
 2015-10-29 19:12:27 +01:00
Blade Barringer 9844d3dc76 Use most recent version of npm 3 in travis 2015-10-29 13:07:50 -05:00
Blade Barringer b4d45834d1 Update travis to use mongo 3 and npm v3 2015-10-29 12:59:10 -05:00
Blade Barringer dd09633d31 Merge branch 'locks-auto-equip' into develop 2015-10-29 12:25:18 -05:00
Blade Barringer 0c82d757c8 Move cs tests to js 2015-10-29 12:25:02 -05:00
Matteo Pagliazzi e813b756ac use higher npm version 2015-10-29 17:26:35 +01:00
Matteo Pagliazzi 23984a7543 revert to old travis file 2015-10-29 17:12:53 +01:00
Matteo Pagliazzi 64852ae2bd Revert "add mongodb to travis ci" 
This reverts commit 8c99cc1d3b.
 2015-10-29 17:09:03 +01:00
Matteo Pagliazzi 8c99cc1d3b add mongodb to travis ci 2015-10-29 16:41:54 +01:00
Matteo Pagliazzi 37d83fdade mongoo 4 and new travis ci infrastructure 2015-10-29 16:35:02 +01:00
Matteo Pagliazzi 8ea69e90dd enable new relic, node 4 and npm 3 2015-10-29 16:11:56 +01:00
Matteo Pagliazzi 92fc2683c6 fix(cluster): use for loop instead of _.times 2015-10-29 16:04:30 +01:00