Commit graph

420 commits

Author SHA1 Message Date
Alan Hamlett
058cb4ddcf python 3.2 not supported by pygments, so drop support for py3.2 2015-08-11 13:57:56 -07:00
Alan Hamlett
7b4711ad54 fallback to builtin json module when importing simplejson fails 2015-08-11 13:52:14 -07:00
Alan Hamlett
337e4bae5b upgrade simplejson to v3.8.0 2015-08-11 12:21:27 -07:00
Alan Hamlett
d36592e1c5 correctly mock packaged requests library 2015-08-11 12:15:35 -07:00
Alan Hamlett
8e8c0154d6 --apikey argument needed 2015-08-11 11:56:24 -07:00
Alan Hamlett
9cbdf1d54f use new travis-ci container builds 2015-08-11 11:55:13 -07:00
Alan Hamlett
cbc032e44b use travis-ci to run tests 2015-08-11 11:52:43 -07:00
Alan Hamlett
4a5e2d9328 first tests, and disable logging while testing 2015-08-11 11:19:22 -07:00
Alan Hamlett
fb97fafb37 pypi expects absolute urls 2015-08-11 10:39:25 -07:00
Alan Hamlett
a2b0978795 format rst so pypi can render it 2015-08-11 10:38:01 -07:00
Alan Hamlett
c81f7e382c fix rst formatting 2015-08-11 10:28:32 -07:00
Alan Hamlett
94670d9c87 setup nose for testing 2015-08-11 10:24:44 -07:00
Alan Hamlett
ccb0b11ffb only use lexer if one was found 2015-08-10 20:10:09 -07:00
Alan Hamlett
e8f2d75927 use os.path.splitext everywhere 2015-08-10 18:32:17 -07:00
Alan Hamlett
2da75aa119 use C++ for header file language if directory contains C++ files 2015-08-10 18:17:50 -07:00
Alan Hamlett
bd68a7767e update Xcode troubleshooting section 2015-08-10 11:53:29 -07:00
Alan Hamlett
0b717a93ba update Xcode troubleshooting section 2015-08-10 11:52:50 -07:00
Alan Hamlett
2daf2ec62e update history for v4.1.1 2015-08-10 11:46:06 -07:00
Alan Hamlett
82f9fcb5d4 Revert "Revert "upgrade requests package to v2.7.0""
This reverts commit 052f255a0c.
2015-08-10 11:43:35 -07:00
Alan Hamlett
6e9e8a9ce2 move language rules to server, detect header files
- move language translations to api server
- move extension rules to api server
- detect correct header file language based on presence of .cpp or .c
  files named the same as the .h file
2015-08-10 11:33:39 -07:00
Alan Hamlett
01ed25f948 upgrade argparse to v1.3.0 2015-08-04 14:42:42 -07:00
Alan Hamlett
052f255a0c Revert "upgrade requests package to v2.7.0"
This reverts commit f5357a9e7b.
2015-07-31 13:25:57 -07:00
Alan Hamlett
85ab611632 handle non-ASCII characters in import path 2015-07-27 14:59:10 -07:00
Alan Hamlett
f5357a9e7b upgrade requests package to v2.7.0 2015-07-24 13:16:52 -07:00
Alan Hamlett
72d9390832 using Output window for Visual Studio logging 2015-07-22 22:59:19 -07:00
Alan Hamlett
739fe4ba99 rename workplace to hostname 2015-07-03 22:51:26 -07:00
Alan Hamlett
f10faca3ee Merge pull request #31 from gandarez/master
Added X-Machine-Name header
2015-07-03 22:41:23 -07:00
Carlos Henrique Gandarez
d6ca2fa489 Added header X-Machine-Name to act as workplace 2015-07-03 21:42:19 -03:00
Carlos Henrique Gandarez
941c72c468 Merge remote-tracking branch 'upstream/master'
Conflicts:
	wakatime/base.py
2015-07-03 21:41:24 -03:00
Alan Hamlett
61b9989641 catch exceptions from pygments.modeline.get_filetype_from_buffer 2015-07-02 12:37:24 -07:00
Alan Hamlett
4b6aee218b v4.1.0 2015-06-29 19:28:35 -07:00
Alan Hamlett
e8bd8bba76 correct priority for project detection
Priority of project detection:
1. .wakatime-project file
2. [project_map] section in .wakatime.cfg INI file
3. --project arg
3. revision control directory name
5. --alternate-project arg
2015-06-29 19:26:01 -07:00
Alan Hamlett
006bab2d71 v4.0.16 2015-06-23 18:12:43 -07:00
Alan Hamlett
5a2ffa7319 fix bug in offline logging where file saved as NULL 2015-06-23 18:11:43 -07:00
Alan Hamlett
8c0c43e58a clean up lexer guessing 2015-06-15 18:55:47 -07:00
Alan Hamlett
6591c4e5e9 limit language detection to known file extensions, unless file contents has a vim modeline 2015-06-15 18:26:10 -07:00
Alan Hamlett
368fecfcf1 auxiliary extension map for when no language can be found, not to overwrite detected language 2015-06-12 17:25:04 -07:00
Alan Hamlett
2880add4c5 v4.0.15 2015-06-11 14:12:46 -07:00
Alan Hamlett
36f6bb9a21 use most accurate language from modeline lexer and filename lexer Pygments guessing functions 2015-06-11 14:11:10 -07:00
Alan Hamlett
127fd115d0 use entity and type for new heartbeats api resource schema 2015-06-02 15:24:02 -07:00
Alan Hamlett
2278e8400f v4.0.14 2015-05-31 17:46:20 -07:00
Alan Hamlett
7f6b6c9c1f correctly log message from py.warnings module 2015-05-31 10:09:39 -07:00
Alan Hamlett
2cdbf6e763 update location of Notepad++ log file 2015-05-30 16:55:30 -07:00
Alan Hamlett
bdc28ccbe8 add NOTICE to manifest for pypi 2015-05-27 22:34:46 -07:00
Alan Hamlett
5aafb4f43d add NOTICE file for vendorized python libraries 2015-05-27 22:34:19 -07:00
Alan Hamlett
91784f5066 clean up kwargs 2015-05-16 14:44:10 -07:00
Alan Hamlett
66a3be703f v4.0.13 2015-05-16 14:37:18 -07:00
Alan Hamlett
c2a8d197bf remove project from args because we pass it separately to send_heartbeat function 2015-05-16 14:35:49 -07:00
Alan Hamlett
906237221b v4.0.12 2015-05-15 15:30:44 -07:00
Alan Hamlett
1c73ba9969 make --project argument take priority over auto-detected project name. new --alternate-project argument that behaves like --project used to. 2015-05-15 15:29:05 -07:00