summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/comments/appinfo/info.xml2
-rw-r--r--apps/comments/l10n/de.js8
-rw-r--r--apps/comments/l10n/de.json8
-rw-r--r--apps/dav/command/migratecalendars.php4
-rw-r--r--apps/dav/command/syncbirthdaycalendar.php4
-rw-r--r--apps/dav/lib/caldav/calendar.php13
-rw-r--r--apps/dav/tests/unit/caldav/calendartest.php7
-rwxr-xr-xapps/files_external/tests/env/stop-amazons3-ceph.sh1
-rwxr-xr-xapps/files_external/tests/env/stop-ftp-morrisjobke.sh1
-rwxr-xr-xapps/files_external/tests/env/stop-sftp-atmoz.sh1
-rwxr-xr-xapps/files_external/tests/env/stop-smb-silvershell.sh1
-rwxr-xr-xapps/files_external/tests/env/stop-swift-ceph.sh1
-rwxr-xr-xapps/files_external/tests/env/stop-webdav-ownCloud.sh1
-rw-r--r--apps/files_sharing/l10n/hu_HU.js4
-rw-r--r--apps/files_sharing/l10n/hu_HU.json4
-rw-r--r--apps/updatenotification/js/notification.js2
-rw-r--r--apps/updatenotification/l10n/et_EE.js1
-rw-r--r--apps/updatenotification/l10n/et_EE.json1
-rw-r--r--apps/user_ldap/l10n/he.js2
-rw-r--r--apps/user_ldap/l10n/he.json2
20 files changed, 43 insertions, 25 deletions
diff --git a/apps/comments/appinfo/info.xml b/apps/comments/appinfo/info.xml
index 9ae084945c7..c61b4a0fc7c 100644
--- a/apps/comments/appinfo/info.xml
+++ b/apps/comments/appinfo/info.xml
@@ -4,7 +4,7 @@
<name>Comments</name>
<description>Files app plugin to add comments to files</description>
<licence>AGPL</licence>
- <author>Arthur Shiwon, Vincent Petry</author>
+ <author>Arthur Schiwon, Vincent Petry</author>
<default_enable/>
<version>0.3.0</version>
<dependencies>
diff --git a/apps/comments/l10n/de.js b/apps/comments/l10n/de.js
index 636d9b88f2e..be0c332740f 100644
--- a/apps/comments/l10n/de.js
+++ b/apps/comments/l10n/de.js
@@ -2,16 +2,16 @@ OC.L10N.register(
"comments",
{
"<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien",
- "%1$s commented" : "%1$s kommentiert",
- "%1$s commented on %2$s" : "%1$s kommentiert %2$s",
+ "%1$s commented" : "%1$s kommentierte",
+ "%1$s commented on %2$s" : "%1$s kommentierte %2$s",
"Comments" : "Kommentare",
- "Type in a new comment..." : "Gebe bitte einen neuen Kommentar ein...",
+ "Type in a new comment..." : "Bitte gib einen neuen Kommentar ein...",
"Delete comment" : "Kommentar löschen",
"Post" : "Speichern",
"Cancel" : "Abbrechen",
"Edit comment" : "Kommentar bearbeiten",
"[Deleted user]" : "[Gelöschter Benutzer]",
- "No other comments available" : "Keine andere Kommentare vorhanden",
+ "No other comments available" : "Keine anderen Kommentare vorhanden",
"More comments..." : "Weitere Kommentare...",
"Save" : "Speichern",
"Allowed characters {count} of {max}" : "Erlaubte Zeichen {count} von {max}",
diff --git a/apps/comments/l10n/de.json b/apps/comments/l10n/de.json
index 67c5352ab46..5981609711e 100644
--- a/apps/comments/l10n/de.json
+++ b/apps/comments/l10n/de.json
@@ -1,15 +1,15 @@
{ "translations": {
"<strong>Comments</strong> for files" : "<strong>Kommentare</strong> für Dateien",
- "%1$s commented" : "%1$s kommentiert",
- "%1$s commented on %2$s" : "%1$s kommentiert %2$s",
+ "%1$s commented" : "%1$s kommentierte",
+ "%1$s commented on %2$s" : "%1$s kommentierte %2$s",
"Comments" : "Kommentare",
- "Type in a new comment..." : "Gebe bitte einen neuen Kommentar ein...",
+ "Type in a new comment..." : "Bitte gib einen neuen Kommentar ein...",
"Delete comment" : "Kommentar löschen",
"Post" : "Speichern",
"Cancel" : "Abbrechen",
"Edit comment" : "Kommentar bearbeiten",
"[Deleted user]" : "[Gelöschter Benutzer]",
- "No other comments available" : "Keine andere Kommentare vorhanden",
+ "No other comments available" : "Keine anderen Kommentare vorhanden",
"More comments..." : "Weitere Kommentare...",
"Save" : "Speichern",
"Allowed characters {count} of {max}" : "Erlaubte Zeichen {count} von {max}",
diff --git a/apps/dav/command/migratecalendars.php b/apps/dav/command/migratecalendars.php
index 5e7f6e9b697..d887309ac3e 100644
--- a/apps/dav/command/migratecalendars.php
+++ b/apps/dav/command/migratecalendars.php
@@ -61,8 +61,8 @@ class MigrateCalendars extends Command {
protected function execute(InputInterface $input, OutputInterface $output) {
$this->service->setup();
- if ($input->hasArgument('user')) {
- $user = $input->getArgument('user');
+ $user = $input->getArgument('user');
+ if (!is_null($user)) {
if (!$this->userManager->userExists($user)) {
throw new \InvalidArgumentException("User <$user> in unknown.");
}
diff --git a/apps/dav/command/syncbirthdaycalendar.php b/apps/dav/command/syncbirthdaycalendar.php
index 5a2baa31d93..90a73a3eeb3 100644
--- a/apps/dav/command/syncbirthdaycalendar.php
+++ b/apps/dav/command/syncbirthdaycalendar.php
@@ -61,8 +61,8 @@ class SyncBirthdayCalendar extends Command {
* @param OutputInterface $output
*/
protected function execute(InputInterface $input, OutputInterface $output) {
- if ($input->getArgument('user') !== null) {
- $user = $input->getArgument('user');
+ $user = $input->getArgument('user');
+ if (!is_null($user)) {
if (!$this->userManager->userExists($user)) {
throw new \InvalidArgumentException("User <$user> in unknown.");
}
diff --git a/apps/dav/lib/caldav/calendar.php b/apps/dav/lib/caldav/calendar.php
index 55f1acec396..1e87f9b4333 100644
--- a/apps/dav/lib/caldav/calendar.php
+++ b/apps/dav/lib/caldav/calendar.php
@@ -22,11 +22,20 @@
namespace OCA\DAV\CalDAV;
use OCA\DAV\DAV\Sharing\IShareable;
+use Sabre\CalDAV\Backend\BackendInterface;
use Sabre\DAV\Exception\Forbidden;
use Sabre\DAV\PropPatch;
class Calendar extends \Sabre\CalDAV\Calendar implements IShareable {
+ public function __construct(BackendInterface $caldavBackend, $calendarInfo) {
+ parent::__construct($caldavBackend, $calendarInfo);
+
+ if ($this->getName() === BirthdayService::BIRTHDAY_CALENDAR_URI) {
+ $this->calendarInfo['{http://sabredav.org/ns}read-only'] = true;
+ }
+ }
+
/**
* Updates the list of shares.
*
@@ -100,10 +109,6 @@ class Calendar extends \Sabre\CalDAV\Calendar implements IShareable {
}
function delete() {
- if ($this->getName() === BirthdayService::BIRTHDAY_CALENDAR_URI) {
- throw new Forbidden();
- }
-
if (isset($this->calendarInfo['{http://owncloud.org/ns}owner-principal'])) {
$principal = 'principal:' . parent::getOwner();
$shares = $this->getShares();
diff --git a/apps/dav/tests/unit/caldav/calendartest.php b/apps/dav/tests/unit/caldav/calendartest.php
index c41070ea435..e7f4d57067c 100644
--- a/apps/dav/tests/unit/caldav/calendartest.php
+++ b/apps/dav/tests/unit/caldav/calendartest.php
@@ -32,7 +32,7 @@ class CalendarTest extends TestCase {
/** @var \PHPUnit_Framework_MockObject_MockObject | CalDavBackend $backend */
$backend = $this->getMockBuilder('OCA\DAV\CalDAV\CalDavBackend')->disableOriginalConstructor()->getMock();
$backend->expects($this->once())->method('updateShares');
- $backend->method('getShares')->willReturn([
+ $backend->expects($this->any())->method('getShares')->willReturn([
['href' => 'principal:user2']
]);
$calendarInfo = [
@@ -52,7 +52,7 @@ class CalendarTest extends TestCase {
/** @var \PHPUnit_Framework_MockObject_MockObject | CalDavBackend $backend */
$backend = $this->getMockBuilder('OCA\DAV\CalDAV\CalDavBackend')->disableOriginalConstructor()->getMock();
$backend->expects($this->never())->method('updateShares');
- $backend->method('getShares')->willReturn([
+ $backend->expects($this->any())->method('getShares')->willReturn([
['href' => 'principal:group2']
]);
$calendarInfo = [
@@ -90,7 +90,8 @@ class CalendarTest extends TestCase {
$calendarInfo = [
'{http://owncloud.org/ns}owner-principal' => 'user1',
'principaluri' => 'user2',
- 'id' => 666
+ 'id' => 666,
+ 'uri' => 'default'
];
$c = new Calendar($backend, $calendarInfo);
diff --git a/apps/files_external/tests/env/stop-amazons3-ceph.sh b/apps/files_external/tests/env/stop-amazons3-ceph.sh
index dcf30d8c515..f559f8f9058 100755
--- a/apps/files_external/tests/env/stop-amazons3-ceph.sh
+++ b/apps/files_external/tests/env/stop-amazons3-ceph.sh
@@ -27,6 +27,7 @@ fi;
for container in `cat $thisFolder/dockerContainerCeph.$EXECUTOR_NUMBER.amazons3`; do
echo "Stopping and removing docker container $container"
# kills running container and removes it
+ docker stop $container
docker rm -f $container
done;
diff --git a/apps/files_external/tests/env/stop-ftp-morrisjobke.sh b/apps/files_external/tests/env/stop-ftp-morrisjobke.sh
index e30ec2e594a..eedf8f82a50 100755
--- a/apps/files_external/tests/env/stop-ftp-morrisjobke.sh
+++ b/apps/files_external/tests/env/stop-ftp-morrisjobke.sh
@@ -27,6 +27,7 @@ fi;
for container in `cat $thisFolder/dockerContainerMorrisJobke.$EXECUTOR_NUMBER.ftp`; do
echo "Stopping and removing docker container $container"
# kills running container and removes it
+ docker stop $container
docker rm -f $container
done;
diff --git a/apps/files_external/tests/env/stop-sftp-atmoz.sh b/apps/files_external/tests/env/stop-sftp-atmoz.sh
index 0c2fd0b5bc6..44380152340 100755
--- a/apps/files_external/tests/env/stop-sftp-atmoz.sh
+++ b/apps/files_external/tests/env/stop-sftp-atmoz.sh
@@ -27,6 +27,7 @@ fi;
for container in `cat $thisFolder/dockerContainerAtmoz.$EXECUTOR_NUMBER.sftp`; do
echo "Stopping and removing docker container $container"
# kills running container and removes it
+ docker stop $container
docker rm -f $container
done;
diff --git a/apps/files_external/tests/env/stop-smb-silvershell.sh b/apps/files_external/tests/env/stop-smb-silvershell.sh
index 40147b89106..56866f13b1f 100755
--- a/apps/files_external/tests/env/stop-smb-silvershell.sh
+++ b/apps/files_external/tests/env/stop-smb-silvershell.sh
@@ -27,6 +27,7 @@ fi;
for container in `cat $thisFolder/dockerContainerSilvershell.$EXECUTOR_NUMBER.smb`; do
echo "Stopping and removing docker container $container"
# kills running container and removes it
+ docker stop $container
docker rm -f $container
done;
diff --git a/apps/files_external/tests/env/stop-swift-ceph.sh b/apps/files_external/tests/env/stop-swift-ceph.sh
index 9f15fb05a7d..418f96e63f6 100755
--- a/apps/files_external/tests/env/stop-swift-ceph.sh
+++ b/apps/files_external/tests/env/stop-swift-ceph.sh
@@ -29,6 +29,7 @@ for container in `cat $thisFolder/dockerContainerCeph.$EXECUTOR_NUMBER.swift`; d
echo "Stopping and removing docker container $container"
# kills running container and removes it
+ docker stop $container
docker rm -f $container
done;
diff --git a/apps/files_external/tests/env/stop-webdav-ownCloud.sh b/apps/files_external/tests/env/stop-webdav-ownCloud.sh
index 8eaf1ba754f..613a22efb8c 100755
--- a/apps/files_external/tests/env/stop-webdav-ownCloud.sh
+++ b/apps/files_external/tests/env/stop-webdav-ownCloud.sh
@@ -27,6 +27,7 @@ fi;
for container in `cat $thisFolder/dockerContainerOwnCloud.$EXECUTOR_NUMBER.webdav`; do
echo "Stopping and removing docker container $container"
# kills running container and removes it
+ docker stop $container
docker rm -f $container
done;
diff --git a/apps/files_sharing/l10n/hu_HU.js b/apps/files_sharing/l10n/hu_HU.js
index aee9a893a19..d76fa12435e 100644
--- a/apps/files_sharing/l10n/hu_HU.js
+++ b/apps/files_sharing/l10n/hu_HU.js
@@ -80,8 +80,8 @@ OC.L10N.register(
"Federated Cloud" : "Egyesített felhő",
"Your Federated Cloud ID:" : "Egyesített felhő azonosító:",
"Share it:" : "Ossza meg:",
- "Add to your website" : "Add hozzá saját weboldaladhoz",
+ "Add to your website" : "Adja hozzá saját weboldalához",
"Share with me via ownCloud" : "Ossza meg velem ownCloud-on keresztül",
- "HTML Code:" : "HTML Code:"
+ "HTML Code:" : "HTML kód:"
},
"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/hu_HU.json b/apps/files_sharing/l10n/hu_HU.json
index a91d017d0fd..242961a1960 100644
--- a/apps/files_sharing/l10n/hu_HU.json
+++ b/apps/files_sharing/l10n/hu_HU.json
@@ -78,8 +78,8 @@
"Federated Cloud" : "Egyesített felhő",
"Your Federated Cloud ID:" : "Egyesített felhő azonosító:",
"Share it:" : "Ossza meg:",
- "Add to your website" : "Add hozzá saját weboldaladhoz",
+ "Add to your website" : "Adja hozzá saját weboldalához",
"Share with me via ownCloud" : "Ossza meg velem ownCloud-on keresztül",
- "HTML Code:" : "HTML Code:"
+ "HTML Code:" : "HTML kód:"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
} \ No newline at end of file
diff --git a/apps/updatenotification/js/notification.js b/apps/updatenotification/js/notification.js
index 9d22bcb2309..810b9c168af 100644
--- a/apps/updatenotification/js/notification.js
+++ b/apps/updatenotification/js/notification.js
@@ -18,7 +18,7 @@ $(document).ready(function(){
version = oc_updateState.updateVersion,
docLink = oc_updateState.updateLink,
text = t('core', '{version} is available. Get more information on how to update.', {version: version}),
- element = $('<a>').attr('href', docLink).text(text);
+ element = $('<a>').attr('href', docLink).attr('target','_blank').text(text);
OC.Notification.showTemporary(
element,
diff --git a/apps/updatenotification/l10n/et_EE.js b/apps/updatenotification/l10n/et_EE.js
index e0ff9695157..e22082ff92e 100644
--- a/apps/updatenotification/l10n/et_EE.js
+++ b/apps/updatenotification/l10n/et_EE.js
@@ -1,6 +1,7 @@
OC.L10N.register(
"updatenotification",
{
+ "Updated channel" : "Uuendatud kanal",
"{version} is available. Get more information on how to update." : "{version} on saadaval. Vaata lisainfot uuendamise kohta.",
"Updater" : "Uuendaja",
"A new version is available: %s" : "Saadaval on uus versioon: %s",
diff --git a/apps/updatenotification/l10n/et_EE.json b/apps/updatenotification/l10n/et_EE.json
index 6a7a80ab08e..9ab8d224a7c 100644
--- a/apps/updatenotification/l10n/et_EE.json
+++ b/apps/updatenotification/l10n/et_EE.json
@@ -1,4 +1,5 @@
{ "translations": {
+ "Updated channel" : "Uuendatud kanal",
"{version} is available. Get more information on how to update." : "{version} on saadaval. Vaata lisainfot uuendamise kohta.",
"Updater" : "Uuendaja",
"A new version is available: %s" : "Saadaval on uus versioon: %s",
diff --git a/apps/user_ldap/l10n/he.js b/apps/user_ldap/l10n/he.js
index b0ef6a5c0a3..49de89877b0 100644
--- a/apps/user_ldap/l10n/he.js
+++ b/apps/user_ldap/l10n/he.js
@@ -123,10 +123,12 @@ OC.L10N.register(
"The LDAP attribute to use to generate the user's display name." : "תכונת LDAP לשימוש כדי להפיק את שם התצוגה של המשתמש.",
"2nd User Display Name Field" : "שדה שני לשם תצוגת משתמש",
"Base User Tree" : "עץ משתמש בסיסי",
+ "One User Base DN per line" : "משתמש DN בסיסי אחד לשורה",
"User Search Attributes" : "מאפייני חיפוש משתמש",
"Optional; one attribute per line" : "אופציונאלי; מאפיין אחד בשורה",
"Group Display Name Field" : "שדה שם תצוגה לקבוצה",
"Base Group Tree" : "עץ קבוצה בסיסי",
+ "One Group Base DN per line" : "קבוצת DN בסיסית לשורה",
"Group Search Attributes" : "מאפייני חיפוש קבוצה",
"Group-Member association" : "שיוך חברי-קבוצה",
"Dynamic Group Member URL" : "נתיב חבר קבוצה דינמית",
diff --git a/apps/user_ldap/l10n/he.json b/apps/user_ldap/l10n/he.json
index bfa91e63aba..cf55f7e4a60 100644
--- a/apps/user_ldap/l10n/he.json
+++ b/apps/user_ldap/l10n/he.json
@@ -121,10 +121,12 @@
"The LDAP attribute to use to generate the user's display name." : "תכונת LDAP לשימוש כדי להפיק את שם התצוגה של המשתמש.",
"2nd User Display Name Field" : "שדה שני לשם תצוגת משתמש",
"Base User Tree" : "עץ משתמש בסיסי",
+ "One User Base DN per line" : "משתמש DN בסיסי אחד לשורה",
"User Search Attributes" : "מאפייני חיפוש משתמש",
"Optional; one attribute per line" : "אופציונאלי; מאפיין אחד בשורה",
"Group Display Name Field" : "שדה שם תצוגה לקבוצה",
"Base Group Tree" : "עץ קבוצה בסיסי",
+ "One Group Base DN per line" : "קבוצת DN בסיסית לשורה",
"Group Search Attributes" : "מאפייני חיפוש קבוצה",
"Group-Member association" : "שיוך חברי-קבוצה",
"Dynamic Group Member URL" : "נתיב חבר קבוצה דינמית",
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-07 00:55:40 +0000