osr-plastic/osr-discourse-src
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
18,432 Commits 130 Branches 462 Tags 739 MiB
bd1ca35f8b
Commit Graph

167 Commits

Author SHA1 Message Date
Marcin Rataj
a56f5a9b65 FIX: fix @mentions for usernames shorter than 2 characters 
Super short usernames were enabled by
https://github.com/discourse/discourse/pull/2838
This is just a fix for @mentions
 2014-10-03 13:20:40 +02:00
Robin Ward
9564ecde76 FEATURE: Site setting for words to censor in posts 2014-10-02 13:58:58 -04:00
Jens Maier
dcd7a149e2 FIX: reworked handling URL bbcode tags 2014-09-24 20:02:02 +02:00
Robin Ward
537e6b193d FIX: Allow proper escaping of bold and italics markdown, even when 
nested.
 2014-09-22 16:52:14 -04:00
Robin Ward
914217f78a FIX: Allow BBCode images within BBCode links 2014-09-22 14:42:24 -04:00
Jens Maier
9cca64cf69 FIX: BBCode blocks parser no longer mangles JsonML arrays 2014-09-22 03:27:39 +02:00
Sam Saffron
b0875f8332 Revert "Revert "FEATURE: fenced code blocks can hint with "pre" or "text""" 
This reverts commit 4487d6a4c2.
 2014-09-18 15:15:42 +10:00
Robin Ward
4487d6a4c2 Revert "FEATURE: fenced code blocks can hint with "pre" or "text"" 
This reverts commit 943ad8d1d5.
 2014-09-17 12:17:32 -04:00
Sam Saffron
943ad8d1d5 FEATURE: fenced code blocks can hint with "pre" or "text" 
Use ```pre or ```text for unhiglighted code blocks
 2014-09-17 01:40:10 +10:00
Jens Maier
30dbb570e5 FIX: fix dialect block ordering 2014-09-10 13:29:40 +02:00
Jens Maier
c58565d09f Fix: dialect block parser should not eat next block's whitespace 2014-08-26 14:11:23 +02:00
Robin Ward
f10f9585ae Better Support for whitelisting caja tags 2014-08-25 13:11:20 -04:00
Régis Hanol
7aaf718cf3 update bbcode dialect and fix vBulletin importer 2014-08-25 10:48:29 +02:00
Robin Ward
2ae46b4742 REMOVE: Auto quoting confused more people than it helped. 2014-08-22 14:51:31 -04:00
Robin Ward
300dbdc88b FIX: BBCode contents can span multiple lines 2014-08-22 14:32:29 -04:00
Robin Ward
104b39540a FIX: BBCode with params couldn't span lines 2014-08-22 12:14:10 -04:00
Jens Maier
23002ae01c Fix: block parser now uses regexes for end tags. solves code block case, where end tag must be on a line of its own. 2014-08-14 01:58:01 +02:00
Robin Ward
717f57c968 Revert "FIX: You couldn't span multiple lines with bold or italics" 
This reverts commit 423d37a2b6.

Conflicts:
	test/javascripts/lib/markdown_test.js
 2014-07-28 13:17:39 -04:00
Robin Ward
8866141ba2 Merge pull request #2592 from Elberet/fix-parser 
Fixes for quirky markdown parser behaviours
 2014-07-28 13:12:22 -04:00
Jens Maier
90d14d9ffc add comments and improve variable names 2014-07-28 19:03:34 +02:00
Jens Maier
479eb64a76 FIX: rewrite replaceBlock logic to better handle mismatched nested quotes. 2014-07-27 16:07:47 +02:00
Robin Ward
423d37a2b6 FIX: You couldn't span multiple lines with bold or italics 2014-07-25 16:08:00 -04:00
Jens Maier
b19ad15086 FIX: improve list bbcodes: ignore newlines resulting in unnecessary blank lines 2014-07-24 19:39:16 +02:00
Jens Maier
79dc68512f FIX: dialects accept nested inline markup 2014-07-24 17:34:13 +02:00
Robin Ward
0f23456259 FIX: Instead of patching markdown-js, fix the issue in Discourse. 2014-07-21 13:09:57 -04:00
Sam
91cd4f2d66 SECURITY: improve escaping protection 2014-07-17 16:11:10 +10:00
Robin Ward
1886ffaff2 FIX: Work with phpBB import style links with ellipsis 2014-07-14 14:27:17 -04:00
Robin Ward
186ce78cb5 FIX: BBCode sanitization and tests 2014-07-14 11:24:25 -04:00
Sam
f37c3dc916 FIX: hoisting not handling duplicate content 2014-07-07 15:01:08 +10:00
Robin Ward
914f0c3512 FIX: Don't surround oneboxes by paragraphs 2014-07-04 15:12:30 -04:00
Robin Ward
7ab98bb0e7 FIX: Missing formatting for oneboxes in preview 2014-07-04 14:15:07 -04:00
Sam
dc9b6b53ad PERF: editor could be crashed if you entered huge inline blocks 2014-07-04 12:49:50 +10:00
Robin Ward
fc1ce96dbb FIX: Change the approach to sanitization. Includes a more detailed API 
for allowing classes and attributes for only certain tag names.
 2014-07-03 16:55:36 -04:00
