110 Commits

Author SHA1 Message Date
onli
2d7947eb93 Add cache activation to configuration (closes #345) 2016-01-15 14:40:51 +01:00
onli
d5398e4691 Move to -alpha3 to signal that the last security upgrade is integrated 2016-01-04 16:03:32 +01:00
Ian
0047140dcc set use_autosave in backend only 2015-08-14 18:15:31 +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
onli
0125f1539e Use internal cache to speedup printEntries & fetchEntries (#345) 2015-05-30 01:23:57 +02:00
Garvin Hicking
5985577fbe Use "secure" flag on SSL connections, thanks to dayton967 2015-03-22 00:41:37 +01:00
Garvin Hicking
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
Ian
9ed46b892f enhance error reporting 2015-01-20 17:07:58 +01:00
Garvin Hicking
2c7a00aaad Use master as development for 2.1
See board for explanation (coming up)
2015-01-20 10:05:42 +01:00
Garvin Hicking
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
garvinhicking
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
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
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
Ian
aca77bd482 cleanup cosmetics 2014-12-10 14:34:54 +01:00
Garvin Hicking
21b277bd1c Add missing i18n constants
prepare rc1
2014-11-29 11:59:47 +01:00
Garvin Hicking
9944cbb0a7 Make PAT_JS mod_rewrite pattern be recognized to .htaccess to prevent ErrorLog entries for looking up such URLs.
Bumps version to beta6 and will recreate .htaccess file
2014-11-02 15:20:21 +01:00
onli
3d569bf02e upgrade-task: remove dashboard and autosave (#71) 2014-09-28 15:35:12 +02:00
Garvin Hicking
5c12922510 Personal preferene for autosave
References #213
2014-09-09 14:34:46 +02:00
Garvin Hicking
da82fd3a16 support imagemagick thumb parameters, slightly reworked
references pull request #205
2014-09-09 13:58:09 +02:00
Garvin Hicking
2217826e56 pre next 2014-07-25 10:47:37 +02:00
Garvin Hicking
da1bf30532 Prepare beta3 for tomorrow. Speak up if you see anything against this. 2014-07-24 11:06:20 +02:00
Garvin Hicking
eb07593088 Change logger to only be instantiated when explicitly enabled to not cause unneccessary debugging
especially in dev-installations
References #131
2014-05-19 11:12:47 +02:00
onli
7d267fa13d Make Log-Level configurable (#131) 2014-05-17 00:39:07 +02:00
Garvin Hicking
dd83225447 This is my proposal on implementing the ability to switch frontend and backend templates independently.
- This introduces a new option "template_backend" that will be set to indicate the backend template, defaults to 2k11.
- The "Engine: xxx" line in info.txt still works, but only for the frontend
- The frontend fallback chain defaults to the old "default" template to ensure that themes will work that have "old-style" HTML output
- The backend fallback chain only falls back to 2k11 and then "default"
- In the future, we will remove templates/default/admin once the mechanism is proven stable

To test this in all cases you can:

- Copy 2k11/ to 2k11-custom, edit info.txt, give it a distinct name. Edit the admin/index.tpl file to add some code to ensure that you will see that template in the backend if you pick it, or adjust the style.css or whatever.
- Copy idea/ to idea-custom, edit info.txt, add a "Engine: 2k11" line. Now you can test how a template would look like that fallsback on 2k11 instead of "default"

Those permutations can be checked and come to my mind:

- Backend: 2k11, Frontend: 2k11
- Backend: 2k11-custom, Frontend: 2k11
- Backend: 2k11, Frontend: 2k11-custom

- Backend: 2k11, Frontend: idea
- Backend: 2k11, Frontend: idea-custom

- Backend: 2k11-custom, Frontend: idea
- Backend: 2k11-custom, Frontend: idea-custom

They seem to work.

Currently the display of backend and frontend theme in templates.inc.tpl takes up some larger space. Maybe it could be prettified somehow, maybe put frontend and backend template next to each other, not beneath each other? Maybe @yellowled has some suggestions.

@onli and @ophian - please have a look at this, since you both also worked on the fallback chains. Please tell me if you have issues with this. We can easily revert, if you see this approach as not workable. This is more a "proof of concept" draft.
2014-05-14 12:58:06 +02:00
onli
09400814d2 Include klogger, enable for trackbacks and index 2014-05-12 20:03:34 +02:00
Garvin Hicking
6489cf7bf8 to the future 2014-04-15 11:01:53 +02:00
Garvin Hicking
5660f461e0 backdate 2014-04-15 00:13:03 +02:00
Garvin Hicking
a42a7a8f00 Well, this will surely come... - hopefully rather later than earlier ;) 2014-04-14 09:27:09 +02:00
Garvin Hicking
178371eed6 Prepare release 2014-04-08 09:22:30 +02:00
Ian
1a72f3a8b8 set alpha4 version
References #72 upgrade part
2014-03-18 09:02:50 +01:00
onli
7f4dbb3e2e Include JS in installer and upgrader
This should fix issue #80 by giving serendipity_editor.js of default to the
installer and  the normal template JS to the upgrader
2014-03-09 16:00:38 +01:00
Ian
179f6a19d6 fix upgraders generating content of js files
References #80
2014-03-08 09:38:59 +01:00
garvinhicking
df92e08671 provide upgrader task for plugin upgrade 2014-02-10 15:12:56 +01:00
Ian
0b1aeddc31 Automatic upgrade removal of old Smarty2 files (2.0-alpha2) 2013-10-01 18:58:56 +02:00
Matthias Gutjahr
1dd627c9c3 Fixed wrong variable name 2013-09-06 14:29:46 +02:00
Matthias Gutjahr
5267970499 Added CLI check required for Metatron 2013-09-06 14:23:34 +02:00
onli
83ddeca71a bundled-libs, not _libs 2013-08-18 15:02:20 +02:00
onli
e63be19fe5 add composer autoloader and libs 2013-08-18 12:46:45 +02:00
onli
d80a8334c8 Use return instead of echo in the remaining core
Debug-messages still may use echo, and some functions in functions_image and trackback still use it to generate progress messages, which should get cleaned up as well but is not that urgent
2013-07-05 19:16:11 +02:00
onli
ae74401668 2k11 is default template, included admin-tpls, and made it installable 2013-05-30 22:19:07 +02:00
Garvin Hicking
53ea38aa3c Port from master 2013-01-21 10:06:09 +01:00
Garvin Hicking
9adcfecc38 More PHP5 compatibility (this constructor thing order did not remove the error for me)
Also be able to set $serendipity['production'] in serendipity_config_local.inc.php
2012-10-18 10:14:04 +02:00
Ian
ea66e5b89f fixed tabs 2012-07-01 18:22:39 +02:00
Garvin Hicking
f12f53aaab Damn, why does cherry picking not work? 2012-06-12 20:51:57 +02:00
Garvin Hicking
d7ef7a7a04 port everything so that 2.0 and 1.7 have the same features 2012-06-12 19:39:11 +02:00
Garvin Hicking
04792e998a port 2012-04-11 21:03:55 +02:00
Ian
1cf5309deb set correct version 2012-04-10 15:13:53 +02:00
Ian
ee116ee460 some more tweaking to the errorToExceptionHandler 2011-12-08 19:21:24 +01:00
Ian
c2afd4efc0 moved custom errorHandler to avoid XML Feed declaring and callback errors 2011-12-06 12:36:03 +01:00