mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity
4,879 Commits 2 Branches 42 Tags
Commit Graph

72 Commits

Author SHA1 Message Date
Ian
f9fc569c5d remove ? 2016-02-10 10:46:58 +01:00
Ian
d97acf8b05 remove RQ, see commit and cooments 
1c1c11f31fd31b54ae98f2921f8411208704c9e5#commitcomment-15999285
 2016-02-10 10:44:58 +01:00
Ian
1c1c11f31f RQ some function arguments 
What shall we do with them, see serendipity_fetchEntry() and getClassByInstanceID() ?
 2016-02-08 15:14:49 +01:00
Ian
96a929df0b remove a strange double whopper ;-) 2015-12-20 20:18:42 +01:00
Ian
0f12a87e31 fix 'backend_save' hooked script to only apply on save condition 2015-12-20 17:31:51 +01:00
Ian
d38ea97fa4 fix serendipity_plugin_api_core_event_hook conditions 2015-12-20 17:29:18 +01:00
Ian
e672cf5350 fix typo 2015-12-11 17:10:57 +01:00
Ian
7fd42fde05 fix typo 
there are more.... of this
 2015-12-01 11:39:13 +01:00
Ian
df17a410b0 fix eraseEntryEditorCache 
remember, this is preview_iframe.tpl updertHooks IFRAME and may not be jQuery based

References #343
 2015-08-18 11:33:04 +02:00
Ian
a5d5e7d940 the jquery check does not want to iterate a fallback 
References #343
 2015-08-16 18:32:02 +02:00
Ian
d5eae21a9c suggested fix for the Serendipity fallback chaining 
This fixes the plugin tpl fallback for all plugins, already using the parseTemplate() method. All others, which may still follow the themes fallback (like contactform etc), would need to always be part of the user template $serendipity['template'], or be fixed later on.

This also fixes the backend chaining, which now simply follows the force with a possible engine and then uses $serendipity['template_backend'] (2k11), $serendipity['defaultTemplate'] (2k11), 'default'.

As a third, this now uses the correct preview_iframe.tpl file on save and checks for a correct set jquery_backend.js in the user theme $serendipity['template'].

Please double check this approach for cases I did not find yet. Thanks! :)


References #343
 2015-08-16 18:05:59 +02:00
Garvin Hicking
12ddca1070 Upport. 
Improved detection for possible javascript errors (i.e. PHP errors, plugins that use invalid PHP 5.4+ syntax, other causes - that people seem to hit a lot)
If the serendipity.spawn function could not be found, we emit a warning (through javascript...)

See thread on forums: http://board.s9y.org/viewtopic.php?f=11&t=20286