Robin Ward
9c48f8f154 FIX: Don't surround <aside> with <p> as that is malformed HTML. 2014-06-30 18:11:22 -04:00
Sam
e2e36a6df3 FIX: bold and italic handling improved 2014-06-30 17:01:46 +10:00
Sam
24ddb6cfad FIX: Bold, italic should not expect a space boundary 2014-06-26 17:45:51 +10:00
Sam
b8357aa90a BUGFIX: newline after bold was not producting a BR 2014-06-26 15:28:08 +10:00
Robin Ward
ff55a30dd7 FIX: <pre> blocks were adding too many new lines. 2014-06-23 15:21:07 -04:00
Robin Ward
42d1fcbbc2 [code] should work just like other kinda of code formatting. 2014-06-23 13:19:27 -04:00
Robin Ward
c6b92f0ef7 FIX: Support for nested bold/italics in MD 2014-06-09 17:46:36 -04:00
Robin Ward
d46fc79344 FIX: winky emoticons were matching with non-spaces before them. 2014-06-04 15:48:27 -04:00
Ben Lubar
73946e5402 quoting fixes 
- allow bbcode quotes to be nested
- don't allow the '=' to be omitted from quotes
- fix some css that made assumptions about nested quotes
 2014-05-27 21:46:31 -05:00
Sam
107003576e Simple workaround for username highlighting for long names 2014-05-25 13:54:52 +10:00
Robin Ward
f51cbc8952 FIX: @mentions should not be processed within links 2014-05-06 17:48:30 -04:00
Robin Ward
ba683bc611 FIX: XSS in markdown converter. 2014-04-28 14:44:15 -04:00
Robin Ward
4dc20e6855 FIX: Sanitize custom quote attributes 2014-04-21 10:19:39 -04:00
Robin Ward
ed6e2b1d79 Remove Zalgo API from Discourse.Mention: 
http://blog.izs.me/post/59142742143/designing-apis-for-asynchrony -
Thanks @riking for finding it.
 2014-04-14 16:51:18 -04:00
Régis Hanol
e663d78104 SECURITY: sanitize markdown urls (prevent XSS) 2014-03-27 15:34:35 +01:00
riking
86774fa5c1 Simplify return statements 2014-03-18 18:23:15 -07:00
riking
593f5df503 Corrections to JSDoc 2014-03-18 18:19:20 -07:00
Robin Ward
6143753fef Support uppercase bbcode too. 2014-03-03 11:59:57 -05:00
Robin Ward
3d62df51a6 FIX: Broken MDTest + Fix for removing leading spaces in a code block 2014-02-11 17:27:24 -05:00
Robin Ward
745cd0f4e9 FIX: Removes console.log 2014-01-22 11:07:19 -05:00
Robin Ward
e2c361f353 FIX: Indented code blocks followed by <blockquote> weren't working. 2014-01-21 16:18:20 -05:00
Robin Ward
3c3449aa1b Revert "New API for replacing elements in the final JsonML. Also changes spoiler" 
This reverts commit 6b9b2d3d6a.

We have come up with a better solution that does not involve HTML
parsing.
 2014-01-21 12:04:58 -05:00
Robin Ward
6b9b2d3d6a New API for replacing elements in the final JsonML. Also changes spoiler 
tag handling to be more robust with repsect to HTML content.
 2014-01-20 15:15:50 -05:00
Régis Hanol
ad8755aa70 BUGFIX: inline spoiler for text, block spoiler for images 2014-01-15 00:53:06 +01:00
Régis Hanol
70161498b6 BUGFIX: spoiler tag on lightboxed images wasn't working 2014-01-12 19:38:46 +01:00
Robin Ward
a502266c42 Enable JSHINT's unused option. It caught a bunch of suspicious stuff which is fixed in this commit. 2013-12-30 13:30:22 -05:00
Robin Ward
4f7d440fa4 Remove unused hook. 2013-12-19 14:43:36 -05:00
Sam
5bd595c9a6 FEATURE: default_code_lang for syntax highlighting is configurable 2013-12-17 12:08:29 +11:00
Robin Ward
2326d4ceb7 FIX: text node emitters should always take strings as parameters even if they 
return JsonML.
 2013-12-16 15:41:46 -05:00
