Skip to content

Commit

Permalink
Merge pull request #7 from nextcloud/shorten-changes
Browse files Browse the repository at this point in the history 
Update 14.0.0.xml
  • Loading branch information
@MorrisJobke
MorrisJobke authored Aug 22, 2018
2 parents e115a67 + 27c5dbf commit 89609d4
Show file tree
Hide file tree
Showing 10 changed files with 5,761 additions and 73 deletions.
30 changes: 14 additions & 16 deletions data/13.0.0.xml
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
<?xml version="1.0" encoding="utf-8" ?>
<release xmlns:xsi= "http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="../schema.xsd"
version="13.0.0">
<changelog href="https://nextcloud.com/changelog/#13-0-0"/>
<whatsNew lang="en">
<regular>
<item>Refined user interface</item>
<item>End-to-end Encryption</item>
<item>Video and Text Chat</item>
</regular>
<admin>
<item>Changes to the Nginx configuration</item>
<item>Theming: CSS files were consolidated</item>
</admin>
</whatsNew>
<?xml version="1.0" encoding="utf-8"?>
<release xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../schema.xsd" version="13.0.0">
<changelog href="https://nextcloud.com/changelog/#13-0-0"/>
<whatsNew lang="en">
<regular>
<item>Refined user interface</item>
<item>End-to-end Encryption</item>
<item>Video and Text Chat</item>
</regular>
<admin>
<item>Changes to the Nginx configuration</item>
<item>Theming: CSS files were consolidated</item>
</admin>
</whatsNew>
</release>
32 changes: 15 additions & 17 deletions data/14.0.0.xml
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
<?xml version="1.0" encoding="utf-8" ?>
<release xmlns:xsi= "http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="../schema.xsd"
version="14.0.0">
<changelog href="https://nextcloud.com/changelog/#14-0-0" />
<whatsNew lang="en">
<regular>
<item>Verify the identity of a share recipient in a video call; and 2FA with Signal &amp; Telegram</item>
<item>Add a note to shares, see pending &amp; deleted shares and search for files by content of comments</item>
<item>Accessibility improvements including dark &amp; high contrast themes and a dyslectic font</item>
</regular>
<admin>
<item>Improved GDPR compliance capabilities with terms &amp; conditions app and separate audit log</item>
<item>Next generation of federated, cross-cloud sharing collaboration: Federation 2.0</item>
<item>Swiftv3 auth support, logging to systemd, Kerberos auth to Samba &amp; multi-IdP SAML</item>
</admin>
</whatsNew>
<?xml version="1.0" encoding="utf-8"?>
<release xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../schema.xsd" version="14.0.0">
<changelog href="https://nextcloud.com/changelog/#14-0-0"/>
<whatsNew lang="en">
<regular>
<item>Verify a share recipient in a video call; 2FA with Signal &amp; Telegram</item>
<item>Add a note to shares; extended share views; search by comments</item>
<item>Accessibility improvements including high contrast theme</item>
</regular>
<admin>
<item>Requires PHP &gt;= 7.0, log format, syslog tag &amp; nginx config changed</item>
<item>Improved GDPR compliance through apps; separate audit log</item>
<item>Kerberos auth to Samba; multi-IdP SAML</item>
</admin>
</whatsNew>
</release>
72 changes: 34 additions & 38 deletions tests/integration/features/whatsNew.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,44 +21,42 @@ Feature: testing the response of the Changelog Server
Given the version of interest is "13.0.0"
When the request is sent
Then the return code is "200"
And the received Etag is "eb7e047b4d0f16fc6de0859abc74a3f1"
And the received Etag is "3fb8717553d719e65caa0eafcee0b191"
And the response is
"""
<?xml version="1.0" encoding="utf-8" ?>
<release xmlns:xsi= "http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="../schema.xsd"
version="13.0.0">
<changelog href="https://nextcloud.com/changelog/#13-0-0"/>
<whatsNew lang="en">
<regular>
<item>Refined user interface</item>
<item>End-to-end Encryption</item>
<item>Video and Text Chat</item>
</regular>
<admin>
<item>Changes to the Nginx configuration</item>
<item>Theming: CSS files were consolidated</item>
</admin>
</whatsNew>
<?xml version="1.0" encoding="utf-8"?>
<release xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../schema.xsd" version="13.0.0">
<changelog href="https://nextcloud.com/changelog/#13-0-0"/>
<whatsNew lang="en">
<regular>
<item>Refined user interface</item>
<item>End-to-end Encryption</item>
<item>Video and Text Chat</item>
</regular>
<admin>
<item>Changes to the Nginx configuration</item>
<item>Theming: CSS files were consolidated</item>
</admin>
</whatsNew>
</release>
"""