Conflicts:
	docs/NEWS
	lang/UTF-8/plugin_lang.php
	lang/UTF-8/serendipity_lang_bg.inc.php
	lang/UTF-8/serendipity_lang_cn.inc.php
	lang/UTF-8/serendipity_lang_cs.inc.php
	lang/UTF-8/serendipity_lang_cz.inc.php
	lang/UTF-8/serendipity_lang_da.inc.php
	lang/UTF-8/serendipity_lang_de.inc.php
	lang/UTF-8/serendipity_lang_en.inc.php
	lang/UTF-8/serendipity_lang_es.inc.php
	lang/UTF-8/serendipity_lang_fa.inc.php
	lang/UTF-8/serendipity_lang_fi.inc.php
	lang/UTF-8/serendipity_lang_fr.inc.php
	lang/UTF-8/serendipity_lang_hu.inc.php
	lang/UTF-8/serendipity_lang_is.inc.php
	lang/UTF-8/serendipity_lang_it.inc.php
	lang/UTF-8/serendipity_lang_ja.inc.php
	lang/UTF-8/serendipity_lang_ko.inc.php
	lang/UTF-8/serendipity_lang_nl.inc.php
	lang/UTF-8/serendipity_lang_no.inc.php
	lang/UTF-8/serendipity_lang_pl.inc.php
	lang/UTF-8/serendipity_lang_pt.inc.php
	lang/UTF-8/serendipity_lang_pt_PT.inc.php
	lang/UTF-8/serendipity_lang_ro.inc.php
	lang/UTF-8/serendipity_lang_ru.inc.php
	lang/UTF-8/serendipity_lang_sa.inc.php
	lang/UTF-8/serendipity_lang_se.inc.php
	lang/UTF-8/serendipity_lang_sk.inc.php
	lang/UTF-8/serendipity_lang_ta.inc.php
	lang/UTF-8/serendipity_lang_tn.inc.php
	lang/UTF-8/serendipity_lang_tr.inc.php
	lang/UTF-8/serendipity_lang_tw.inc.php
	lang/UTF-8/serendipity_lang_zh.inc.php
	lang/addlang.txt
	lang/plugin_lang.php
	lang/serendipity_lang_bg.inc.php
	lang/serendipity_lang_cn.inc.php
	lang/serendipity_lang_cs.inc.php
	lang/serendipity_lang_cz.inc.php
	lang/serendipity_lang_da.inc.php
	lang/serendipity_lang_de.inc.php
	lang/serendipity_lang_en.inc.php
	lang/serendipity_lang_es.inc.php
	lang/serendipity_lang_fa.inc.php
	lang/serendipity_lang_fi.inc.php
	lang/serendipity_lang_fr.inc.php
	lang/serendipity_lang_hu.inc.php
	lang/serendipity_lang_is.inc.php
	lang/serendipity_lang_it.inc.php
	lang/serendipity_lang_ja.inc.php
	lang/serendipity_lang_ko.inc.php
	lang/serendipity_lang_nl.inc.php
	lang/serendipity_lang_no.inc.php
	lang/serendipity_lang_pl.inc.php
	lang/serendipity_lang_pt.inc.php
	lang/serendipity_lang_pt_PT.inc.php
	lang/serendipity_lang_ro.inc.php
	lang/serendipity_lang_ru.inc.php
	lang/serendipity_lang_sa.inc.php
	lang/serendipity_lang_se.inc.php
	lang/serendipity_lang_sk.inc.php
	lang/serendipity_lang_ta.inc.php
	lang/serendipity_lang_tn.inc.php
	lang/serendipity_lang_tr.inc.php
	lang/serendipity_lang_tw.inc.php
	lang/serendipity_lang_zh.inc.php
 2015-03-02 11:16:55 +01:00
