Log

Author Commit Date CI Message
Miles Johnson ee2c024e 2014-05-24T12:28:39 Make function matching a pattern [#239]
Lea Verou 73313472 2014-05-24T14:31:35 Merge branch 'gh-pages' of https://github.com/LeaVerou/prism into gh-pages
Lea Verou b590706a 2014-05-24T14:26:44 Merge pull request #260 from rip-lang/gh-pages Remove leftover `console.log`
Lea Verou d44312b6 2014-05-24T14:25:49 Converted the CSS, SCSS and JS grammars according to #258
Thomas Ingram 8557daa9 2014-05-24T14:23:52 Remove leftover `console.log`
Lea Verou eb65c68b 2014-05-24T14:13:36 Generated minified versions & prism.js after merging #258
Lea Verou 19263423 2014-05-24T14:05:24 Merge pull request #258 from rip-lang/escapism Fix premature HTML encoding
Thomas Ingram ad7513cb 2014-05-24T13:06:57 Attempt to fix clike and markup grammars Original authors should at least verify these changes are correct
Thomas Ingram c0a0353d 2014-05-23T13:40:52 Stop prematurely escaping code block Refactor Prism.highlight to HTML encode tokens before calling Token.stringify. This is a breaking change for nearly all grammars! Previously Prism was encoding HTML entities *before* passing the code block to the parser. Now it encodes HTML entities *after* the tokens have been parsed (before rendering to HTML).
Thomas Ingram 9f6cff9b 2014-05-23T13:01:26 Whitespace cleanup
Lea Verou 97a87448 2014-05-22T17:38:54 Fixed #247
Lea Verou 62561684 2014-05-22T17:36:51 Reversed change in Core
Lea Verou 3084f7cd 2014-05-22T17:33:53 Merge branch 'gh-pages' of https://github.com/LeaVerou/prism into gh-pages
Lea Verou 0bf2a8e5 2014-05-22T17:28:57 Updated minified files
Lea Verou da7ee951 2014-05-18T06:30:24 Merge pull request #256 from jozic/add-scala add Scala support to prism
Eugene Platonov 8115e640 2014-05-17T21:32:55 add Scala support to prism
Lea Verou c1aa3354 2014-04-28T12:14:41 Merge pull request #216 from nauzilus/plugin-show-langauge Plugin to show highlighted language, per Issue #1
Lea Verou 465ee8f6 2014-04-28T11:50:15 Merge pull request #242 from nauzilus/fix-testdrive-highlighting Highlight after language downloaded
Lea Verou 005a09de 2014-04-25T15:47:03 Merge pull request #245 from themightychris/patch-1 support for PHP's #-style comments
Chris Alfano 48cbb067 2014-04-25T11:54:39 support for PHP's #-style comments although it fails to detect when a # is within a string, just like it does for // though when // isn't preceded by a : but such are the limits of parsing code with regexp :(
Lea Verou d60f9804 2014-04-23T08:45:14 Merge pull request #243 from nauzilus/gh-pages Update minified file for File Highlight plugin
Daniel Flint 77de180c 2014-04-23T19:29:58 Update minified file for File Highlight plugin
Lea Verou 318c2b5b 2014-04-22T22:00:44 Merge pull request #211 from nauzilus/gh-pages Support for ASP.NET syntax
Daniel Flint c3ffc8be 2014-04-23T08:46:48 Consistent indenting.
Daniel Flint 2b8e9f2f 2014-04-23T08:32:47 If loading a new language, don't attempt highlight until it's actually downloaded.
Daniel Flint d160f3c1 2014-04-22T22:14:13 Merge branch 'gh-pages' of https://github.com/LeaVerou/prism into gh-pages
Lea Verou 8cb5bcb6 2014-04-22T06:31:19 Merge pull request #241 from adam-lynch/bump-version Preparation for publishing on npm
Adam Lynch 5ff5f823 2014-04-22T11:29:37 Package name is now prismjs Also JetBrains files are no longer ignored
Daniel Flint 79a7d9a7 2014-04-22T16:03:31 Include owner in components.js, also minified CSS/JS.
Lea Verou 50fd6ce4 2014-04-22T03:20:54 Merge pull request #220 from nauzilus/redownload Redownload URL
Daniel Flint af26cb1f 2014-04-22T15:08:48 Change delimiter Use + as a delimiter rather than | as requested.
Adam Lynch d1e2aed3 2014-04-21T14:46:07 Added .npmignore
Adam Lynch 03baaf7e 2014-04-21T13:31:18 Rename of node module prism is taken
Adam Lynch 3536d763 2014-04-21T13:30:50 Bump up version number
Lea Verou 8344fd5c 2014-04-21T13:37:18 Updated minified files
Lea Verou 74a37abf 2014-04-21T13:36:40 Merge branch 'gh-pages' of https://github.com/LeaVerou/prism into gh-pages
Lea Verou 36471491 2014-04-21T13:36:32 Updated minified files
Lea Verou 1758634b 2014-04-21T06:29:13 Merge pull request #179 from geraintluff/gh-pages Add Node.js support
Lea Verou 6abd43e2 2014-04-21T06:16:51 Merge pull request #221 from nauzilus/toc-fix Fix ToC generator to work with base
Lea Verou 7ddd2613 2014-04-21T12:42:38 Added owners to plugins/languages/themes
Lea Verou 00d50c01 2014-04-21T11:48:24 Fixed #236
Lea Verou a12e8692 2014-04-11T18:58:24 Merge pull request #235 from robfletcher/gh-pages Supports "dollar-slashy" string syntax introduced in Groovy 1.8.
Rob Fletcher 64a48377 2014-04-11T13:55:50 Supports "dollar-slashy" string syntax introduced in Groovy 1.8. Also some fixes for compatibility with latest version of Prism.
Lea Verou 9250bfbf 2014-04-11T02:10:00 Merge pull request #234 from robfletcher/gh-pages Added new Groovy keyword – `trait` – to the language definition
Rob Fletcher b7c93c85 2014-04-11T05:34:47 Added new Groovy keyword – `trait` – to the language definition
Lea Verou 0997089e 2014-04-02T08:40:10 Merge pull request #232 from adamzap/gh-pages Add `this` as a keyword in JavaScript
Adam Zapletal 1f6b1295 2014-04-02T01:20:23 Add `this` as a keyword in JavaScript
Daniel Flint 82a038fd 2014-03-27T06:16:01 Actually include the Redownload URL in the downloaded source
Lea Verou 06615482 2014-03-23T20:10:11 Merge pull request #228 from jeroenvisser101/patch-1 Added support for MySQL single line comment
Jeroen Visser 9fdcf0b3 2014-03-23T13:38:52 Added support for MySQL single line comment Added an extra hash to support MySQL single line comments
Lea Verou e96c2b42 2014-03-21T13:29:24 Merge pull request #215 from idleberg/gh-pages Added support for NSIS
Lea Verou f0d43847 2014-03-18T06:41:33 Merge pull request #226 from chriscoyier/gh-pages Adding CSS-Tricks logo
Chris Coyier b181a012 2014-03-17T17:51:14 Adding CSS-Tricks logo by Lea's generous request at https://twitter.com/LeaVerou/status/441696454303027201
Daniel Flint 583c4058 2014-03-01T21:55:25 Fix ToC generator to work with base
Daniel Flint e50c9d3d 2014-02-28T15:31:50 Align coding style
Lea Verou 45eddb46 2014-02-27T17:43:37 Merge pull request #219 from nauzilus/downloader-fix Debounce multiple rapid generateCode calls.
Daniel Flint 8a12c15f 2014-02-28T06:36:13 Debounce multiple rapid generateCode requests. Changing compression level or on page load causes a large amount of generate code requests as each source file is loaded. Because there's no guarantee the order that these requests will start-and more importantly, end-the generated code can contain undefined code snippets.
Lea Verou 6e3e5bab 2014-02-27T20:25:09 Added get/set to JS keywords
Daniel Flint d1bc6fa8 2014-02-27T13:11:52 "Redownload" functionality Include "redownload" url in output JS/CSS, so you can easily re-get what built your source in the first place at a later date (e.g. to get latest version of your custom build).
Jan T. Sott d1fa9596 2014-02-25T10:06:29 Update prism-nsis.min.js
Jan T. Sott da161cd7 2014-02-25T10:05:28 Update prism-nsis.js
Jan T. Sott a1918d6f 2014-02-25T10:04:16 Update prism-nsis.js
Daniel Flint 79af7964 2014-02-24T22:34:43 Plugin to show highlighted language, per Issue #1
idleberg 8270868f 2014-02-24T14:56:34 added credits
idleberg 79f1a83a 2014-02-24T14:51:38 added NSIS syntax
Lea Verou 3ddb92de 2014-02-23T23:42:30 Merge pull request #214 from nauzilus/autolinker-fixes Fix Issue #163 Autolinker plugin incorrectly ignores URL fragment identifiers
Daniel Flint 88696fab 2014-02-23T16:52:29 Autolinker fixes Capture query string and document fragment in url regex If inserting to attr-value, need to match url-link first, otherwise query string '=' gets picked up as punctuation. Don't prepend mailto: if it's already there (e.g. inside an href)
Daniel Flint a211c26f 2014-02-22T22:28:12 Fix Issue #200 - map 'xml' extension to 'markup', and 'py' to 'python' (can't explain the OP saying the Python example worked, I can't even see the example, and couldn't replicate).
Lea Verou d775fab1 2014-02-21T22:24:10 Merge pull request #213 from darkwing/update-mdn-logo Updating MDN logo on homepage
David Walsh 37cb2daf 2014-02-21T20:27:15 Updating MDN logo on homepage
Daniel Flint b18fee53 2014-02-21T12:23:15 More token naming changes. Check for loaded languages before attempting to augment/reference them.
Daniel Flint e943e67f 2014-02-21T07:10:48 Improved token names Optional quotes around runat="server". Group capturing doesn't seem to work in lookaheads, so mismatched quotes will pass :(
Lea Verou 19be3168 2014-02-20T10:09:40 Merge pull request #210 from apfelbox/wpd-cssextras-issue Fix incompatibility between CSS extras & the WPD plugin
Jannik Zschiesche 701436d6 2014-02-20T15:58:31 Fix incompatibility between CSS extras & the WPD plugin
Daniel Flint 9f1d0e1e 2014-02-20T16:02:05 New language - ASP.NET (C#). Initial commit, still some work to do and hacks to workaround.
Lea Verou cc36c856 2014-02-07T17:30:38 Merge pull request #205 from japborst/gh-pages Included another tutorial on Prism
Jelmer Borst 38476cfb 2014-02-07T23:12:59 Included another tutorial on Prism Includes the ability to show language name
Lea Verou 5920fc54 2014-02-07T15:43:16 Merge pull request #204 from augustjd/patch-1 Updated prism-c.js for enhanced C macro support
augustjd efff6cbc 2014-02-07T12:26:07 Updated prism-c.js for enhanced C macro support Previously, #include <stdio.h> resulted in the < and > being tagged as operators, which is confusing. Also, preprocessor directives are not allowed to have spaces after the # and before the directive (#include, #define, #if, etc.), so I updated the regex to ignore improperly formatted macros. Currently, macro arguments will be highlighted as properties, but you can line 11 to whatever flagging is desired (keyword, for instance) to visually distinguish between the macro and its arguments.
Lea Verou 256aec14 2014-01-15T17:16:41 Merge pull request #167 from ryanzec/gh-pages Make line-highlight plugin work with line-numbers plugin
Miles Johnson a1b8166f 2013-12-28T15:37:03 Merge pull request #198 from mavimo/patch-1 Remove duplicate keywords in PHP
Marco Vito Moscaritolo a48fdb8f 2013-12-29T00:25:45 Remove duplicate keywords in PHP There are some duplicate keyword in PHP keywords definition: * extends * static * use
Lea Verou ff1e4076 2013-12-27T12:19:08 Merge pull request #195 from pothibo/gh-pages Removed extra character in variable regexp
Pier-Olivier Thibault 39e2eb58 2013-12-27T13:28:02 Removed extra character in variable regexp Fix #175 by removing '&' as a variable prefix. For some reason, this change also fixes the '<' character being appended with a ; character.
Lea Verou 37f6f438 2013-12-20T06:55:25 Merge pull request #190 from kbjr/gh-pages Add PATCH, TRACE, and CONNECT methods to http lang
James Brumond 7bfed0f0 2013-12-18T22:31:53 added extra methods to HTTP lang
Lea Verou 52d40a28 2013-12-15T04:27:09 Merge pull request #189 from dwachss/gh-pages Allow more characters in attribute values
Daniel Wachsstock a74ff878 2013-12-14T19:36:16 Allow more characters in attribute values The current pattern uses `\w+` but the [html5 grammar](http://www.w3.org/html/wg/drafts/html/master/syntax.html#attribute-value-(unquoted%29-state) allows just about any character, `[^\s'">=]+`
Lea Verou f90ef53d 2013-12-12T05:32:00 Merge pull request #176 from shakyShane/gh-pages Compatibility fix with new Ghost Blogging Platform
Shane Osbourne 2b09b19a 2013-12-12T12:09:28 Fix indentation to match individual formatting styles per file
Lea Verou 5222f13e 2013-12-09T13:01:37 Merge pull request #182 from arnehormann/add-go add Go support to prism
Arne Hormann def5c233 2013-12-01T15:16:53 add Go support to prism
Lea Verou 1a7a993c 2013-11-29T05:59:34 Added info about components.js
Lea Verou 6d22f291 2013-11-29T05:57:29 Added instructions for contributors
Geraint Luff 8a7157be 2013-11-12T22:33:44 Add Node.js support
Lea Verou 7fd4aca6 2013-10-29T06:42:21 Merge pull request #177 from mvalipour/gh-pages Add support for C# and Gherkin
Mohammad Valipour 32286a6d 2013-10-29T13:35:38 add .min version for csharp and gherkin. also fixed indentation for csharp
Mohammad Valipour f325baaa 2013-10-29T13:30:39 Add corresponding entries for csharp and gherkin to components.js
valipour 837f61be 2013-10-27T10:51:02 add missing keywords to csharp language component
valipour e694d6a1 2013-10-26T20:56:49 add component file for gherkin language