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

4499 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Garvin Hicking
93e781048c * Make preview_iframe.tpl template files load the proper frontend 
CSS file, including cache-busting version string when changing
     themes

References #302
 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 #328
 2015-03-16 17:44:57 +01:00
Garvin Hicking
0fd299adf2 Merge branch 'master' of github.com:s9y/Serendipity 2015-03-16 17:42:44 +01:00
Garvin Hicking
5398e2f72a Let spartacus hook into cronjob plugin to mail plugin update notifications 2015-03-16 17:42:22 +01:00
Matthias Mees
6175559fda Change theme demo link to theme demo button 
References #314
 2015-03-16 17:03:11 +01:00
Matthias Mees
d41d949642 Suppress emitting quicksearch plugin in sidebar 
Next has a quicksearch widget in the header already.
 2015-03-16 16:46:27 +01:00
garvinhicking
0cce92d4d7 Add ability to preview demo themes in spartacus. 2015-03-16 14:31:34 +01:00
Garvin Hicking
9278c9e40c * Allow templatechooser plugin to read a custom "blacklist.txt" 
within its directory, that can blacklist certain themes from
     being selected.
 2015-03-16 14:13:55 +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
Ian
72f316712b fix cke_source code linebreak view for Mozillas 2015-03-16 11:08:42 +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
863db549f7 Add a space when styling is missing to not clutter output 2015-03-16 10:46:53 +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
Ian
325ea6de7b Revert "fix strange PHP parse error on subdomain usage" 
This reverts commit ffe581225caac600d6589ea2181ec1697e7a7db1.
 2015-03-15 13:00:18 +01:00
Ian
2947081b41 Revert "document" 
This reverts commit c705dddf8d769658fd44da498579840b76472273.
 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
onli
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
onli
73dc7a9225 ML: Show add-button in popup also when empty 2015-03-14 19:42:42 +01:00
Matthias Mees
9ad1dd9312 Add SEO meta elements to core templates 
References #310
 2015-03-14 12:41:56 +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
1062145b49 next ver 2015-03-12 20:35:12 +01:00
Garvin Hicking
0eab8c6efa release 2015-03-12 20:28:55 +01:00
Garvin Hicking
820ccc4709 document 2015-03-12 20:17:14 +01:00
Garvin Hicking
7c51555438 Modify if-statement 
References #324
 2015-03-12 20:13:01 +01:00
Matthias Mees
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
Garvin Hicking
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 5ee05f1143e57f5976e7502104c3fcf43e857d19 and 441bb6d56fe352804653c2c9bb8f47fc9e010ec5 (comments)
 2015-03-12 12:01:43 +01:00
Garvin Hicking
f5669177de Unify gravatar 2015-03-12 10:46:57 +01:00
Garvin Hicking
b76e117366 Unify gravatar 2015-03-12 10:46:34 +01:00
Garvin Hicking
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
Matthias Mees
d84cd93c57 Remove legacy CSS for template_preview 2015-03-11 17:50:43 +01:00
Garvin Hicking
5ee05f1143 We don't really need those files anymore. 2015-03-09 10:16:45 +01:00
onli
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
Garvin Hicking
811af79b16 should be truncated 2015-03-02 12:31:46 +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
Matthias Mees
6954db1843 Substitute inline styles with plainList class in syndication list 
References #285
 2015-02-23 23:46:14 +01:00
onli
e31078615b syndication: fix syntax error from ac7c8c07169b9fcaf3326be3537740e60aec962d 2015-02-23 23:19:22 +01:00
onli
ac7c8c0716 syndication: fix rel-url bug and enable plain textlink (#285) 2015-02-23 22:04:33 +01:00
Matthias Mees
b5b28450f3 Remove legacy div + styles from 2k11's preview 
References #307
 2015-02-22 21:13:09 +01:00
Matthias Mees
18f75f5e7c Document extra localStorage test 
References #306
 2015-02-18 15:27:01 +01:00