[Pkg-owncloud-commits] [php-sabredav] 63/66: Merge branch '2.1'
David Prévot
taffit at moszumanska.debian.org
Wed May 27 13:56:59 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to tag 3.0.0-alpha1
in repository php-sabredav.
commit 4a6b73cf5fbef9b24278ebc48392edb529393550
Merge: ccf7e7f 809033f
Author: Evert Pot <me at evertpot.com>
Date: Tue May 19 13:50:17 2015 +0300
Merge branch '2.1'
CHANGELOG.md | 7 +++++++
lib/DAV/Browser/Plugin.php | 4 ++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --cc CHANGELOG.md
index 12477a7,cec7cf7..762e9d4
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -1,105 -1,13 +1,112 @@@
ChangeLog
=========
+3.0.0-alpha1 (2015-05-19)
+-------------------------
+
+* It's now possible to get all property information from files using the
+ browser plugin.
+* Browser plugin will now show a 'calendar export' button when the
+ ics-export plugin is enabled.
+* Some nodes that by default showed the current time as their last
+ modification time, now no longer has a last modification time.
+* CardDAV namespace was missing from default namespaceMap.
+* #646: Properties can now control their own HTML output in the browser plugin.
+* #646: Nicer HTML output for the `{DAV:}acl` property.
+* Browser plugin no longer shows a few properties that take up a lot of space,
+ but are likely not really interesting for most users.
+* #654: Added a collection, `Sabre\DAVACL\FS\HomeCollection` for automatically
+ creating a private home collection per-user.
+* Changed all MySQL columns from `VARCHAR` to `VARBINARY` where possible.
+* Improved older migration scripts a bit to allow easier testing.
+* The zip release ships with [sabre/vobject 3.4.3][vobj],
+ [sabre/http 4.0.0-alpha3][http], [sabre/event 2.0.22][evnt],
+ [sabre/uri 1.0.1][uri] and [sabre/xml 0.4.3][xml].
+
+
+2.2.0-alpha4 (2015-04-13)
+-------------------------
+
+* Complete rewrite of the XML system. We now use our own [sabre/xml][xml],
+ which has a much smarter XML Reader and Writer.
+* BC Break: It's no longer possible to instantiate the Locks plugin without
+ a locks backend. I'm not sure why this ever made sense.
+* Simplified the Locking system and fixed a bug related to if tokens checking
+ locks unrelated to the current request.
+* `FSExt` Directory and File no longer do custom property storage. This
+ functionality is already covered pretty well by the `PropertyStorage` plugin,
+ so please switch.
+* Renamed `Sabre\CardDAV\UserAddressBooks` to `Sabre\CardDAV\AddressBookHome`
+ to be more consistent with `CalendarHome` as well as the CardDAV
+ specification.
+* `Sabre\DAV\IExtendedCollection` now receives a `Sabre\DAV\MkCol` object as
+ its second argument, and no longer receives seperate properties and
+ resourcetype arguments.
+* `MKCOL` now integrates better with propertystorage plugins.
+* The zip release ships with [sabre/vobject 3.4.2][vobj],
+ [sabre/http 4.0.0-alpha1][http], [sabre/event 2.0.1][evnt],
+ [sabre/uri 1.0.0][uri] and [sabre/xml 0.4.3][xml].
+
+
+2.2.0-alpha3 (2015-02-25)
+-------------------------
+
+* Contains all the changes introduced between 2.1.2 and 2.1.3.
+* The zip release ships with [sabre/vobject 3.4.2][vobj],
+ [sabre/http 4.0.0-alpha1][http], [sabre/event 2.0.1][evnt] and
+ [sabre/uri 1.0.0][uri].
+
+
+2.2.0-alpha2 (2015-01-09)
+-------------------------
+
+* Renamed `Sabre\DAV\Auth\Backend\BackendInterface::requireAuth` to
+ `challenge`, which is a more correct and better sounding name.
+* The zip release ships with [sabre/vobject 3.3.5][vobj],
+ [sabre/http 3.0.4][http], [sabre/event 2.0.1][evnt].
+
+
+2.2.0-alpha1 (2014-12-10)
+-------------------------
+
+* The browser plugin now has a new page with information about your sabredav
+ server, and shows information about every plugin that's loaded in the
+ system.
+* #191: The Authentication system can now support multiple authentication
+ backends.
+* Removed: all `$tableName` arguments from every PDO backend. This was already
+ deprecated, but has now been fully removed. All of these have been replaced
+ with public properties.
+* Deleted several classes that were already deprecated much earlier:
+ * `Sabre\CalDAV\CalendarRootNode`
+ * `Sabre\CalDAV\UserCalendars`
+ * `Sabre\DAV\Exception\FileNotFound`
+ * `Sabre\DAV\Locks\Backend\FS`
+ * `Sabre\DAV\PartialUpdate\IFile`
+ * `Sabre\DAV\URLUtil`
+* Removed: `Sabre\DAV\Client::addTrustedCertificates` and
+ `Sabre\DAV\Client::setVerifyPeer`.
+* Removed: `Sabre\DAV\Plugin::getPlugin()` can now no longer return plugins
+ based on its class name.
+* Removed: `Sabre\DAVACL\Plugin::getPrincipalByEmail()`.
+* #560: GuessContentType plugin will now set content-type to
+ `application/octet-stream` if a better content-type could not be determined.
+* #568: Added a `componentType` argument to `ICSExportPlugin`, allowing you to
+ specifically fetch `VEVENT`, `VTODO` or `VJOURNAL`.
+* #582: Authentication backend interface changed to be stateless. If you
+ implemented your own authentication backend, make sure you upgrade your class
+ to the latest API!
+* #582: `Sabre\DAV\Auth\Plugin::getCurrentUser()` is now deprecated. Use
+ `Sabre\DAV\Auth\Plugin::getCurrentPrincipal()` instead.
+
+
+ 2.1.4 (2015-??-??)
+ ------------------
+
+ * #651: Double-encoded path in the browser plugin. Should fix a few broken
+ links in some setups.
+
+
2.1.3 (2015-02-25)
------------------
diff --cc lib/DAV/Browser/Plugin.php
index 9fb97f5,4573c2d..fa96968
--- a/lib/DAV/Browser/Plugin.php
+++ b/lib/DAV/Browser/Plugin.php
@@@ -376,99 -334,6 +376,99 @@@ class Plugin extends DAV\ServerPlugin
}
/**
+ * Generates the 'plugins' page.
+ *
+ * @return string
+ */
+ function generatePluginListing() {
+
+ $html = $this->generateHeader('Plugins');
+
+ $html.="<section><h1>Plugins</h1>";
+ $html.="<table class=\"propTable\">";
+ foreach($this->server->getPlugins() as $plugin) {
+ $info = $plugin->getPluginInfo();
+ $html.='<tr><th>' . $info['name'] . '</th>';
+ $html.='<td>' . $info['description'] . '</td>';
+ $html.='<td>';
+ if (isset($info['link']) && $info['link']) {
+ $html.='<a href="' . $this->escapeHTML($info['link']) . '"><span class="oi" data-glyph="book"></span></a>';
+ }
+ $html.='</td></tr>';
+ }
+ $html.="</table>";
+ $html.="</section>";
+
+ /* Start of generating actions */
+
+ $html.=$this->generateFooter();
+
+ return $html;
+
+ }
+
+ function generateHeader($title, $path = null) {
+
+ $version = DAV\Version::VERSION;
+
+ $vars = [
+ 'title' => $this->escapeHTML($title),
+ 'favicon' => $this->escapeHTML($this->getAssetUrl('favicon.ico')),
+ 'style' => $this->escapeHTML($this->getAssetUrl('sabredav.css')),
+ 'iconstyle' => $this->escapeHTML($this->getAssetUrl('openiconic/open-iconic.css')),
+ 'logo' => $this->escapeHTML($this->getAssetUrl('sabredav.png')),
+ 'baseUrl' => $this->server->getBaseUri(),
+ ];
+
+ $html = <<<HTML
+<!DOCTYPE html>
+<html>
+<head>
+ <title>$vars[title] - sabre/dav $version</title>
+ <link rel="shortcut icon" href="$vars[favicon]" type="image/vnd.microsoft.icon" />
+ <link rel="stylesheet" href="$vars[style]" type="text/css" />
+ <link rel="stylesheet" href="$vars[iconstyle]" type="text/css" />
+
+</head>
+<body>
+ <header>
+ <div class="logo">
+ <a href="$vars[baseUrl]"><img src="$vars[logo]" alt="sabre/dav" /> $vars[title]</a>
+ </div>
+ </header>
+
+ <nav>
+HTML;
+
+ // If the path is empty, there's no parent.
+ if ($path) {
+ list($parentUri) = URLUtil::splitPath($path);
- $fullPath = URLUtil::encodePath($this->server->getBaseUri() . $parentUri);
++ $fullPath = $this->server->getBaseUri() . URLUtil::encodePath($parentUri);
+ $html.='<a href="' . $fullPath . '" class="btn">⇤ Go to parent</a>';
+ } else {
+ $html.='<span class="btn disabled">⇤ Go to parent</span>';
+ }
+
+ $html.= ' <a href="?sabreAction=plugins" class="btn"><span class="oi" data-glyph="puzzle-piece"></span> Plugins</a>';
+
+ $html.="</nav>";
+
+ return $html;
+
+ }
+
+ function generateFooter() {
+
+ $version = DAV\Version::VERSION;
+ return <<<HTML
+<footer>Generated by SabreDAV $version (c)2007-2015 <a href="http://sabre.io/">http://sabre.io/</a></footer>
+</body>
+</html>
+HTML;
+
+ }
+
+ /**
* This method is used to generate the 'actions panel' output for
* collections.
*
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabredav.git
More information about the Pkg-owncloud-commits
mailing list