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
e1b26a884c
Add display for selling items, needs right img
2015-10-30 02:27:36 -07:00
d3a6ff5b2d
fix(front-page): Remove extra script tag
...
Why did I even do that?
2015-10-29 17:07:41 -04:00
332df1d646
Merge pull request #6136 from HabitRPG/upgrade-stack
...
Upgrade stack
2015-10-29 19:28:51 +01:00
dd09633d31
Merge branch 'locks-auto-equip' into develop
2015-10-29 12:25:18 -05: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
6ff904bd5a
Merge branch 'develop' into czan-develop
2015-10-29 08:40:03 -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
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
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
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
a7c52e6086
Reinstate amplitude analytics
2015-10-27 19:37:57 -05:00
3bae95d3ae
remove console.log for push notifications
2015-10-27 22:11:47 +01:00
47ec2e1f93
Challenges now display'no owner' if original owner deletes account
2015-10-27 22:15:19 +02:00
7541c5a260
fix(analytics): disable amplitude
2015-10-27 17:59:29 +01:00
d05b00fb34
fix(analytics): enable analytics and correctly export methods
2015-10-27 17:39:37 +01:00
2443177729
fix(server): disable analytics until bug is fixed
2015-10-27 17:26:15 +01:00
98a00fcb4e
fix(memory) do not check for new relic until it is enabled again
2015-10-27 17:10:46 +01:00
f9afc8a8c6
Reorganize development user operations
2015-10-27 08:48:18 -05:00
078c37bdda
presskit
...
press kit update
2015-10-27 15:34:52 +02:00
4886b50aa3
Add testing for batch update. Handle unknown operations better.
2015-10-27 08:13:30 -05:00
1cc7ea872f
chore(news): Exhaust Strike Bailey - recommiting after temporary removal
2015-10-27 19:18:05 +10:00
23059763eb
revert Exhaust Strike Bailey change (commit f5d6c92897) to allow urgent deployment
2015-10-27 18:45:30 +10:00
a29c412781
prevent addTenGems and addHourglass being used in production -- PRs https://github.com/HabitRPG/habitrpg/pull/6115 and https://github.com/HabitRPG/habitrpg/pull/6117 by nivl4
2015-10-27 18:31:17 +10:00
f5d6c92897
chore(news): Exhaust Strike Bailey
2015-10-27 00:24:11 -04:00
4d6bd38648
Add GET routes for /user/tags and /user/tags/{id}
...
An operation that is useful for tools to be able to do is to list a
user's tags without having to pull down the entire user object (which is
likely significantly larger than the tags). This commit adds a route to
GET /user/tags, to get a list of the user's tags, as well as a GET
/user/tags/{id} to get the details of a particular tag.
This commit also includes tests for the two new routes.
2015-10-27 13:49:17 +11:00
c04b27ffd5
Simplify community guidelines string
2015-10-26 18:08:45 -05:00
f0e4149adb
Merge branch 'develop' into ksami-develop
2015-10-26 17:56:05 -05:00
4dd368a028
Merge pull request #6082 from anilanar/reroll-syntax-bug
...
fix a minor syntax error when opening reroll modal.
2015-10-26 17:55:16 -05:00
a556cf1c13
Merge pull request #6113 from crookedneighbor/ogAc8BA0_prevent_changing_class_change_from_api
...
ogAc8BA0 - prevent changing class change from api without spending gems
2015-10-26 17:45:56 -05:00
2790008937
Adjust error message to not point to a readme file that does not exist.
2015-10-26 17:27:08 -05:00
13bca6b9a9
Prevent class from being changed via PUT /user
2015-10-26 17:25:51 -05:00
392889c7da
feat(mystery): October 2015 subscriber set
2015-10-23 15:45:43 -04:00
f2c856f6e6
Make link translatable in options/inventory/time-travelers
2015-10-23 23:40:11 +08:00
b3cc58886c
Make strings translatable in options/social/chat-box
2015-10-23 23:20:59 +08:00
bcc522f08d
feat(sharing): Add Tumblr button
2015-10-22 13:52:26 -04:00
d08a3efbcd
fix(news): Bogus trailing slash
2015-10-22 12:04:43 -05:00
e269e04172
fix a minor syntax error when opening reroll modal.
2015-10-22 09:24:04 +02:00
Thrashmandicoot