Commit Graph

11445 Commits

Author SHA1 Message Date
Sabe Jones 9227dd89be fix(event): Extend festival one day 2015-11-01 13:27:36 -06:00
Blade Barringer da06e0736a Adjust style of tests. 2015-10-31 21:37:44 -05:00
Blade Barringer f84a10ee4e Simplify delete user test 2015-10-31 21:37:17 -05:00
Blade Barringer d5c346bf3f Merge branch 'develop' into jeremyabbott-deleteusertestupdates 2015-10-31 21:27:16 -05:00
Jeremy Abbott 19128cf8f2 Fnished user in solo group tests
Also minor code cleanup in random files.
2015-10-31 16:19:50 -05:00
Sabe Jones 2e7006a0f7 chore(news): Burnout win Bailey 2015-10-31 16:03:34 -04:00
Blade Barringer 421b402948 Add helper to check the existence of a document 2015-10-31 10:55:28 -05:00
Blade Barringer 6a65711c2f Close db connections in helpers 2015-10-31 10:55:17 -05:00
Alys fa060bf6cd revert a commit that went live prematurely when I was distracted - sorry for commit spam 2015-10-31 19:26:05 +09:00
Alys 559a2cea50 revert my stupid tavern quest hack because a server restart was all that was needed 2015-10-31 19:11:07 +09:00
Alys fbb1f9aec5 create a nasty hack to get rid of the persistent Tavern quest exhaust sprites 2015-10-31 19:01:21 +09:00
Alys 8f21fb2419 set lastCron to current moment if the user's timezone has changed when they authenticate 2015-10-31 18:34:35 +09:00
Blade Barringer c419ca8839 Merge pull request #6068 from AminArria/Wrong-max-level-messages
Wrong max level messages
2015-10-30 23:21:29 -05:00
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