Log

Author Commit Date CI Message
Lea Verou 5b3f31da 2014-07-11T12:30:40 Merge pull request #289 from aviaryan/c-ini fixed some bugs in INI highlighting
Avi Aryan d5dd3be2 2014-07-11T12:00:49 updated ini minified file
Avi Aryan d4f03482 2014-07-11T11:47:07 fixed bugs with ini highlight
Lea Verou af7a42a4 2014-07-10T19:25:02 Updated minified versions
Lea Verou 51531e06 2014-07-10T10:24:42 Merge pull request #288 from aviaryan/gh-pages Added AutoHotkey and Ini highlighting, resolved #287
Avi Aryan bb997900 2014-07-10T17:15:14 alphabetically arranged keywords
Avi Aryan d648f371 2014-07-10T13:51:29 added Ini highlighting
Avi Aryan a156e893 2014-07-09T15:08:02 added separate highlighting token for 'function' in prism.css, closes #287
Avi Aryan 37c2c180 2014-07-09T15:04:15 added AutoHotkey highlighting
Lea Verou cbe9b042 2014-07-03T16:13:36 Merge pull request #285 from TheCrambler/gh-pages Added Prism.js Tutorial Link
TheCrambler a530a1b7 2014-07-03T13:32:44 Added Prism.js Tutorail Link Added an extra link to a tutorial I wrote on how to implement Prism.js into a WordPress site.
Lea Verou 2182709d 2014-06-30T08:46:36 Merge pull request #284 from MathieuAlphamosa/patch-1 SQL : Multi lines strings
MathieuAlphamosa 069fa6d8 2014-06-30T11:17:22 Update prism-sql.js Faster and more reliable http://jsperf.com/javascript-multiline-regexp-workarounds
MathieuAlphamosa 42ab9b44 2014-06-27T11:11:22 SQL : Multi lines strings 'string' regex modified to accept line breaks as SQL strings can use them.
Lea Verou 4c2eddc3 2014-06-25T16:13:26 Merge pull request #282 from uranusjr/objc Add Objective-C Syntax
Tzu-ping Chung e6ff300c 2014-06-26T04:04:42 Use tabs for indentation
Tzu-ping Chung 62687ecc 2014-06-26T03:59:26 objc -> objectivec
Tzu-ping Chung ecb20c18 2014-06-25T22:06:06 Add objc to components
Tzu-ping Chung c76f777d 2014-06-25T21:35:03 Add Objective-C syntax
Lea Verou a13db04a 2014-06-17T08:55:00 Merge pull request #277 from apfelbox/gh-pages Made components.js re-usable
Jannik Zschiesche 527c0f98 2014-06-17T14:25:27 components.js update * made `components.js` use a JSON-compatible structure * remove the exclusion through bower
Lea Verou 55724eb9 2014-06-04T19:22:45 Merge pull request #272 from ChrisChares/gh-pages Added Swift Language
ChrisChares e2c11520 2014-06-04T17:18:43 added newline to end of prism-swift.js
ChrisChares efc1d2bc 2014-06-04T17:13:37 added swift language
Lea Verou 84522d86 2014-06-03T07:23:01 Merge pull request #265 from rip-lang/rip Grammar for new language, Rip
Thomas Ingram 9d5a0969 2014-05-12T11:35:31 Recognize punctuation and reference
Thomas Ingram 5d1cf199 2014-05-10T20:16:58 Recognize character
Thomas Ingram ee4b3838 2014-05-10T19:53:21 Recognize keywords
Thomas Ingram 568728d9 2014-05-10T19:35:07 Recognize regex, symbol, string (crudely)
Thomas Ingram 444c60f9 2014-05-10T19:32:08 Recognize boolean, date, time, datetime, number
Thomas Ingram dc45d573 2014-05-10T13:40:57 Simple start for Rip Recognize comment, builtin, boolean
Lea Verou 584911ca 2014-06-02T10:24:59 Merge pull request #271 from apfelbox/javascript-keywords Updated keywords in JavaScript definition
Jannik Zschiesche d27b693f 2014-06-01T17:18:03 Updated keywords in JavaScript definition * Sort keywords alphabetically (to ease maintenance) * Added all missing keywords * Added ECMAScript 5 keywords * Added true/false/null as explicit keywords Source: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Reserved_Words Fixes #270
Lea Verou 2323537a 2014-05-25T10:45:33 Merge pull request #266 from arnehormann/patch-1 replace entities with their literals
Lea Verou 86fe1c88 2014-05-25T10:45:11 Merge pull request #267 from nauzilus/grammar-update Remove escaped entities from pattern match.
Lea Verou 0d07db63 2014-05-25T10:44:23 Merge pull request #268 from sherblot/java Remove escaped entities from Java
Sebastien Herblot d478d6aa 2014-05-25T09:20:51 Remove escaped entities from Java
Daniel Flint b348fc62 2014-05-25T07:57:38 Remove escaped entities from pattern match.
Arne Hormann a2acb949 2014-05-25T01:52:02 replace entities with their literals
Lea Verou 4a472307 2014-05-24T16:14:20 Minified files
Lea Verou 9ff5de1e 2014-05-24T16:13:33 Merge pull request #264 from robfletcher/gh-pages #258 removed HTML entities from Groovy grammar
Lea Verou 308354da 2014-05-24T16:13:17 Merge pull request #263 from rip-lang/gh-pages Simplify encoding logic
Rob Fletcher a7efae77 2014-05-24T21:03:41 #258 removed HTML entities from Groovy grammar
Thomas Ingram cddff711 2014-05-24T15:59:23 Simplify encoding logic
Lea Verou 34365bfc 2014-05-24T15:57:07 Minified files
Lea Verou 3ea7a8c4 2014-05-24T15:56:42 Merge pull request #262 from milesj/css-fixes CSS function fixes
Miles Johnson 7b20bc1a 2014-05-24T12:55:05 Use lookahead for function matching
Miles Johnson bae1210e 2014-05-24T12:33:50 Move function to base CSS [#237]
Miles Johnson ee2c024e 2014-05-24T12:28:39 Make function matching a pattern [#239]
Lea Verou 603a8a02 2014-05-24T15:26:54 Added twitter link to footer, minified some files
Lea Verou 971c7b13 2014-05-24T15:23:07 Merge pull request #261 from milesj/php-fixes Removed HTML entities
Miles Johnson e437402f 2014-05-24T12:12:28 Remove entities [#258]
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