Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion apps/admin_audit/appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,4 @@
<types>
<logging/>
</types>
<default_enable/>
</info>
2 changes: 1 addition & 1 deletion apps/comments/appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion apps/dav/appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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/>
Expand Down
6 changes: 3 additions & 3 deletions apps/encryption/lib/Controller/StatusController.php
Original file line number Diff line number Diff line change
Expand Up @@ -73,18 +73,18 @@ public function getStatus() {
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(
Expand Down
2 changes: 1 addition & 1 deletion apps/encryption/templates/settings-admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
?>
<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"
Expand Down
2 changes: 1 addition & 1 deletion apps/encryption/templates/settings-personal.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
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 ): ?>

Expand Down
4 changes: 2 additions & 2 deletions apps/federatedfilesharing/appinfo/info.xml
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion apps/federation/appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion apps/files_external/appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions apps/files_sharing/appinfo/info.xml
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion apps/files_trashbin/appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion apps/provisioning_api/appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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/>
Expand Down
2 changes: 1 addition & 1 deletion apps/systemtags/appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion apps/testing/appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion apps/theming/appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion apps/updatenotification/appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion apps/user_ldap/appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions apps/workflowengine/appinfo/info.xml
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
1 change: 0 additions & 1 deletion build/integration/features/provisioning-v1.feature
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down