Andy Lindeman
6818744dae
Merge remote-tracking branch 'origin/master' into pygments-bump
2014-06-11 13:56:53 -04:00
Andy Lindeman
607185ac61
Be explicit about lexer
2014-06-11 13:56:40 -04:00
Brian Lopez
81b7a412c3
Merge pull request #1270 from github/cut-release-v2.11.5
...
Bump version for 2.11.5 release
2014-06-10 15:28:27 -07:00
Brian Lopez
09b9a8b441
bump version for 2.11.5 release
2014-06-10 16:00:08 -05:00
Andy Lindeman
85479cc2de
Swift has a lexer now
2014-06-10 15:54:56 -04:00
Andy Lindeman
3ad4eb2b59
Adds supports for Slim
2014-06-10 15:54:56 -04:00
Andy Lindeman
878fe95ec3
Upgrades to pygments.rb 0.6.0
2014-06-10 15:54:55 -04:00
Arfon Smith
701e720ab8
Merge pull request #1259 from github/bump-charlock-again
...
Bump charlock to 0.7.3
2014-06-09 11:10:30 -05:00
Arfon Smith
e709ce7d56
Samples
2014-06-09 06:27:26 -05:00
Arfon Smith
32c89a5405
Merge pull request #1260 from dalehenrich/patch-1
...
.ston extension for "Smalltalk Object Notation"
2014-06-09 06:26:34 -05:00
Dale Henrichs
1735982a73
Merge branch 'ston_test' of github.com:dalehenrich/linguist into ston_test
2014-06-08 21:21:56 -07:00
Dale Henrichs
625e0aa1af
add sample files
2014-06-08 21:21:29 -07:00
Dale Henrichs
00e1a3f8fd
ahhh, caps are sorted before lower case ...
2014-06-08 20:56:09 -07:00
Dale Henrichs
539256b08e
send to travis
2014-06-08 20:49:45 -07:00
Dale Henrichs
ff791f5a39
"looks like I should have used JSON lexer
...
- let's see what travis has to say
2014-06-08 20:41:41 -07:00
Arfon Smith
304fc344a1
Merge pull request #1257 from simonwistow/master
...
Add support for the Varnish VCL edge scripting language
2014-06-08 21:46:32 -05:00
Dale Henrichs
9d940755e7
.ston extension for "Smalltalk Object Notation"
...
See https://github.com/svenvc/ston
2014-06-07 14:49:39 -07:00
Brian Lopez
bc04232f87
add the fixture
2014-06-07 15:32:29 -05:00
Brian Lopez
e17ebec098
Bump charlock to 0.7.3
...
This version includes a fix for the encoding lookup table for some
encoding aliases in the ICU detection API
2014-06-07 15:25:44 -05:00
Simon Wistow
7cd23036a7
Add support for the Varnish VCL edge scripting language
2014-06-06 12:59:50 -07:00
Arfon Smith
44c5413abf
Merge pull request #1256 from github/1042-update
...
1042 update
2014-06-06 12:38:45 -05:00
Arfon Smith
50ab58e91f
Merge commit 'refs/pull/1042/head' of github.com:github/linguist into 1042
...
Conflicts:
lib/linguist/vendor.yml
2014-06-06 12:32:30 -05:00
Arfon Smith
1fd0732390
Merge branch 'master' into 1042
...
Conflicts:
lib/linguist/vendor.yml
2014-06-06 12:31:56 -05:00
Arfon Smith
ed1b9ee899
Merge pull request #1255 from github/680-update
...
680 update
2014-06-06 12:12:09 -05:00
Arfon Smith
d3c04d6310
nesC
2014-06-06 12:08:38 -05:00
Julian Gehring
f66ffe305f
Change R package ignores to absolute paths
2014-06-06 08:57:11 -07:00
Arfon Smith
2a9ff0083c
Merge branch 'master' into 814
...
Conflicts:
lib/linguist/languages.yml
2014-06-06 09:55:08 -05:00
Brian Lopez
c1cf7ea825
Merge pull request #1254 from github/cut-release-v2.11.4
...
v2.11.4 release
2014-06-05 10:03:43 -07:00
Brian Lopez
67f7268a55
bump version for v2.11.4 release
2014-06-05 10:55:32 -05:00
Brian Lopez
a55ee7eb09
Merge pull request #1253 from github/newer-charlock
...
Use the :ruby_encoding value from charlock 0.7.2
2014-06-05 08:51:46 -07:00
Brian Lopez
203f6d1944
forgot to add the test fixture
2014-06-04 17:15:33 -05:00
Brian Lopez
42c68f21d1
test ruby_encoding
2014-06-04 15:59:42 -05:00
Brian Lopez
7e8be1293e
Use the :ruby_encoding value from charlock 0.7.2
2014-06-04 15:51:33 -05:00
Arfon Smith
09c234ec26
Merge pull request #1190 from Madsn/patch-1
...
Add html5shiv to vendor.yml
2014-06-04 10:30:03 -05:00
Arfon Smith
65a26c3e73
Merge pull request #1248 from github/1035-update
...
1035 update
2014-06-03 22:06:54 -05:00
Arfon Smith
98f35aefdc
Merge branch 'master' into 1035
...
Conflicts:
lib/linguist/languages.yml
lib/linguist/samples.json
2014-06-03 22:03:59 -05:00
Arfon Smith
38a3714514
Samples update
2014-06-03 21:37:25 -05:00
Arfon Smith
491700f925
Merge pull request #1198 from Spirit-of-Oberon/master
...
Support of the Component Pascal language
2014-06-03 21:36:52 -05:00
Andy Lindeman
4d033e7e83
Merge pull request #1246 from github/cut-release-v2.11.3
...
Bumps to 2.11.3
2014-06-03 15:15:14 -04:00
Andy Lindeman
efc3638065
Freshens up the release docs
2014-06-03 14:50:27 -04:00
Andy Lindeman
b7685ab317
Bumps to 2.11.3
2014-06-03 14:50:17 -04:00
Andy Lindeman
83c5f6a004
Merge pull request #1245 from alindeman/binarylike_data
...
Handle case where newline chars don't transcode to detected encoding
2014-06-03 12:55:33 -04:00
Andy Lindeman
aa5a94cc3e
Handle case where newline chars don't transcode to detected encoding
...
We've seen cases where binary files are detected as encodings such as
ISO-8859-8-I. This usually happens when the binary files are short, so
while the detector is mistaken, there is also not very much data for use
in the detection algorithm in the first place so it's understandable
that the detector was wrong.
In these cases, the code to convert ASCII newline characters to
encodings such as ISO-8859-8-I fails because there is no conversion
between them.
We now simply assume that the data is all one line in those cases. In
reality the data is binary, but this obviously difficult to detect
reliably.
2014-06-03 12:26:23 -04:00
Arfon Smith
a5b6331ab5
Merge pull request #1244 from akashivskyy/master
...
Add orange color to Apple Swift language
2014-06-03 10:53:55 -05:00
Adrian Kashivskyy
2164b28c64
Update Swift color
2014-06-03 16:03:49 +02:00
Adrian Kashivskyy
0fb824b345
Add orange color to Swift
2014-06-03 15:54:15 +02:00
Arfon Smith
29ee094d66
Merge pull request #1241 from github/1239-update
...
1239 update
2014-06-02 21:11:40 -05:00
Arfon Smith
4a7ae50ec8
Dammit
2014-06-02 21:07:11 -05:00
Arfon Smith
398439a937
Pedantic
2014-06-02 21:04:39 -05:00
Arfon Smith
a3bc3a7615
Merge branch 'master' into 1239-update
...
Conflicts:
lib/linguist/samples.json
2014-06-02 21:01:00 -05:00
