kurbezz/browser-wakatime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source 
# Conflicts:
#	assets/js/config.js
This commit is contained in:
Nathaniel van Diepen
2016-12-19 13:19:28 -07:00
parent 2e692a6ede 8ae8474e3a
commit 62de58d1ef
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
assets/js/config.js
View File

@@ -19,13 +19,13 @@ var config = {
// By default logging is enabled // By default logging is enabled
loggingEnabled: true, loggingEnabled: true,
// Url to which to send the heartbeat // 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 // 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 // The url to logout the user from wakatime
logoutUserUrl: 'https://wakatime.com/logout', logoutUserUrl: 'https://wakatime.com/logout',
// Gets stats from the WakaTime API // 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 // Different colors for different states of the extension
colors: { colors: {
allGood: '', allGood: '',