|
42fcc2a4
|
2015-03-21T02:22:34
|
|
Merge branch 'master' into prism-textile
Conflicts:
components.js
|
|
4fa8ac5c
|
2015-03-21T01:27:59
|
|
Add Smalltalk language
|
|
7a4c6355
|
2015-03-20T23:39:32
|
|
Merge branch 'gh-pages' of https://github.com/PrismJS/prism into prism-textile
Conflicts:
components.js
|
|
05bb4bda
|
2015-03-20T23:32:42
|
|
Merge branch 'master' into prism-wiki
Conflicts:
components.js
|
|
8f89ea23
|
2015-03-16T14:29:44
|
|
Fix merge conflicts again
|
|
e8f101f3
|
2015-03-16T04:50:37
|
|
Merge pull request #502 from hason/gherkin
Improved gherkin highlighter
|
|
6eaf1768
|
2015-03-15T18:45:28
|
|
Add reST language (fix #552)
|
|
53eb9d25
|
2015-02-25T12:23:30
|
|
Improved gherkin highlighter
|
|
1b284a1a
|
2015-03-10T21:05:52
|
|
Add Wiki markup language
|
|
df8267d6
|
2015-03-09T22:41:12
|
|
Merge branch 'gh-pages' of https://github.com/PrismJS/prism into prism-textile
Conflicts:
components.js
|
|
6006eef7
|
2015-03-09T21:53:15
|
|
Add Textile language
|
|
80489ab9
|
2015-03-04T19:56:43
|
|
Merge branch 'gh-pages' of github.com:LeaVerou/prism into stylus
Conflicts:
components.js
|
|
18ce84f3
|
2015-02-27T23:58:28
|
|
Add basic highlighting for SAS language. (fix #515)
|
|
fadb1e88
|
2015-02-13T23:11:08
|
|
fix indentation
|
|
95173e4d
|
2015-02-13T22:52:05
|
|
fix merge conflict
|
|
45977784
|
2015-02-06T13:50:12
|
|
Added F# support and example
Added F# support and example
|
|
fe1c6376
|
2015-02-04T19:05:10
|
|
Highlight keywords plugin does not use CSS anymore. Should fix #490
|
|
4a03e273
|
2015-02-01T18:03:53
|
|
Initial definition for stylus
|
|
cbe75b80
|
2015-01-21T13:19:33
|
|
Merge pull request #481 from vkbansal/plugin
Added Highlight Keywords plugin
|
|
43e93e6c
|
2015-01-20T14:52:20
|
|
Added TypeScript definition
|
|
9d83d4d5
|
2015-01-19T21:06:21
|
|
Added Highlight Keywords plugin
|
|
875ad39f
|
2015-01-18T17:30:09
|
|
Added React JSX definition
|
|
e852617b
|
2015-01-11T20:47:34
|
|
Changed indentation in 'title'
|
|
e5af211f
|
2015-01-11T20:05:59
|
|
Changed indentation from spaces to tabs
|
|
23cd3870
|
2015-01-11T17:53:06
|
|
Added basic support for the julia language
|
|
c03c2948
|
2015-01-07T19:57:07
|
|
Merge branch 'master' into prism-markdown
Conflicts:
components.js
|
|
7830e25a
|
2015-01-07T00:33:16
|
|
Added missing dependency
|
|
81792f50
|
2015-01-07T00:30:37
|
|
Merge branch 'master' into prism-actionscript
Conflicts:
components.js
|
|
1fcd3373
|
2015-01-07T00:27:51
|
|
Merge branch 'master' into prism-smarty
Conflicts:
components.js
|
|
dc0599cb
|
2015-01-05T09:01:17
|
|
Example for NASM
|
|
9cfcc2d8
|
2014-12-31T10:19:19
|
|
PowerShell support
|
|
a80c06d3
|
2014-12-23T08:32:54
|
|
Merge pull request #414 from Golmote/prism-handlebars
Handlebars reworked
|
|
a4250c8e
|
2014-12-21T14:33:25
|
|
Examples first shot
|
|
aabf7a76
|
2014-12-21T12:33:29
|
|
Eiffel should not be a default language + add credits
|
|
20606ea6
|
2014-12-21T03:30:57
|
|
Merge pull request #407 from Conaclos/gh-pages
Add Eiffel programming language definition.
|
|
02458f8f
|
2014-12-20T20:26:03
|
|
Merge branch 'master' into prism-markdown
Conflicts:
components.js
|
|
7c9c8950
|
2014-12-20T20:24:34
|
|
Merge branch 'master' into prism-handlebars
Conflicts:
components/prism-handlebars.min.js
|
|
c80422b9
|
2014-12-20T20:19:50
|
|
Merge branch 'master' into prism-smarty
Conflicts:
components.js
|
|
be2bacde
|
2014-12-20T19:44:00
|
|
Merge branch 'master' into prism-actionscript
Conflicts:
components.js
|
|
20e44b08
|
2014-12-20T14:07:29
|
|
Merge branch 'master' into prism-dart
Conflicts:
components.js
|
|
d2caa5e9
|
2014-12-20T14:05:44
|
|
Merge branch 'master' into prism-rust
Conflicts:
components.js
|
|
67fc5438
|
2014-12-20T14:03:36
|
|
Merge branch 'master' into prism-applescript
Conflicts:
components.js
|
|
00c3122f
|
2014-12-20T13:33:14
|
|
Merge branch 'master' into prism-actionscript
Conflicts:
components.js
|
|
63c67979
|
2014-12-20T13:15:36
|
|
Merge branch 'master' into prism-pascal
Conflicts:
components.js
|
|
028e99fc
|
2014-12-20T13:09:12
|
|
Merge branch 'master' into prism-jade
Conflicts:
components.js
|
|
684c0183
|
2014-12-20T13:05:12
|
|
Merge branch 'master' into prism-haml
Conflicts:
components.js
|
|
317151b6
|
2014-12-20T12:46:22
|
|
Merge branch 'master' into prism-erlang
Conflicts:
components.js
|
|
f292e225
|
2014-12-20T12:36:03
|
|
Merge branch 'master' into prism-fortran
Conflicts:
components.js
|
|
2224a11e
|
2014-12-20T12:31:58
|
|
Merge branch 'master' into prism-lolcode
Conflicts:
components.js
|
|
08e31573
|
2014-12-20T12:24:37
|
|
Merge branch 'master' into prism-pascal
Conflicts:
components.js
|
|
4dd16d9b
|
2014-12-20T12:14:56
|
|
Merge branch 'master' into prism-r
Conflicts:
components.js
|
|
1aed42eb
|
2014-12-14T18:42:43
|
|
Add Less language
|
|
07067006
|
2014-12-20T11:48:24
|
|
Add Dart language
|
|
dee0e793
|
2014-12-20T11:48:24
|
|
Add Dart language
|
|
6711ff05
|
2014-12-20T10:34:18
|
|
Add R language
|
|
dabc5d05
|
2014-12-20T09:33:00
|
|
Add LOLCODE language
|
|
7dd1a602
|
2014-12-19T23:41:20
|
|
Add Pascal language
|
|
140db6bb
|
2014-12-19T21:13:03
|
|
Add Fortran language
|
|
f22c3911
|
2014-12-19T09:14:54
|
|
Add Erlang language
|
|
c743454a
|
2014-12-18T09:01:24
|
|
Add Haml language
|
|
cd963b88
|
2014-12-18T08:10:38
|
|
Added missing dependency
|
|
fac57f13
|
2014-12-17T20:57:34
|
|
Add Jade language
|
|
9d851564
|
2014-12-16T21:29:46
|
|
Added missing dependency
|
|
45f2b828
|
2014-12-16T21:28:20
|
|
Update components
|
|
1bd4d064
|
2014-12-16T09:03:57
|
|
Add AppleScript language
|
|
b075a0c0
|
2014-12-16T00:30:19
|
|
Added missing dependency
|
|
8440df9e
|
2014-12-16T00:29:17
|
|
Added missing dependency
|
|
cb3f1cbc
|
2014-12-15T23:53:37
|
|
Add Rust language
|
|
0f9da40b
|
2014-12-15T20:03:39
|
|
Add Smarty language
|
|
ecedf4a7
|
2014-12-15T00:55:58
|
|
Update components to add dependency
|
|
ea170578
|
2014-12-14T18:42:43
|
|
Add Less language
|
|
65de193f
|
2014-12-12T20:23:27
|
|
Add MATLAB language
|
|
6b37690d
|
2014-12-10T22:54:29
|
|
Added Markdown language
|
|
c5044386
|
2014-12-09T08:21:31
|
|
Merge branch 'gh-pages' of https://github.com/LeaVerou/prism
Conflicts:
components.js
|
|
7ce45c44
|
2014-12-09T07:43:29
|
|
Add Handlebars to components.js
|
|
f3b78833
|
2014-12-09T07:40:03
|
|
Add perl to components.js
|
|
5edb31d2
|
2014-12-04T19:54:03
|
|
Add Eiffel programming language definition.
|
|
4b606263
|
2014-09-12T22:05:59
|
|
Add NASM (Netwide Assembler) language definition.
|
|
c60d3876
|
2014-10-18T21:51:06
|
|
added scheme language
|
|
14e754fa
|
2014-08-29T17:07:00
|
|
Adjust existing code to a common style
Use Tabs.
|
|
8b71e6e4
|
2014-08-29T15:50:13
|
|
[Git language support] oldline => deleted, newline => inserted + typo
|
|
c3232e3e
|
2014-08-29T11:06:10
|
|
Renamed apacheconf back to the name without dashes
Sorry for the confusion.
|
|
0ea9172c
|
2014-08-24T15:18:26
|
|
Added support for Apache configuration syntax
Supports:
-All official directives, both block and inline, up to Apache 2.4
-Block directives parameters separated by colon (":")
-Comments
-Strings
-Environment variables (eg. ${HOME})
|
|
011e430c
|
2014-08-13T16:49:24
|
|
Added missing comma in components.json
|
|
e1a659d3
|
2014-08-13T16:46:45
|
|
Merge pull request #295 from bholst/gh-pages
Add language definition for Haskell
|
|
657b089f
|
2014-08-06T19:44:18
|
|
Added initial LaTeX support
|
|
ec93e86c
|
2014-07-24T12:51:18
|
|
Added Twig language
|
|
8a77383b
|
2014-07-13T20:49:37
|
|
Add language definition for Haskell
|
|
d648f371
|
2014-07-10T13:51:29
|
|
added Ini highlighting
|
|
37c2c180
|
2014-07-09T15:04:15
|
|
added AutoHotkey highlighting
|
|
62687ecc
|
2014-06-26T03:59:26
|
|
objc -> objectivec
|
|
ecb20c18
|
2014-06-25T22:06:06
|
|
Add objc to components
|
|
527c0f98
|
2014-06-17T14:25:27
|
|
components.js update
* made `components.js` use a JSON-compatible structure
* remove the exclusion through bower
|
|
efc1d2bc
|
2014-06-04T17:13:37
|
|
added swift language
|
|
dc45d573
|
2014-05-10T13:40:57
|
|
Simple start for Rip
Recognize comment, builtin, boolean
|
|
8115e640
|
2014-05-17T21:32:55
|
|
add Scala support to prism
|
|
c1aa3354
|
2014-04-28T12:14:41
|
|
Merge pull request #216 from nauzilus/plugin-show-langauge
Plugin to show highlighted language, per Issue #1
|
|
d160f3c1
|
2014-04-22T22:14:13
|
|
Merge branch 'gh-pages' of https://github.com/LeaVerou/prism into gh-pages
|
|
79a7d9a7
|
2014-04-22T16:03:31
|
|
Include owner in components.js, also minified CSS/JS.
|
|
7ddd2613
|
2014-04-21T12:42:38
|
|
Added owners to plugins/languages/themes
|