4a9b0f1d12
Merge branch 'Thrashmandicoot-merchant-button-fix' into develop
2015-10-30 22:50:26 -05:00
898850fd6e
Adjust wording of market message.
2015-10-30 22:50:04 -05:00
92271c2049
Clean up view for market.
2015-10-30 22:49:13 -05:00
76de8af848
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into merchant-button-fix
2015-10-30 20:02:16 -07:00
1051ff0006
Fix inline-styling to be class styling
2015-10-30 20:01:22 -07:00
c2222a42c7
Add 70% width styling for item sales
2015-10-30 20:01:06 -07:00
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
34c51fc710
revert recent cron change (better code incoming; what WAS I thinking)
2015-10-31 10:59:41 +10:00
ad6fbef85c
Move chat tests to new infrastructure
2015-10-30 14:47:14 -05:00
68660b3043
Merge pull request #6140 from HabitRPG/sabrecat/habitoween
...
WIP: Habitoween
2015-10-30 14:46:44 -05:00
dca0d7c3f3
fix(event): Keep NPCs burnt out
2015-10-30 15:36:17 -04:00
161069cfec
prevent cron running if the lastCron date is in the future
2015-10-31 04:12:43 +10:00
003524a19b
Update npm
2015-10-30 10:28:10 -05:00
724bc6e861
Compiled css for sprites
2015-10-30 10:10:12 -05:00
e82d4e59d8
put.nvmrc back
2015-10-30 15:29:56 +01:00
e145439b0b
starts cleaning up the repo
2015-10-30 15:27:33 +01:00
e8fa22bf93
chore(i18n): update locales
2015-10-30 09:25:43 -05:00
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
6f18470b65
Update readme
2015-10-30 09:04:19 -05:00
aa111b3c1a
Update tests to assert against translation strings
2015-10-30 09:01:57 -05:00
75e85c085d
fix typo in package.json
2015-10-30 14:18:14 +01:00
0131ba3e45
reert all the deps upgrades
2015-10-30 14:16:35 +01:00
413a06c8d3
disable newrelic
2015-10-30 13:34:18 +01:00
f979dd9c0f
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into merchant-button-fix
2015-10-30 03:55:23 -07:00
715dd28e24
chore(newrelic): upgrade to ~1.23.0
2015-10-30 11:51:18 +01:00
64ea4e42e7
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into merchant-button-fix
2015-10-30 03:43:35 -07:00
0e52a62ad2
dynamic images for merchant, finishes refactor
2015-10-30 03:43:13 -07:00
2097004676
chore(node): upgrade to ^4.2.1
2015-10-30 10:44:13 +01:00
e1b26a884c
Add display for selling items, needs right img
2015-10-30 02:27:36 -07:00
ebbc72e9c2
Refactor sellForGold, add displayPotion/item
2015-10-30 02:26:41 -07:00
d3a6ff5b2d
fix(front-page): Remove extra script tag
...
Why did I even do that?
2015-10-29 17:07:41 -04:00
1923a3a467
change on-hover text for Mystery Item gift box to just mention wiki page
2015-10-30 06:59:54 +10:00
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
4051cdf06d
add requirejs to devDeps as it is a required peerDependency
2015-10-29 19:56:50 +01:00
332df1d646
Merge pull request #6136 from HabitRPG/upgrade-stack
...
Upgrade stack
2015-10-29 19:28:51 +01:00
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
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
9844d3dc76
Use most recent version of npm 3 in travis
2015-10-29 13:07:50 -05:00
b4d45834d1
Update travis to use mongo 3 and npm v3
2015-10-29 12:59:10 -05:00
dd09633d31
Merge branch 'locks-auto-equip' into develop
2015-10-29 12:25:18 -05:00
0c82d757c8
Move cs tests to js
2015-10-29 12:25:02 -05:00
e813b756ac
use higher npm version
2015-10-29 17:26:35 +01:00
23984a7543
revert to old travis file
2015-10-29 17:12:53 +01:00
64852ae2bd
Revert "add mongodb to travis ci"
...
This reverts commit 8c99cc1d3b
2015-10-29 17:09:03 +01:00
8c99cc1d3b
add mongodb to travis ci
2015-10-29 16:41:54 +01:00
37d83fdade
mongoo 4 and new travis ci infrastructure
2015-10-29 16:35:02 +01:00
8ea69e90dd
enable new relic, node 4 and npm 3
2015-10-29 16:11:56 +01:00
92fc2683c6
fix(cluster): use for loop instead of _.times
2015-10-29 16:04:30 +01:00
f9ab04e4f9
upgrade to express 4.x
...
cleanup package.json
put errorHandler middleware as the last one
use accepts module instead of req.acceptedLanguages
use normal object notation as it is supported is es5
remove deprecations from auth controller
remove deprecations from groups controller
Revert "remove deprecations from groups controller"
This reverts commit 7cf36295ebbc50c1f2b210a8ab447d7f2c41dba9.
Revert "remove deprecations from auth controller"
This reverts commit deecd701e0551862ba53ea894f2d87a746384fed.
request limit upped to 1mb and 10k chars for query parameters
Upgrade to Express 4.x
2015-10-29 15:59:45 +01:00
ee55c44548
Add text assertion to test
2015-10-29 08:42:37 -05:00
Blade Barringer