4390 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Arfon Smith	8d8ea959ee	Merge pull request #2527 from radeksimko/hcl-as-ruby ... Parse HCL as Ruby, not JavaScript	2015-07-30 14:42:46 +01:00
Radek Simko	1c73db499f	Parse HCL as Ruby, not JavaScript	2015-07-30 11:31:06 +01:00
Arfon Smith	16a4b4947f	Merge pull request #2526 from github/cut-releasev4.5.10 ... Bumping to v4.5.10 v4.5.10	2015-07-29 15:21:31 +01:00
Arfon Smith	4b2abb2064	Bumping to v4.5.10	2015-07-29 14:50:11 +01:00
Arfon Smith	c581b6a5a7	Merge pull request #2525 from github/grammars-update ... Grammars update	2015-07-29 14:37:08 +01:00
Arfon Smith	4c66582f87	Grammars update	2015-07-29 14:27:35 +01:00
Arfon Smith	11388a5355	Merge pull request #1899 from sethvargo/patch-1 ... Add HCL to languages.yml	2015-07-29 14:14:38 +01:00
Arfon Smith	24ca98b1a3	Merge pull request #2524 from github/more-encompassing-number-skips ... More encompassing number skips	2015-07-29 14:07:04 +01:00
Arfon Smith	90a293727d	Merge branch 'master' into more-encompassing-number-skips	2015-07-29 13:54:51 +01:00
Arfon Smith	e869f6c173	Merge pull request #2438 from edm00se/master ... add support for XPages	2015-07-25 17:52:01 +01:00
Arfon Smith	07173d2238	Merge pull request #2515 from github/xbase-ch ... xBase .ch	2015-07-21 15:26:45 +01:00
Arfon Smith	6b747f7d65	Adding Charity and heuristic for xBase .ch files	2015-07-21 14:59:47 +01:00
Arfon Smith	aef19d72f9	Merge branch 'master' into xbase-ch	2015-07-21 13:55:59 +01:00
Arfon Smith	e1a661bffc	Merge pull request #2506 from hdgarrood/master ... Use a different grammar for PureScript	2015-07-21 13:37:05 +01:00
Arfon Smith	560f9b15d7	Merge pull request #2510 from joelparkerhenderson/master ... Add documentation categorization for CHANGELOG et. al.	2015-07-20 16:30:57 +01:00
Joel Parker Henderson	682cc2d82d	Add documentation categorization for CHANGELOG et. al.	2015-07-19 19:36:12 -06:00
Harry Garrood	29197736c7	Use a different grammar for PureScript	2015-07-19 09:18:09 +01:00
Arfon Smith	e1dbd68713	Merge branch 'master' of github.com:github/linguist	2015-07-16 14:43:21 -07:00
Arfon Smith	0ecb865797	Merge branch 'rpavlick-master'	2015-07-16 14:40:52 -07:00
Arfon Smith	1ced06483e	Merge branch 'master' of https://github.com/rpavlick/linguist into rpavlick-master	2015-07-16 14:40:21 -07:00
Garen Torikian	861cee33d5	Merge pull request #2502 from vszakats/patch-1 ... CONTRIBUTING.md: minor URL cleanups	2015-07-15 15:40:51 -07:00
Viktor Szakats	6b882438b0	CONTRIBUTING.md: minor URL cleanups ... use `https://` and `.svg`, follow a redirect.	2015-07-15 13:39:27 +02:00
Arfon Smith	c570646c2d	Merge pull request #2500 from github/cut-release-v4.5.9 ... Cut release v4.5.9 v4.5.9	2015-07-14 16:22:23 -07:00
Arfon Smith	75f72578ad	Bumping version to v4.5.9	2015-07-14 08:59:32 -07:00
Arfon Smith	4dc566e13f	Updating OpenEdge-ABL grammars	2015-07-14 08:58:59 -07:00
Arfon Smith	bcfdbe3616	Grammars update	2015-07-14 08:56:44 -07:00
Arfon Smith	314b7f134d	Merge pull request #2499 from vszakats/xgramm ... add grammar for xbase and harbour languages	2015-07-14 08:48:24 -07:00
Eric McCormick	87eb4577ea	trying this again	2015-07-13 21:31:02 -05:00
Eric McCormick	7563bf43e9	Revert "removed samples" ... This reverts commit ce8cfed7ff.	2015-07-13 21:28:36 -05:00
Eric McCormick	ce8cfed7ff	removed samples	2015-07-13 21:22:54 -05:00
Eric McCormick	8742de9a88	pulling .xsp, .form, .view from PR ... Per comment in [PR 2438](https://github.com/github/linguist/pull/2438#issuecomment-120588670), pulling all but .xsp-config and .xsp.metadata for uniqueness and non-overlapping assignment based on file extension. This should be set / overridden in the `.gitattributes` file, [as demonstrated here](https://github.com/edm00se/AnAppOfIceAndFire/blob/master/.gitattributes), to assign the XPages language to the project files.	2015-07-13 21:11:06 -05:00
Arfon Smith	9c0af2ea5b	Merge pull request #2488 from github/code-of-conduct ... Add code of conduct to contributing guidelines	2015-07-13 15:14:20 -07:00
Viktor Szakats	4c81c0d904	add grammar for xbase and harbour languages	2015-07-13 15:28:42 +02:00
Viktor Szakats	4dcdb0c79c	xBase: add .ch extension + sample	2015-07-13 10:32:08 +02:00
Arfon Smith	d459f7289e	Merge pull request #2493 from miek/patch-1 ... Add .kicad_pcb extension for KiCad PCB design files	2015-07-12 13:44:17 +01:00
Arfon Smith	d2c4104d30	Merge pull request #2494 from k2b6s9j/crystal-grammar ... Use a Crystal grammar over the Ruby grammar for Crystal files.	2015-07-12 13:42:53 +01:00
Kepler Sticka-Jones	89fabd9a89	Use a Crystal grammar over the Ruby grammar for Crystal files. ... The Crystal does have several little differences which distinguish it from Ruby. Thus it needs it's own grammar.	2015-07-11 09:24:22 -07:00
Mike Walters	3f7ce832ab	Add .kicad_pcb extension for KiCad PCB design files	2015-07-11 16:34:05 +01:00
Arfon Smith	3fdc904b18	Merge pull request #2487 from thorade/issue2486_Modelica ... more samples for Modelica language,	2015-07-11 07:59:48 +01:00
Arfon Smith	cf471af677	Merge pull request #2483 from github/cut-release-v4.5.8 ... v4.5.8 release v4.5.8	2015-07-10 22:57:07 +01:00
rpavlick	2d392581e2	adding NCL language	2015-07-09 07:17:01 -07:00
Arfon Smith	79a428ab8d	Merge pull request #2180 from pchaigno/inc-extension ... .inc file extension	2015-07-08 19:25:50 +01:00
Brandon Keepers	7ed1b9b0b1	Add code of conduct to contributing guidelines	2015-07-08 14:10:59 -04:00
thorade	58fd8a5d87	more samples for Modelica language, ... see issue #2486	2015-07-07 12:40:37 +02:00
Paul Chaignon	9f8c15ed6c	Merge branch 'master' into inc-extension	2015-07-05 14:45:35 +02:00
Paul Chaignon	b94eda18ab	New .inc Pascal samples	2015-07-05 12:48:22 +02:00
Paul Chaignon	849eb28b01	New .inc SourcePawn samples	2015-07-05 12:48:12 +02:00
Paul Chaignon	b0073d461c	New .inc C++ samples	2015-07-05 12:47:57 +02:00
Arfon Smith	21e97cc65c	Merge pull request #2170 from pchaigno/mod-extension ... .mod extension	2015-07-04 20:57:40 +01:00
Paul Chaignon	06c1033952	Fix error from merge conflicts	2015-07-04 18:04:19 +02:00