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
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
6ff904bd5a
Merge branch 'develop' into czan-develop
2015-10-29 08:40:03 -05:00
bf27d62cc2
Merge branch 'api_tests' into develop
2015-10-29 08:07:55 -05:00
68fabbf56f
Update names
2015-10-29 08:07:06 -05:00
4b44c935e8
Merge branch 'develop' into Bunjl-develop
2015-10-29 07:58:31 -05:00
bce37f7220
Adjusted Press Kit naming.
2015-10-29 07:55:17 -05:00
5cc790093e
Move join party tests to new structure.
2015-10-29 07:41:49 -05:00
55fcf678c3
Move push notification to new infrastructure.
2015-10-28 21:36:04 -05:00
ab1ac1f543
Remove unneeded test
2015-10-28 21:09:55 -05:00
265bb56db2
Move get user tests
2015-10-28 21:06:28 -05:00
e98484d0ec
Move anonymous route test to new structure.
2015-10-28 21:00:28 -05:00
fd4fb836f0
Move task tests
2015-10-28 17:18:27 -05:00
01373882c6
make error notification persistent, change text and make it translatable
2015-10-28 19:42:26 +01:00
7205ac689d
Merge pull request #6114 from kylestratis/issue-5542a
...
Issue 5542a - remove FIXME comment from invitations section in user model
2015-10-28 06:45:50 -05:00
909d556a6d
Merge remote-tracking branch 'HabitRPG/develop' into develop
2015-10-28 09:47:47 +02:00
5269df2932
namefix
2015-10-28 09:47:04 +02:00
5754b4f72a
chore(i18n): update locales
2015-10-27 21:38:23 -05:00
1a6b1f2a1c
Update string
2015-10-27 21:36:52 -05:00
b82054128d
chore(i18n): update locales
2015-10-27 21:36:51 -05:00
b70597e1d1
Merge pull request #6122 from crookedneighbor/batch_update_adjustment
...
Batch update adjustment
2015-10-27 21:35:19 -05:00
ed464a2b70
Merge pull request #6127 from crookedneighbor/reinstate_amplitude
...
Reinstate amplitude
2015-10-27 21:35:10 -05:00
711413f832
Update string
2015-10-27 21:28:33 -05:00
cdc58c78fd
Merge branch 'nicolevonvon-develop' into develop
2015-10-27 20:19:09 -05:00
c812c0ae90
Add popover to no owner label
2015-10-27 20:18:39 -05:00
0283408d1e
Removed FIXME comment above invitations object - the object is still being used.
2015-10-27 21:12:19 -04:00
691ab86bd6
Add test for default user id
2015-10-27 19:40:11 -05:00
a7c52e6086
Reinstate amplitude analytics
2015-10-27 19:37:57 -05:00
Thrashmandicoot