Robin Ward
a7a7387da1 Automatically convert some quotes to blockquotes 2013-12-13 15:31:25 -05:00
Régis Hanol
9b6538832d whitelist google.com/maps iframes 2013-11-29 18:08:53 +01:00
Robin Ward
549060867d Updated documentation for inlineRegexp 2013-11-25 11:35:28 -05:00
Robin Ward
127c3d0e21 FIX: Performance regression on Markdown renderer. 2013-11-08 11:42:26 -05:00
Robin Ward
ac9a763ab3 FIX: Extra space before tags in blockquotes 2013-11-07 16:06:50 -05:00
Robin Ward
902b6bc79f FIX: Oneboxes were losing formatting in preview after being cached. 2013-11-06 15:58:41 -05:00
Robin Ward
b8e63719f8 FIX: Don't autolink within a markdown link. 2013-11-04 14:24:40 -05:00
Robin Ward
13fa473c6d Fix JSHINT 2013-10-22 11:33:45 -04:00
Robin Ward
e2845f7f16 Restrict SIZE= to numbers 2013-10-22 11:08:13 -04:00
Robin Ward
b51fb4d3fb Sync up with markdown-js + our changes 2013-10-21 15:06:58 -04:00
Robin Ward
7a5c3bfcd8 whitelist acceptable syntax highlighting classes 2013-10-21 13:11:10 -04:00
Robin Ward
d10f9f756f FIX: [code] blocks with # headers within 2013-10-21 12:12:58 -04:00
Robin Ward
1783089d64 FIX: [quote] without params was failing. 2013-10-21 11:12:47 -04:00
Robin Ward
db2283b9d3 FIX: JSHint 2013-10-18 17:48:19 -04:00
Robin Ward
1113b8d7a8 FIX: Don't double sanitize values, allow blockquotes with leading text 2013-10-18 17:34:54 -04:00
Robin Ward
d7182d0b14 FIX: Only wrap inline html tags in <p> 2013-10-18 15:21:05 -04:00
Robin Ward
67771d6bdf FIX: New line after blockquote 2013-10-16 10:28:48 -04:00
Robin Ward
f27413219e Support for MDTest 2013-10-16 10:28:42 -04:00
Robin Ward
5281b7f80c Upgraded and refactored Sanitizing. Much less crap should get through now! 
Conflicts:
	app/assets/javascripts/discourse/components/syntax_highlighting.js
 2013-10-15 10:53:11 -04:00
Robin Ward
af931f0444 Reverting the Sanitizer commit in case we have to do something urgent 
before we deploy it early next week. It's in the branch `sanitizer` for
now.

This reverts commit 9e93d8ed52.
 2013-10-11 16:44:26 -04:00
Robin Ward
9e93d8ed52 Upgraded and refactored Sanitizing. Much less crap should get through now! 
Conflicts:
	app/assets/javascripts/discourse/components/syntax_highlighting.js
 2013-10-11 16:25:40 -04:00
Robin Ward
9e815dbef9 FIX: Blockquote issue 2013-10-01 16:45:45 -04:00
Robin Ward
37304b7eba FIX: Too many new lines in long quotes 2013-09-27 15:08:56 -04:00
Robin Ward
84a8a358c3 Trivial: Rename dialect action to block quotes rather than simple quotes 2013-09-09 14:11:56 -04:00
Robin Ward
49910b860b FIX: Regression that removed the ability to quote code 2013-09-09 13:20:03 -04:00
Robin Ward
a9f3489237 FIX: Don't onebox links with labels unless the labels are the same as the URL 2013-09-06 16:47:26 -04:00
Robin Ward
63be950e5f FIX: Quotes inside a list 2013-09-05 17:04:01 -04:00
Robin Ward
63f2187d72 FIX: Don't do intraword italics when prefixed by a forward slash 2013-08-30 10:56:41 -04:00
Robin Ward
380a6c9e9d FIX: Blockquotes prefixed by spaces 2013-08-29 15:18:27 -04:00
Robin Ward
c99cf64d70 FIX: Quoting within code blocks. 2013-08-29 14:42:31 -04:00
Robin Ward
45b9f8048a Documentation update to dialect 2013-08-29 13:59:41 -04:00
Robin Ward
eb5830f3b0 FIX: Make getURL available to plugins while they are starting up in a similar load order 
to the client app.
 2013-08-29 13:11:12 -04:00
Robin Ward
3cec95a2c3 Better API for parsing out blocks in the parser. 2013-08-29 11:47:44 -04:00
Robin Ward
6029a77efb A nicer API for dealing with text replacements in Discourse's parser pipeline 2013-08-28 16:15:50 -04:00
Robin Ward
eeef24b9da Allow basic emoticons to work too. 2013-08-28 15:27:03 -04:00
Robin Ward
af18cc87fd Better documentation for new Dialect helpers. Migrated emoticon support to new helper format. 2013-08-28 13:55:08 -04:00
Robin Ward
f7ad80ff7b A couple of important markdown fixes. 2013-08-28 11:14:31 -04:00
Robin Ward
8f94760cd4 Better API for adding on to our Dialect 2013-08-27 18:17:34 -04:00