1
0
Commit Graph

532 Commits

Author SHA1 Message Date
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
820ccc4709 document 2015-03-12 20:17:14 +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
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
ac7c8c0716 syndication: fix rel-url bug and enable plain textlink (#285) 2015-02-23 22:04:33 +01:00
18f75f5e7c Document extra localStorage test
References #306
2015-02-18 15:27:01 +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
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
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
b62516fcce Document changes
References #297
2015-02-08 16:28:25 +01:00
Ian
0670bb86c1 document emoticon plugin fix 2015-02-05 17:03:27 +01:00
Ian
3077b4747d Use strict frontend template fallback
in case it is used as a copy template, see http://board.s9y.org/viewtopic.php?f=11&p=10441860#p10441860

Extra Note by Garvin :)
If you create a custom theme to be used with Serendipity 2.0+, use serendipity_getTemplateFile(..., 'serendipityHTTPPath', true) whenever you reference files that are relevant to the frontend output inside your config.inc.php file. The distinction of Backend and Frontend themes in Serendipity 2.0 will otherwise try to search for a file in the backend-directory of a theme, because the theme configuration screen is displayed within the backend, not the frontend
2015-02-04 15:28:30 +01:00
Ian
a576ee8ec9 Revert "Use strict frontend template fallback"
This reverts commit 8788403baa.
2015-02-04 15:26:41 +01:00
Ian
8788403baa Use strict frontend template fallback
in case it is used as a copy template, see http://board.s9y.org/viewtopic.php?f=11&p=10441860#p10441860

Extra Note by Garvin :)
If you create a custom theme to be used with Serendipity 2.0+, use serendipity_getTemplateFile(..., 'serendipityHTTPPath', true) whenever you reference files that are relevant to the frontend output inside your config.inc.php file. The distinction of Backend and Frontend themes in Serendipity 2.0 will otherwise try to search for a file in the backend-directory of a theme, because the theme configuration screen is displayed within the backend, not the frontend
2015-02-04 15:23:21 +01:00
Ian
12eb66a669 Revert "Use strict frontend template fallback"
This reverts commit 4d0daa24d0.
2015-02-04 15:14:28 +01:00
Ian
4d0daa24d0 Use strict frontend template fallback
in case it is used as a copy template, see
http://board.s9y.org/viewtopic.php?f=11&p=10441860#p10441860
2015-02-04 14:40:05 +01:00
Ian
044f1f7dd5 document fa95f33 and 71a9650 2015-02-03 13:39:41 +01:00
e542dcb38a Document changes and prepare language constants 2015-01-30 22:19:07 +01:00
71e41b3a5a Issue #238 prevent umlauts and special characters for creating/editing media dirs 2015-01-29 15:40:45 +01:00
5f7f2e5ce0 Issue #234: Granular forcing of backend popups for specific areas
References #234
2015-01-29 15:25:38 +01:00
a99156a21d * Issue #248: Add $serendipity['forceBase64']=true option (can be set
in serendipity_config_local.inc.php) to make Serendipity *not*
      use 8bit Imap functions for sending mail, for MTAs that behave
      erradically otherwise.

References #248
2015-01-27 14:45:06 +01:00
859e66d8af Instaler should verify password
References #257
2015-01-27 14:36:32 +01:00
253428dd93 Drop $authorid as discussed
References #264
2015-01-27 14:21:53 +01:00
797c56e015 Document recent changes (Oops)
References #274 #275 #276
2015-01-24 16:04:49 +01:00
463733b30b New language constants
references #274

(my first cherry-pick)

Conflicts:
	docs/NEWS
2015-01-24 14:58:19 +01:00
b92c805bc5 backport 2015-01-23 09:40:59 +01:00
0530e3f789 prep release
master will get an updated docs/RELEASE later when we see no problems with 2.0 adoption
2015-01-23 09:26:10 +01:00
265b3a6a08 document smarty fix 2015-01-22 20:20:20 +01:00
d6385b7754 document #269 2015-01-22 19:58:21 +01:00
Ian
f2e7f6b2a0 document 2015-01-20 18:40:48 +01:00
2c7a00aaad Use master as development for 2.1
See board for explanation (coming up)
2015-01-20 10:05:42 +01:00
1b9e5de787 * Prevent entryproperties from saving/displaying a browser-side
stored password that was actually not set.
[THIS BUGGED ME FOR A SOOOOO LONG TIME!]

    * Stronger check for existing logger interface to prevent errors
      when it is not actively used.
2015-01-15 15:39:00 +01:00
8b51c37b98 Address issue #261
Prevent resetting entryproperties when using serendipity_updertEntry
2015-01-15 10:13:53 +01:00
d6ac2aacf0 document 2015-01-12 13:26:19 +01:00
7f6194e195 * Patch PEAR.php to use "static" isError declaration to prevent
PHP error messages
2015-01-05 12:44:58 +01:00
adfb237b4a fix wrong IF-order
We'll need to also apply that to all additional_themes
2015-01-05 11:37:29 +01:00
afa74da11c fix fulltext search for types other than mysql 2015-01-05 11:22:22 +01:00
ff3cd29f2a document past changes, did I miss anything? 2015-01-01 15:01:02 +01:00
Ian
4b13006687 document 2014-12-23 19:27:44 +01:00
d35b4d127d Fix wrong parameters to serendipity_entity_decode() 2014-12-23 11:33:41 +01:00
36cde3030a * Fixes escaping of comments in the new backend pane to prevent
XSS. Thanks to Steffen Röemann for reporting!
2014-12-23 11:10:53 +01:00
Ian
f0ade5eda0 is not not, is now! ;-) 2014-12-19 11:40:01 +01:00
2f631807fe Fix conflicts.
Merge branch '2.0' of github.com:s9y/Serendipity into 2.0

Conflicts:
	docs/NEWS
2014-12-19 09:56:10 +01:00
c8e147874b Move around searchTerm escaping, document. 2014-12-19 09:55:34 +01:00
b3bb1f38fc Merge branch '2.0' of github.com:s9y/Serendipity into 2.0 2014-12-15 10:01:04 +01:00