16 Commits

Author SHA1 Message Date
onli
121c796d48 revert 61ae46383effc52b0f4f7470caa3bda29cf9b1fa 2013-05-31 16:10:17 +02:00
Ian
af3c686111 Update serendipity_editor.js.tpl
uarrgh
2013-05-31 12:58:18 +03:00
Ian
c980451725 Update serendipity_editor.js.tpl
Hey, never assume something is “obvious”
2013-05-31 11:57:01 +02:00
Matthias Mees
0c22d50477 Removed some redundant comments. 2013-05-31 10:29:44 +02:00
Ian
7316e74b65 upport master → 2.0 in 2k11/serendipity_editor.js.tpl (fixed typos)
Do not forget to remove engl short (not) notations in js file doc notes, to help github prettifier
2013-05-31 10:04:08 +03:00
Ian
61ae46383e upport master → 2.0 in 2k11/serendipity_editor.js.tpl
added CKEDITOR, some better mode switches and re-added noWysiwygAdd() since this was changed and fixed, after the jquery refactoring was done in 2.0.

Note docs should not get removed, sonce this is done automatically in any modifier.
2013-05-31 08:58:48 +02:00
Matthias Mees
72a6e9473a Documented a JS error I can't fix right now. 2013-05-30 22:06:42 +02:00
Matthias Mees
7f72419e3c I think that makes the backend noConflict-free. 2013-05-30 21:43:51 +02:00
Matthias Mees
992df72fac Some changes to make the console.log thingy work in .tpl file. 2013-05-30 19:19:35 +02:00
Matthias Mees
ddadd81f4a Merge branch '2.0' of github.com:s9y/Serendipity into 2.0 2013-05-30 19:07:02 +02:00
Matthias Mees
b2ca3ef066 Include admin_scripts.js in serendipity_editor.js.tpl.
Also update redundant references in .tpl files.
2013-05-30 19:06:10 +02:00
Ian
5ae5329de8 Update serendipity_editor.js.tpl
remove note "..'t" notation, to have github prettify code view back
2013-05-30 19:54:54 +03:00
Matthias Mees
c2c27470ff Include header_spawn.js in serendipity_editor.js.tpl. 2013-05-30 18:13:33 +02:00
Matthias Mees
5edc98545d include 2k11.admin.js in serendipity_editor.js.tpl. 2013-05-30 17:41:35 +02:00
Matthias Mees
5058866698 Include image_selector.js in serendipity_editor.js.tpl. 2013-05-30 17:28:46 +02:00
onli
0cd974fa6d proof-of-concept .js.tpl: Added fallback for serendipity_editor.js.tpl as serendipity_editor.js to default-template, and changed serendipity_get_file to react to .js.tpl-files in template-directories 2013-03-06 14:55:21 +01:00