summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2016-08-08 18:05:33 +0200
committerGitHub <noreply@github.com>2016-08-08 18:05:33 +0200
commit97c8232b9f87146e0d7cf9da8696979489329eca (patch)
treecb3a63a3544bff6c1d254493abf0c13e7afb9a5a
parent70eef2a82e1f7a08e8783af16927c21e59d71ccb (diff)
parente7b515582a556e58daafa75b76a5290f9ec5899e (diff)
downloadnextcloud-server-97c8232b9f87146e0d7cf9da8696979489329eca.tar.gz
nextcloud-server-97c8232b9f87146e0d7cf9da8696979489329eca.zip
Merge pull request #739 from nextcloud/increment-versions-master
Increment the versions and adjust the capitilization
-rw-r--r--apps/admin_audit/appinfo/info.xml1
-rw-r--r--apps/comments/appinfo/info.xml2
-rw-r--r--apps/dav/appinfo/info.xml2
-rw-r--r--apps/encryption/lib/Controller/StatusController.php6
-rw-r--r--apps/encryption/templates/settings-admin.php2
-rw-r--r--apps/encryption/templates/settings-personal.php2
-rw-r--r--apps/federatedfilesharing/appinfo/info.xml4
-rw-r--r--apps/federation/appinfo/info.xml2
-rw-r--r--apps/files_external/appinfo/info.xml2
-rw-r--r--apps/files_sharing/appinfo/info.xml4
-rw-r--r--apps/files_trashbin/appinfo/info.xml2
-rw-r--r--apps/provisioning_api/appinfo/info.xml2
-rw-r--r--apps/systemtags/appinfo/info.xml2
-rw-r--r--apps/testing/appinfo/info.xml2
-rw-r--r--apps/theming/appinfo/info.xml2
-rw-r--r--apps/updatenotification/appinfo/info.xml2
-rw-r--r--apps/user_ldap/appinfo/info.xml2
-rw-r--r--apps/workflowengine/appinfo/info.xml4
-rw-r--r--build/integration/features/provisioning-v1.feature1
19 files changed, 22 insertions, 24 deletions
diff --git a/apps/admin_audit/appinfo/info.xml b/apps/admin_audit/appinfo/info.xml
index d651fd037d3..0da8b115dc8 100644
--- a/apps/admin_audit/appinfo/info.xml
+++ b/apps/admin_audit/appinfo/info.xml
@@ -14,5 +14,4 @@
<types>
<logging/>
</types>
- <default_enable/>
</info>
diff --git a/apps/comments/appinfo/info.xml b/apps/comments/appinfo/info.xml
index 2bd28dd8954..39584694e23 100644
--- a/apps/comments/appinfo/info.xml
+++ b/apps/comments/appinfo/info.xml
@@ -6,7 +6,7 @@
<licence>AGPL</licence>
<author>Arthur Schiwon, Vincent Petry</author>
<default_enable/>
- <version>1.0.0</version>
+ <version>1.1.0</version>
<dependencies>
<owncloud min-version="9.2" max-version="9.2" />
</dependencies>
diff --git a/apps/dav/appinfo/info.xml b/apps/dav/appinfo/info.xml
index e2ffd249c33..19b65d84327 100644
--- a/apps/dav/appinfo/info.xml
+++ b/apps/dav/appinfo/info.xml
@@ -5,7 +5,7 @@
<description>WebDAV endpoint</description>
<licence>AGPL</licence>
<author>owncloud.org</author>
- <version>1.0.0</version>
+ <version>1.1.0</version>
<default_enable/>
<types>
<filesystem/>
diff --git a/apps/encryption/lib/Controller/StatusController.php b/apps/encryption/lib/Controller/StatusController.php
index a508c3c6b72..6882475e972 100644
--- a/apps/encryption/lib/Controller/StatusController.php
+++ b/apps/encryption/lib/Controller/StatusController.php
@@ -73,18 +73,18 @@ class StatusController extends Controller {
case Session::INIT_EXECUTED:
$status = 'interactionNeeded';
$message = (string)$this->l->t(
- 'Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files.'
+ 'Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files.'
);
break;
case Session::NOT_INITIALIZED:
$status = 'interactionNeeded';
$message = (string)$this->l->t(
- 'Encryption App is enabled but your keys are not initialized, please log-out and log-in again'
+ 'Encryption app is enabled but your keys are not initialized, please log-out and log-in again'
);
break;
case Session::INIT_SUCCESSFUL:
$status = 'success';
- $message = (string)$this->l->t('Encryption App is enabled and ready');
+ $message = (string)$this->l->t('Encryption app is enabled and ready');
}
return new DataResponse(
diff --git a/apps/encryption/templates/settings-admin.php b/apps/encryption/templates/settings-admin.php
index 9804db045cd..5c551267ff5 100644
--- a/apps/encryption/templates/settings-admin.php
+++ b/apps/encryption/templates/settings-admin.php
@@ -7,7 +7,7 @@ style('encryption', 'settings-admin');
?>
<form id="ocDefaultEncryptionModule" class="sub-section">
<?php if(!$_["initStatus"]): ?>
- <?php p($l->t("Encryption App is enabled but your keys are not initialized, please log-out and log-in again")); ?>
+ <?php p($l->t("Encryption app is enabled but your keys are not initialized, please log-out and log-in again")); ?>
<?php else: ?>
<p id="encryptHomeStorageSetting">
<input type="checkbox" class="checkbox" name="encrypt_home_storage" id="encryptHomeStorage"
diff --git a/apps/encryption/templates/settings-personal.php b/apps/encryption/templates/settings-personal.php
index aba350ea4b6..b92a9a19723 100644
--- a/apps/encryption/templates/settings-personal.php
+++ b/apps/encryption/templates/settings-personal.php
@@ -5,7 +5,7 @@ script('encryption', 'settings-personal');
script('core', 'multiselect');
?>
<form id="ocDefaultEncryptionModule" class="section">
- <h2><?php p($l->t('basic encryption module')); ?></h2>
+ <h2><?php p($l->t('Basic encryption module')); ?></h2>
<?php if ($_["initialized"] === \OCA\Encryption\Session::NOT_INITIALIZED ): ?>
diff --git a/apps/federatedfilesharing/appinfo/info.xml b/apps/federatedfilesharing/appinfo/info.xml
index 711ee091d8f..2a80bd54da3 100644
--- a/apps/federatedfilesharing/appinfo/info.xml
+++ b/apps/federatedfilesharing/appinfo/info.xml
@@ -1,11 +1,11 @@
<?xml version="1.0"?>
<info>
<id>federatedfilesharing</id>
- <name>Federated File Sharing</name>
+ <name>Federated file sharing</name>
<description>Provide federated file sharing across servers</description>
<licence>AGPL</licence>
<author>Bjoern Schiessle, Roeland Jago Douma</author>
- <version>1.0.0</version>
+ <version>1.1.0</version>
<namespace>FederatedFileSharing</namespace>
<category>other</category>
<dependencies>
diff --git a/apps/federation/appinfo/info.xml b/apps/federation/appinfo/info.xml
index 55491f38b55..b8d697a4db2 100644
--- a/apps/federation/appinfo/info.xml
+++ b/apps/federation/appinfo/info.xml
@@ -5,7 +5,7 @@
<description>Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing.</description>
<licence>AGPL</licence>
<author>Bjoern Schiessle</author>
- <version>1.0.0</version>
+ <version>1.1.0</version>
<namespace>Federation</namespace>
<category>other</category>
<dependencies>
diff --git a/apps/files_external/appinfo/info.xml b/apps/files_external/appinfo/info.xml
index e8bf11498ae..43f06d60843 100644
--- a/apps/files_external/appinfo/info.xml
+++ b/apps/files_external/appinfo/info.xml
@@ -13,7 +13,7 @@
<admin>admin-external-storage</admin>
</documentation>
<rememberlogin>false</rememberlogin>
- <version>1.0.0</version>
+ <version>1.1.0</version>
<types>
<filesystem/>
</types>
diff --git a/apps/files_sharing/appinfo/info.xml b/apps/files_sharing/appinfo/info.xml
index 240b5e61933..133119feabd 100644
--- a/apps/files_sharing/appinfo/info.xml
+++ b/apps/files_sharing/appinfo/info.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<info>
<id>files_sharing</id>
- <name>Share Files</name>
+ <name>File sharing</name>
<description>
This application enables users to share files within ownCloud. If enabled, the admin can choose which groups can share files. The applicable users can then share files and folders with other users and groups within ownCloud. In addition, if the admin enables the share link feature, an external link can be used to share files with other users outside of ownCloud. Admins can also enforce passwords, expirations dates, and enable server to server sharing via share links, as well as sharing from mobile devices.
Turning the feature off removes shared files and folders on the server for all share recipients, and also on the sync clients and mobile apps. More information is available in the ownCloud Documentation.
@@ -10,7 +10,7 @@ Turning the feature off removes shared files and folders on the server for all s
<licence>AGPL</licence>
<author>Michael Gapczynski, Bjoern Schiessle</author>
<default_enable/>
- <version>1.0.0</version>
+ <version>1.1.0</version>
<types>
<filesystem/>
</types>
diff --git a/apps/files_trashbin/appinfo/info.xml b/apps/files_trashbin/appinfo/info.xml
index 2b19ba6fe11..16ed81efd77 100644
--- a/apps/files_trashbin/appinfo/info.xml
+++ b/apps/files_trashbin/appinfo/info.xml
@@ -10,7 +10,7 @@ To prevent a user from running out of disk space, the Deleted files app will not
<licence>AGPL</licence>
<author>Bjoern Schiessle</author>
<default_enable/>
- <version>1.0.0</version>
+ <version>1.1.0</version>
<types>
<filesystem/>
</types>
diff --git a/apps/provisioning_api/appinfo/info.xml b/apps/provisioning_api/appinfo/info.xml
index 2f62ff69b17..009bdca0c1e 100644
--- a/apps/provisioning_api/appinfo/info.xml
+++ b/apps/provisioning_api/appinfo/info.xml
@@ -17,7 +17,7 @@
<documentation>
<admin>admin-provisioning-api</admin>
</documentation>
- <version>1.0.0</version>
+ <version>1.1.0</version>
<namespace>Provisioning_API</namespace>
<types>
<prevent_group_restriction/>
diff --git a/apps/systemtags/appinfo/info.xml b/apps/systemtags/appinfo/info.xml
index 3521658ac20..5eced10b710 100644
--- a/apps/systemtags/appinfo/info.xml
+++ b/apps/systemtags/appinfo/info.xml
@@ -7,7 +7,7 @@
<licence>AGPL</licence>
<author>Vincent Petry, Joas Schilling</author>
<default_enable/>
- <version>1.0.0</version>
+ <version>1.1.0</version>
<dependencies>
<owncloud min-version="9.2" max-version="9.2" />
</dependencies>
diff --git a/apps/testing/appinfo/info.xml b/apps/testing/appinfo/info.xml
index 1ab6e67805a..0acccf357fb 100644
--- a/apps/testing/appinfo/info.xml
+++ b/apps/testing/appinfo/info.xml
@@ -5,7 +5,7 @@
<description>This app is only for testing! It is dangerous to have it enabled in a live instance</description>
<licence>AGPL</licence>
<author>Joas Schilling</author>
- <version>1.0.0</version>
+ <version>1.1.0</version>
<dependencies>
<owncloud min-version="9.2" max-version="9.2" />
</dependencies>
diff --git a/apps/theming/appinfo/info.xml b/apps/theming/appinfo/info.xml
index 2cc18672a3b..8ae1d3eb73a 100644
--- a/apps/theming/appinfo/info.xml
+++ b/apps/theming/appinfo/info.xml
@@ -5,7 +5,7 @@
<description>Adjust the Nextcloud theme</description>
<licence>AGPL</licence>
<author>Nextcloud</author>
- <version>1.0.0</version>
+ <version>1.1.0</version>
<namespace>Theming</namespace>
<category>other</category>
diff --git a/apps/updatenotification/appinfo/info.xml b/apps/updatenotification/appinfo/info.xml
index 08043827370..4070e90f221 100644
--- a/apps/updatenotification/appinfo/info.xml
+++ b/apps/updatenotification/appinfo/info.xml
@@ -5,7 +5,7 @@
<description>Displays update notifications for ownCloud and provides the SSO for the updater.</description>
<licence>AGPL</licence>
<author>Lukas Reschke</author>
- <version>1.0.0</version>
+ <version>1.1.0</version>
<namespace>UpdateNotification</namespace>
<default_enable/>
<dependencies>
diff --git a/apps/user_ldap/appinfo/info.xml b/apps/user_ldap/appinfo/info.xml
index b3141ec0c76..b0984dcf624 100644
--- a/apps/user_ldap/appinfo/info.xml
+++ b/apps/user_ldap/appinfo/info.xml
@@ -9,7 +9,7 @@ A user logs into ownCloud with their LDAP or AD credentials, and is granted acce
</description>
<licence>AGPL</licence>
<author>Dominik Schmidt and Arthur Schiwon</author>
- <version>1.0.0</version>
+ <version>1.1.0</version>
<types>
<authentication/>
</types>
diff --git a/apps/workflowengine/appinfo/info.xml b/apps/workflowengine/appinfo/info.xml
index 066589c6618..b53f8aedb16 100644
--- a/apps/workflowengine/appinfo/info.xml
+++ b/apps/workflowengine/appinfo/info.xml
@@ -1,11 +1,11 @@
<?xml version="1.0"?>
<info>
<id>workflowengine</id>
- <name>Files Workflow Engine</name>
+ <name>Files workflow engine</name>
<description></description>
<licence>AGPL</licence>
<author>Morris Jobke</author>
- <version>1.0.0</version>
+ <version>1.1.0</version>
<namespace>WorkflowEngine</namespace>
<category>other</category>
diff --git a/build/integration/features/provisioning-v1.feature b/build/integration/features/provisioning-v1.feature
index d397a2852ad..38ed5213b19 100644
--- a/build/integration/features/provisioning-v1.feature
+++ b/build/integration/features/provisioning-v1.feature
@@ -282,7 +282,6 @@ Feature: provisioning
Then the OCS status code should be "100"
And the HTTP status code should be "200"
And apps returned are
- | admin_audit |
| comments |
| dav |
| federatedfilesharing |