Scenario: Request against a valid version, expecting info
Given the version of interest is "14.0.0"
When the request is sent
Then the return code is "200"
And the received Etag is "86fbfac10d9dfc51b82acec847d2ae58"
And the received Etag is "1cb8496aba7de138528af2206fddaf35"

Scenario: Request against a valid version with matching an valid etag
Given the version of interest is "13.0.0"
And the known Etag is "eb7e047b4d0f16fc6de0859abc74a3f1"
And the known Etag is "3fb8717553d719e65caa0eafcee0b191"
When the request is sent
Then the return code is "304"
And the response is empty

Scenario: Request against a valid version with matching an valid etag
Given the version of interest is "14.0.0"
And the known Etag is "86fbfac10d9dfc51b82acec847d2ae58"
And the known Etag is "1cb8496aba7de138528af2206fddaf35"
When the request is sent
Then the return code is "304"
And the response is empty
Expand All @@ -68,31 +66,29 @@ Feature: testing the response of the Changelog Server
And the known Etag is "abcdefabcdef00011122233344455566"
When the request is sent
Then the return code is "200"
And the received Etag is "86fbfac10d9dfc51b82acec847d2ae58"
And the received Etag is "1cb8496aba7de138528af2206fddaf35"

Scenario: Request against a valid version with outdated etag
Given the version of interest is "13.0.0"
And the known Etag is "abcdefabcdef00011122233344455566"
When the request is sent
Then the return code is "200"
And the received Etag is "eb7e047b4d0f16fc6de0859abc74a3f1"
And the received Etag is "3fb8717553d719e65caa0eafcee0b191"
And the response is
"""
<?xml version="1.0" encoding="utf-8" ?>
<release xmlns:xsi= "http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="../schema.xsd"
version="13.0.0">
<changelog href="https://nextcloud.com/changelog/#13-0-0"/>
<whatsNew lang="en">
<regular>
<item>Refined user interface</item>
<item>End-to-end Encryption</item>
<item>Video and Text Chat</item>
</regular>
<admin>
<item>Changes to the Nginx configuration</item>
<item>Theming: CSS files were consolidated</item>
</admin>
</whatsNew>
<?xml version="1.0" encoding="utf-8"?>
<release xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../schema.xsd" version="13.0.0">
<changelog href="https://nextcloud.com/changelog/#13-0-0"/>
<whatsNew lang="en">
<regular>
<item>Refined user interface</item>
<item>End-to-end Encryption</item>
<item>Video and Text Chat</item>
</regular>
<admin>
<item>Changes to the Nginx configuration</item>
<item>Theming: CSS files were consolidated</item>
</admin>
</whatsNew>
</release>
"""
2 changes: 1 addition & 1 deletion vendor/composer/ClassLoader.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ private function findFileWithExtension($class, $ext)
$subPath = $class;
while (false !== $lastPos = strrpos($subPath, '\\')) {
$subPath = substr($subPath, 0, $lastPos);
$search = $subPath.'\\';
$search = $subPath . '\\';
if (isset($this->prefixDirsPsr4[$search])) {
$pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
foreach ($this->prefixDirsPsr4[$search] as $dir) {
Expand Down
Loading

0 comments on commit 89609d4

Please sign in to comment.