Commit Graph

2278 Commits

Author SHA1 Message Date
Arfon Smith
80184f1e1d Merge branch 'master' into 780 2014-05-02 13:36:14 -05:00
Arfon Smith
d893259e75 Merge pull request #1146 from Rolinh/master
Change DOT language type from programming to data (fix #1145)
2014-05-02 13:32:37 -05:00
Arfon Smith
d3f37f5013 Merge pull request #1158 from github/1142-update
1142 update
2014-05-02 13:29:10 -05:00
Arfon Smith
0e6a46abfc Merge branch 'master' into 1142
Conflicts:
	lib/linguist/samples.json
2014-05-02 13:18:47 -05:00
Arfon Smith
49e27387b7 Samples update 2014-05-02 13:16:58 -05:00
Arfon Smith
c2495c27d3 Merge pull request #1141 from killmous/master
Added samples for Haskell
2014-05-02 13:16:30 -05:00
Arfon Smith
f0a3acd735 Merge pull request #1156 from quarterto/patch-1
Update PHP colour to reflect php.net
2014-05-02 13:11:53 -05:00
Arfon Smith
29d2930de8 Merge pull request #1144 from TazeTSchnitzel/patch-1
Gave GML a colour (its official colour)
2014-05-02 13:07:17 -05:00
Anthony Ramine
2d82071103 Delete primary_extension from language data
The language attribute is still maintained as the first extension found.

This allows Mercury to be properly detected by Linguist, as per #748.
2014-05-01 21:35:49 +02:00
Matt Brennan
f4a3636371 Update PHP colour to reflect php.net
Currently the PHP colour is very similar to C#, and seems to have been pull from thin air. PHP has a perfectly nice distinctive purple, used on [php.net](http://php.net) since forever. This pull request changes PHP's colour to a dark shade of that purple.

Before                                   | After
-----------------------------------------|-----------------------------------------
![](http://www.colorhexa.com/6e03c1.png) | ![](http://www.colorhexa.com/4f5d95.png)
2014-05-01 09:33:05 +01:00
NN
d8f96441da Add more extensions based on XML 2014-05-01 10:06:15 +03:00
Oldes
cf5646d45a Fixing the Text only lexer 2014-04-29 23:32:30 +02:00
Oldes
5c3d32cafd Using Text lexer untill proper lexer will be accepted 2014-04-29 23:28:39 +02:00
Oldes
ea45db38e9 Changed name to just: Red 2014-04-29 23:09:24 +02:00
Oldes
a978c4eb34 Red language (red-lang.org) 2014-04-29 23:04:53 +02:00
Robin Hahling
65302dbec7 Change DOT language type from programming to data (fix #1145)
DOT language is a (graph) description language thus a subset of a data
language.
2014-04-29 10:03:46 +02:00
Andrea Faulds
3c82131863 Gave GML a colour (its official colour) 2014-04-28 19:03:28 +01:00
Paul Chaignon
00873da7a6 New sample file for R 2014-04-27 18:36:34 +02:00
killmous
a17f7d1cb2 Added samples for Haskell 2014-04-27 11:29:26 -05:00
Jonathan Feinberg
9f850db126 Add support for Processing's new Python Mode sketches. 2014-04-26 21:22:49 -04:00
Arfon Smith
e513ac628a Merge pull request #1135 from github/js-colour-update
Updating JS colour to be a little softer
2014-04-26 19:57:49 -05:00
Arfon Smith
3dc11186a1 Updating JS colour to be a little softer 2014-04-26 19:55:17 -05:00
Arfon Smith
2fbca98e7f Merge pull request #1130 from github/2.10.15-release
Cutting 2.10.15 release
v2.10.15
2014-04-25 15:56:16 -05:00
Arfon Smith
7ad411fbaa Cutting 2.10.15 release 2014-04-25 13:46:54 -05:00
Arfon Smith
4e4e77bc9a Merge pull request #1123 from garyb/purescript-colour
Change PureScript colour to avoid clash with JavaScript
2014-04-24 20:47:20 -05:00
Arfon Smith
a7afdaa677 Merge pull request #1125 from github/liquid-rethink
Rethinking Liquid extensions
2014-04-24 20:44:40 -05:00
Arfon Smith
dd24b54a31 Rethinking Liquid extensions 2014-04-24 20:36:35 -05:00
Arfon Smith
833e409bd8 Merge pull request #1122 from github/2.10.14
Bumping to 2.10.14
v2.10.14
2014-04-24 16:04:21 -05:00
Gary Burgess
c2a376fbc9 Revise purescript colour 2014-04-24 20:32:02 +01:00
Arfon Smith
c21707b8b1 Bumping to 2.10.14 2014-04-24 14:22:32 -05:00
Arfon Smith
c04f4519a7 Merge pull request #1121 from github/linguist-version
Adding Linguist::VERSION
2014-04-24 14:12:57 -05:00
Arfon Smith
fd7db27b48 Using Linguist::VERSION in gemspec 2014-04-24 14:09:10 -05:00
Arfon Smith
cab85f3de3 Adding Linguist::VERSION 2014-04-24 13:53:37 -05:00
Arfon Smith
34893650eb Merge pull request #1120 from github/1116-1117-update
1116 1117 update
2014-04-24 13:37:48 -05:00
Paul Chaignon
bb58840c1c .st file extension for StringTemplate HTML files
Conflicts:
	lib/linguist/samples.json
2014-04-24 13:34:08 -05:00
Parker Moore
cbcbb969d5 Add XML, HTML and JSON samples for Liquid. 2014-04-23 23:02:19 -04:00
Parker Moore
3c21f8db51 Update samples.json with Liquid samples. 2014-04-23 22:54:04 -04:00
Parker Moore
6c3f8a7787 For now, let's just use a Text-only Liquid lexer. 2014-04-23 18:12:19 -04:00
Parker Moore
915a11f2b6 type can also be "prose" 2014-04-23 18:12:10 -04:00
Parker Moore
55ce1e8b93 Remove HTML+Liquid language. 2014-04-23 18:02:33 -04:00
Parker Moore
ccce5475bf Add Liquid samples. 2014-04-23 17:45:16 -04:00
Parker Moore
cb844a1913 Add liquid to languages.yml. 2014-04-23 17:18:10 -04:00
Rick Bradley
6c4c2fa0e0 Merge pull request #1114 from github/2.10.13
cut a 2.10.13 release
v2.10.13
2014-04-23 13:48:22 -07:00
Rick Bradley
ba26e1f5d5 2.10.13 2014-04-23 14:47:33 -05:00
Arfon Smith
bbddd3f946 Samples 2014-04-23 11:08:43 -05:00
Arfon Smith
2634866b91 Merge pull request #1040 from Mikulas/latte
Added support for Latte
2014-04-23 11:06:53 -05:00
Arfon Smith
d13825daff Merge pull request #1060 from kohenkatz/patch-1
Added Buildr 'Buildfile' and 'buildfile'
2014-04-22 22:34:28 -05:00
Arfon Smith
e7233db9fa Merge pull request #1110 from github/samples_checking
Towards testing for presence of sample files
2014-04-22 22:17:14 -05:00
Arfon Smith
cec5942d6b Removing extra . 2014-04-22 22:09:30 -05:00
Arfon Smith
aaef516c22 Regenerating samples.json 2014-04-22 19:41:21 -05:00