1467 Commits

Author SHA1 Message Date
onli
fcab850687 remove unused pregenerate entry function 2015-07-26 18:37:45 +02:00
onli
6c561a6875 fix multi_cat, remove track_referrer 2015-07-26 18:15:22 +02:00
onli
9173e046e5 start indexCleanup: move code to functions_routing 2015-07-26 17:53:49 +02:00
Garvin Hicking
00be5d7b4c Security fixes from Tim Coen (file upload, comment token escaping, 2k11 js comment name escaping) 2015-07-24 13:27:21 +02:00
Ian
86ab8c62b1 uff 2015-07-13 14:34:57 +02:00
Ian
e6cab58414 change SET NAMES to mysqli_set_charset and fix a bug in 2cd condition 2015-07-09 12:33:31 +02:00
Ian
2f06e28f23 use recommended mysqli_set_charset 2015-07-08 11:01:20 +02:00
Ian
9efb1665ad fix missing db object 2015-07-07 18:01:10 +02:00
Ian
755fe60075 check array to avoid errors 2015-07-07 09:36:46 +02:00
Stefan Möding
241f223536 Fix column quotes for INSERT statement 2015-07-04 21:07:43 +02:00
Ian
13775ba4b2 fix mysqli importer conversion param order change 2015-07-04 11:11:11 +02:00
Ian
c6031dc1dc remove $Ids$ 2015-07-03 17:18:23 +02:00
Ian
4a0c591657 fix importers to use new mysqli API extension
References http://board.s9y.org/viewtopic.php?f=10&t=20421

Is somwone able to test this here and there?
2015-07-03 17:14:29 +02:00
Ian
171a501cb5 correct 0a1cb87 2015-06-17 10:13:50 +02:00
onli
bb2c5a63d0 Cleanup syndication fixed ()
cleans 97d9f5ce310ad05aea3494dcf84253bc3b6a7392
2015-06-16 21:56:04 +02:00
Ian
0a1cb87151 prep for downgrade of Smarty update 2015-06-16 12:37:08 +02:00
Ian
1b1a130e38 document better multiple nugget example gratia plugin
contactform will probably change, when this fixes are out.
2015-06-01 16:51:28 +02:00
Ian
1e6fda11e7 emit multiple nuggets for core JS-Editor
and only use Spawnnuggets if exist.

This is for multi-nugget-textareas, not using the wysiwyg* event hooks, eg contactform plugin < v.1.17
2015-06-01 14:34:18 +02:00
onli
0125f1539e Use internal cache to speedup printEntries & fetchEntries () 2015-05-30 01:23:57 +02:00
Garvin Hicking
5056cd6409 added ifModule checks 2015-05-22 09:40:00 +02:00
Ian
a1854d4567 disable unused var 2015-05-01 14:29:09 +02:00
Ian
e5f1364bda add another removed file to upgrader 2015-05-01 12:40:12 +02:00
onli
90a4b95b61 Move showMediaToolbar to 1. personal settings, add docu () 2015-04-04 17:32:21 +02:00
Garvin Hicking
6fdde3a251 remove file in array 2015-04-01 12:22:57 +02:00
Thomas Hochstein
63786a41c2 Really fix concatenation of entry body for full feed
Commit 70c4ce8e406a6a3088f0f2485a9af21c68033589 will need double quotes around \n ...

See  for context.
2015-03-29 21:50:52 +02:00
Matthias Gutjahr
70c4ce8e40 Fix concatenation of entry body for full feed
When requesting a (RSS) feed response, the extended body is added to the entry body. The separating charcter has been changed from a space to a newline because some plugins like Markdown or Textile could not parse the first line of the extended body correctly.

Fixes: 
Related: http://board.s9y.org/viewtopic.php?f=10&t=20331
2015-03-29 21:11:18 +02:00
onli
b73eb367f2 Prevent negative offset () 2015-03-27 00:00:10 +01:00
onli
9032f24f4b Show rescale in ML-popup when toolbar is active () 2015-03-26 23:55:22 +01:00
Garvin Hicking
e7d822be11 Things I noticed for s9y.github.io 2015-03-19 16:17:30 +01:00
Garvin Hicking
5f14b67e66 Things I noted during configuration 2015-03-19 16:08:39 +01:00
Garvin Hicking
93e781048c * Make preview_iframe.tpl template files load the proper frontend
CSS file, including cache-busting version string when changing
     themes

References 
2015-03-18 13:32:14 +01:00
Ian
8b863d5370 fix 2.0.2 upgrader resting dirs removal 2015-03-17 08:39:02 +01:00
Garvin Hicking
2970ac60a6 patch by @fugue88 for shared installs
references 
2015-03-16 17:44:57 +01:00
garvinhicking
0cce92d4d7 Add ability to preview demo themes in spartacus. 2015-03-16 14:31:34 +01:00
Garvin Hicking
98cd0e0541 fix 2015-03-16 14:07:24 +01:00
Garvin Hicking
5f59a811e8 Allow to set custom cookie validity.
Will be needed for blog.s9y.org templatechooser, which is why I need it in 2.0.1
2015-03-16 13:58:52 +01:00
Ian
104122925b fix slash 2015-03-16 12:33:25 +01:00
Ian
31e58ff044 some more dead removals 2015-03-16 12:29:17 +01:00
Garvin Hicking
6b81f519e7 Also add a var for comments limit 2015-03-16 11:14:27 +01:00
Garvin Hicking
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
Garvin Hicking
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
Garvin Hicking
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
Garvin Hicking
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
Garvin Hicking
7c51555438 Modify if-statement
References 
2015-03-12 20:13:01 +01:00
Ian
a2c77619dc extend 2.0.1 removal list
see 5ee05f1143e57f5976e7502104c3fcf43e857d19 and 441bb6d56fe352804653c2c9bb8f47fc9e010ec5 (comments)
2015-03-12 12:01:43 +01:00
onli
75397c7d47 Remove $p == 1 search wildcard requirement ()
The bug meant to be fixed in 51208e0f72 (diff-cbbd600f627a5af39c73092fbc3fbf46) is not reproducible anymore
2015-03-07 11:55:37 +01: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
onli
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
Garvin Hicking
3605937049 Fix Issue 2015-02-11 14:28:14 +01:00