2980 Commits

Author	SHA1	Message	Date
Paul Chaignon	06c1033952	Fix error from merge conflicts	2015-07-04 18:04:19 +02:00
Paul Chaignon	8c54f68040	Fix conflicts from merging master into 'mod-extension'	2015-07-04 18:01:56 +02:00
Arfon Smith	117735ffb9	Merge pull request #2179 from pchaigno/symlinks ... Ignore symbolic links	2015-07-04 16:57:43 +01:00
Paul Chaignon	f98e6bdac7	Use proper format for symlinks, submodules and trees	2015-07-04 17:14:30 +02:00
Arfon Smith	a63a609ce1	v4.5.8 release	2015-07-04 10:36:45 +01:00
Arfon Smith	6c45e5ec19	Merge branch 'master' into 1823-local	2015-07-04 05:46:23 +01:00
Ian A. Mason	77bc72be14	Added an ace mode, and put the SMT entry in the correct place, maybe.	2015-07-01 11:22:04 -07:00
Ian A. Mason	5f456d8b22	Some part way through the adding a language checklist.	2015-06-30 15:29:02 -07:00
Vicent Marti	a351cdd486	Merge pull request #2477 from github/vmg/release-4.5.7 ... Rrelease 4.5.7	2015-06-30 14:58:18 +02:00
Arfon Smith	0b2e43cdee	Merge pull request #2457 from drewcrawford/master ... Adding some more vendered expressions	2015-06-29 21:16:08 -05:00
Vicent Marti	ee3081fb4c	Bump to 4.5.7	2015-06-26 03:34:18 -07:00
Paul Chaignon	56dec47561	Merge branch 'master' into inc	2015-06-21 14:20:53 +02:00
Garen Torikian	f6b50a67f9	Change Haxe and Ragel colors to pass tests	2015-06-20 09:55:33 -07:00
Zalim Bashorov	cd47798d13	try to fix conflicts	2015-06-20 09:49:51 -07:00
Zalim Bashorov	3b54df2cde	Change color for Kotlin based on color in logo ... IMHO it's more suitable.	2015-06-20 09:49:51 -07:00
Paul Chaignon	8bf1defdc1	Merge branch 'master' into associate-heuristic-with-extension ... Conflicts: lib/linguist/heuristics.rb	2015-06-18 21:54:59 +02:00
Drew Crawford	8845b266de	Adding some more vendered expressions ... * `Vendor/`, the capitalized path * Crashlytics, a common iOS framework * Fabric, a common iOS framework	2015-06-17 21:25:54 -05:00
Arfon Smith	468fd425fc	Bumping to v4.5.6	2015-06-17 09:03:29 -05:00
Lars Brinkhoff	8c66f0a5da	Heuristic for PicoLisp.	2015-06-16 06:51:58 +02:00
Lars Brinkhoff	78efc2d0de	Add PicoLisp language.	2015-06-16 06:51:57 +02:00
Lars Brinkhoff	28103ee25b	Add .ms to GAS.	2015-06-15 07:18:43 +02:00
Lars Brinkhoff	0a0d2ddb1a	Heuristics for Groff and Nemerle.	2015-06-15 07:18:43 +02:00
Lars Brinkhoff	ba1ab64b56	More Groff file extensions.	2015-06-15 07:18:43 +02:00
Kevin Butler	3180c5d554	Allow delimiting by comma in the language name	2015-06-10 15:37:31 +01:00
William Candillon	302cfea295	Update languages.yml	2015-06-08 14:32:07 +02:00
Paul Chaignon	be122ca1a5	Fix test for Perl heuristic ... Improve heuristic rule for Perl6 Separate heuristic rules for .pl (with Prolog) and .pm (without Prolog)	2015-06-06 19:55:04 +02:00
Paul Chaignon	656f4f440d	Several extensions can be associated to a heuristic rule	2015-06-06 17:44:02 +02:00
Paul Chaignon	7fb62de4d7	Associate each heuristic rule to a file extension	2015-06-06 15:37:41 +02:00
Jake Petroules	2806987f2f	.qbs extension for QML.	2015-06-02 00:46:56 -07:00
Arfon Smith	f380aa2e5e	Merge pull request #2426 from tamird/generated-go-bindata ... Detect Go files generated by go-bindata	2015-05-31 15:53:49 +02:00
Arfon Smith	a2ce1972ec	Merge pull request #2429 from larsbrinkhoff/kbuild ... Make filename: Kbuild	2015-05-31 15:51:51 +02:00
Paul Chaignon	ec61a6974f	.al extension for Perl	2015-05-30 15:07:56 +02:00
Lars Brinkhoff	8e550f7093	'Kbuild' is a common makefile name.	2015-05-29 07:18:31 +02:00
Arfon Smith	53e53880bd	Merge pull request #2419 from evgenyneu/master ... Treat Carthage path as vendored	2015-05-28 13:33:47 -05:00
Arfon Smith	671b5788ed	Merge pull request #2413 from yegortimoschenko/jruby-executable ... Add JRuby executable example, fixes #2412	2015-05-28 10:27:53 -05:00
Arfon Smith	76d10cd85c	Merge pull request #2422 from CalebFenton/master ... Add Smali language	2015-05-28 10:17:48 -05:00
Arfon Smith	42c155d667	Merge pull request #2425 from larsbrinkhoff/fix-rust ... Fix Rust heuristic.	2015-05-28 10:16:24 -05:00
Tamir Duberstein	d17222ec91	Detect Go files generated by go-bindata	2015-05-28 11:03:36 -04:00
Tamir Duberstein	a1ea55d006	Trim whitespace	2015-05-28 11:03:36 -04:00
Lars Brinkhoff	38aa7bae3f	Fix Rust heuristic.	2015-05-28 07:10:25 +02:00
Caleb Fenton	788fac7c43	Add Smali language	2015-05-27 10:37:17 -07:00
Arfon Smith	71934152e4	Merge pull request #2378 from Mailaender/patch-1 ... Added support for .mdpolicy XML files	2015-05-27 08:41:22 -05:00
Matthias Mailänder	e20d6fc04a	add .mdpolicy XML files	2015-05-23 21:32:17 +02:00
Evgenii Neumerzhitckii	a1e8fc4f97	Treat Carthage path as vendored	2015-05-23 21:54:25 +10:00
Yegor Timoschenko	43a2da46f9	Add jruby and rbx interpreters for Ruby	2015-05-21 19:35:45 +00:00
Arfon Smith	b92b3af602	Merge pull request #2390 from larsbrinkhoff/lex-yacc ... Add Lex and Yacc languages	2015-05-21 12:47:08 -05:00
Arfon Smith	83b76cde34	Merge pull request #2203 from pchaigno/vhost-nginx ... .vhost as a Nginx extension	2015-05-21 11:34:45 -05:00
Arfon Smith	5ff0d488d2	Merge pull request #2392 from vighnesh1987/apache-thrift ... Add Apache thrift support to generated? check	2015-05-20 12:43:55 -05:00
Simen Bekkhus	efd34d8cb0	Display IntelliJ configurations files as XML ... Fixes #2409	2015-05-20 14:18:01 +02:00
Lars Brinkhoff	869c9d2fdd	Add .l to Groff.	2015-05-20 08:16:26 +02:00