Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	assets/js/config.js
This commit is contained in:
Nathaniel van Diepen
2016-12-19 13:19:28 -07:00

View File

@@ -19,13 +19,13 @@ var config = {
// By default logging is enabled
loggingEnabled: true,
// Url to which to send the heartbeat
heartbeatApiUrl: 'https://api.wakatime.com/api/v1/users/current/heartbeats',
heartbeatApiUrl: 'https://wakatime.com/api/v1/users/current/heartbeats',
// Url from which to detect if the user is logged in
currentUserApiUrl: 'https://api.wakatime.com/api/v1/users/current',
currentUserApiUrl: 'https://wakatime.com/api/v1/users/current',
// The url to logout the user from wakatime
logoutUserUrl: 'https://wakatime.com/logout',
// Gets stats from the WakaTime API
summariesApiUrl: 'https://api.wakatime.com/api/v1/users/current/summaries',
summariesApiUrl: 'https://wakatime.com/api/v1/users/current/summaries',
// Different colors for different states of the extension
colors: {
allGood: '',