Log

Author Commit Date CI Message
Golmote 9ff81a49 2014-12-21T12:28:49 Merge branch 'master' into prism-download
Lea Verou 20606ea6 2014-12-21T03:30:57 Merge pull request #407 from Conaclos/gh-pages Add Eiffel programming language definition.
Golmote 11a79455 2014-12-20T20:22:03 Updated minified file
Golmote 5330f028 2014-12-20T20:17:42 Merge pull request #415 from Golmote/prism-css Fixed css-extras additional highlightings
Golmote 91bb0bb1 2014-12-20T19:37:26 Run gulp
Golmote 5795ef11 2014-12-20T19:36:15 Merge https://github.com/LeaVerou/prism
Golmote 3b052132 2014-12-20T19:35:18 JS function can contain $
Golmote 22ec5cb2 2014-12-20T19:33:43 Exponent may be signed with +
Golmote 65080051 2014-12-20T19:21:48 Add error message in red above the code if a file fails to download
Lea Verou fd0ca047 2014-12-20T08:33:26 Merge pull request #442 from Golmote/prism-gulp Run gulp tasks
Golmote 86b4d4df 2014-12-20T14:21:28 Run gulp tasks
Golmote 2da3a7e7 2014-12-20T14:07:54 Merge pull request #440 from Golmote/prism-dart Add Dart language
Golmote 20e44b08 2014-12-20T14:07:29 Merge branch 'master' into prism-dart Conflicts: components.js
Golmote a5a344fc 2014-12-20T14:06:33 Merge pull request #430 from Golmote/prism-rust Add Rust language
Golmote d2caa5e9 2014-12-20T14:05:44 Merge branch 'master' into prism-rust Conflicts: components.js
Golmote fba61efb 2014-12-20T14:04:17 Merge pull request #431 from Golmote/prism-applescript Add AppleScript language
Golmote 67fc5438 2014-12-20T14:03:36 Merge branch 'master' into prism-applescript Conflicts: components.js
Golmote 24659943 2014-12-20T14:02:11 Merge all keywords in one regexp
Golmote 0ea461be 2014-12-20T13:16:43 Merge pull request #437 from Golmote/prism-pascal Add Pascal language
Golmote 63c67979 2014-12-20T13:15:36 Merge branch 'master' into prism-pascal Conflicts: components.js
Golmote 4141d8ab 2014-12-20T13:13:40 Merge pull request #433 from Golmote/prism-jade Add Jade language
Golmote 77848153 2014-12-20T13:12:45 Minor edits
Golmote 028e99fc 2014-12-20T13:09:12 Merge branch 'master' into prism-jade Conflicts: components.js
Golmote 0ad7eac3 2014-12-20T13:07:48 Merge pull request #434 from Golmote/prism-haml Add Haml language
Golmote 684c0183 2014-12-20T13:05:12 Merge branch 'master' into prism-haml Conflicts: components.js
Golmote 61bf0eae 2014-12-20T13:04:34 Fixed broken ternary
Golmote f2d0be11 2014-12-20T12:55:15 Minor edits
Golmote d6906fec 2014-12-20T12:47:01 Merge pull request #435 from Golmote/prism-erlang Add Erlang language
Golmote 317151b6 2014-12-20T12:46:22 Merge branch 'master' into prism-erlang Conflicts: components.js
Golmote 974487ae 2014-12-20T12:36:42 Merge pull request #436 from Golmote/prism-fortran Add Fortran language
Golmote f292e225 2014-12-20T12:36:03 Merge branch 'master' into prism-fortran Conflicts: components.js
Golmote 4825d037 2014-12-20T12:34:01 Merge pull request #438 from Golmote/prism-lolcode Add LOLCODE language
Golmote 2224a11e 2014-12-20T12:31:58 Merge branch 'master' into prism-lolcode Conflicts: components.js
Golmote 08e31573 2014-12-20T12:24:37 Merge branch 'master' into prism-pascal Conflicts: components.js
Golmote aba1a72c 2014-12-20T12:23:55 Simplify hex, oct and bin number detection
Golmote 853a1682 2014-12-20T12:17:00 Merge pull request #439 from Golmote/prism-r Add R language
Golmote 4dd16d9b 2014-12-20T12:14:56 Merge branch 'master' into prism-r Conflicts: components.js
Golmote de49fafd 2014-12-20T12:11:08 Merge pull request #427 from Golmote/prism-less Add Less language
Golmote b378d4bb 2014-12-20T12:06:25 Merge remote-tracking branch 'origin/prism-less' into prism-less Conflicts: components.js
Golmote 72c40031 2014-12-14T18:46:15 Removed useless comment and reformatted Less component
Golmote 1aed42eb 2014-12-14T18:42:43 Add Less language
Golmote 6c821ee9 2014-12-20T11:57:57 Merge remote-tracking branch 'origin/prism-dart' into prism-dart Conflicts: components.js
Golmote 07067006 2014-12-20T11:48:24 Add Dart language
Lea Verou fdb1c8d2 2014-12-20T05:48:42 Merge pull request #422 from Golmote/prism-matlab Add MATLAB language
Golmote dee0e793 2014-12-20T11:48:24 Add Dart language
Lea Verou df9e5caf 2014-12-20T05:47:59 Merge pull request #421 from Golmote/prism-coffeescript-keywords Improved CoffeeScript
Lea Verou ba486c79 2014-12-20T05:43:40 Merge pull request #420 from Golmote/prism-scheme-fix Fix filename of minified Scheme
Lea Verou e3aee503 2014-12-20T05:42:02 Merge pull request #419 from Golmote/prism-download New download page with dynamic loading of the scripts
Golmote 6711ff05 2014-12-20T10:34:18 Add R language
Golmote dabc5d05 2014-12-20T09:33:00 Add LOLCODE language
Golmote 7dd1a602 2014-12-19T23:41:20 Add Pascal language
Golmote 140db6bb 2014-12-19T21:13:03 Add Fortran language
Golmote f22c3911 2014-12-19T09:14:54 Add Erlang language
Golmote 0e24ff95 2014-12-18T09:06:42 Fixed typo in swig filter
Golmote c743454a 2014-12-18T09:01:24 Add Haml language
Golmote cd963b88 2014-12-18T08:10:38 Added missing dependency
Golmote fac57f13 2014-12-17T20:57:34 Add Jade language
Golmote d16e98e9 2014-12-16T23:37:44 Fix spacing
Golmote 1a9f09a3 2014-12-16T09:10:06 Removed useless comment
Golmote 1bd4d064 2014-12-16T09:03:57 Add AppleScript language
Golmote 8440df9e 2014-12-16T00:29:17 Added missing dependency
Golmote cb3f1cbc 2014-12-15T23:53:37 Add Rust language
Golmote 1bc55bdd 2014-12-14T18:46:15 Removed useless comment and reformatted Less component
Golmote ea170578 2014-12-14T18:42:43 Add Less language
Golmote d63e397d 2014-12-13T00:58:56 Fixed multiline comments
Golmote e36045f8 2014-12-12T21:39:53 Improved string regexp to not mess with matrix transposition
Golmote 65de193f 2014-12-12T20:23:27 Add MATLAB language
Golmote 93530f85 2014-12-12T08:54:55 Undo changes in css, just fix css-extras instead
Golmote 3ad0af57 2014-12-12T08:20:57 Reject promise if file does not exist
Golmote af315b7c 2014-12-11T23:15:18 Use spaces for alignments
Golmote fd9cd8d3 2014-12-11T23:13:15 Use spaces for alignments
Golmote 3599113b 2014-12-11T22:35:53 Coffeescript refiew and improvements
Golmote 3aa77a38 2014-12-11T20:16:17 Improved CoffeeScript keywords based on the documentation. Fixes #389
Golmote 76090216 2014-12-11T20:01:50 Fix filename of minified Scheme
Golmote 7c55b9cc 2014-12-11T19:49:57 New download page with dynamic loading of the scripts
Golmote f22f3249 2014-12-09T20:53:41 Keep prism.js up to date
Golmote 0c2a2085 2014-12-09T20:53:18 Added color and number to CSS
Lea Verou 46b75132 2014-12-09T02:23:25 Merge pull request #409 from Golmote/gh-pages Added Handlebars language
Golmote c5044386 2014-12-09T08:21:31 Merge branch 'gh-pages' of https://github.com/LeaVerou/prism Conflicts: components.js
Lea Verou 859a5922 2014-12-09T02:09:17 Merge pull request #410 from Golmote/prism-perl Added perl language
Golmote 05129ed8 2014-12-09T07:54:52 Fix delimiters highlighting + highlight numbers and booleans
Golmote 7ce45c44 2014-12-09T07:43:29 Add Handlebars to components.js
Golmote f3b78833 2014-12-09T07:40:03 Add perl to components.js
Golmote 551f75fc 2014-12-08T23:51:39 Added perl language
Golmote c272a04a 2014-12-08T23:04:02 Added Handlebars language
Victorien ELVINGER 5d7913cb 2014-12-06T20:14:31 Add g flag for Eiffel decimals
Victorien ELVINGER 50513d1f 2014-12-06T19:45:05 Make simpler decimal number regex
Lea Verou e1487236 2014-12-05T00:24:19 Merge pull request #404 from rbmj/gh-pages Add NASM (Netwide Assembler) language definition.
Victorien ELVINGER 25a775e8 2014-12-05T01:16:35 Improve number handling for Eiffel.
Victorien ELVINGER cb8a1c38 2014-12-04T23:44:54 Enable juxtaposed digit separators
Victorien ELVINGER 5edb31d2 2014-12-04T19:54:03 Add Eiffel programming language definition.
Jannik Zschiesche 531adde3 2014-12-02T18:27:31 Merge pull request #386 from himedlooff/gh-pages Updates location of prism.css in bower.json.
rbmj 4b606263 2014-09-12T22:05:59 Add NASM (Netwide Assembler) language definition.
Lea Verou 4160c577 2014-11-15T14:12:09 Merge pull request #396 from zeitgeist87/gh-pages Revert invalid move of the language-css alias
Andreas Rohner e2e36855 2014-11-15T19:56:20 Revert invalid move of the language-css alias One of the language-css aliases, which was moved inwards by the previous patch was actually in the right place. This patch reverts the change to correct the newly introduced error of the previous patch.
Jannik Zschiesche 56a8a2bc 2014-11-15T19:28:43 Merge pull request #395 from zeitgeist87/gh-pages Remove invalid alias declarations, which cause HTML highlighting to fail
Andreas Rohner 3154f9b9 2014-11-15T19:09:40 Move invalid alias declarations, which cause HTML highlighting to fail The alias declarations in prism-javascript.js and prism-css.js are in the wrong place and must be moved inside of the pattern object. Otherwise they get injected into the markup grammar. The execution fails, because the alias is a string and not a RegExp.
Lea Verou 17d9aa8a 2014-11-14T20:30:10 insertBefore() with only two arguments appends (similar to how DOM insertBefore() behaves)
Lea Verou 23edcc8c 2014-11-14T20:10:05 Added language-xxx aliases in nested language refs to ease styling
Lea Verou 436a7bd6 2014-11-14T19:43:50 Make insertBefore() update pointers to the object from other language definitions. Use case/Example: In dabblet, code-highlight.js adds some extra tokens to CSS. But CSS also extends markup to highlight CSS in style elements/attributes and that happens *before* the extra CSS tokens were added. However, because references were not updated, CSS highlighted in markup was using the original CSS definition, without the added tokens. I’m surprised we haven’t caught this earlier, I’d expect it to affect many advanced uses of Prism.