4262 Commits

Author SHA1 Message Date
Ian
0dc26512a3 stop default encoding in cke savings
else searching terms will/may not match

References #249 and #236
2014-12-19 15:51:06 +01:00
Ian
f0ade5eda0 is not not, is now! ;-) 2014-12-19 11:40:01 +01:00
Garvin Hicking
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
Garvin Hicking
c8e147874b Move around searchTerm escaping, document. 2014-12-19 09:55:34 +01:00
Ian
dc6d32bf68 automark nl2br disabled on wysiwyg usage
References s9y/Serendipity#243
2014-12-15 16:00:45 +01:00
garvinhicking
c3d060c973 Move logger init to seperate funtion so that its PHP 5.3+ syntax does
not fatally break the serendipity_config.inc.php parsing on PHP5 5.3-.
Also create a reasonable error message when running on an old version.
2014-12-15 10:13:10 +01:00
garvinhicking
b3bb1f38fc Merge branch '2.0' of github.com:s9y/Serendipity into 2.0 2014-12-15 10:01:04 +01:00
garvinhicking
24bb0112d9 php detection 2014-12-15 10:00:33 +01:00
Garvin Hicking
3010116e97 New lang constant for PHP version bail 2014-12-15 09:58:36 +01:00
Garvin Hicking
48c9089f77 pre release again 2014-12-11 13:26:12 +01:00
Ian
aca77bd482 cleanup cosmetics 2014-12-10 14:34:54 +01:00
Ian
ffe93c92fc allow php class_exists in smarty security and better 0ffd02c
Rferences #245
2014-12-10 12:01:15 +01:00
Garvin Hicking
698c6ce698 update our changelog with some recent changes 2014-12-10 10:11:16 +01:00
onli
8b233d562e Fix syndication subtome onlick handler 2014-12-07 23:15:32 +01:00
Ian
67a82a7e1d simple proposel to fix wrong preview stylesheet
References #119
2014-12-07 18:57:51 +01:00
Ian
4466096c18 better 7e46e92e1b8cf35237c8dc15f14b79b7df48ffff 2014-12-07 18:28:58 +01:00
Ian
7e46e92e1b lang charset proposel for serendipity_die()
References #236
2014-12-07 18:26:01 +01:00
onli
d91b86486b specialchar charset fallback on early calls (#236, #240) 2014-12-07 17:47:14 +01:00
Ian
0204a597c7 cleanup 2014-12-07 17:21:32 +01:00
Ian
0ffd02cf1c assign has_freetag in backend
Fixes commit f60df79b152a63e4fa5f2bf36e4e797d0dfeb7dc
References #245
2014-12-06 15:52:31 +01:00
onli
c004d90a6c Don't die in smarty_purge if file not writeable (#240) 2014-12-02 21:43:09 +01:00
Ian
e64793a809 typo 2014-12-02 16:57:10 +01:00
Ian
03cc73d77e properly reset ep_disable_markup_% (L217)
References #242
2014-12-02 16:52:51 +01:00
Garvin Hicking
b835364dfd remove wysiwyg note 2014-12-02 13:42:25 +01:00
Ian
2f3170ef18 modify alternate 2014-12-02 11:33:20 +01:00
onli
abba5bdb15 Make smarty_purge PHP 5.3 compatible (#240) 2014-12-01 19:04:41 +01:00
onli
a319d59eed fix serendipity_smarty_purge to delete all cache files (#240) 2014-11-30 21:36:04 +01:00
onli
a3cd4d555a empty smarty cache before upgrade 2014-11-30 18:12:25 +01:00
Garvin Hicking
21b277bd1c Add missing i18n constants
prepare rc1
2014-11-29 11:59:47 +01:00
Garvin Hicking
cc6e5ec94d Fix wrong constants being utilized, thanks @yellowled
References #148
2014-11-27 09:37:52 +01:00
Ian
ecd211479f CKEditor 4.4.6 - checke 2014-11-26 13:05:27 +01:00
Ian
1fb5bcf38e cleanup cke s9y configuration file
breaks apart long paragraph group in full,
adds mediaembed to default and maximize to standard toolbar

References #148
2014-11-26 13:00:13 +01:00
Ian
b51b3dfb59 simplify tb tweak in 77033ef
References #148
2014-11-26 10:52:32 +01:00
Ian
77033efcf4 move cke toolbar css tweaks to a better place
which also makes it independent from cke plugin file usage.

References #148
2014-11-26 10:14:23 +01:00
Ian
94f161359e fix note in 8eaffe4 2014-11-25 16:52:29 +01:00
Ian
8eaffe46fe better fb9414b 2014-11-25 16:40:18 +01:00
Ian
fb9414b9ae ckeditor extend more for serendipity
This hides the ckeditor image widget button by CSS in all supported Serendipity toolbars, but keeps it internal functionality enabled which is needed for MediaLibrary inserts.
This forces the user to use the specialized ML button for image inserts only, but will still be supported by CKE toolbar.
An Image double click will still use the image widget like before.
Best checked place was to put this in admin/style.css.

References 148
2014-11-25 14:27:16 +01:00
Ian
85ef7dafc4 Revert "no Umlauts note for image directories"
This reverts commit cb00982db944e49062e8bd4fed65dad1aabb49d5.
2014-11-25 09:42:17 +01:00
Ian
cb00982db9 no Umlauts note for image directories
References #236
2014-11-24 17:08:02 +01:00
Ian
92e56848cf fix input title categoryname 2014-11-24 14:58:51 +01:00
Ian
efe2303b23 extend 8da4c647a88241899f9d377eaa81c7b080406685
in blogger a strange editor was used to write the file
2014-11-24 14:30:49 +01:00
Ian
8da4c647a8 cleanup tabs and whites 2014-11-24 14:17:38 +01:00
Ian
6d7e2f44a3 better use stripos for system32 path excludes
References 325de34183499bac7517b7226c7f1996fdad18ae
2014-11-24 13:09:38 +01:00
Garvin Hicking
325de34183 Only remove "system32" and not paths like "imagemagicksystem32", we don't want to strip parts here that a user COULD possibly pick.
Also remove my check, because it's obsolete now.
2014-11-24 11:52:52 +01:00
Garvin Hicking
affa3a3638 Merge branch '2.0' of github.com:s9y/Serendipity into 2.0 2014-11-24 11:48:27 +01:00
Garvin Hicking
4d17c0ae02 Added SQLite3 OO layer, old one did not work for PHP 5.4+
PDO SQlite3 is preferrable though
2014-11-24 11:48:16 +01:00
Ian
9545fcbbc9 installer checks - remove unwanted empty or system32 path parts
and wrong system32/convert.exe path on WIN, which is not ImageMagick!
2014-11-24 11:43:27 +01:00
Garvin Hicking
2e1240ba22 1. Reject system32\convert.exe calls
2. Make mysqli be the selected default when installing (PHP at some point will deprected mysql, so better start now to advertise mysqli)
3. Prepare SQLite3 DB Layer
2014-11-24 11:26:44 +01:00
Garvin Hicking
73f417fe39 Check for ENT_HTML401 existance to make the patch work with PHP 5.3 2014-11-24 11:18:21 +01:00
Garvin Hicking
eab43b12f5 Adjust remaining htmlspecialchars() accordingly 2014-11-24 10:13:40 +01:00