|
d1f90a11
|
2015-09-08T08:19:09
|
|
Merge branch 'gh-pages' into prism-q
Conflicts:
components.js
|
|
|
82638e75
|
2015-09-08T07:34:56
|
|
Merge branch 'gh-pages' into prism-j
|
|
|
ea61184a
|
2015-09-07T21:56:23
|
|
Merge branch 'gh-pages' into prism-nim
|
|
|
fd324de9
|
2015-09-07T21:35:58
|
|
Merge branch 'gh-pages' into prism-monkey
Conflicts:
components.js
|
|
|
8e93d55b
|
2015-09-07T08:14:00
|
|
Merge branch 'gh-pages' into prism-basic
|
|
|
8af0b91a
|
2015-09-07T08:02:38
|
|
Merge branch 'gh-pages' into prism-mizar
Conflicts:
components.js
|
|
|
95720443
|
2015-09-07T07:33:04
|
|
Merge branch 'gh-pages' into prism-mel
|
|
|
6c0bc91c
|
2015-09-06T19:05:51
|
|
Merge branch 'gh-pages' into prism-inform7
|
|
|
92de71d7
|
2015-09-06T18:37:33
|
|
Merge branch 'gh-pages' into prism-glsl
|
|
|
4d3f20e4
|
2015-09-06T11:26:39
|
|
Merge branch 'gh-pages' into prism-d
|
|
|
9019fce5
|
2015-09-06T08:12:40
|
|
Merge branch 'gh-pages' into prism-textile
Conflicts:
components.js
|
|
|
125e91ff
|
2015-09-05T18:52:14
|
|
Merge branch 'gh-pages' of https://github.com/temnoregg/prism into gh-pages + fixes + add example and tests
Conflicts:
components.js
|
|
e8083520
|
2015-09-05T16:44:38
|
|
Merge pull request #576 from JustinBeckwith/gh-pages
add dockerfile highlighting
|
|
|
a3e751a4
|
2015-09-05T11:19:11
|
|
Merge branch 'prism-markdown-tcl' of https://github.com/PeterChaplin/prism into gh-pages + add tests
Conflicts:
components.js
|
|
|
c4516114
|
2015-09-05T09:48:50
|
|
Elixir is capitalized (2) + fixed example
|
|
|
a2dda448
|
2015-09-05T00:26:10
|
|
Merge branch 'gh-pages' into prism-elixir
|
|
|
1f45942c
|
2015-09-04T08:58:16
|
|
Add support for APL. Closes #308
|
|
|
b2f14d96
|
2015-09-04T08:19:21
|
|
Merge branch 'plugin-jsonp' of https://github.com/nauzilus/prism into gh-pages
Conflicts:
components/prism-core.min.js
|
|
|
9a9020ba
|
2015-09-03T22:54:45
|
|
Merge pull request #561 from Golmote/prism-check-all
Add a "Select All" languages checkbox (fix #513)
|
|
|
35b8c500
|
2015-08-30T19:34:33
|
|
Sass: Add missing require in components
|
|
|
39bd8278
|
2015-08-18T19:00:24
|
|
Add gulp task to build languages map in Show language plugin (Fix #671)
|
|
57f43163
|
2015-08-18T14:39:45
|
|
remove code comments in components.js
|
|
|
ed9f2b21
|
2015-08-17T08:47:32
|
|
Move removal of initial line feed to a plugin
|
|
|
d3155c97
|
2015-07-05T20:49:20
|
|
Add support for Q (kdb+ database)
|
|
|
d03f11a6
|
2015-07-05T16:01:54
|
|
Add support for J
|
|
|
972fc8fd
|
2015-07-04T11:12:30
|
|
Add support for Nim
|
|
|
3275c884
|
2015-07-03T22:55:59
|
|
Add support for Monkey
|
|
|
aff67338
|
2015-07-03T21:46:20
|
|
Add support for BASIC
|
|
|
e90c74e3
|
2015-07-03T08:25:55
|
|
Add support for Mizar
|
|
|
930e97fa
|
2015-07-02T07:51:39
|
|
Add support for MEL (Maya Embedded Language)
|
|
|
c3850a30
|
2015-07-01T22:14:58
|
|
Add support for Inform 7
|
|
|
69344cb7
|
2015-07-01T07:10:55
|
|
Add support for GLSL (OpenGL Shading Language)
|
|
|
08054b15
|
2015-06-30T21:29:30
|
|
Add support for elixir
|
|
|
c2735d20
|
2015-06-29T21:53:56
|
|
Add support for D
|
|
2698f82e
|
2015-06-27T22:36:43
|
|
Merge pull request #609 from mcdurdin/gh-pages
Add Keyman language highlighting
|
|
|
3baa61c1
|
2015-06-27T22:25:58
|
|
Merge pull request #610 from Golmote/prism-makefile
Add support for Makefile
|
|
|
82dbbdfe
|
2015-06-28T03:07:59
|
|
Merge remote-tracking branch 'official/gh-pages' into prism-brainfuck
Conflicts:
components.js
|
|
|
12219d2f
|
2015-06-28T02:17:08
|
|
Add support for Makefile
|
|
74103771
|
2015-06-27T21:52:20
|
|
Added Keyman language (http://help.keyman.com/developer)
|
|
|
43e6157d
|
2015-06-18T18:52:55
|
|
Merge pull request #595 from a-rey/add-vhdl
adding vhdl language
|
|
|
b0818046
|
2015-06-13T11:03:08
|
|
Basic Sass support (fix #199)
|
|
e2580134
|
2015-06-12T15:38:43
|
|
adding vhdl language
|
|
99d87ca2
|
2015-05-13T17:54:36
|
|
fix CR feedback, add better sample
|
|
951e973e
|
2015-05-08T08:27:36
|
|
add dockerfile highlighting
|
|
|
b31e2dd5
|
2015-04-01T09:05:57
|
|
Add a "Select All" languages checkbox (fix #513)
|
|
|
404dfb72
|
2015-03-27T19:48:45
|
|
Merge branch 'gh-pages' of https://github.com/PrismJS/prism into prism-textile
|
|
6e555bc0
|
2015-03-03T23:29:32
|
|
Added YAML highlighter
|
|
|
690a193d
|
2015-03-21T09:27:35
|
|
Merge fix
|
|
|
42fcc2a4
|
2015-03-21T02:22:34
|
|
Merge branch 'master' into prism-textile
Conflicts:
components.js
|
|
|
d1ddcf57
|
2015-03-21T02:18:35
|
|
Alphabetical order fix: "e" comes before "h"...
|
|
|
53b737b1
|
2015-03-21T02:09:01
|
|
Reorder languages in components.js (Fix #441)
|
|
|
4fa8ac5c
|
2015-03-21T01:27:59
|
|
Add Smalltalk language
|
|
|
230b67ae
|
2015-03-21T00:05:02
|
|
Add Brainfuck 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
|
|
98c326b2
|
2014-12-31T12:23:01
|
|
Added Qore to component listing
|
|
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
|