1
0
Commit Graph

4485 Commits

Author SHA1 Message Date
Ian
72f316712b fix cke_source code linebreak view for Mozillas 2015-03-16 11:08:42 +01:00
872d978d63 Added config vars to influence dashboard limit
http://board.s9y.org/posting.php?mode=quote&f=10&p=10442506
2015-03-16 10:47:56 +01:00
863db549f7 Add a space when styling is missing to not clutter output 2015-03-16 10:46:53 +01:00
c249403c16 * Adapt .htaccess profile of "mod_rewrite for 1&1 and problematic
servers" to not include the "Options -MultiViews" option, since
     this is often blocked
2015-03-16 10:16:35 +01:00
Ian
325ea6de7b Revert "fix strange PHP parse error on subdomain usage"
This reverts commit ffe581225c.
2015-03-15 13:00:18 +01:00
Ian
2947081b41 Revert "document"
This reverts commit c705dddf8d.
2015-03-15 12:59:47 +01:00
Ian
c705dddf8d document 2015-03-15 11:27:55 +01:00
Ian
ffe581225c fix strange PHP parse error on subdomain usage
preventing ckeditor to load the resource and itself.

console errors like:
ckeditor.js:77 GET http://sub.domain.org/htmlarea/ckeditor/ckeditor/plugins/procurator/plugin.js?t=F0RD
ckeditor.js:226 Uncaught [CKEDITOR.resourceManager.load] Resource name "procurator" was not found at "http://sub.domain.org/htmlarea/ckeditor/ckeditor/plugins/procurator/plugin.js?t=F0RD".

server error.log like:
[Sun Mar 15 10:34:32 2015] [error] [client 1.2.3.4] PHP Parse error:  syntax error, unexpected '{' in /var/www/domain.org/html/sub/htmlarea/ckeditor/ckeditor/plugins/procurator/plugin.js on line 129, referer: http://sub.domain.org/serendipity_admin.php?serendipity[adminModule]=entries&serendipity[adminAction]=new

Why does PHP read/parse js files?
Why does it not respect // notes, nor /* notes */ in this case?