Ian
1eff19d1b0 use in release versions only 2015-01-11 15:29:53 +01:00
Ian
3df6aff87a cosmetics 2015-01-01 16:04:41 +01:00
onli
92afc37753 Introduce serendipity_specialchars-wrapper for encoding bug (#236) 
PHP 5.4 sets UTF-8 as the default for htmlspecialchars, htmlentities and html_entity_decode. The first two will echo an empty string when given a string with umlauts. This commits introduces serendipity_specialchar-wrapper that are meant to be a temporary solution for the s9y-core until PHP 5.6 fixed the bug, so the native charset option of s9y continues to work.
 2014-11-23 23:41:08 +01:00
Ian
93667e2f46 revert main fbf821c capabilities changes 2014-10-06 14:18:37 +02:00
Ian
fbf821c714 make $serendipity['capabilities'][*] variables work 2014-10-02 19:11:00 +02:00
onli
37b55759f2 New Plugin default selection (#71) 
This is based on Garvins proposal, with some small additions. Subject to further change
 2014-09-28 15:05:54 +02:00
Matthias Mees
6bd322e195 indexedDB feature test for autocache in editors. 
References #186
 2014-06-17 11:31:38 +02:00
Ian
4b3b005833 revert 433da49 2014-06-02 17:06:30 +02:00
Ian
433da491d1 add frontent fallback for errorHandlerCreateDOM() js 
in case theme does not have js hooked {$head_link_script}
Fixes #167
 2014-06-02 15:49:06 +02:00
onli
eef94a8048 Integrate autosave_local into core (#118) 2014-05-29 19:26:13 +02:00
Ian
c6f4da1c04 temporary fix missing backend_js hook 
But there still are serious issues left, see Reference #167
 2014-05-24 11:55:59 +02:00
Ian
13c9b4b74d frontend jquery.noConflict mode set deprecated 
and make this configurable by $serendipity['capabilities']['jquery-noconflict'] = false;

References #166
 2014-05-23 14:14:58 +02:00
Garvin Hicking
0e008d0885 This should make jquery.js of a theme no longer be included for the default backend. 
Custom backends would now use jquery_backend.js if they really wanted to provide their own.

References #166
 2014-05-22 11:59:50 +02:00
Garvin Hicking
e8bae220e6 A proposal on how 2k11 could utilize pre-event hooks. Now per-event so that the function name no longer 
clashes with child-themes that need to include the 2k11 config.inc.php.
 2014-05-22 11:44:25 +02:00
onli
694b446e1a Move serendipiy_editor.js.tpl convertion into core 
http://board.s9y.org/viewtopic.php?f=11&t=19927
 2014-05-16 16:13:16 +02:00
Ian
c69932eaae rename create() js errorHandler function to errorHandlerCreateDOM() 2014-03-24 15:19:16 +01:00
onli
7bf373248b serendipity_editor.js.tpl without core 
To have this in the plugin api didn't look right. the fallback to default works this time, so this should be alright.
 2014-03-23 23:53:55 +01:00
onli
0d54063c5e Use old method to init ckeditor 
Instead of using global JS-variables and ignoring serendipity[textarea]={$view}, this
approach actually uses the variable and therefore reinstates wysiwyg_init.tpl.

ckeditor_custom_config.js (Thx Ian!) is still respected, but the toolbar got restored to the old version. We need an easy way to remove _underline_, for example. It could be extended though.

This fixes #{107} somewhat, as serendipity_image_selector.php is useable now, but still with display errors (and without an upload widget). Probably still a good idea to copy the ML-eapproach of the normal textareas

This also works with htmlnuggets, without using spawnnugget from the core, instead wysiwyg_init.tpl gets reused in the plugin-config.

ckeditor_custom_plugin.js got emptied, the relevant code (which should only be the part that adds the plugins into the toolbar) should be integrated into wysiwyg_init.tpl).
 2014-03-23 23:03:09 +01:00
Ian
76f87c5e08 cleanup note in cb0ba6c 2014-03-17 19:36:19 +01:00
Ian
cb0ba6cf7e fix non-read pre event hook for other templates 
This fixes the problem of empty core backend js files
and not properly executed ckeditor inits with other templates.

References #72
closes #72
 2014-03-17 14:55:37 +01:00
Ian
408774cba3 move errorToException 'appendTop' javascript into 'js' hook 
since this also fixes not having had this in backend_header before.
 2014-03-16 09:33:20 +01:00
Ian
7028149361 add missing bracket to 9fecaf1 2014-03-05 12:58:28 +01:00
Ian
9fecaf1372 upport missing 7cf4c12 and e5b28180a5 2014-03-05 12:41:03 +01:00
Garvin Hicking
3d7765f066 upport 1.7.6 security fixes 2014-02-06 09:36:31 +01:00
Ian
915c5f6531 Fix possible temporary caching errors failing $eventData[0]['properties'] 2013-10-01 19:03:12 +02:00
Ian
eaa8a29d2d upport e7c93ad835 2013-07-01 18:47:45 +02:00
onli
a654b13a9a Complete include_once usage, romove constants 2013-06-22 12:32:54 +02:00
onli
cbe07715fd use include_once 2013-06-21 18:11:03 +02:00
onli
99caf8d74e set default plugins to their new canonical names so installer can work again 2013-06-19 23:23:38 +02:00
onli
02d4df2a02 Move internal plugins into plugin-folder 
Stepping stone to later use spartacus for all of them. Will break installed plugins
 2013-06-16 19:39:44 +02:00
onli
0044e210ae Remove layout.php remains 2013-06-15 15:29:54 +02:00
Matthias Mees
251f61a039 Disable jQuery noConflict mode in the backend. 
NOTE: If someone can improve this, by all means: do so. And excuse
      my toddler's PHP here.
 2013-05-30 18:44:42 +02:00
Matthias Mees
7288ffdef8 Fixed most of the redundant br elements in the core. 2012-12-03 13:35:59 +01:00
Garvin Hicking
f12f53aaab Damn, why does cherry picking not work? 2012-06-12 20:51:57 +02:00
Garvin Hicking
da886799aa Merge branch '2.0' of github.com:s9y/Serendipity into 2.0 2012-04-22 16:15:18 +02:00
Garvin Hicking
d8243ece6e improved escaping, thanks to stefan schurtz 2012-04-22 16:13:58 +02:00
Ian
54e310b1e4 fixed Smarty const check 2012-04-17 11:37:53 +02:00
Ian
9c7f73a857 tab converting and parseTemplate() fix 2012-02-02 14:11:50 +01:00