KevinMidboe/linguist
1
0
Fork 0
mirror of https://github.com/KevinMidboe/linguist.git synced 2025-10-29 17:50:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,637 Commits 13 Branches 127 Tags
d4c8fb8a28e91f97a7e53428a365c0abbac36d3d
Commit Graph

1835 Commits

Author SHA1 Message Date
Arfon Smith
d599f000c1 Merge branch 'master' into 920 
Conflicts:
	lib/linguist/samples.json
 2014-04-22 10:38:26 -05:00
Arfon Smith
ada4cad25c Seems a little fussy? 2014-04-22 10:27:35 -05:00
Arfon Smith
4ba6f9567b CAPS 2014-04-22 10:25:50 -05:00
Arfon Smith
d84867d6f3 Merge branch 'master' into 924 
Conflicts:
	lib/linguist/samples.json
 2014-04-22 10:22:01 -05:00
Arfon Smith
33e5d3a444 Merge branch 'master' into 1072 2014-04-22 09:58:28 -05:00
Arfon Smith
7b6a0e9cad Samples update 2014-04-22 09:40:45 -05:00
Arfon Smith
8e681359ba Merge pull request #1102 from CNG/MTML 
Add Movable Type Markup Language support
 2014-04-22 09:36:04 -05:00
Steven Normore
39e5f5bab3 change golang color to #375EAB 2014-04-22 10:30:35 -04:00
Charlie Gorichanaz
1c5916d3f2 Add Movable Type Markup Language support 2014-04-22 13:06:19 +00:00
Sebastian Godelet
d8cc60a026 fix moocode, add ace_mode for Mercury 2014-04-22 14:02:53 +02:00
Paul Chaignon
9f49efef0a New file extensions and samples for SQL 2014-04-22 10:34:19 +02:00
Ricky Elrod
9d569c8bd5 Idris is upstream in Pygments now: https://bitbucket.org/birkenfeld/pygments-main/pull-request/210 2014-04-22 02:54:27 -04:00
Arfon Smith
58d65c2d27 Not sure where we lost this 2014-04-21 17:18:10 -05:00
Arfon Smith
b065d8c0d7 Merge branch 'master' into 1049 
Conflicts:
	lib/linguist/samples.json
 2014-04-21 17:03:18 -05:00
Arfon Smith
88131e0844 Merge branch 'master' into 1046 
Conflicts:
	lib/linguist/languages.yml
	lib/linguist/samples.json
 2014-04-21 16:03:42 -05:00
Arfon Smith
06cee71e07 Merge branch 'master' into 989 
Conflicts:
	lib/linguist/languages.yml
 2014-04-21 15:43:49 -05:00
Arfon Smith
6106441e58 Merge pull request #1095 from wcandillon/master 
Add JSONiq support
 2014-04-21 15:09:39 -05:00
William Candillon
a949338a91 Add JSONiq support 2014-04-21 21:58:41 +02:00
Arfon Smith
ad93511c98 Merge pull request #1026 from pchaigno/intellisense-js 
Add jQuery IntelliSense files to vendor.yml
 2014-04-21 14:22:25 -05:00
Arfon Smith
ca8ad800ca Samples update 2014-04-21 13:44:46 -05:00
Arfon Smith
54335c74f6 Merge pull request #1002 from matthew-white/stata 
Stata
 2014-04-21 13:44:00 -05:00
Arfon Smith
7e9612fe9f Merge branch 'master' into 1014 
Conflicts:
	lib/linguist/samples.json
 2014-04-21 13:37:02 -05:00
Arfon Smith
22e09a587c Merge branch 'master' into 1005 
Conflicts:
	lib/linguist/samples.json
 2014-04-21 12:51:40 -05:00
Arfon Smith
1b5d35a536 Samples update 2014-04-21 12:47:09 -05:00
Arfon Smith
5d480fc6d6 Merge pull request #1008 from garyb/master 
PureScript programming language
 2014-04-21 12:46:42 -05:00
Arfon Smith
918a69e6f0 Merge branch 'master' into 1068 
Conflicts:
	lib/linguist/samples.json
 2014-04-21 12:19:12 -05:00
Arfon Smith
6d346fdc8d Merge pull request #1071 from jkutner/add_session_lang 
Added ShellSession language
 2014-04-21 12:11:43 -05:00
Arfon Smith
09506dbbd9 Merge pull request #1056 from spderosso/alloy 
Add support for the Alloy language
 2014-04-21 11:58:55 -05:00
Rick Bradley
c72ad3f402 regen samples.json on current master 2014-04-21 11:54:10 -05:00
Arfon Smith
715732bb93 Merge branch 'master' into obj_cpp 
Conflicts:
	lib/linguist/samples.json
 2014-04-21 11:51:50 -05:00
Rick Bradley
62e34caa4c regen samples.json on new master 2014-04-21 11:46:01 -05:00
Arfon Smith
142dcd27e5 Merge branch 'master' into obj_cpp 
Conflicts:
	lib/linguist/samples.json
 2014-04-21 11:44:24 -05:00
Rick Bradley
2f94e46f1f Merge branch 'master' into GrammaticalFramework-master 2014-04-21 11:42:23 -05:00
Arfon Smith
26fbc45baf Merge branch 'master' into 815 
Conflicts:
	lib/linguist/samples.json
 2014-04-21 11:37:49 -05:00
Rick Bradley
a2537fa108 regen samples.json from current master 2014-04-21 11:32:50 -05:00
Rick Bradley
8e76ba2020 Merge branch 'master' into SparkysWidgets-master 2014-04-21 11:31:14 -05:00
Arfon Smith
00ff4a1d8a Merge branch 'master' into 817-updated 
Conflicts:
	lib/linguist/samples.json
 2014-04-21 11:23:48 -05:00
Arfon Smith
98dacd07c2 Merge branch 'master' into 817 
Conflicts:
	lib/linguist/samples.json
 2014-04-21 11:22:18 -05:00
Rick Bradley
2aa27c99b3 regen samples on new new master 2014-04-21 11:12:37 -05:00
Arfon Smith
236f521e13 Merge pull request #1084 from github/891-update 
891 update
 2014-04-21 11:11:06 -05:00
Brandon Keepers
d0d6dfa5c0 Merge pull request #1041 from Mikulas/typo 
Fix languages.yml 'interpreters' key documentation
 2014-04-21 12:09:46 -04:00
Arfon Smith
5af528184d Merge branch 'master' into 891-update 
Conflicts:
	lib/linguist/samples.json
 2014-04-21 11:09:06 -05:00
Rick Bradley
01c4fba092 merge master; regen samples data 2014-04-21 11:08:29 -05:00
Arfon Smith
20c9ed9f36 Adding .tm Tcl samples 2014-04-21 11:04:23 -05:00
Rick Bradley
40f4c49ba9 Merge pull request #879 from zilverline/master 
Legit.  Merging.

Thanks for the bugfix, @s0meone!
 2014-04-21 09:04:22 -07:00
Arfon Smith
a265237b2e Merge branch 'master' into 891 2014-04-21 11:01:50 -05:00
Rick Bradley
e7f5cadfcb regen samples with new new master 2014-04-21 10:59:35 -05:00
Rick Bradley
96a162225d regen samples.json 2014-04-21 10:52:13 -05:00
Arfon Smith
09c2f763f1 Merge branch 'master' into updated-922 
Conflicts:
	lib/linguist/samples.json
 2014-04-21 10:51:42 -05:00
Rick Bradley
ce096e277d Merge pull request #1081 from github/pr-931-updated 
Mathematica (part deux) -- replaces #931
 2014-04-21 08:50:14 -07:00