Commit Graph

1761 Commits

Author SHA1 Message Date
Arfon Smith e0997b311b Merge branch 'master' into 1364-local
Conflicts:
	lib/linguist/languages.yml
2014-08-13 14:59:31 -07:00
Arfon Smith 3c2ca312b9 Merge pull request #1375 from arthurvr/master
Update vendor.yml: added animate.css
2014-08-13 14:53:17 -07:00
Arfon Smith 43923976c2 Adding test to check that languages.yml includes all extensions represented in samples folder 2014-08-11 14:16:25 -07:00
Brandon Keepers 41c880afc7 Merge pull request #1432 from pchaigno/cycript
Support for Cycript language
2014-08-05 13:37:09 -04:00
Brandon Keepers 3d242c3a3a Merge pull request #1433 from pchaigno/knockout.js
Add knockout.js library as vendor file
2014-08-05 13:19:02 -04:00
Brandon Keepers 9325b07d68 Merge pull request #1438 from pchaigno/file-extensions
Remove file extensions with multiple segments
2014-08-05 13:01:00 -04:00
Paul Chaignon c8bc0a5c79 Remove file extensions with multiple segments 2014-08-04 11:23:31 +02:00
Paul Chaignon f58522d5a9 Lexer for Handlebars 2014-08-03 22:53:23 +02:00
Paul Chaignon 27a621531b Add knockout.js library as vendor file 2014-08-01 16:07:52 +02:00
Paul Chaignon 0235433b7e Support for Cycript language with .cy file extension 2014-08-01 15:56:44 +02:00
Arfon Smith dd181421a7 3.1.1 2014-07-28 17:32:40 +01:00
Arfon Smith 61faea0298 Fixing up bin/linguist 2014-07-23 11:20:31 -05:00
Arfon Smith 437f81c4a0 3.1.0 2014-07-22 13:59:58 -05:00
Arfon Smith 26dad7dada 3.1.0beta 2014-07-22 12:51:24 -05:00
Arfon Smith 8c7b54d6e3 Fixing BlobHelper loading issue 2014-07-22 12:26:21 -05:00
Arfon Smith 529d3faaf8 Explictly load FileBlob 2014-07-18 20:40:14 -05:00
Arfon Smith 90ff1b5896 Merge branch 'master' into cut-release-v3.0.4 2014-07-15 12:34:06 -07:00
Josh Abernathy 4d7a34c177 pbproj's are cool too. 2014-07-15 12:27:35 -07:00
Josh Abernathy 5c3385ecd8 Actually let's keep those. 2014-07-15 12:08:23 -07:00
Josh Abernathy a1af3a509c Most Xcode files have a human-readable diff now! 2014-07-15 12:06:55 -07:00
Arfon Smith 2913a87cc4 Linguist v3.0.4 2014-07-15 11:54:59 -07:00
Arfon Smith 60144c907e Modifying Mirah search terms 2014-07-15 11:01:41 -07:00
Arthur Verschaeve 1828cf6fc7 Update vendor.yml: added animate.css 2014-07-11 20:07:42 +02:00
Arfon Smith 6af5adaac1 blob.mode 2014-07-09 12:56:50 -05:00
Arfon Smith 17a28f2e91 Merge branch 'master' into 1285-local
Conflicts:
	lib/linguist/language.rb
	lib/linguist/samples.json
2014-07-09 12:46:18 -05:00
William Woodruff e6fd58b3aa fixed extension order, hopefully correctly this time 2014-07-08 12:53:55 -04:00
William Woodruff 2ef905ef1e fixed extension order, hopefully correctly this time 2014-07-08 12:43:31 -04:00
William Woodruff db80aa84dc fixed extension order 2014-07-08 12:31:40 -04:00
William Woodruff f404cc16a1 added two more common file endings for perl programs 2014-07-08 00:41:34 -04:00
Arfon Smith 7393c2ef91 3.0.3 release 2014-07-07 15:47:04 -05:00
Arfon Smith 4948ec2999 Merge pull request #1354 from github/binary-language-mkII
Ask Charlock earlier
2014-07-07 15:43:52 -05:00
Arfon Smith bc7596a8b5 Removing second binary? check 2014-07-07 15:24:22 -05:00
Arthur Verschaeve 6762ca8aa7 Update vendor.yml: normalize.css
Added popular CSS reset Normalize.css (http://necolas.github.io/normalize.css/)
2014-07-07 08:53:42 +02:00
Arfon Smith 986611ac36 Ask Charlock earlier 2014-07-04 21:12:46 -05:00
Arfon Smith 94b4ad1de6 Merge pull request #1353 from github/1217-local
1217 local
2014-07-04 18:49:34 -05:00
Arfon Smith f10821ac49 Samples 2014-07-04 14:38:05 -05:00
Arfon Smith cd5298dee6 Reverting https://github.com/github/linguist/pull/1268 2014-07-04 14:23:59 -05:00
Josh Oldenburg aa72012d41 Ignore everything in the Pods directory. 2014-07-03 16:18:58 -04:00
Vicent Marti 458831b885 3.0.2 2014-07-03 18:29:54 +02:00
Vicent Marti f5e4789ccb Properly handle detection of binary files 2014-07-03 18:29:19 +02:00
Arfon Smith 1b712d2800 Merge pull request #1339 from dvorak/master
Add Puppetfile to ruby filenames
2014-07-03 10:47:39 -05:00
Arfon Smith c4c3c27cfe Merge branch 'master' into 1320-local
Conflicts:
	lib/linguist/samples.json
2014-07-02 13:27:34 -05:00
Clayton O'Neill a2dd9d2c8c Add Puppetfile to ruby filenames 2014-07-02 10:46:26 -04:00
Josh Oldenburg 06e095e5fc Only ignore Pods/ for CocoaPods. 2014-07-01 21:38:51 -04:00
Arfon Smith 607792e1b2 Merge branch 'master' into 1323-local
Conflicts:
	lib/linguist/samples.json
2014-07-01 16:32:52 -05:00
Arfon Smith fb38135a61 Merge pull request #1325 from pchaigno/interpreter-php
Interpreter for PHP
2014-07-01 16:27:39 -05:00
Arfon Smith a5d5b6e6c7 Merge pull request #1333 from spderosso/alloy-lexer
use Alloy lexer
2014-07-01 15:57:55 -05:00
Arfon Smith 2fd2cdf68a Samples 2014-07-01 15:57:20 -05:00
Arfon Smith 11049ca3ca Merge pull request #1331 from GWRon/master
Fixed support for "BlitzMax"
2014-07-01 15:56:43 -05:00
Arfon Smith 9281bd043a Version 2014-07-01 11:19:05 -05:00