Arfon Smith
037857623d
Merge branch 'master' into cache-bustin
...
Conflicts:
lib/linguist/version.rb
2014-10-14 19:45:09 -05:00
Arfon Smith
d7b19d577b
Bumping version
2014-10-14 19:44:35 -05:00
Adam Roben
c70048a3e2
Use TextMate 1 scope for HTML+ERB files
...
The TextMate 2 scope requires support for injection grammars, which some parsers don't support.
2014-10-14 14:19:05 -04:00
Ryunosuke SATO
a1884ca261
Run test against Ruby 2.2 on Travis CI
2014-10-15 00:54:00 +09:00
Ryunosuke SATO
e452291314
Run test against latest Ruby 2.1 on Travis CI
...
see: https://twitter.com/travisci/status/513233940442644480
2014-10-15 00:53:57 +09:00
Arfon Smith
6d51117a91
Merge pull request #1593 from github/more-tmscopes
...
Add more TextMate scopes
v3.3.1
2014-10-14 10:06:47 -05:00
Arfon Smith
848a1cc1e5
Minor bump
2014-10-14 10:06:38 -05:00
Adam Roben
9092dfdc7f
Add a TextMate scope for Literate CoffeeScript
2014-10-14 10:50:39 -04:00
Adam Roben
d7fe0cc5c7
Add TextMate scopes for HTML variants
2014-10-14 10:41:19 -04:00
Adam Roben
15ec37d4bc
Add a TextMate scope for Objective-C++
2014-10-14 10:41:19 -04:00
Adam Roben
43cc701ac3
Add a TextMate scope for JSON
2014-10-14 10:41:19 -04:00
Adam Roben
7cb8357f73
Add a TextMate scope for YAML
2014-10-14 10:41:19 -04:00
Adam Roben
4b46bcf649
Add TextMate scopes for Sass/SCSS files
2014-10-14 10:41:19 -04:00
Arfon Smith
a954a6465e
Update README.md
2014-10-14 09:29:45 -05:00
Arfon Smith
afb6041104
Merge pull request #1592 from github/vmg/tmscopes
...
Vmg/tmscopes
v3.3.0
2014-10-14 09:07:02 -05:00
Arfon Smith
4b28fdbc4d
Removing beta label
2014-10-14 08:45:49 -05:00
Arfon Smith
b8a5e8505a
Merge branch 'vmg/tmscopes' into cache-bustin
...
Conflicts:
lib/linguist/version.rb
2014-10-13 20:21:31 -05:00
Arfon Smith
3087d640a3
3.2.2b1
2014-10-13 19:33:03 -05:00
Arfon Smith
e87b89ab5b
Removing todo
2014-10-13 18:52:27 -05:00
Arfon Smith
7aabc6a5ad
A different approach
2014-10-13 17:01:53 -05:00
Arfon Smith
5cc053694a
Remove pry
2014-10-13 16:38:51 -05:00
Arfon Smith
653314448c
Bust that cache
2014-10-13 16:37:46 -05:00
Arfon Smith
4f14db10ea
Merge pull request #933 from pchaigno/pro
...
Support of the .pro file extension for Prolog.
2014-10-13 14:57:19 -05:00
Arfon Smith
98e348ba5f
Minor docs update fixes #1581
2014-10-13 14:48:50 -05:00
Arfon Smith
a69b20c1a4
Minor docs update #fixes 1581
2014-10-13 14:48:04 -05:00
Vicent Marti
9275e5240f
Bump version
2014-10-13 17:50:57 +02:00
Vicent Marti
7dcc3b3edf
Add tm_scope to the BlobHelper
2014-10-13 17:19:38 +02:00
Vicent Marti
6e872c11b6
Pass tm_scope overrides
2014-10-13 17:19:38 +02:00
Vicent Marti
e5b6001759
Add support for TextMate scopes
2014-10-13 17:19:38 +02:00
Arfon Smith
769f1b8658
Merge pull request #1587 from github/linguist-3.2.1
...
Linguist v3.2.1
v3.2.1
2014-10-13 09:47:52 -05:00
Arfon Smith
5814b61356
Linguist v3.2.1
2014-10-13 09:47:02 -05:00
Arfon Smith
8a6d7f67ed
Merge pull request #1517 from github/1515-local
...
3.2.0b3 gem / cc @vmg
v3.2.0
2014-10-13 09:40:14 -05:00
Arfon Smith
bcb016a938
Removing beta label
2014-10-13 09:30:09 -05:00
Arfon Smith
065c6c02a8
Merge branch '1515-local' of github.com:github/linguist into 1515-local
2014-10-13 09:10:21 -05:00
Arfon Smith
f7386fcd72
Rugged bump
2014-10-13 09:10:08 -05:00
Arfon Smith
df703ef997
Rugged bump
2014-10-13 09:09:33 -05:00
Arfon Smith
9f6c421d91
Merge pull request #1586 from github/revert-1515-vmg/attributes
...
Revert "Load Git Attributes for Linguist-specific overrides"
2014-10-13 09:03:36 -05:00
Arfon Smith
91370ae955
Revert "Load Git Attributes for Linguist-specific overrides"
2014-10-13 08:58:53 -05:00
Arfon Smith
ffc0be191e
Removing beta label
2014-10-13 08:42:46 -05:00
Vicent Marti
6e9f6da2a2
Merge pull request #1515 from github/vmg/attributes
...
Load Git Attributes for Linguist-specific overrides
2014-10-13 15:13:22 +02:00
quentin
48f2949d69
Move the extension-less sample scripts in a filenames/ subdir
2014-10-13 10:09:07 +02:00
quentin
baa3cba0fc
Add sample Tcl/Tk scripts to test Tcl/Tk shebang detection
...
Scripts taken from:
* starfield: http://wiki.tcl.tk/14140
* owh: http://wiki.tcl.tk/906
2014-10-13 03:05:56 +02:00
quentin
eb54a92328
Add Tcl/Tk interpreters to languages.yml for shebang detection
2014-10-13 02:38:07 +02:00
Romain Lespinasse
ce1e2441f4
Choose a color from the Golo logo
2014-10-11 10:27:06 +02:00
Arfon Smith
c8cb7b7cab
Git attr
2014-10-10 15:34:03 -05:00
Arfon Smith
7baa130d8d
Merge branch 'master' into 1515-local
2014-10-10 15:32:28 -05:00
Arfon Smith
332d97b57f
Removing generated override for now.
2014-10-10 15:32:08 -05:00
Ted Nyman
9c0dbdd48e
Merge pull request #1575 from Jaxan/clean-samples
...
Adds samples for the clean programming language
2014-10-10 12:52:30 -07:00
Joshua Moerman
bec0052065
Adds samples for the clean programming language
2014-10-05 12:55:00 +02:00
Tomas Morstein
08290ac49e
remove very rarely used .dcl extension for now
...
...to avoid collision with Clean language as well
as the .dcl extension can be seen only in some special
cases -- especially in context of DCL emulation tools
for non-OpenVMS systems (probably to avoid potential
confusion with MS-DOS .com files).
2014-10-04 22:46:32 +02:00