Commit Graph

1746 Commits

Author SHA1 Message Date
Andrée Hansson f6e2189739 Regex matching filename 'composer.lock' fixed
The previous regex had an unescaped period, which matches any character between 'composer' and 'lock' in the filename.
2014-07-28 13:24:10 +02: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
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
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
Arfon Smith 6771f7c272 Merge branch 'master' into 1318-local 2014-07-01 11:12:44 -05:00
Santiago Perez De Rosso 76b896a66d use Alloy lexer 2014-07-01 11:18:42 -04:00
Ronny Otto a12520763c Fixed support for "BlitzMax"
- language was already defined but missed "type: programming", so detection of "BlitzMax"-files did not work. Fixed that.
- added "BlitzMax"-example to samples (and recreated samples.json)
2014-07-01 09:56:11 +02:00
Paul Chaignon 819bb7caab Interpreter for PHP 2014-06-28 12:35:26 +02:00
Aloke Desai 152205a146 fixed whitespace 2014-06-27 21:12:41 -07:00
Aloke Desai 85dbcb5444 added grace support 2014-06-27 19:58:53 -07:00
Vicent Marti df09a746a0 b3 2014-06-27 16:57:58 +02:00
Lucas Bajolet 5199fcf0a2 Updated samples.json.
Signed-off-by: Lucas Bajolet <r4pass@hotmail.com>
2014-06-27 10:53:17 -04:00
Lucas Bajolet addf4e2485 Added Nit to supported languages.
Signed-off-by: Lucas Bajolet <r4pass@hotmail.com>
2014-06-27 10:49:08 -04:00
Vicent Marti d9be472ccb Skip submodules when diffing 2014-06-27 16:41:23 +02:00
Vicent Marti 32828a9af5 b2 2014-06-27 13:51:56 +02:00
Vicent Marti 65eaf98d0b docs 2014-06-26 21:26:26 +02:00
Arfon Smith 526244be11 Samples 2014-06-26 17:38:39 +01:00
Arfon Smith bc53d0b55e Merge pull request #1311 from maximusvladimir/master
Added 3 character glsl extensions.
2014-06-26 17:37:42 +01:00
Vicent Marti 907d3c5a36 b1 2014-06-26 18:17:51 +02:00