Brandon Keepers
06bcdba9c4
Merge pull request #1654 from danijar/master
...
Exclude minified JavaScript and CSS
2014-11-03 14:20:59 -05:00
Danijar Hafner
1dbbcb73e7
Add tests for minified JavaScript and CSS
...
Also, exclude -min.css pattern, like already done for JavaScript files
2014-11-03 19:41:31 +01:00
Arfon Smith
f2cd75332c
Merge pull request #1660 from github/1623-local
...
1623 local
2014-11-02 20:17:38 -06:00
Arfon Smith
2cd7579e21
Merge branch '1623-local' of github.com:github/linguist into 1623-local
...
Conflicts:
lib/linguist/heuristics.rb
2014-11-02 20:14:46 -06:00
Arfon Smith
d9daae176e
Merge branch 'master' into 1623-local
...
Conflicts:
lib/linguist/heuristics.rb
2014-11-02 20:13:58 -06:00
Arfon Smith
20814ec533
Merge branch 'master' into 1623-local
...
Conflicts:
lib/linguist/heuristics.rb
2014-11-02 20:12:59 -06:00
Arfon Smith
9d8ab16a38
Merge branch 'master' into 1623-local
...
Conflicts:
lib/linguist/heuristics.rb
2014-11-02 20:11:49 -06:00
Arfon Smith
49c2793bf5
Syntax preference
2014-11-02 19:56:20 -06:00
Danijar Hafner
20aee11cea
Exclude minified JavaScript and CSS
...
Those files are either external libraries or builds of the repository itself. In any case they are generated automatically and shouldn't count in the language statistics. This also simplifies some of the rules that had to exclude both minified and normal dependencies.
2014-11-01 19:13:19 +01:00
Arfon Smith
e8cf750e18
Merge pull request #1639 from pchaigno/asc
...
Heuristic rule to detect AsciiDoc files
2014-11-01 09:26:49 -05:00
Brandon Keepers
21f56744d4
Merge pull request #1608 from github/just-yajl
...
Use yajl since it is already a dependency
2014-10-31 18:03:28 -04:00
Brandon Keepers
02aeb4f895
Merge remote-tracking branch 'origin/master' into just-yajl
...
* origin/master: (42 commits)
its always greener
that new green shell
Removing stale extension
Update README.md
Add moon interpreter for MoonScript
Bumping version for 3.4.1 release
Use text.html.erb scope for HTML+ERB files
Add sample .dyalog file for file type APL
Added extra Papyrus sample files.
Add sample Papyrus script
Add Papyrus support
Add LOLCODE support
Add ProGuard config files to vendored files
Recognise *.dyalog as APL sources
Assign a bunch more TextMate scopes
CI step for samples
Add .command as a Shell file extension
CI config
Vendored gems
Update cibuild
...
Conflicts:
Rakefile
2014-10-31 18:03:03 -04:00
Arfon Smith
f9de16fbd2
Merge pull request #1620 from unfunco/ant-build-dist-support
...
Add build.xml.dist to XML filenames
2014-10-31 16:46:49 -05:00
Brandon Keepers
abe002f30c
Merge remote-tracking branch 'origin/master' into tricknotes-ruby-22
...
* origin/master: (51 commits)
its always greener
that new green shell
Removing stale extension
Update README.md
Add moon interpreter for MoonScript
Bumping version for 3.4.1 release
Use text.html.erb scope for HTML+ERB files
Add sample .dyalog file for file type APL
Added extra Papyrus sample files.
Add sample Papyrus script
Add Papyrus support
Add LOLCODE support
Add ProGuard config files to vendored files
Recognise *.dyalog as APL sources
Assign a bunch more TextMate scopes
CI step for samples
Add .command as a Shell file extension
CI config
Vendored gems
Update cibuild
...
Conflicts:
Gemfile
2014-10-31 17:36:06 -04:00
Jessica Lord
e5ae6fb00d
Merge pull request #1650 from github/greenshell
...
That new green shell, fixes #1640
2014-10-31 21:16:34 +00:00
Jessica Lord
a0a8dd8897
its always greener
2014-10-31 21:15:59 +00:00
Jessica Lord
e00f073726
that new green shell
2014-10-31 20:08:25 +00:00
Arfon Smith
1a9ee8e187
Merge pull request #1636 from Verteiron/master
...
Add support for Papyrus scripts
2014-10-30 06:24:56 -05:00
Arfon Smith
213fce00e0
Merge pull request #1646 from github/gradle-extension
...
Removing stale extension
2014-10-29 19:57:32 -05:00
Arfon Smith
380739b209
Removing stale extension
2014-10-29 19:56:59 -05:00
Arfon Smith
36322f8ac0
Update README.md
2014-10-29 19:38:19 -05:00
Arfon Smith
57d1ec7733
Merge pull request #1645 from pchaigno/moon-shebang
...
Add moon interpreter for MoonScript
2014-10-29 17:10:14 -05:00
Paul Chaignon
648c6d4547
Add moon interpreter for MoonScript
2014-10-29 15:00:21 -04:00
Arfon Smith
6ab5870b59
Merge pull request #1643 from github/linguist-3.4.1
...
Bumping version for 3.4.1 release
2014-10-29 13:34:41 -05:00
Arfon Smith
7dbe2bb774
Bumping version for 3.4.1 release
2014-10-29 13:13:26 -05:00
Adam Roben
163a039e0d
Merge pull request #1641 from github/aroben-patch-1
...
Use text.html.erb scope for HTML+ERB files
2014-10-29 10:02:49 -04:00
Adam Roben
9595e2ba7e
Use text.html.erb scope for HTML+ERB files
...
This grammar does a better job highlighting than the text.html.ruby grammar does. It requires injection grammar support, but there's no getting around that.
2014-10-29 10:00:09 -04:00
Arfon Smith
a696e3a7a2
Merge pull request #1632 from ngn/master
...
Recognise *.dyalog as APL sources
2014-10-27 17:38:34 +00:00
Paul Chaignon
ebabcfc84f
Heuristic rule to detect AsciiDoc files
2014-10-27 10:50:18 -04:00
ngn
8336dc33e4
Add sample .dyalog file for file type APL
...
Taken from
https://github.com/Gianfrancoalongi/APLUnit/blob/master/UT.dyalog
2014-10-27 10:35:23 +00:00
Verteiron
5f22bf225c
Added extra Papyrus sample files.
2014-10-26 15:30:40 -05:00
Verteiron
8eee8ad9cf
Add sample Papyrus script
...
This is the metaquest script from one of my own mods.
2014-10-26 14:58:17 -05:00
Verteiron
24743985e4
Add Papyrus support
...
Papyrus is a scripting language used by mods/plugins for The Elder Scrolls V: Skyrim.
2014-10-26 14:53:20 -05:00
Arfon Smith
94fba197d1
Merge pull request #1634 from wil93/master
...
Add LOLCODE support
2014-10-26 09:06:38 +00:00
William Di Luigi
3504a36c3e
Add LOLCODE support
2014-10-26 00:23:08 +02:00
Arfon Smith
c8038d1c80
Merge pull request #1633 from pchaigno/proguard
...
ProGuard config files as vendored
2014-10-24 22:48:11 +01:00
Paul Chaignon
8ba8b48caf
Add ProGuard config files to vendored files
2014-10-24 17:18:22 -04:00
ngn
92d0c1f3b7
Recognise *.dyalog as APL sources
2014-10-24 15:55:27 +01:00
Adam Roben
d4186bd34a
Merge pull request #1630 from github/even-more-tmscopes
...
Assign a bunch more TextMate scopes
2014-10-23 11:42:57 -07:00
Adam Roben
008ba9e23f
Assign a bunch more TextMate scopes
2014-10-23 11:22:19 -07:00
Paul Chaignon
fd707ddf7e
Heuristic rules to distinguish .sc files between SuperCollider and Scala
2014-10-23 14:22:12 -04:00
Arfon Smith
f258e4940d
Merge branch 'master' of github.com:github/linguist
2014-10-23 12:16:26 +01:00
Arfon Smith
a7b8e38bf3
CI step for samples
2014-10-23 12:16:02 +01:00
Arfon Smith
b65129a8e1
Merge pull request #1622 from pchaigno/shell-extensions
...
Add .command as a Shell file extension
2014-10-23 10:54:05 +01:00
Paul Chaignon
b6a9993c97
Add .sc as a SuperCollider file extension
2014-10-22 10:16:30 -04:00
Paul Chaignon
6b0783936f
Add .command as a Shell file extension
2014-10-21 19:07:03 -04:00
Arfon Smith
2a66b754c2
CI config
2014-10-21 18:41:25 -04:00
Arfon Smith
460443b3c8
Merge branch 'master' of github.com:github/linguist
2014-10-21 18:40:53 -04:00
Arfon Smith
cd99ab2d6e
Vendored gems
2014-10-21 18:40:43 -04:00
Arfon Smith
6d07302963
Update cibuild
2014-10-21 16:49:13 -05:00
