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
9fb671f068
fix(social): Better share image
2015-10-21 16:25:03 -05:00
a2c0e02283
fix(social): Correct OG tag errors
2015-10-21 16:37:33 -04:00
d32f6f23cc
feat(sharing): Improved front page FB share
2015-10-21 15:59:17 -04:00
e75d3547c5
force emails to lowercase and use a lowercase version of username to check for duplicates
2015-10-21 13:14:18 +02:00
c7f8426bce
preparation for code for lowercase emails and lowercase version of username to check for duplicates
2015-10-21 11:01:06 +02:00
d4146d69e2
Merge pull request #6072 from HabitRPG/sabrecat/pets-201510
...
Pet Quest for October 2015
2015-10-20 18:12:19 -05:00
5fbd6814b0
fix(pets): Realign frog sprites
...
Also adds a note about the To-Do sorting fix to the Bailey announcement
2015-10-20 18:55:57 -04:00
d0a34fc0ad
feat(quests): 2015-10 Pet
...
Also adds Exhaust Strike-specific text to the remaining affected NPCs.
2015-10-20 12:32:45 -04:00
0a6d9fa23a
WIP(pets): Frog quest
2015-10-19 23:12:24 -04:00
703caeadff
Merge pull request #6038 from vIiRuS/patch-5
...
store iOS tutorial steps
2015-10-19 17:49:13 -05:00
Blade Barringer