Might that be because Chrome says to all available loading js resources in Serendipity "Resource interpreted as Script but transferred with MIME type text/html" ???
2015-03-15 11:23:23 +01:00
27cf643135 Show ML toolbar when inserting image (#281)
This commit has two parts: First, media_items was changed to show (parts) of the image toolbar also when being in the editor popup, if the option is enabled. Second, it modifies the rename and the delete button of that toolbar to use ajax, because they otherwise would return to the normal ML. TODO1: Ajaxify the rescale function as well, or make it redirect properly, so the button can be enabled. TODO2: See if the code in media_items can be simplified, it is a dumb translation of the existing approach
2015-03-14 22:02:49 +01:00
73dc7a9225 ML: Show add-button in popup also when empty 2015-03-14 19:42:42 +01:00
9ad1dd9312 Add SEO meta elements to core templates
References #310
2015-03-14 12:41:56 +01:00
88a4776891 Fix not initializing smarty framework in the preview iframe, which lead to templates
config.inc.php files not being loaded (to hook into a config.inc.php)
2015-03-13 15:37:10 +01:00
8f88998c90 only show relative dir 2015-03-13 15:03:00 +01:00
Ian
7c7dc58665 fix wrong upgrade removal of dead files with 2.0.1 update 2015-03-13 12:47:20 +01:00
1062145b49 next ver 2015-03-12 20:35:12 +01:00
0eab8c6efa release 2015-03-12 20:28:55 +01:00
820ccc4709 document 2015-03-12 20:17:14 +01:00
7c51555438 Modify if-statement
References #324
2015-03-12 20:13:01 +01:00
cabad4a933 Escape entry title in dashboard
References #322
2015-03-12 19:03:42 +01:00
Ian
f800305abe remove files actually listed to get removed
extends a2c7761
2015-03-12 17:37:19 +01:00
94eb2b32de We also need to escape the JS at this point 2015-03-12 12:23:52 +01:00
Ian
18bdf03623 remove references for serendipity_define.js(+.php) 2015-03-12 12:10:13 +01:00
Ian
a2c77619dc extend 2.0.1 removal list
see 5ee05f1143 and 441bb6d56f (comments)
2015-03-12 12:01:43 +01:00
f5669177de Unify gravatar 2015-03-12 10:46:57 +01:00
b76e117366 Unify gravatar 2015-03-12 10:46:34 +01:00
bdd6c4fb17 Fix missing escaping (possible XSS) of category names in the Backend
Entry Admin, which would allow editors that create a forged
category name to attack other editors in the backend (privileged
access to the backend required).
Thanks a lot to Edric Teo for reporting this issue.
2015-03-12 10:16:59 +01:00
d84cd93c57 Remove legacy CSS for template_preview 2015-03-11 17:50:43 +01:00
5ee05f1143 We don't really need those files anymore. 2015-03-09 10:16:45 +01:00
75397c7d47 Remove $p == 1 search wildcard requirement (#309)
The bug meant to be fixed in 51208e0f72 (diff-cbbd600f627a5af39c73092fbc3fbf46) is not reproducible anymore
2015-03-07 11:55:37 +01:00
811af79b16 should be truncated 2015-03-02 12:31:46 +01:00
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
6954db1843 Substitute inline styles with plainList class in syndication list
References #285
2015-02-23 23:46:14 +01:00
e31078615b syndication: fix syntax error from ac7c8c0716 2015-02-23 23:19:22 +01:00
ac7c8c0716 syndication: fix rel-url bug and enable plain textlink (#285) 2015-02-23 22:04:33 +01:00
b5b28450f3 Remove legacy div + styles from 2k11's preview
References #307
2015-02-22 21:13:09 +01:00
18f75f5e7c Document extra localStorage test
References #306
2015-02-18 15:27:01 +01:00
e932ad78b0 Add extra test for localStorage
localStorage may be deactivated by setting a config option or using
security-related extensions at least in some browsers, which might
(at least in FF) break backend JS functionality.

So we need an extra check if localStorage is null.

References #306
2015-02-17 18:22:58 +01:00
e7502ef9bc manually restore from before merge
The merge in 7740886ff9 accidentally overwrote changes that were important. This commit tries to restore them while also keeping the additions from feature_updateAll.
2015-02-15 20:04:33 +01:00
7740886ff9 Merge branch 'feature_updateAll'
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
	templates/2k11/admin/style.css
2015-02-15 19:22:15 +01:00
a7c2d5b868 Fix CSS regression due to markup changes in ddac2c
References #301
2015-02-13 20:05:12 +01:00
ddac2c8048 Fix media chooser preview in theme options config group
Firefox-only bug if responsive img is a descendant of a fieldset.
Related to 67864f195f.

References #301
2015-02-13 19:42:09 +01:00
ef068314cb Fix incomplete translation in Next theme 2015-02-12 22:15:19 +01:00
0e66dbd79a Remove user.css reference and theme options
Affected themes: bulletproof, 2k11, next

These themes will use the core method of including the user.css in
serendipity.css starting with 2.0.1. A note has been added to all
three themes' theme options to document that the possibility of a
user.css exists.

References #280
2015-02-11 16:10:58 +01:00
c079c2e8b7 use "user.css" instead 2015-02-11 15:13:48 +01:00
0f175d9478 References Issue #280
* Issue 280: Allow every theme to utilize a "style_user.css" file
     that gets loaded on top of the frontend (or backend, if in admin/
     subdirectory) theme. This file can be used for customized CSS
     of a blog-admin which carries over to future Serendipity updates
2015-02-11 14:59:21 +01:00
9290ee29da Move/rename 2k15 to next
The name has been changed to protect the innocent. (Meaning the
users. From confusion.)
2015-02-11 14:32:24 +01:00
3605937049 Fix Issue #299 2015-02-11 14:28:14 +01:00
8323d9272d Expose serendipity_rewriteURL to smarty API 2015-02-11 10:34:58 +01:00
e2ab5e9858 Remove template no longer needed with Smarty 3 from 2k15 2015-02-10 14:39:18 +01:00
b5af1289f2 Add spacing for custom items in configuration groups
Most notably, this will affect custom theme config options.
2015-02-10 12:45:54 +01:00