Compare commits

...

3333 Commits

Author SHA1 Message Date
C Montero-Luque e5620fe4ed 8.1.6 2016-03-08 09:03:58 -05:00
C Montero-Luque a74a7d069e 8.1.6 RC2 2016-03-04 18:16:06 -05:00
C. Montero Luque 384af4731c Merge pull request #22863 from owncloud/stable8.1-trashbin-checkpath
[stable8.1] Properly check path validity before deleting to trash
2016-03-04 13:36:07 -05:00
Vincent Petry 833729808c Properly check path validity before deleting to trash
This prevents deleting the whole "files" folder of the user whenever
$ownerPath is empty. This can happen in concurrency situations.
2016-03-04 15:39:41 +01:00
C Montero-Luque 279f1d0010 8.1.6 RC1 2016-03-01 20:41:49 -05:00
Thomas Müller ee1330f121 Merge pull request #22409 from owncloud/stable8.1-gdrive-reindexarraytoduetoduplicates
[stable8.1] Reindex array in GDrive after removing duplicates
2016-03-01 14:47:35 +01:00
Morris Jobke e8e694d31e Merge pull request #22617 from owncloud/backport-22358-stable8.1
[backport][stable8.1] Fix race condition when switching filter mode
2016-03-01 13:43:22 +01:00
Roeland Douma 256c2cd705 Merge pull request #22630 from owncloud/stable8.1-fedshare-testremote-after-404
[stable8.1] Properly trigger testRemote after getting a 404 from remote fed share
2016-02-29 11:26:42 +01:00
Vincent Petry 0df34d96e0 Merge pull request #22634 from owncloud/stable8.1-backport-22565
[stable8.1] Avoids scanning the root storage
2016-02-25 16:49:23 +01:00
Morris Jobke aebafadd99 Merge pull request #22632 from owncloud/stable8.1-backport-18762
[stable8.1] Use "json_encode" and "json_decode" instead of unserialize
2016-02-25 15:30:45 +01:00
Björn Schießle 1aa653177c Merge pull request #22627 from owncloud/fix_broken_unencrypted_size_8.1
[stable8.1] Heal unencrypted file sizes at download time
2016-02-25 14:59:24 +01:00
Bjoern Schiessle a369a7d478 recalculate unencrypted size if we assume that the size stored in the db is not correct 2016-02-25 11:17:09 +01:00
Morris Jobke 963c3aa93e Avoids scanning the root storage
This check will skip the background scan for the root storage
because there is nothing in the root storage that isn't already
in another (mostly user-) storage.

Fixes #22501
2016-02-24 17:35:50 +01:00
Morris Jobke a2338752c8 [user_ldap] properly decode cached objects
* fixes #21896
2016-02-24 16:35:35 +01:00
Vincent Petry 2bc01e7b42 Properly trigger testRemote after getting a 404 from remote fed share
Whenever a remote fed share's shareinfo call returns a 404, don't
directly assume the storage is not available by throwing
StorageNotAvailableException. We need to properly throw
NotFoundException to trigger the later logic that calls testRemote()
that verifies that the 404 is not from a broken server but really from
an obsolete share.
2016-02-24 16:35:22 +01:00
Lukas Reschke 241f784ad0 Use "json_encode" and "json_decode" instead of unserialize 2016-02-24 16:32:56 +01:00
Arthur Schiwon d63d4ab145 Fix race condition when switching filter mode. Fixes #22278 2016-02-24 11:21:53 +01:00
Morris Jobke e0a38cd473 Merge pull request #22572 from owncloud/stable8.1-backport-21544
[stable8.1] set etag and permission fields for trashbin entries
2016-02-24 11:09:59 +01:00
Roeland Douma 524063bf36 Merge pull request #22558 from owncloud/backport-22496-share-group-problem-8.1
[8.1] Fix on shared groups assignment.
2016-02-22 15:48:20 +01:00
Robin Appelman 18e927e5f2 set etag and permission fields for trashbin entries 2016-02-22 15:37:06 +01:00
Leonardo Diez 0f2010d8c3 Fix on shared groups assignment. 2016-02-22 10:45:30 +01:00
Morris Jobke a4668fdaf6 Merge pull request #22373 from owncloud/stable8.1-backport-22369
[stable8.1] Fix BMP support
2016-02-16 09:26:54 +01:00
Roeland Douma 0a39b1df68 Merge pull request #22363 from owncloud/backport-20152-stable8.1
[stable8.1] Remove invalid type-cast
2016-02-15 19:39:34 +01:00
Vincent Petry c5aff0933c Reindex array in GDrive after removing duplicates
Whenever duplicates are removed from the array, the indices are not in
sequence. This seems to cause trouble with opendir/the dir wrapper and
make it skip valid entries.

This fix reindexes the array to make it work.
2016-02-15 17:47:19 +01:00
Morris Jobke 5b1c0991da Fix BMP support
* fixes #16461
2016-02-14 09:37:31 +01:00
Lukas Reschke 9f3dad8353 Remove invalid type-cast
This is an `is_array` operation and not a `in_array` one. Thus this typecast is not required.

Fixes https://github.com/owncloud/core/issues/20095
2016-02-13 14:28:58 +01:00
Morris Jobke 38ebc06aa9 Merge pull request #22173 from owncloud/stable8.1-backport-22143
[Stable 8.1] When a user is removed we should remove the right shares
2016-02-06 09:27:13 +01:00
Roeland Jago Douma 8aa9b3189d When a user is removed we should remove the right shares
* This means all the shares directly shared with them
* Or all group shares having a special share with them

This patch fixes the operator precedece (AND before OR).
So before this patch:

(share_with = <deleted user> AND share_type = 0) OR share_type=2

So it deleted all user specific shares

Now:
share_with = <deleted user> AND (share_type = 0 OR (share_type=2)
2016-02-05 20:08:26 +01:00
Morris Jobke ac51b9da70 Merge pull request #21864 from owncloud/sync-certificates-with-upstream-81
[stable8.1] Sync certificates with upstream
2016-01-25 08:24:02 +01:00
Lukas Reschke 8b9e2d2426 Sync certificates with upstream 2016-01-22 22:12:21 +01:00
Thomas Müller 19e7e57fb0 Merge pull request #21748 from owncloud/stable8.1-backport-20927
[stable8.1] Handle return code of streamCopy in WebDAV put
2016-01-18 14:16:09 +01:00
Morris Jobke 952d640999 Handle return code of streamCopy in WebDAV put
* throw a different exception if streamCopy failed
2016-01-15 14:29:41 +01:00
Thomas Müller 40b76dfd56 Merge pull request #21694 from owncloud/stable8.1-users-scrolltop
[stable8.1] Keep scroll position in users page when sorting
2016-01-15 13:19:16 +01:00
Vincent Petry c55397491a Keep scroll position in users page when sorting
When sorting, some browsers like Chrome will lose the scroll position,
possibly because the sorting code is touching the DOM elements.

This fix saves the scroll position before sorting and sets it back
afterwards.
2016-01-13 15:36:32 +01:00
Vincent Petry 46253ef664 Merge pull request #21665 from owncloud/smb-statcache-cap-81
[8.1] cap the number of entries we cache in smb's statcache
2016-01-13 10:45:16 +01:00
Robin Appelman 2e5e756913 cap the number of entries we cache in smb's statcache 2016-01-12 18:12:40 +01:00
Morris Jobke 5182879c3f Merge pull request #21632 from owncloud/backport-17924-stable8.1
[backport] [stable8.1] always use an LDAP URL when connecting to LDAP
2016-01-12 10:31:45 +01:00
Arthur Schiwon 7539979e68 always use an LDAP URL when connecting to LDAP 2016-01-11 21:45:46 +01:00
Morris Jobke 6c35e7036a Merge pull request #21564 from owncloud/ext-smb-dep-stable8.1
[stable8.1] Check libsmbclient-php as well as smbclient binary
2016-01-11 11:33:47 +01:00
Robin McCorkell 016a58260c Check libsmbclient-php as well as smbclient binary 2016-01-09 09:19:13 +00:00
Vincent Petry c9c6efd157 Merge pull request #21314 from owncloud/scanner-skip-not-available-81
[8.1] Skip unavailable storages in scanner
2016-01-08 12:22:19 +01:00
Robin Appelman d523ed997a also log exception 2016-01-07 09:06:47 +01:00
Robin Appelman 49a2bbf4ab Skip unavailable storages in scanner 2016-01-07 09:06:45 +01:00
Morris Jobke f5952cbd76 Merge pull request #21463 from owncloud/stable8.1-fix-callable-ajax-scan
listen() requires a callable and not an array
2016-01-05 16:02:22 +01:00
Morris Jobke 3ccaaad687 listen() requires a callable and not an array
* fixes #21350
* fixes regression introduced with #20764
2016-01-05 14:33:25 +01:00
Morris Jobke 038351e0f7 Merge pull request #21296 from owncloud/stable8.1-prevent0bytedownloads
[stable8.1] prevent 0 byte downloads when storage returns false
2016-01-05 13:44:14 +01:00
Vincent Petry 073a00adb1 Merge pull request #21263 from owncloud/backport-21260-stable8.1
[backport] [stable8.1] initialize l10n instance earlier, fixes an undefined var warning foll…
2015-12-24 15:55:37 +01:00
Thomas Müller fbc0276ab5 Merge pull request #21340 from owncloud/fix-unit-tests
[stable8.1] Fix unit tests
2015-12-23 07:10:28 +01:00
Lukas Reschke 5fc1123f1c Fix unit tests 2015-12-22 21:24:47 +01:00
Morris Jobke 985aa59c22 Merge pull request #21235 from owncloud/stable8.1-backport-21232
[stable8.1] Use name of ICollection for exception message
2015-12-22 19:15:27 +01:00
Morris Jobke b3f8f9c9fe Merge pull request #21275 from owncloud/stable81_20884
[Stable 8.1] [Sharing] Respect disabled incoming federated shares
2015-12-22 19:13:15 +01:00
Morris Jobke 2d28fbcda6 Merge pull request #21294 from owncloud/backport-21255-stable8.1
user management: show password error temporary (backport for stable8.1)
2015-12-22 19:11:53 +01:00
C Montero-Luque 47a2c3738c 8.1.5 2015-12-21 07:23:26 -05:00
C Montero-Luque d4a53261c7 8.1.5 RC2 2015-12-18 17:32:43 -05:00
Robin Appelman 2c5234dcfe add unit test 2015-12-18 18:36:22 +01:00
Jörn Friedrich Dreyer 7090509505 prevent 0 byte downloads when storage returns false 2015-12-18 18:34:13 +01:00
michag86 fb5501fec3 Update users.js 2015-12-18 17:04:02 +01:00
Roeland Jago Douma 5721038f47 [Sharing] Respect disabled incoming federated shares
Only fetch the incoming federated shares if incoming shares are actually
enabled.

Fixes #20713
2015-12-18 09:17:54 +01:00
Arthur Schiwon bf675afafc initialize l10n instance earlier, fixes an undefined var warning followed by a php error 2015-12-17 15:56:19 +01:00
Morris Jobke 6f6bf2667b add unit test for #21230 2015-12-16 16:23:35 +01:00
Morris Jobke 2b8a6a19bc Use name of ICollection for exception message
* fixes #21230
2015-12-16 16:23:30 +01:00
C Montero-Luque 678ad217e2 8.1.5 RC1 2015-12-15 16:07:51 -05:00
Vincent Petry 9e174431f8 Merge pull request #21207 from owncloud/backport-21133-stable8.1
[backport] [stable8.1] Fix shared files of deleted users, detect DN change when checking for existence on LDAP
2015-12-15 18:43:47 +01:00
Vincent Petry d69cab983a Merge pull request #21210 from owncloud/stable8.1-handle-enforce-home-folder-rule-setting
[stable8.1] Properly handle enforce home folder naming rule setting
2015-12-15 18:43:05 +01:00
Björn Schießle c3595bd50b Merge pull request #21199 from owncloud/fix_20296_8.1
[stable8.1] don't allow to create a federated share if source and target are the same
2015-12-15 14:56:23 +01:00
Vincent Petry f2fb9fb6c2 Fixed JS unit tests for fed owner display name 2015-12-15 11:45:26 +01:00
Björn Schießle 73dda65a2e show display name but internally use the user name 2015-12-15 11:45:26 +01:00
Björn Schießle a1d59a92ab don't allow to create a federated share if source and target server are the same 2015-12-15 11:45:26 +01:00
Morris Jobke f43e1687f8 Properly handle enforce home folder naming rule setting 2015-12-15 10:10:53 +01:00
Arthur Schiwon 42c6990c8c fix find DN by UUID for AD 2015-12-14 23:19:24 +01:00
Arthur Schiwon b756dceccc unit test on getHome in combination with OfflineUser 2015-12-14 23:19:19 +01:00
Arthur Schiwon 945c4d19c5 adjust unit test 2015-12-14 23:19:14 +01:00
Arthur Schiwon 65cb4b4eee look for DN changes before marking a user as deleted 2015-12-14 23:19:08 +01:00
Arthur Schiwon 2e9f6dea90 throw NoUserException in getHome when the requested user does not exist anymore 2015-12-14 23:19:03 +01:00
Morris Jobke b6caf41387 Merge pull request #21151 from owncloud/backport-20978-stable8.1
reset mailadress/displayname on blur (backport for stable8.1)
2015-12-14 17:31:57 +01:00
Lukas Reschke 5881d7b8ed Merge pull request #21193 from owncloud/preview-non-existing-81
[8.1] Handle non existing files in version previews
2015-12-14 16:35:16 +01:00
Robin Appelman 51c6cd5c6a Handle non existing files in version previews 2015-12-14 16:04:10 +01:00
Thomas Müller ed9089f951 Merge pull request #21156 from owncloud/trashbin-loggedout-81
[8.1] Fix trashbin wrapper when no user is loggedin
2015-12-14 12:27:18 +01:00
Lukas Reschke ada7573174 Use XMLWriter to generate response
Gets rid of manual XML generation.
2015-12-14 09:39:34 +01:00
Robin Appelman e6afdd5659 skip test if we cant use the filesystem when not logged in 2015-12-11 15:41:25 +01:00
Robin Appelman 9c8083dab9 Fix thrashbin wrapper when no user is loggedin 2015-12-11 15:41:23 +01:00
michag86 9a0af8e59d reset mailadress/displayname on blur 2015-12-11 14:58:06 +01:00
Vincent Petry f11314b761 Merge pull request #21091 from owncloud/backport-20995-stable8.1
[backport] [stable8.1] ensure multiselect always receives an array when setting its value, f…
2015-12-10 18:00:05 +01:00
Vincent Petry cf009768f9 Merge pull request #21116 from owncloud/stable8.1-backport-21109
[stable8.1] Deduplicate version expire jobs
2015-12-10 16:37:23 +01:00
Morris Jobke 259e05b670 Deduplicate version expire jobs
* versionSize is calculated anyway in the expire job - > dropped
* offset/neededSpace was needed for expiry before the file is moved to the versions -> now this is included already in the currently used space because the expiry job is defered to a point in time after the version creation
* fixes #21108
2015-12-10 13:49:01 +01:00
Vincent Petry 29ae188c71 Merge pull request #21102 from owncloud/stable8.1_20989
[Stable8.1] Update parent when moving share into recieved share
2015-12-10 13:44:05 +01:00
Roeland Jago Douma 643778b028 Update parent when moving share into recieved share
Fixes #20769

When I receive a share and move a share of myself into that share (which
is allowed currently) I effectively hand over ownership of the files I
move. So we need to update the share I move to have as a parent the
share I move it into. Else our mounting system gets confused.
2015-12-10 11:32:03 +01:00
Morris Jobke fccfa3cf0b Merge pull request #21081 from owncloud/stable8.1-share-computesharepermissions-notstore
[stable8.1] Fix (re)share permission checks in a few code paths
2015-12-10 09:35:56 +01:00
Arthur Schiwon 6bedaf0f69 ensure multiselect always receives an array when setting its value, fixes #18734 2015-12-09 20:12:02 +01:00
Vincent Petry c132f91f9d Merge pull request #21085 from owncloud/occ-shall-not-fail-hard-in-maintenance-mode-stable8.1
Don't load commands of apps when in maintenance mode
2015-12-09 19:57:33 +01:00
Thomas Müller af67c456ac Don't load commands of apps when in maintenance mode - fixes #20939 2015-12-09 16:40:53 +01:00
Vincent Petry 2f2e932e02 Add explicit check for groups excluded from sharing
Since isSharable() doesn't do the check for groups excluded from
sharing, adding an explicit check in the sharing code.
2015-12-09 15:59:31 +01:00
Vincent Petry 5ecd8cc24d Fix more unit tests to pass a mock storage instead of null to FileInfo 2015-12-09 15:59:27 +01:00
Vincent Petry af70564335 Add reshare permission checks
Added in isSharable() in incoming remote share.
Added in isSharable() in regular incoming share.
Added in FileInfo to make sure the proper attributes are returned to the
clients.
2015-12-09 15:58:42 +01:00
Vincent Petry 2466972efd Compute share permissions in the view
The share permissions are now computed in the View/FileInfo instead of
storing them directly/permanently on the storage
2015-12-09 15:58:39 +01:00
Morris Jobke 873e932f59 Merge pull request #21042 from owncloud/backport-21037-stable8.1
[backport][stable8.1] passing an empty base in this diagnosis call will not result  in LDAP…
2015-12-08 17:34:43 +01:00
Arthur Schiwon d6a7b607ce passing an empty base in this diagnosis call will not result in LDAP errors
Neither in "Invalid DN syntax" nor in "Object not found"
2015-12-08 15:07:40 +01:00
Morris Jobke 2a86de9b34 Merge pull request #20999 from owncloud/backport-20981-multiple-emails-for-sharelink-8.1
[8.1] Allow sending a share email to multiple users
2015-12-07 16:25:20 +01:00
Thomas Müller 94cf29c5cf Merge pull request #20986 from owncloud/use-proper-logexception-stable8.1
ILogger has no logException()
2015-12-07 16:19:04 +01:00
Joas Schilling cfc1109073 Add a unit test for single user case as well 2015-12-07 15:50:20 +01:00
Joas Schilling b5420170e0 Allow sending a share email to multiple users 2015-12-07 15:50:16 +01:00
Thomas Müller ce2e172513 ILogger has no logException() - fixes #20797 2015-12-07 12:11:00 +01:00
Vincent Petry 563f0c8a81 Merge pull request #20795 from owncloud/stable8.1-backport-20790
[stable8.1] Deduplicate queued trashbin expire jobs
2015-12-04 17:45:24 +01:00
Morris Jobke bab3fcb134 Merge pull request #20956 from owncloud/stable8.1-backport-20877
[stable8.1] Check the expiration date for null
2015-12-04 15:55:57 +01:00
Morris Jobke e2b7f66b26 Check the expiration date for null
* null is always less than any value -> expirationDate gets null
  which is "no date set"
* ref https://github.com/owncloud/core/issues/20590#issuecomment-158393075
2015-12-04 15:03:52 +01:00
Vincent Petry 7d8aaa81c0 Merge pull request #20489 from owncloud/backport-20487-8.1
[8.1] Activity oracle sql error for favorites
2015-12-03 16:40:20 +01:00
Thomas Müller e89ab22d3a Merge pull request #20831 from owncloud/catch-missing-route-81
[8.1] Dont die when we're missing a route
2015-11-30 22:46:11 +01:00
Robin Appelman 0ac6470a2f Dont die when we're missing a route 2015-11-30 14:10:41 +01:00
Morris Jobke df6344211e Deduplicate queued trashbin expire jobs
* fixes #20425
* this removes the argument trashbin size from the expire job - it is now
  calculated in the expire job
* the queue now detects properly that the job is already queue and doesn't
  add it again
2015-11-27 15:13:08 +01:00
Vincent Petry 4c2ae6e9ee Merge pull request #20764 from owncloud/scan-eventsource-no-paths-81
[8.1] Dont output paths in scan.php
2015-11-26 16:40:03 +01:00
Robin Appelman a4a7ee1761 Dont output paths in scan.php 2015-11-26 16:35:04 +01:00
Morris Jobke 132c454d21 Merge pull request #20698 from owncloud/stable8.1-backport-19530
[stable8.1] Make sure the share we found is for the same item
2015-11-25 10:25:11 +01:00
Joas Schilling 943782bdfe Add a unit test for "share a file inside a folder that is already shared" 2015-11-24 09:58:47 +01:00
Joas Schilling a85cf1caf7 Make sure all variables are defined 2015-11-24 09:58:41 +01:00
Joas Schilling 88bba3ad15 Make sure the share we found is for the same item 2015-11-24 09:58:34 +01:00
Morris Jobke 75b4abb0d2 Merge pull request #20678 from owncloud/backport-joblist-fix-8.1
[8.1] Make the JobList test more robust by sorting the result of getAll bef…
2015-11-23 11:39:33 +01:00
Joas Schilling 6ce3419914 Make the JobList test more robust by sorting the result of getAll before comparison 2015-11-23 10:45:52 +01:00
Morris Jobke e1fc0d2345 Merge pull request #20637 from owncloud/cache-escape-like-81
[8.1] Escape like parameter in cache operations
2015-11-20 16:46:46 +01:00
Robin Appelman 9d04876824 escape like parameter in cache move 2015-11-20 14:40:08 +01:00
Robin Appelman 46942ff9ec Add test for special character during move 2015-11-20 14:40:05 +01:00
Robin Appelman fa16c219c5 define escape character for like statements on oracle 2015-11-20 14:40:01 +01:00
Robin Appelman 98f8732e83 define escape character for like statements on sqlite 2015-11-20 14:39:57 +01:00
Joas Schilling cef8c875f9 Add a unit test that executes the query 2015-11-18 10:42:33 +01:00
Joas Schilling e0a9755113 Oracle can not return statements but only values
So evaluate the condition directly and return 1 or 0
2015-11-13 11:35:30 +01:00
Morris Jobke 2e0665acb0 Merge pull request #20307 from owncloud/stable8.1-backport-use-actual-mimetype-detection-instad-of-oath-1
[stable8.1] Use actual mimetype detection instead of extension
2015-11-10 16:00:46 +01:00
Lukas Reschke 8537468c2c Use actual mimetype detection instead of extension
We cannot rely on the extension as the file may also be a valid TAR or ZIP file without such content. Especially when getting resources from the ownCloud appstore.
2015-11-10 15:06:45 +01:00
Morris Jobke 5871a0e93b Merge pull request #20395 from owncloud/stable8.1-extstorage-gdrive-forceapproval
[stable8.1] Force approval in GDrive oauth to get refresh_token
2015-11-09 14:01:06 +01:00
Vincent Petry f6872ef1a5 Force approval in GDrive oauth to get refresh_token
Forcing the approval of app permissions makes sure that the GDrive API
will always return a refresh_token.

In the case of apps that were already authorized for the current user/domain,
the API doesn't return the refresh_token which causes expiration issues.
2015-11-09 13:05:26 +01:00
Morris Jobke e67107615d Merge pull request #20367 from owncloud/stable8.1-backport-20346
[stable8.1] Show the language code in personal settings for unknown languages
2015-11-09 08:10:27 +01:00
Morris Jobke 0e0a6ba0b6 Merge pull request #20362 from owncloud/backport-20271-stable8.1
[Backport] [stable8.1] attempt to connect to backup server again
2015-11-06 15:26:19 +01:00
Morris Jobke bdeff3530c Show the language code in personal settings for unknown languages
Steps to reproduce:
* having an unknown language set in oc_preferences
* browse the personal settings
* only get listed the first letter of this language in the language chooser
2015-11-06 14:01:39 +01:00
Arthur Schiwon c603143ed7 integration tests 2015-11-06 12:59:15 +01:00
Arthur Schiwon c3155505a5 LDAP: attempt to connect to backup server again, if main server is not available. Fixes #18701 2015-11-06 12:59:08 +01:00
Vincent Petry ec999816d2 Merge pull request #20246 from owncloud/backport-20192-stable8.1
[backport] [stable8.1] if a user that is flag as deleted shows up again, remove that flag. F…
2015-11-05 17:26:23 +01:00
Vincent Petry 0c8bce90c0 Merge pull request #20286 from owncloud/stable8.1-share-preventmovemountpointintosharedfolder
[stable8.1] Prevent moving mount point into already shared folder (outgoing)
2015-11-05 10:29:46 +01:00
Morris Jobke 17ed25c542 Merge pull request #20298 from owncloud/backport-20155-8.1
[backport] [stable8.1] add port to host only, if an URL is used instead of a plain hostname
2015-11-04 16:17:43 +01:00
Arthur Schiwon ccb2a386a4 add port to host only, if an URL is used instead of a plain hostname 2015-11-04 13:01:29 +01:00
Vincent Petry 897f134889 Prevent moving mount point into already shared folder (outgoing)
It is already not allowed to share a folder containing mount points /
incoming shares.

This fixes an issue that made it possible to bypass the check by moving
the incoming share mount point into an existing outgoing share folder.
2015-11-04 10:44:10 +01:00
Morris Jobke cb0762d0d4 Merge pull request #20163 from owncloud/backport-19489
[stable8.1] fix possible infinite loop when reading groups in the wizard
2015-11-03 13:22:53 +01:00
Arthur Schiwon 21600c7b1a if a user that is flag as deleted shows up again, remove that flag. Fixes #20090
Conflicts:
	apps/user_ldap/lib/access.php
2015-11-02 22:27:34 +01:00
Morris Jobke 61a1fc9159 Merge pull request #19773 from owncloud/stable8.1-proppatch-lastmodified
[stable8.1] Fix mtime PROPPATCH to be "lastmodified" instead of "getlastmodified"
2015-11-02 09:01:55 +01:00
Morris Jobke f71f985427 Merge pull request #20137 from owncloud/LukasReschke-patch-2
[stable8.1] Update certificate bundle
2015-11-02 09:01:21 +01:00
C Montero-Luque aca9fce93f 8.1.4 2015-10-30 12:45:25 -04:00
Arthur Schiwon e0583a10f3 fix possible infinite loop when reading groups in the wizard 2015-10-29 21:46:46 +01:00
Lukas Reschke 1e2fca60e0 [stable8.1] Update certificate bundle
Backport of https://github.com/owncloud/core/pull/20126
2015-10-29 10:36:35 +01:00
C Montero-Luque f7f34dbeb4 8.1.4 RC2 2015-10-28 10:22:39 -04:00
Thomas Müller 8e0cddbe01 Merge pull request #19512 from owncloud/backport-19419-stable8.1
[backport] [stable8.1] memberOf resembles a DN as well and is actively used
2015-10-28 11:09:01 +01:00
Thomas Müller 3bad2ac1e5 fixing typo 2015-10-28 09:24:19 +01:00
Arthur Schiwon 9f3ea9116e memberOf resembles a DN as well and is actively used
Conflicts:
	apps/user_ldap/tests/access.php
2015-10-28 09:21:54 +01:00
Morris Jobke 3387d05ca9 Merge pull request #19972 from owncloud/stable8.1-backport-19635
[stable8.1] allow an attribute to return more than one value
2015-10-27 14:08:26 +01:00
Thomas Müller 74871b1676 Merge pull request #20064 from owncloud/stable8.1-add-warning-for-php7
[stable8.1] Stop processing if PHP 7 is used
2015-10-26 22:04:14 +01:00
Lukas Reschke 352d695c95 Stop processing if PHP 7 is used
PHP 7 is only compatible with ownCloud 8.2.0
2015-10-26 17:39:35 +01:00
Lukas Reschke cc9d5e44b1 Adjust unit tests 2015-10-26 16:46:34 +01:00
Lukas Reschke 643cba065a Fix style 2015-10-26 16:46:22 +01:00
Frédéric Fortier c5b28e0795 Revert "adjust to nested group fix
This reverts commit 845485cfe, which fixes #19816 regression.
2015-10-26 16:46:09 +01:00
Thomas Müller 5062007000 Merge pull request #19998 from owncloud/backport-fix-deleted-ldap-user-sharing-stable8.1
[8.1] handle NoUserException in sharing code
2015-10-23 15:26:54 +02:00
Thomas Müller 9daf3e7410 Merge pull request #20007 from owncloud/stable8.1-backport-19957
[8.1] Expose syslog tag in the configuration
2015-10-23 15:26:10 +02:00
Thomas Müller 8f6774fc4c Merge pull request #20002 from owncloud/backport-19970-8.1
[8.1] Fix "Call to a member function getUID() on boolean" in Crypt
2015-10-23 15:25:54 +02:00
Steffen Lindner 371f4bf472 Add syslog_tag docu to sample config 2015-10-23 14:17:04 +02:00
Volker Fröhlich 49879b868b Expose syslog tag in the configuration 2015-10-23 14:16:49 +02:00
Joas Schilling 1cf61baa41 Fix "Call to a member function getUID() on boolean" in Crypt 2015-10-23 13:45:09 +02:00
Morris Jobke e3642f2f3d handle NoUserException in sharing code
* setup LDAP users
* share from an LDAP user
* delete that LDAP user
* log in as share recipient
* before: unhandled NoUserException
* after: NoUserEception is logged and share is not shown anymore
2015-10-23 12:21:52 +02:00
Arthur Schiwon bb973c2d76 adjust fetchList with a single requested attribute accordingly 2015-10-22 12:08:25 +02:00
Arthur Schiwon cde21db620 adjust tests 2015-10-22 12:08:17 +02:00
Arthur Schiwon f9be35c931 fix primary group retrieval 2015-10-22 12:08:09 +02:00
Arthur Schiwon ba13cecb76 treat dn as any other attribute when building the search() return array 2015-10-22 12:07:52 +02:00
Arthur Schiwon 5412899665 adjust handling changed return array structure from search() and fetchList() 2015-10-22 12:03:07 +02:00
Arthur Schiwon 6ccc5a6cd3 allow an attribute to return more than one value 2015-10-22 12:02:48 +02:00
Arthur Schiwon 7ccd52db25 lowercase configured displayname attribute so isset works - all attribute names coming from ldap are lowercased for easy comparison 2015-10-22 12:01:26 +02:00
Arthur Schiwon a05ead505d fix update quota with known value 2015-10-22 12:01:25 +02:00
Arthur Schiwon 0a9904963d stable8.1 related adjustments to #18469 backport 2015-10-22 12:01:25 +02:00
Arthur Schiwon c1953f9676 Backport #18469 (read all relevant user attributes on login and user search, in one query)
read all relevant user attributes on login and user search, in one query. saves us some.

Conflicts:
	apps/user_ldap/user_ldap.php

adjust to nested group fix

do not throw exception when no attribute is specified
2015-10-22 12:01:25 +02:00
C Montero-Luque 5e8f0a893d 8.1.4 RC1 2015-10-21 17:09:42 -04:00
Thomas Müller c16a847163 Merge pull request #19832 from owncloud/stable8.1-public-recognizeauthsession
[stable8.1] Allow public auth to recognize sesssion
2015-10-20 14:25:59 +02:00
Thomas Müller c2ded337e6 Merge pull request #19830 from owncloud/fix-expiration-format-stable8.1
Use proper format when setting the expiration date
2015-10-16 15:43:38 +02:00
Vincent Petry df4348674b Allow public auth to recognize sesssion
When a public link password has been input, its auth is stored in the
session.
This fix makes it possible to recognize the session when using public
webdav from the files UI.
2015-10-16 13:50:39 +02:00
Thomas Müller f3392f9e59 Use proper format when setting the expiration date 2015-10-16 13:47:36 +02:00
Thomas Müller 923e6ca1bf Merge pull request #19809 from owncloud/show-serverside-share-link-expiration-stable8.1
Update expiration date on link sharing
2015-10-16 13:08:14 +02:00
Roeland Douma 64fb704c4e Merge pull request #19638 from owncloud/stable8.1_backport_sharingcheckmiddleware_fixes
Stable8.1 backport sharingcheckmiddleware fixes
2015-10-16 08:51:37 +02:00
Thomas Müller 4ba4fb5ffb Merge pull request #19784 from owncloud/stable8.1_backport_19727
[Stable8.1] Return path instead of itemsource
2015-10-15 19:58:42 +02:00
Thomas Müller e1d2ab83cc Set expiration date on password change 2015-10-15 17:16:18 +02:00
Thomas Müller 6fd2f18b85 Only show expiration date in the web ui if it has been set 2015-10-15 16:58:51 +02:00
Thomas Müller a2810f6207 Update expiration date on link sharing 2015-10-15 15:23:50 +02:00
Lukas Reschke 4d92aa551d Merge pull request #19786 from owncloud/backport-stable8.1-setup-transport
[stable8.1] Setup sendmail transport
2015-10-15 14:00:24 +02:00
Lukas Reschke 5ed1744a6f Setup sendmail transport
Replaces https://github.com/owncloud/core/pull/19047 and fixes https://github.com/owncloud/enterprise/issues/854  and https://github.com/owncloud/core/issues/19110
2015-10-14 16:29:55 +02:00
Roeland Jago Douma 371061ac6d Return path instead of itemsource
Fixes #19678

Errors should contain paths and not internal ids
2015-10-14 15:56:03 +02:00
Vincent Petry a68d9159bd Fix mtime PROPPATCH to be "lastmodified" instead of "getlastmodified"
Fix regression that makes PROPPATCH of mtime work like it did in OC <=
8.0.
The PROPPATCH must be done on the "lastmodified" property.
The "getlastmodified" now return 403 again.
2015-10-14 14:23:37 +02:00
Morris Jobke 85c8af596d Merge pull request #19740 from owncloud/stable8.1-do-not-leak-exception-data
[stable8.1] Do not print exception message
2015-10-13 18:19:18 +02:00
Morris Jobke 2f2d94f801 Merge pull request #19287 from RealRancor/restruct_config_sample
Restructure config.sample.php of stable8.1
2015-10-13 16:23:42 +02:00
Lukas Reschke 9ece45ca28 Do not print exception message
In case of an error the error message often contains sensitive data such as the full path which potentially leads to a full path disclosure.

Thus the error message should not directly get displayed to the user and instead be logged.
2015-10-13 14:31:47 +02:00
Morris Jobke e9a17fbee5 Merge pull request #19715 from owncloud/stable8.1-repair-donotrepairfoldermimetypes
[stable8.1] Do not update mime types for folders with extension
2015-10-13 09:54:00 +02:00
Vincent Petry 37747016f2 Do not update mime types for folders with extension
Some folders might have an extension like "test.conf".
This fix prevents to overwrite the folder's mime type with another mime
type while running the mimetype repair step.
2015-10-12 17:28:32 +02:00
Thomas Müller 07f903a1e3 Merge pull request #19466 from owncloud/tarstreamer-stable8.1
[stable8.1] backport Tarstreamer
2015-10-12 11:58:03 +02:00
Morris Jobke 4c13a648bb Merge pull request #18855 from owncloud/memcached-fix-stable8.1
[stable8.1] Fallback to complete Memcached flush if getAllKeys fails
2015-10-09 13:19:35 +02:00
Morris Jobke c3ec3b0fe0 Merge pull request #19658 from owncloud/stable8.1-backport-19546
Stable8.1 backport 19546
2015-10-09 13:16:33 +02:00
Thomas Müller 045c491be8 Updating 3rdparty dependency 2015-10-09 13:03:09 +02:00
Robin Appelman 56fcef3d56 fix internal path when searching in storage root
(cherry picked from commit c2d76d2)
2015-10-09 08:52:42 +02:00
Robin Appelman db909277f1 Add unit test for searching in storage root
(cherry picked from commit e28a2ff)
2015-10-09 08:52:42 +02:00
Olivier Paroz 30c149deeb The minimum size for internalRootLength is 1
(cherry picked from commit 3173ed2)
2015-10-09 08:52:42 +02:00
Thomas Müller 87f27d0ba1 Merge pull request #19652 from owncloud/backport-disable-appstore-for-ee
[stable8.1] Disable app store for EE by default
2015-10-09 08:48:43 +02:00
Thomas Müller 48ec118af6 Merge pull request #19604 from owncloud/stable8.1-backport-19574
[stable8.1] Clear the shares after the test like storages and files
2015-10-09 08:48:27 +02:00
Lukas Reschke b21912aa41 Disable app store for EE by default
This disables the app store for EE versions by default to address some problems caused by the wrong assumption that "Official" means supported by ownCloud Inc.

Administrators can still enable the app store by setting `appstoreenabled` to true in the config file.
2015-10-08 15:12:41 +02:00
Joas Schilling f83f80ac71 Only use zip64 when we have 64 bit php 2015-10-08 10:32:24 +02:00
Roeland Jago Douma c7d9936d67 sharingcheckmiddleware now handles externalshares as well
Added new annotations for the externalsharescontroller class
* @NoOutgoingFederatedSharingRequired
* @NoIncomingFederatedSharingRequired

By default both are required for all functions in the
externalSharesController.

A proper exception is thrown and then a 405 is returned instead of the
default error page. Since it is only an API endpoint this makes more
sense.

Unit tests added and updated
2015-10-08 08:20:08 +02:00
Roeland Jago Douma ffb8819125 Split files_sharing middelware
Since for external shares there is no need for link shares to be enabled
we should check which controller is actually being called.

This makes sure that in all cases we verify that the files_sharing app
is enabled. But only for the share controller (public shares) we check
if the API is enabled and if links are enabled.

TODO: add checks for federated sharing as well
2015-10-08 08:11:15 +02:00
Lukas Reschke b5f8f94341 Only intercept exceptions of type "NotFoundException" instead of any Exception
The sharing backend may throw another exception for example when the activity app encounters a problem. Previously this just triggered a 404 error page and the exception got not logged at all. With this change such exceptions get not intercepted and regularly handled as exceptions so that we have meaningful log data. Also the user will be shown a window informing him that an error happened.

Helps to debug cases such as https://github.com/owncloud/core/issues/19465
2015-10-08 08:11:06 +02:00
Roeland Jago Douma a77f679779 Respect disabled sharing API settings
If the sharing API setting is disabled that sharing check middle ware
should block the request. Thus making link shares unavailable.
Fixes #18970

* Unit test added
* Unit tests updated
2015-10-08 08:09:55 +02:00
Morris Jobke c2ca7fc91d Clear the shares after the test like storages and files
* adjusted to stable8.1 backport of #19574
2015-10-06 14:12:15 +02:00
Thomas Müller 29a4d1b512 Merge pull request #19598 from owncloud/stable8.1_backport_19553
[stable8.1] Backport of #19553: show MM-DD-YYYY as expiration date consistently
2015-10-06 14:07:04 +02:00
Roeland Jago Douma c589244b40 Backport of #19553
Show expiration date always as MM-DD-YYYY
2015-10-06 07:50:36 +02:00
Thomas Müller 4a1246fa29 Merge pull request #19485 from owncloud/stable8.1-backport-19460
[8.1] backport 19460 | Fix postScanFile event and make it available to utils scanner
2015-10-01 12:01:49 +02:00
Olivier Paroz dc128295c6 Make postScanFile and postScanFolder available to OC\Files\Utils\Scanner
(cherry picked from commit cc64c09)
2015-09-30 18:19:44 +02:00
Olivier Paroz 788831f139 Always send a postScanFile event when done scanning a file
postScanFile is important when scanning external storage as it indicates when the file is ready to be used
(cherry picked from commit 9ea05c8)
2015-09-30 18:19:11 +02:00
Thomas Müller 9a81eca7ba Merge pull request #19450 from owncloud/stable8.1-backport-19440-19426
Stable8.1 backport 19440 19426
2015-09-30 16:11:06 +02:00
Thomas Müller b9e0e6a573 Merge pull request #19475 from owncloud/thumbnail-temp-clean-81
[8.1] Clean temp files used for thumbnail generation
2015-09-30 16:10:27 +02:00
Robin Appelman 32c6fdf098 Clean temp files used for thumbnail generation 2015-09-30 15:15:08 +02:00
Thomas Müller 643b6c11c3 Adding TarStreamer and updating ZipStreamer 2015-09-30 10:32:57 +02:00
Victor Dubiniuk 9e5f538897 Uniform behavour for tar and zip 2015-09-30 10:25:33 +02:00
Victor Dubiniuk ab68469e61 More corrections 2015-09-30 10:25:33 +02:00
Victor Dubiniuk b70e7f4d0a Add namespace. Fix broken zip 2015-09-30 10:25:33 +02:00
Victor Dubiniuk 623ce418ce Add PHpdoc 2015-09-30 10:25:33 +02:00
Victor Dubiniuk 6c2f95ff9f Introduce streamer 2015-09-30 10:25:29 +02:00
Morris Jobke 2764aa1b99 Merge pull request #18572 from owncloud/stable8.1-backport-18553
[stable8.1] Save detected l10n of browser on login
2015-09-29 18:23:24 +02:00
Lukas Reschke 1a167dd5ac Add blob: scheme to default CSP policy
Fixes https://github.com/owncloud/core/issues/19438
(cherry picked from commit e735a99)
2015-09-29 17:11:39 +02:00
Olivier Paroz f934a6fae6 Fix CSP for images for legacy apps
Fixes #19425
(cherry picked from commit c4bac16)
2015-09-29 17:00:54 +02:00
Morris Jobke 50a8ba6062 Merge pull request #19446 from owncloud/stable8.1-backport-19441
[stable8.1][upgrade] switch to debug logging on upgrade
2015-09-29 16:48:09 +02:00
Morris Jobke 427f7d5a5c Merge pull request #19439 from owncloud/stable8.1-share-disablepluginwhennocoreshare
[stable8.1] Do not register JS share plugin if core sharing API is disabled
2015-09-29 16:30:59 +02:00
Morris Jobke 655eb4ce40 [upgrade] switch to debug logging on upgrade
* resets afterwards
* adds output about the previous log level
2015-09-29 16:14:45 +02:00
Vincent Petry 9bd37d2acd Do not register JS share plugin if core sharing API is disabled 2015-09-29 14:24:19 +02:00
Morris Jobke 1d2803ec9a Save detected l10n of browser on login
* fixes owncloud/activity#373
2015-09-28 14:00:33 +02:00
Thomas Müller d6994b2da6 Merge pull request #19216 from owncloud/stable8.1-discardexpirationdatefornonlinkshares
[stable8.1] Discard expiration date from result for non-link shares
2015-09-24 21:07:15 +02:00
Thomas Müller c4667d5213 Merge pull request #18957 from owncloud/stable8.1-backport-17791
[stable8.1] Add custom CSP for Win 10 compatibility
2015-09-24 21:06:49 +02:00
RealRancor 310762a118 Restructure config.sample.php of stable8.1 2015-09-23 09:57:34 +02:00
Vincent Petry 7b5218ed30 Merge pull request #19149 from owncloud/issue-19147-backport-update-break
Issue 19147 backport update break
2015-09-22 12:34:55 +02:00
Björn Schießle 00447f32f6 Merge pull request #18747 from owncloud/fix_password_reset_8.1
[stable8.1] use login name for password reset
2015-09-22 09:52:17 +02:00
Thomas Müller 876266f0ce Merge pull request #19051 from owncloud/backport-shibboleth-fix-stable8.1-2
Repeated calls to loginWithApache() should not not try to set user in…
2015-09-21 16:09:47 +02:00
blizzz dc1755ab52 Merge pull request #18123 from GreenArchon/backport-17759-stable8.1
[stable8.1]Properly nest groups when using memberOf to detect group membership, fixes #17759
2015-09-21 15:51:06 +02:00
Vincent Petry c48a61a975 Discard expiration date from result for non-link shares 2015-09-21 11:42:46 +02:00
Björn Schießle 42c454e8d0 Merge pull request #19011 from owncloud/fix_18926_8.1
[stable8.1]  check for the right user if we can change his password
2015-09-21 10:05:49 +02:00
Vincent Petry aaa1249075 Improved update version detection logic 2015-09-18 09:07:18 +02:00
Vincent Petry 380971c76d Simplify comparison algo 2015-09-18 09:07:18 +02:00
Vincent Petry 1efcbca9dc Throw exception on downgrade attempt 2015-09-18 09:07:18 +02:00
Vincent Petry 1f7b231b9a Restrict upgrades to explicit allowed version
version.php now contains the previous ownCloud version from which
upgrades are allowed. Any other upgrades will show a message that the
upgrade/downgrade is not supported.

Conflicts:
	version.php
2015-09-18 09:07:16 +02:00
Thomas Müller 0b279f9a13 Merge pull request #19075 from owncloud/check-maintenance-before-everything-else
Check for maintenance mode first so we send the 503 instead of login …
2015-09-16 10:24:22 +02:00
Joas Schilling aa12a9983a Check for maintenance mode first so we send the 503 instead of login verification 2015-09-16 09:27:38 +02:00
Thomas Müller bf149b1529 Repeated calls to loginWithApache() should not not try to set user information in the session again 2015-09-15 16:40:12 +02:00
Joas Schilling c736f5dcc4 Merge pull request #18816 from owncloud/move-background-job-registration-to-install-update-8.1
Move background job registration to install update 8.1
2015-09-15 10:36:11 +02:00
Morris Jobke 63e07b0525 Merge pull request #18703 from owncloud/request-fix-stable8.1
[stable8.1] Decode request content only on getContent
2015-09-15 09:17:13 +02:00
Individual IT Services 690a4597e3 Merge pull request #19013 from owncloud/stable8.1-backport-19006
[stable8.1] allow ".." in folder names
2015-09-14 16:22:11 +05:45
Individual IT Services 709f289beb allow ".." in folder names
backport of #19006
fix for #18987
2015-09-14 16:04:56 +05:45
Bjoern Schiessle fd259db588 check for the right user if we can change his password 2015-09-14 11:50:46 +02:00
Joas Schilling 5500cb9b4e Move registration of LDAP background jobs to the install and update 2015-09-14 11:14:54 +02:00
Joas Schilling 15a054f127 Move registration of background job to install/update 2015-09-14 11:08:40 +02:00
C Montero-Luque 015323c1cb 8.1.3 2015-09-10 10:28:00 -04:00
Lukas Reschke 4d1b898bc5 Add custom CSP for Win 10 compatibility
The default content-security-policy of ownCloud forbids inline
JavaScript for security reasons. IE starting on Windows 10 will
however also obey the CSP which will break the event source fallback.
As a workaround thus we set a custom policy which allows the execution
of inline JavaScript.

This fixes https://github.com/owncloud/core/issues/14286
2015-09-10 15:01:38 +02:00
Morris Jobke 8d800e9635 Merge pull request #18928 from owncloud/stable8.1-backport-18832
[stable8.1] Avoid re-propagation of shares during one propagation run
2015-09-09 23:21:08 +02:00
Morris Jobke bef8dd4171 Merge pull request #18904 from owncloud/missing-context-on-update-file-target_8.1
[stable8.1] Use context function call instead of static
2015-09-09 15:15:56 +02:00
Morris Jobke 2f851201db Merge pull request #18903 from owncloud/fix_sharing_add_to_group_8.1
[stable8.1] fix addToGroup hook
2015-09-09 15:15:48 +02:00
Morris Jobke cbcbbd9423 Avoid re-propagation of shares during one propagation run
* fix was proposed by @nickvergessen
2015-09-09 15:10:54 +02:00
Morris Jobke 5d433da1ae Merge pull request #18814 from owncloud/shared-mount-delay-setup-8.1
[8.1] Delay setting up the filesystem for a share owner untill the share is used
2015-09-09 15:07:52 +02:00
Joas Schilling 349c650535 Use context function call instead of static 2015-09-08 17:13:39 +02:00
Bjoern Schiessle 3ceee5408a intproduce pre_addToGroup hook. we need to calculate the possible unique
targets before the user was added to the group otherwise we will always detect
a name collision
2015-09-08 17:08:52 +02:00
Bjoern Schiessle 3b30dd4394 use the correct user if we update the share table 2015-09-08 17:08:39 +02:00
Lukas Reschke f3b8b90191 Merge pull request #18844 from owncloud/app-upgrade-routenotfound-stable8.1
[stable8.1] Always add to $loadedApps
2015-09-08 13:40:54 +02:00
Robin McCorkell 76399dc6b0 Fallback to complete Memcached flush if getAllKeys fails
Newer Memcached's do not support the underlying protocol commands that
getAllKeys() is implemented with. We should fallback to clearing
everything in that case, as causing (temporary) performance problems for
other applications on the server is better than having stale cached data.
2015-09-06 18:16:15 +01:00
Robin McCorkell a2d456c195 Always add to $loadedApps 2015-09-05 11:43:00 +01:00
Robin Appelman 9c289b71c6 setup owner when getting users for share 2015-09-03 15:12:46 +02:00
Robin Appelman 4676f39855 Delay setting up the filesystem for a share owner untill the share is used 2015-09-03 15:12:38 +02:00
C Montero-Luque 7b510f2510 8.1.2 2015-09-02 10:54:56 +02:00
Bjoern Schiessle b823bbbc28 use login name for password reset 2015-09-01 18:01:59 +02:00
Robin McCorkell 0dfa839582 Decode request content only on getContent 2015-08-31 14:05:51 +01:00
C Montero-Luque 01fc0b53f6 8.1.2 RC1 2015-08-30 10:36:12 +02:00
Morris Jobke 04bed337ee Merge pull request #18612 from owncloud/stable8.1-newer-certs-2
[stable8.1] Use certificates that expire in 10 years
2015-08-28 18:44:10 +02:00
Lukas Reschke 0e4bdfbef3 Use certificates that expire in 10 years
🙊 🙊 🙊
2015-08-27 22:25:40 +02:00
Morris Jobke 3233b9c4ee Merge pull request #18583 from owncloud/backport-of-18582
[stable8.1] Remove last occurence of `forcessl`
2015-08-26 22:08:49 +02:00
Lukas Reschke 1850476916 Remove last occurence of forcessl
This shoudl have been adjusted as well, now it's consistent with `setMagicInCookie`. While it does not have a security impact directly some automated scanners reported this all the time.
2015-08-26 15:09:00 +02:00
Morris Jobke bcc79b0e40 Merge pull request #18579 from owncloud/backport-18279-stable8.1
[backport] also don't count group members when more than 1 ldap configs are active
2015-08-26 14:29:29 +02:00
Arthur Schiwon 1d8b5ac909 also don't count group members when more than 1 ldap configs are active 2015-08-26 11:58:36 +02:00
Joas Schilling 540ad35f3b Merge pull request #18544 from owncloud/stable8.1-backport-18439
[stable8.1] [app management] fix dependency check on install
2015-08-26 11:00:39 +02:00
Morris Jobke d2c81fd3c5 Merge pull request #18555 from owncloud/fix-gs-share-stable8.1
[stable8.1] Simply hide sharing buttons for IE8 - fixes #18011
2015-08-25 21:59:32 +02:00
Lukas Reschke c3468c7b29 Merge pull request #18559 from owncloud/ext-objectstore-stable8.1
[stable8.1] Prevent objectstore being set from client side
2015-08-25 20:56:38 +02:00
Robin McCorkell a1706f61aa Prevent objectstore being set from client side 2015-08-25 16:21:09 +01:00
Thomas Müller 7d436579cb don't load gs-share 2015-08-25 16:50:17 +02:00
Thomas Müller b2adf17433 Simply hide sharing buttons for IE8 - fixes #18011 2015-08-25 16:09:28 +02:00
Morris Jobke 76306dd5a1 [app management] fix dependency check on install 2015-08-25 14:19:54 +02:00
Morris Jobke 727cb3b2a3 Merge pull request #18446 from owncloud/ext-setuservars-string-stable8.1
[stable8.1] setUserVars() should only attempt substitution with strings
2015-08-25 09:00:22 +02:00
Morris Jobke 227e338542 Merge pull request #18487 from owncloud/add-cors-header-to-allow-client-based-check
[stable8.1] Add CORS header to status.php to allow client-based check…
2015-08-24 09:30:02 +02:00
Lukas Reschke 6dffa0fc95 [stable8.1] Add CORS header to status.php to allow client-based check in the future 2015-08-22 14:48:28 +02:00
Robin McCorkell bf1096602b Retain compatibility with updated storage configurations
String booleans are still accepted
2015-08-20 12:28:59 +01:00
Robin McCorkell d6bc77599e setUserVars() should only attempt substitution with strings 2015-08-20 02:21:45 +01:00
Morris Jobke 21c9dd284b Merge pull request #18431 from owncloud/add-warning-ca-bundle-stable8.1
[stable8.1] Add warning for not existing CA bundle when updating
2015-08-19 19:53:44 +02:00
Morris Jobke 174c4e3113 Merge pull request #18353 from owncloud/backport-block-autocomplete
[stable8.1] Add option to disable autocomplete in share dialog
2015-08-19 16:16:11 +02:00
Lukas Reschke 373d1b67b2 Add warning for not existing CA bundle when updating
For newer releases we shall use an integrity check. But that's a good alternative for now.
2015-08-19 15:13:24 +02:00
Thomas Müller 31eb4f06f7 Merge pull request #18397 from owncloud/smb-1.0.4-81
[8.1] Update Icewind/SMB to 1.0.4
2015-08-19 09:16:06 +02:00
Robin Appelman b9e5809869 update icewind/smb to 1.0.4 2015-08-18 17:36:55 +02:00
Robin Appelman 8c145541f6 update icewind/smb to 1.0.3 2015-08-18 17:36:51 +02:00
Robin McCorkell 880ba38e2c Merge pull request #18367 from owncloud/config-php-tyops-8-1
typo fixes
2015-08-17 23:42:06 +01:00
Carla Schroder 47ec44da3b typo fixes 2015-08-17 10:49:28 -07:00
Morris Jobke 60cd118371 Add option to disable autocomplete in share dialog 2015-08-17 15:45:06 +02:00
Morris Jobke 2c81ac1cf7 Merge pull request #18182 from owncloud/backport-18159-stable8.1
Backport 18159 stable8.1
2015-08-16 14:39:25 +02:00
Thomas Müller 3ea3fc7b62 Merge pull request #18274 from owncloud/issue-18261-sharing-capabilities-use-wrong-default-8.1
[8.1] Issue 18261 sharing capabilities use wrong default 8.1
2015-08-14 12:24:51 +02:00
Morris Jobke dc012be598 Merge pull request #18277 from owncloud/stable8.1-17852
[stable8.1] add test for factories
2015-08-14 00:36:56 +02:00
Jan-Christoph Borchardt 94f2b2ba8c Merge pull request #18284 from owncloud/stable8.1-backport-17785
[stable8.1] fix mobile scrolling, lower sidebar sensitivity, fix #11193
2015-08-13 23:38:46 +02:00
Jan-Christoph Borchardt 116ec56e8c Merge pull request #18288 from owncloud/stable8.1-backport-18231
[stable8.1] Show strage full warning for shared storages temporary
2015-08-13 23:38:20 +02:00
Morris Jobke 444d5d27de Show strage full warning for shared storages temporary
* removed the setDefault call because then it will always be
  reshown
  * was added with ba475d4862
* fixes #18208
2015-08-13 17:12:41 +02:00
Jan-Christoph Borchardt dcda1e1e61 fix mobile scrolling, lower sidebar sensitivity, fix #11193 2015-08-13 15:43:49 +02:00
Morris Jobke 6bcf2b9e77 Merge pull request #18257 from owncloud/stable8.1-backport-17680
[stable8.1] handle rmdir on files for ftp storages
2015-08-13 15:31:51 +02:00
Thomas Müller dbc03b68ae Merge pull request #18237 from owncloud/backport-scanfilesignature
[stable8.1] Backport scanfilesignature
2015-08-13 14:54:25 +02:00
Jan-Christoph Borchardt 94eb5f645a Merge pull request #18266 from owncloud/stable8.1-filelist-emptycontentduringmask
[stable8.1] Make sure to hide empty content message when mask is shown
2015-08-13 14:48:37 +02:00
Bernhard Posselt c31e2464c8 add test for factories
use ref for factory test

Ensure we construct SimpleContainer

Use single instance of DIContainer in routing tests
2015-08-13 13:27:32 +01:00
Joas Schilling 9e42d3ed43 Fix config map provider for tests 2015-08-13 13:09:08 +02:00
Joas Schilling d3266f5459 Fix default values of sharing capabilities
The problem is the UI used a different default than the capabilities.
So when you never touched the config, the setting in admins said "disabled"
while the capabilities said "enabled".
2015-08-13 13:01:32 +02:00
Vincent Petry dcd9154f04 Make sure to hide empty content message when mask is shown 2015-08-13 11:55:15 +02:00
Joas Schilling c8e1359c9d Add a basic unit test which notifies us about incompatible extending 2015-08-13 11:41:13 +02:00
Robin Appelman 6c8689072c handle rmdir on files for ftp storages 2015-08-13 10:54:41 +02:00
Joas Schilling e272ec0c3e Fix duplicated line in doc block 2015-08-12 15:51:29 +02:00
Vincent Petry 327f96f29b Fix scanFile signature to avoid boring warning 2015-08-12 15:40:45 +02:00
Vincent Petry 1add97feae Merge pull request #17753 from oparoz/fix-previews-for-public-uploads
[stable8.1] Fix preview of old file on public upload conflicts
2015-08-12 10:58:40 +02:00
Thomas Müller e9a1a8cf75 Merge pull request #18172 from owncloud/fix-language-of-files-activities-in-emails-8.1
[8.1] Correctly make use of the languageCode argument in the files activity extension
2015-08-12 10:23:49 +02:00
Thomas Müller 69970f83f9 Merge pull request #18139 from owncloud/stable8.1-share-permwrongvar
[stable8.1] Fix removal of share permissions when share disabled for user
2015-08-12 10:23:35 +02:00
Thomas Müller 82bffa0df2 Merge pull request #18108 from owncloud/dav-upload-updater-81
[8.1] go trough the updater when uploading over webdav
2015-08-12 10:21:09 +02:00
Thomas Müller 7c58985ca1 Merge pull request #18104 from owncloud/share-group-conflict-81
[8.1] Re-use the share entry we have for the shared storage instead of searching for it every time
2015-08-12 10:20:44 +02:00
Thomas Müller 18ec257ab2 Merge pull request #18064 from owncloud/import_root_certificates_8.1
[stable8.1] disable "ssl root certificate" settings if user can't mount external storages
2015-08-12 10:20:27 +02:00
Thomas Müller 04b409fb09 Merge pull request #17991 from owncloud/backport-correct-regex
[stable8.1] Correct regex
2015-08-12 10:20:01 +02:00
Thomas Müller 571b7f0c2c Merge pull request #17972 from owncloud/stable81-17969
[stable8.1] [admin settings] only retrieve log file size if file exists
2015-08-12 10:19:52 +02:00
Thomas Müller e94d8bbf24 Merge pull request #17957 from owncloud/stable8.1-backport-17489
[stable8.1] Fix parsing of sharetime as string
2015-08-12 10:19:31 +02:00
Thomas Müller ac04692eac Merge pull request #17951 from owncloud/backport-17464-stable8.1
[stable8.1] Backport of #17464, fix uncaught exception on not permitted file type…
2015-08-12 10:19:16 +02:00
Thomas Müller f7cb36a706 Merge pull request #17947 from owncloud/fix_move_files_8.1
[stable8.1] make sure that hooks are emitted properly on file move operation
2015-08-12 10:19:01 +02:00
michag86 c9132190ab Update installer.php 2015-08-10 18:38:22 +02:00
michag86 677bb62edf Check if archive contains a directory named like appid 2015-08-10 18:38:11 +02:00
Joas Schilling 087acc550c Correctly make use of the languageCode argument in the files activity extension 2015-08-10 14:59:51 +02:00
Frank Karlitschek ca66a705ec 8.1.1 2015-08-07 20:17:23 -04:00
Vincent Petry 89ccdcf134 Fix removal of share permissions when share disabled for user 2015-08-07 19:05:55 +02:00
Frédéric Fortier 1436baaff7 fix more review comments for #18042 / #17759 2015-08-07 09:14:55 -04:00
Frédéric Fortier 30b3b075ba Take review comments into consideration for pr #18042 / issue #17759 2015-08-07 09:14:40 -04:00
Frédéric Fortier 6e1e70439b Properly nest groups when using memberOf to detect group membership, fixes #17759 2015-08-07 09:14:28 -04:00
Robin Appelman e0a330315d go trough the updater when uploading over webdav 2015-08-06 16:58:09 +02:00
Robin Appelman b91f002baf just pass the share instead of searching for it 2015-08-06 14:30:36 +02:00
Robin Appelman cb791c7fe2 add unit tests for share target conflict with group shares 2015-08-06 14:30:25 +02:00
Thomas Müller 1a1e19f929 Merge pull request #18054 from owncloud/shared-propagate-check-recipient-stable81
[8.1] fix infinite loops with propagating etags on reshares
2015-08-05 12:01:36 +02:00
Bjoern Schiessle 6534202573 also block certificate management in the back-end if external storages are disabled for the user 2015-08-05 10:40:49 +02:00
Bjoern Schiessle a430e75425 only add the possibility to import ssl root certificates to the personal
setting if the user can mount external storages
2015-08-05 10:40:40 +02:00
Robin Appelman 78a46dcac1 fix infinite loops with propagating etags on reshares 2015-08-04 14:05:41 +02:00
C Montero-Luque 8c9b8f4fe9 8.1.1 RC1 2015-08-03 07:16:38 -04:00
Thomas Müller a0ab86bb91 Merge pull request #18013 from owncloud/enc_always_update_file_cache_8.1
[stable8.1] let the encryption storage wrapper always update the file cache
2015-08-03 12:54:01 +02:00
Björn Schießle ab16bea5c7 Merge pull request #17990 from owncloud/enc_only_update_file_cache_once_8.1
[stable8.1] only update database on the first run
2015-08-03 11:34:24 +02:00
Bjoern Schiessle 2e8f47dfb6 always update file cache, the cache can handle partial data correctly if the file doesn't already exists in the file cache 2015-07-31 17:34:01 +02:00
Bjoern Schiessle a79a15e6c5 only update database on the first run (first run = we have a version number from the old encryption app) 2015-07-31 10:50:56 +02:00
Roeland Douma cf4f43363c Merge pull request #18003 from owncloud/backport-17805-stable8.1
[stable8.1][avatar] add error handlers for avatar setup
2015-07-31 10:46:18 +02:00
Morris Jobke ef2eeae852 [avatar] add error handlers for avatar setup
add colon to translated string

use placeholder in t()

Adding a size limitation for avatar upload

Unit test for file size

Fix typo & display server side error message
2015-07-31 07:35:01 +02:00
Lukas Reschke f7360795f8 Add more unit tests 2015-07-30 16:10:28 +02:00
Lukas Reschke c61b23561b Correct regular expressions
Previously the regex was only matching on single characters. Meaning that file names such as "👍.txt" where possible while "👍" alone never was. This check apparently never worked as expected.
2015-07-30 16:10:21 +02:00
Morris Jobke 4409aed581 [admin settings] only retrieve log file size if file exists
* fixes #17467
2015-07-29 22:00:21 +01:00
Morris Jobke a9524e250a Merge pull request #17949 from owncloud/stable8.1-settings-users-apprenderedforsearchbox
[stable8.1] Trigger "apprendered" event in users page
2015-07-29 15:03:58 +02:00
Morris Jobke 42ca905d62 tests for _parseTime with hex and empty strings 2015-07-29 14:55:30 +02:00
Morris Jobke 4d6dcec751 Fix parsing of sharetime as string
In some cases the ajax/share.php will return the share time as string.
If this is the case it would get parsed completely wrong and cause the
share dropdown to not work anymore. This change will properly cast the
string to an interger and also fallback if this is not possible.
2015-07-29 14:55:21 +02:00
Arthur Schiwon 9bfbed5e0d Backport of #17464, fix uncaught exception on not permitted file types when setting avatar
refactor integration tests to make it easier to add new ones

add integration tests for avatar update

fix uncaught exception on not permitted file types when setting avatar, fixes #17232

fix test after rebasing
2015-07-29 12:45:02 +02:00
Vincent Petry c411dcd30a Trigger "apprendered" event in users page
This will properly update the controls bar width and display the search
box initially.
2015-07-29 11:35:23 +02:00
Bjoern Schiessle 2c83115a3d make sure that we emit the hooks if a file gets moved from a subfolder to the root folder with the nodes API 2015-07-29 11:07:47 +02:00
Thomas Müller 73da1ca71d Merge pull request #17935 from owncloud/detect-old-openssl-versions-stable81
[stable8.1] Detect old NSS and OpenSSL versions
2015-07-29 09:22:23 +02:00
Thomas Müller 7f5f7711ad Merge pull request #17929 from owncloud/stable8.1-smb-storageiddoubleslash
[stable8.1] Double slash for SMB storage id for compatibility
2015-07-28 23:50:31 +02:00
Vincent Petry 891a4d2ccd Merge pull request #17928 from owncloud/fix_17925_8.1
[stable8.1] set logger in constructor
2015-07-28 18:30:14 +02:00
Lukas Reschke e0b5bea50f Add unit tests 2015-07-28 16:35:55 +02:00
Lukas Reschke 3133949418 Detect old NSS and OpenSSL versions
This will detect old NSS and OpenSSL versions and show appropriate errors in the admin interface.

Fixes https://github.com/owncloud/core/issues/17901
2015-07-28 16:02:06 +02:00
Vincent Petry dcd5666601 Double slash for SMB storage id for compatibility 2015-07-28 14:30:56 +02:00
Bjoern Schiessle fc467da7d3 set logger in constructor 2015-07-28 14:21:38 +02:00
Vincent Petry a949f6c576 Merge pull request #17911 from owncloud/fix-enc-wrapper-without-encryption-stable8.1
[stable8.1] Fix enc wrapper without encryption stable8.1
2015-07-27 19:29:52 +02:00
Thomas Müller e8cbfd16a2 Merge pull request #17903 from owncloud/fix_17898_8.1
[backport 8.1] get header size before we open the file to avoid locking exception
2015-07-27 17:12:12 +02:00
Bjoern Schiessle e25a116aa6 adujust version to the stable8.1 branch 2015-07-27 16:48:58 +02:00
Bjoern Schiessle 036ba93ded add condition to update query 2015-07-27 16:09:57 +02:00
Joas Schilling b8561bda9c Add an update script to reset the value
In case encryption was not enabled, we accidently set encrypted = 1 for
files inside mount points, since 8.1.0. This breaks opening the files in
8.1.1 because we fixed the code that checks if a file is encrypted.
In order to fix the file, we need to reset the flag of the file. However,
the flag might be set because the file is in fact encrypted because it was
uploaded at a time where encryption was enabled.

So we can only do this when:
- Current version of ownCloud before the update is 8.1.0 or 8.2.0.(0-2)
- Encryption is disabled
- files_encryption is not known in the app config

If the first two are not the case, we are save. However, if files_encryption
values exist in the config, we might have a false negative here.
Now if there is no file with unencrypted size greater 0, that means there are
no files that are still encrypted with "files_encryption" encryption. So we
can also safely reset the flag here.

If this is not the case, we go with "better save then sorry" and don't change
the flag but write a message to the ownCloud log file.
2015-07-27 16:09:45 +02:00
Joas Schilling c4ddf08b79 Add a unit test for the disabled encryption case 2015-07-27 16:08:19 +02:00
Joas Schilling ef65e519ae Only set is encrypted when encryption is enabled 2015-07-27 16:08:11 +02:00
Bjoern Schiessle 4b41021fc3 get header size before we open the file to avoid locking exception 2015-07-27 14:31:06 +02:00
Thomas Müller 0ef06afc75 Merge pull request #17896 from owncloud/backport-scan-check-path
[stable8.1] check if the user is trying to scan a valid path
2015-07-27 13:40:11 +02:00
Thomas Müller 6dedef7967 Merge pull request #17883 from owncloud/backport-17882
[stable8.1] Allow classes in <h2> tags
2015-07-27 11:56:32 +02:00
Thomas Müller 1c7d737124 Merge pull request #17842 from rullzer/backport_17818
[Stable8.1] assign error message to correct object (backport #17818)
2015-07-27 11:28:15 +02:00
Lukas Reschke 4ee61f3c7a Add unit tests 2015-07-27 11:22:28 +02:00
Robin Appelman c910ac1f47 check if the user is trying to scan a valid path 2015-07-27 11:19:27 +02:00
Morris Jobke 95e44bfc4e Merge pull request #17843 from owncloud/dont-set-share-password-twice-stable8.1
Adding error handling in case setting the password fails
2015-07-27 08:56:47 +02:00
Lukas Reschke ee18718099 Allow classes in <h2> tags
Previously something like `<h2 class="inlineblock"><?php p($l->t('Some title')) ?></h2>` was shown as `<h2 class="inlineblock">Some title` within the sidebar instead as `Some Title` due to the fact that the regex was catching these classes but was not properly running the string replace function.
2015-07-26 23:02:22 +02:00
Thomas Müller 6782c6d22e Merge pull request #17853 from owncloud/sharing-password-policy-stable8.1
Sharing password policy stable8.1
2015-07-24 21:25:41 +02:00
Thomas Müller cef2680c0d Fix PHPDoc on setPassword 2015-07-24 16:49:34 +02:00
Thomas Müller e29158c892 Use a hook to integrate sharing password verification 2015-07-24 16:49:19 +02:00
Thomas Müller a53b7e3240 Adding error handling in case setting the password fails 2015-07-23 16:35:10 +02:00
michag86 74e0b6f1e5 assign error message to correct object
fix for  #17817
2015-07-23 16:17:39 +02:00
Jan-Christoph Borchardt b8e8e3fdaf Merge pull request #17832 from owncloud/improve_apps_template_8.1
[8.1 backport] make sure that there is a space between user- and admin-documentation
2015-07-23 12:29:09 +02:00
Bjoern Schiessle 965fd990fc make sure that there is a space between user- and admin-documentation 2015-07-23 11:00:10 +02:00
C Montero-Luque 3fdd5d9012 8.1.1 beta1 again 2015-07-22 17:05:14 -04:00
C Montero-Luque b4bef0214e 8.1.1 beta1 2015-07-22 16:49:28 -04:00
Thomas Müller ee85d1fd37 Merge pull request #17802 from owncloud/update-sabre-dav-2.1.6
Update SabreDAV to 2.1.6
2015-07-22 21:19:35 +02:00
Björn Schießle 77a37e076f Merge pull request #17816 from owncloud/enc_improved_app_description_8.1
[8.1 backport] improved description for the default encryption module
2015-07-22 21:01:20 +02:00
Bjoern Schiessle a07675e513 improved app description and adjust it to the way the new encryption module works 2015-07-22 16:18:10 +02:00
Joas Schilling 2b63903942 Update SabreDAV to 2.1.6 2015-07-22 12:00:29 +02:00
Joas Schilling 2bc2e974b2 Merge pull request #17752 from owncloud/enc_migration_fix_mountpoint_detection_8.1
[8.1 backport] fix system wide mount point detection on migration
2015-07-21 11:06:09 +02:00
Morris Jobke 2ecba9e5a5 Merge pull request #17762 from owncloud/backport-17723-stable8.1
Backport of #17723 to stable8.1
2015-07-21 00:30:37 +02:00
Morris Jobke dd5b347672 Merge pull request #17704 from owncloud/backport-stable8.1-17255-17526
Backport stable8.1 #17255 #17526
2015-07-21 00:01:36 +02:00
Arthur Schiwon 8be59bf7e0 Backport of #17723 to stable8.1
fix runtime caching in ldap's user manager, fixes #17631

fix indentation. no code changes, whitespace only.
2015-07-20 22:50:10 +02:00
Thomas Müller e92d427dde Merge pull request #17707 from owncloud/backport-fix-closest-stable8.1
fix browser compatibility issue for element.closest
2015-07-20 21:36:22 +02:00
Olivier Paroz 897e99ac58 Fix preview of old file on public upload conflicts 2015-07-20 16:51:28 +02:00
Bjoern Schiessle dc6cc57e11 fix mount point detection 2015-07-20 16:26:07 +02:00
Morris Jobke f1df6cd4ff Merge pull request #17736 from owncloud/backport-allow-update-of-disabled-apps
[stable8.1] Allow upgrade of not enabled apps
2015-07-20 14:24:22 +02:00
Morris Jobke ff8e63c991 Merge pull request #17711 from owncloud/fix_repeated_migration_oc8.1
[8.1 backport] Don't mix up directories if the migration runs multiple times
2015-07-20 13:58:20 +02:00
Thomas Müller d4cc4019fd Allow upgrade of not enabled apps 2015-07-19 12:16:15 +02:00
Björn Schießle 6383bd3744 Merge pull request #17702 from owncloud/enc_detect_legacy_files2_8.1
[8.1 backport] make sure that we always detect legacy files correctlly
2015-07-17 21:39:45 +02:00
Morris Jobke 738e116c00 Merge pull request #17710 from owncloud/stable8.1-s2s-catchremotelockexceptions
[Stable 8.1] s2s catchremotelockexceptions
2015-07-17 18:35:10 +02:00
Bjoern Schiessle 777964ff2b unit tests 2015-07-17 15:30:55 +02:00
Bjoern Schiessle 00a044f885 don't move keys if the key where already moved in a previous migration run 2015-07-17 15:30:43 +02:00
Vincent Petry 335372064e Throw lock exceptions if remote share returned 423 status code 2015-07-17 15:26:40 +02:00
Hendrik Leppelsack 17d7a2893e fix browser compatibility issue for element.closest 2015-07-17 15:08:45 +02:00
Morris Jobke 1b8eb668de Merge pull request #17697 from owncloud/fix-undefined-REMOTE_ADDR-stable8.1
Fixing 'Undefined index: REMOTE_ADDR' - fixes #17460
2015-07-17 14:20:57 +02:00
Arthur Schiwon a3172008c6 LDAP: when checking group for matching filter, also take base DN into consideration. Fixes #17516 2015-07-17 13:42:33 +02:00
Arthur Schiwon b2db982768 Backport of 17255 to stable8.1
ensure groups match filter when using memberOf to read users group, refs #17119

integration test

adjust unit test

tests solidity
2015-07-17 13:41:58 +02:00
Bjoern Schiessle 001dd400a1 set targetIsEncrypted to true if file cache indicates that we try to read a encrypted file 2015-07-17 13:28:58 +02:00
Bjoern Schiessle 5bfbfca266 make sure that we always detect legacy files correctly 2015-07-17 13:28:58 +02:00
Thomas Müller fc6420c290 Fixing 'Undefined index: REMOTE_ADDR' - fixes #17460 2015-07-17 12:35:00 +02:00
Thomas Müller 015d4e3ba3 Merge pull request #17690 from owncloud/stable8.1-repair-ocs-ids
[stable8.1] Add repair step for outdated OCS IDs
2015-07-17 12:02:45 +02:00
Thomas Müller deeacacfae Merge pull request #17678 from owncloud/backport-encryption_migration_improvements-stable8.1
Backport encryption migration improvements stable8.1
2015-07-17 11:58:06 +02:00
Thomas Müller d199fb4e8d Merge pull request #17679 from owncloud/backport-fix_trashbin-stable8.1
only move real files to the trash bin
2015-07-17 11:57:41 +02:00
Lukas Reschke 289fd99333 Prefer OCS Id from database
To be consistent with other logic the app id from the database needs to be prefered. Especially when it comes to be able to replace an outdated OCS id.
2015-07-17 08:33:51 +02:00
Lukas Reschke 579bee03bd Add repair step for outdated OCS IDs
There is the case where OCs IDs might become outdated such as it has been with the calendar and contacts app which refer to the old dummy entry. This means that users with the old OCS id can't update updates as well will receive invalid state flags. (e.g. "experimental" instead of "approved")

To allow instances to properly update the applications in the future we need to migrate the OCS IDs for now manually.
2015-07-16 18:52:27 +02:00
Morris Jobke 816910baf1 Merge pull request #17676 from owncloud/backport-files-scan-user-path-stable8.1
Lock scanner to the given user
2015-07-16 16:00:43 +02:00
Bjoern Schiessle fb452486d7 only move real files to the trash bin 2015-07-16 15:11:12 +02:00
Bjoern Schiessle ae1332e9c9 only create new key pair if both keys are missing 2015-07-16 14:07:26 +02:00
Bjoern Schiessle 9d9ab82a17 only cleanUp the remaining keys if the migration really finished succesfully 2015-07-16 14:07:17 +02:00
Morris Jobke edb15bd493 Merge pull request #17653 from owncloud/backport-17330-share-group-path-exception
[stable8.1] Fix the path for users which have an exception for a group share
2015-07-16 13:19:19 +02:00
Robin Appelman 4c6b26d056 Lock scanner to the given user 2015-07-16 12:14:23 +02:00
Vincent Petry 8e1fca7402 Merge pull request #17658 from owncloud/share-lock-owner-parent-stable81
[8.1] lock parent folders for the owner when locking a shared file as recipient
2015-07-16 11:59:48 +02:00
Vincent Petry db5a574faf Merge pull request #17556 from owncloud/enc_fix_migration_stable8.1
[stable8.1 backport] more secure way to update the database
2015-07-16 11:57:00 +02:00
Morris Jobke 8e0294d0fd Merge pull request #17294 from owncloud/stable8.1-s2s-catchmoreexceptiontypes
[stable8.1] Catch more error codes thrown by federated shares
2015-07-16 11:50:00 +02:00
Morris Jobke 256c57c01e Merge pull request #17337 from owncloud/stable8.1-backport-17077
[stable8.1] fix getting mount points when passing a path to the files:scan command
2015-07-15 14:51:57 +02:00
Robin Appelman db21b0964c only lock the parent folders 2015-07-15 13:43:34 +02:00
Robin Appelman cc45b49de7 lock parent folders for the owner when locking a shared file as recipient 2015-07-15 13:42:59 +02:00
Morris Jobke 90104fc5d8 Merge pull request #17643 from owncloud/stable8.1-s2s-hasupdated-catch405
[stable8.1] Throw StorageNotAvailable if propfind on root failed
2015-07-15 11:11:28 +02:00
Joas Schilling 8f2ce01553 Make sure the owner always has the right path 2015-07-15 10:12:50 +02:00
Vincent Petry 3ade5f5111 Add test case when owner renames shared folder 2015-07-15 10:12:41 +02:00
Vincent Petry 60939ebd2c Add unit test for getUsersSharingFile
This is to test if the user list and paths are correct, even when a
recipient renamed the received shared folder
2015-07-15 10:12:29 +02:00
Joas Schilling c73f938ff4 Fix the path for users which have an exception for a group share 2015-07-15 10:12:16 +02:00
Björn Schießle 06d7480fa2 Merge pull request #17642 from owncloud/stable8.1-backport-17565
[stable8.1] allow remote shares for users with email as usernames
2015-07-14 18:20:45 +02:00
Vincent Petry 48b2a4e034 Throw StorageNotAvailable if propfind on root failed
If PROPFIND fails with 404 or 405 on the remote share root, it means the
storage is not available. Throw StorageNotAvailable is such case.
2015-07-14 17:41:58 +02:00
Felix Böhm 824df7e22d allow remote shares for users with email as usernames 2015-07-14 15:33:12 +02:00
Vincent Petry ab308d246a Merge pull request #17632 from owncloud/stable8.1-backport-17606
[stable8.1] Handle returned null value in app level code
2015-07-14 11:44:06 +02:00
Morris Jobke dc9454ea3c Handle returned null value in app level code
* getApplication on OCSClient can also return null
  this is now handled properly
* fixes #17587
2015-07-14 08:58:28 +02:00
Vincent Petry f920923dd6 Throw storage not available on guzzle error
If the remote server is in maintenance mode, we must throw storage not
available exception instead of not found which might auto-remove the
share.
2015-07-13 18:55:24 +02:00
Thomas Müller 698e2ebc90 Merge pull request #17607 from owncloud/stable8.1-backport-17426
[stable8.1] [config sample] Update info about appstore
2015-07-13 17:40:54 +02:00
Morris Jobke 1548d69762 [config sample] Update info about appstore 2015-07-13 14:52:38 +02:00
Bjoern Schiessle 8466d9d235 more secure way to update the database 2015-07-10 11:49:51 +02:00
Morris Jobke 48b1e9e2a6 Merge pull request #17288 from owncloud/stable8.1-chunk-cleanupgracefulonlock
Stable8.1 chunk cleanupgracefulonlock
2015-07-09 22:31:40 +02:00
Morris Jobke f21eb35431 Merge pull request #17518 from owncloud/stable8.1-backport-config-sample
[stable8.1] backport config sample
2015-07-09 14:30:05 +02:00
Morris Jobke 509725fad9 [config sample] improve RST markup and wording 2015-07-09 10:09:11 +02:00
Morris Jobke 447c60c4e4 refine sample config text 2015-07-09 10:06:06 +02:00
Morris Jobke eb055b0d78 [config sample] merge Miscellaneous & All other options 2015-07-09 10:06:01 +02:00
Morris Jobke d48d59661a Merge pull request #17289 from owncloud/stable8.1-files-cleanuppartfileonlyonce
Stable8.1 files cleanuppartfileonlyonce
2015-07-08 10:34:55 +02:00
Morris Jobke 312d82fe71 Merge pull request #17332 from owncloud/fix-temporary-mountpoint-name-in-activities
Fix the mount point name before creating the activities
2015-07-08 10:33:15 +02:00
Morris Jobke 96b97d1567 Merge pull request #17338 from owncloud/stable8.1-backport-17252
[stable8.1] Only do the description kung-fu on strings - fixes #17028
2015-07-08 10:32:53 +02:00
Morris Jobke 97e49e422f Merge pull request #17366 from owncloud/fix_16740_8.1
[oc8.1] owner is stored as 'uid_owner', not as 'owner' in the oc_share table
2015-07-08 10:32:30 +02:00
Morris Jobke 5d3d44eeb9 Merge pull request #17370 from owncloud/stable8.1-share-onlyshowstaticownerifavailable
[stable8.1] Do not show static share owner if not available
2015-07-08 10:31:33 +02:00
Morris Jobke 51978aa296 Merge pull request #17417 from owncloud/stable8.1-backport-17159
[stable8.1] remove duplicate ID in HTML template for public shares
2015-07-08 10:31:11 +02:00
Morris Jobke 3823713c7c Merge pull request #17429 from owncloud/stable8.1-backport-17088
[stable8.1] [upgrade] add verbosity check and show repair info & steps
2015-07-08 10:29:16 +02:00
Thomas Müller 3854dead08 Merge pull request #17431 from owncloud/stable8.1-update-readme
[stable8.1] Update readme versions
2015-07-07 10:33:36 +02:00
Vincent Petry ce0f391ecd Update README version and bower 2015-07-07 10:22:36 +02:00
Morris Jobke 388409290a [Repair] add repair info for changed collation 2015-07-07 10:16:54 +02:00
Morris Jobke fb85fc619d [upgrade] add verbosity check and show repair info & steps 2015-07-07 10:16:49 +02:00
Morris Jobke d5e90e7239 remove duplicate ID in HTML template for public shares 2015-07-06 13:34:11 +02:00
Vincent Petry c04beb0bad Do not show static share owner if not available
In some corner cases, an outgoing share exists but sharing is not
allowed for the current user. This would cause the file list to break
because the static text could not be rendered as the owner was
undefined.
2015-07-03 11:54:50 +02:00
Bjoern Schiessle 9def2fcf71 call post_addToGroup als for class OC_User because sharing and LDAP are using this class. Minimal approach to fix #16740 2015-07-03 10:36:09 +02:00
Bjoern Schiessle 1427a79643 owner is stored as 'uid_owner', not as 'owner' in the oc_share table 2015-07-03 10:36:01 +02:00
C Montero-Luque 06ec916b11 8.1.0 2015-07-02 18:20:11 -04:00
Lukas Reschke 7d94d963e9 Merge pull request #17356 from owncloud/stable8.1-apps-keepgloballist
[stable8.1] Fix global app list state
2015-07-02 21:37:41 +02:00
Vincent Petry c051c180ab Fix global app list state 2015-07-02 17:31:22 +02:00
Lukas Reschke 9cba7c1793 Merge pull request #17317 from owncloud/stable81-clean-ocsid
[stable8.1] Delete OCS ID from DB if none is specified
2015-07-02 14:15:27 +02:00
Lukas Reschke 16514762bf Merge pull request #17311 from owncloud/stable81-remove-ocs-ids
[stable8.1] Remove OCS IDs
2015-07-02 14:15:19 +02:00
Thomas Müller 2727d9797d Only do the description kung-fu on strings - fixes #17028 2015-07-02 13:16:47 +02:00
Robin Appelman a95b5c3b3e handle invalid results from mount providers 2015-07-02 13:03:09 +02:00
Robin Appelman 1902101923 handle error during setup 2015-07-02 13:03:06 +02:00
Robin Appelman 8a3f54c225 add unit test 2015-07-02 13:03:03 +02:00
Robin Appelman 478fe752e7 fix getting mount points when passing a path to the files:scan command 2015-07-02 13:02:59 +02:00
Joas Schilling ea731c5c66 Use the item name when refering to the unaccepted remote share 2015-07-02 12:35:30 +02:00
Björn Schießle caa3210a59 Merge pull request #17308 from owncloud/stable8.1-backport-17293
Stable8.1 backport 17293
2015-07-02 12:17:56 +02:00
Lukas Reschke 8fe5d4b268 Bump versions 2015-07-02 09:20:25 +02:00
Lukas Reschke 85fc84e3d3 Delete OCS ID from DB if none is specified
If no OCS ID is specified in appinfo.xml and an app update is triggered and a OCS ID is stored in the DB we should clean the value.

Ref https://github.com/owncloud/activity/issues/320#issuecomment-117937748
2015-07-02 09:20:21 +02:00
Lukas Reschke 6008bf975d [stable81] Remove OCS IDs
While making the AppStore ready for 8.1 I also deleted some dummy entries which means that these IDs do not resolve anymore. We should remove them to prevent errors such as https://github.com/owncloud/core/issues/17307

Ref https://github.com/owncloud/activity/issues/320#issuecomment-117691867
2015-07-02 08:47:31 +02:00
Jan-Christoph Borchardt 4abec8b5b9 Revert "fix z-index of share-autocomplete"
This reverts commit 4edf388a38.
2015-07-02 08:24:04 +02:00
Jan-Christoph Borchardt d6cbf8be71 Revert "explicitly set z-index on app-content, fix overlap from navigation"
This reverts commit 71e5bc1803.
2015-07-02 08:23:58 +02:00
Vincent Petry 2d92b5a64e Catch more error codes thrown by federated shares
Most of the time it doesn't make sense to forward Guzzle's
RequestException, so we convert it to StorageNotAvailable instead.

This prevents unpredictable error codes to block access to unrelated
folders needlessly.
2015-07-01 16:23:57 +02:00
Thomas Müller d6b24c7bbc Merge pull request #17266 from owncloud/stable8.1-backport-17224
Stable8.1 backport 17224
2015-07-01 16:12:55 +02:00
Vincent Petry 4aa2eff94c Only delete part file on error if it is really a part file 2015-07-01 15:25:17 +02:00
Vincent Petry 4fff832fa6 Clean up part file only once, not twice on error 2015-07-01 15:25:09 +02:00
Vincent Petry 39e391fd1a Catch cache garbage collection exception on postLogin
Just log the exception instead of preventing access to OC.
2015-07-01 15:19:46 +02:00
Vincent Petry e48afaf334 Test for chunk cache garbage collection 2015-07-01 15:19:43 +02:00
Vincent Petry 18e4fe7add Do not try clearing locked files in cache folder 2015-07-01 15:19:38 +02:00
Morris Jobke c7bc669e00 Merge pull request #17267 from owncloud/stable8.1-backport-17264
Use UTF-8 mode for preg_split and preg_replace
2015-07-01 09:13:48 +02:00
Lukas Reschke 09038697cd Use UTF-8 mode for preg_split and preg_replace
Otherwise a single application with a description containing a non compliant character can break the whole ownCloud appstore. This is for example https://apps.owncloud.com/content/show.php?content=149553

Fixes https://github.com/owncloud/core/issues/17101#issuecomment-117365224
2015-07-01 07:52:40 +02:00
Thomas Müller eb2e8d99cc Avoid namespace clash 2015-07-01 07:48:35 +02:00
Thomas Müller 82493e9789 Fixing content type detection and handle all local printErrorPage calls 2015-07-01 07:48:31 +02:00
Thomas Müller 526a45be18 Adding request specific exception handling - now with WebDAV responses - refs #17192 2015-07-01 07:48:27 +02:00
Thomas Müller 283f8e7e69 Adding exception handling for ServerNotAvailableException - refs #17192 2015-07-01 07:48:23 +02:00
Vincent Petry 16ff6cff54 Merge pull request #17256 from owncloud/locking-disablecallbackwrapperwhendisabled
Do not set callback wrapper when locking is disabled
2015-06-30 18:28:28 +02:00
Björn Schießle 2c1b0f9a66 Merge pull request #17225 from owncloud/fix_12106
if it is a mount point we need to get the path from the mount manager
2015-06-30 16:40:57 +02:00
Bjoern Schiessle 44ec3dd110 if it is a mount point we need to get the path from the mount manager 2015-06-30 15:08:18 +02:00
Vincent Petry 0118bf04dc Merge pull request #17251 from owncloud/issue-17247-filesize-stat-failed-for-in-log
Perform the filesize on the file that exists
2015-06-30 14:51:29 +02:00
Vincent Petry afd83caf69 Do not set callback wrapper when locking is disabled 2015-06-30 13:45:41 +02:00
Morris Jobke 2bcd0af177 Merge pull request #17189 from owncloud/files-straypartfilesonexception
Cleanup part file after upload exception
2015-06-30 11:58:26 +02:00
Joas Schilling 9c533342fc Perform the filesize only when the file exists
Regression from 95602d4069
and 9b336765b6
2015-06-30 11:47:58 +02:00
Joas Schilling a1bfc26b88 Merge pull request #17249 from owncloud/file-cache-is-a-icache
Fixing "ImportController::__construct() must implement interface OCP\…
2015-06-30 09:46:09 +02:00
Thomas Müller fc474de573 Fixing "ImportController::__construct() must implement interface OCP\\ICache, instance of OC\\Cache\\File given" 2015-06-29 22:43:18 +02:00
Thomas Müller 6506357210 Merge pull request #17239 from owncloud/files-nameconflictfix
Fix class name conflict
2015-06-29 21:47:39 +02:00
Thomas Müller 883888bdc6 Merge pull request #17240 from owncloud/do-not-rely-on-php-being-fast
Do not rely on actual time in unit tests
2015-06-29 21:47:15 +02:00
Vincent Petry 167f57c15e Unlock first path on rename if second path is locked 2015-06-29 17:31:14 +02:00
Vincent Petry 3217d4dad1 Cleanup part file after upload exception
Added unit tests for checking for stray part files.
Convert exception to sabre exception in upload put method.

Also added unit test for exception mapping, which also indirectly tests
that the part file is being deleted on exception.

This applies to both chunking and non-chunking mode.

Added some unit tests for chunk upload.
2015-06-29 17:31:14 +02:00
Lukas Reschke 422d088bb9 Do not rely on actual time in unit tests
Ref https://github.com/owncloud/core/pull/17238#issuecomment-116724055
2015-06-29 17:15:42 +02:00
Vincent Petry 2fa432dfb8 Fix class name conflict
Looks like PHP 5.6.x doesn't like name conflicts.

\Sabre\DAV\Server would overlap with \OC\Connector\Sabre\Server.
2015-06-29 17:11:14 +02:00
Morris Jobke b88a0e7080 Merge pull request #17231 from owncloud/add-missing-version-field
Add missing version field
2015-06-29 16:41:47 +02:00
Joas Schilling 30f5fa42e5 Merge pull request #17229 from owncloud/maintenance-plugin-test
Unit tests added for MaintenancePlugin
2015-06-29 16:22:38 +02:00
Thomas Müller 372a9afabe Fixing ctor calls and ctor itself to not break usage in calendar and contacts ..... 2015-06-29 15:54:05 +02:00
Lukas Reschke ab4d5d20ea Typehint $targetVersion 2015-06-29 15:10:40 +02:00
Lukas Reschke 1db047a336 Add missing version field 2015-06-29 15:09:57 +02:00
Lukas Reschke b56af26199 Merge pull request #17222 from owncloud/issue-17101-send-oc-version-to-app-store
Send OC version to appstore so it can reply with the right links
2015-06-29 15:07:00 +02:00
Thomas Müller f8127046ee Unit tests added for MaintenancePlugin 2015-06-29 14:18:09 +02:00
Joas Schilling 70eb20e3a7 Merge pull request #17030 from owncloud/lock-posthooks
Keep shared lock for post-hooks
2015-06-29 14:17:03 +02:00
Morris Jobke c57fb19b2f Merge pull request #17226 from owncloud/webdav-add-message-on-maintenance
In case of maintenance we should add a message to the exception
2015-06-29 14:11:36 +02:00
Lukas Reschke 5810e7ab87 Merge pull request #17050 from owncloud/request-status-from-ocs
Request approved state for disabled apps with ocsid
2015-06-29 13:41:11 +02:00
Thomas Müller e236e564af In case of maintenance we should add a message to the exception 2015-06-29 12:31:01 +02:00
Joas Schilling ae3d402dbc Send OC version to appstore so it can reply with the right links 2015-06-29 12:14:07 +02:00
Lukas Reschke 30145c0b52 Also load enabled apps 2015-06-29 11:38:28 +02:00
Thomas Müller aa595392f6 Merge pull request #17217 from owncloud/use-new-updater-url
Use new updater URL + add unit tests
2015-06-29 11:27:23 +02:00
Vincent Petry b55f71ee03 Merge pull request #17083 from owncloud/share-etag-update-target
take share target into account when updating recipient etags
2015-06-29 09:10:37 +02:00
Jenkins for ownCloud 733d59ed44 [tx-robot] updated from transifex 2015-06-29 01:54:44 -04:00
Thomas Müller 774a38256d Merge pull request #17219 from owncloud/LukasReschke-patch-1
Increase timeout again
2015-06-28 20:19:52 +02:00
Lukas Reschke a43ba1bf1d Update comment 2015-06-28 17:06:49 +02:00
Lukas Reschke 7b4e1f526b Increase timeout again
Our test execution is terribly slow and now also exceeds more than one hour on our CI system. This means that Scrutinizer fails hard on a lot of PRs such as https://github.com/owncloud/core/pull/17217#issuecomment-116252420
2015-06-28 17:06:15 +02:00
Lukas Reschke 03498c0b2c Build base URL 2015-06-28 12:26:47 +02:00
Lukas Reschke 04fe9e05f0 Use new updater URL + add unit tests
Uses the new updater url "https://updates.owncloud.com/server/"
2015-06-28 11:25:28 +02:00
Jenkins for ownCloud 4d565a8447 [tx-robot] updated from transifex 2015-06-28 01:55:19 -04:00
Lukas Reschke 717f91a4e8 Merge pull request #17214 from owncloud/fix-php-doc-user-interface
Fix PHPDoc + Indentation
2015-06-27 21:58:49 +02:00
Lukas Reschke dd0625faf3 Merge pull request #17212 from owncloud/ocs-spec
Add endpoint with list of OCS providers
2015-06-27 21:56:46 +02:00
Lukas Reschke a793b98fd0 Fix indentation 2015-06-27 20:37:07 +02:00
Lukas Reschke af01958f3e Add missing annotations for parameters 2015-06-27 20:35:47 +02:00
Lukas Reschke d1f0ff372e Merge pull request #17163 from owncloud/update-licenses
Update license headers
2015-06-27 20:22:23 +02:00
Lukas Reschke 76878e9943 Add endpoint with list of OCS providers
This adds a OCS provider list at `ocs-provider/` to enable a somewhat autodiscovery of services.

In the moment it is not possible for applications to add own entries and it is basically hard-coded in the controller. I'm aware that this is not an optimal solution and I'm happy for any pragmatic input that won't pollute our public API too much. (and is not a big super hack, this is already hacky enough ;-))

That said, I'd consider it as a first step also feasible to go with this somewhat hard-coded list and see if this gets adopted...
2015-06-27 18:23:49 +02:00
Roeland Douma 708c6268ad Merge pull request #17206 from oparoz/bpg-media-type
Adding BPG media type
2015-06-27 10:19:56 +02:00
Lukas Reschke 465606c254 Merge pull request #17199 from owncloud/feature/show-error-when-shareservice-dies
add check if server returns a 500 and display error
2015-06-27 09:34:34 +02:00
Jenkins for ownCloud 28c223edc6 [tx-robot] updated from transifex 2015-06-27 01:55:58 -04:00
Joas Schilling 77ae2d6fc4 Merge pull request #17202 from oparoz/repair-scan-signature
Signature of overriding method should match the parent
2015-06-27 02:35:40 +02:00
Björn Schießle 569c2a8deb Merge pull request #17203 from owncloud/fix-share-autocomplete
fix z-index of share-autocomplete
2015-06-26 22:01:42 +02:00
Olivier Paroz 158c5b5e47 Adding BPG media type 2015-06-26 19:22:12 +02:00
Clark Tomlinson ca1da0acb7 add check if server returns a 500 and display error
resolves https://github.com/owncloud/core/issues/17170
2015-06-26 12:50:09 -04:00
Vincent Petry 0684cc15dc Merge pull request #17071 from owncloud/share-get-users-non-existing
fix getUsersSharingFile with locking
2015-06-26 18:27:53 +02:00
Jan-Christoph Borchardt 4edf388a38 fix z-index of share-autocomplete 2015-06-26 17:48:35 +02:00
Olivier Paroz b30515ddda Signature of overriding method should match the parent 2015-06-26 17:45:04 +02:00
Vincent Petry 271ef9dedb Remove test-specific method to make Bjoern and Joas happy 2015-06-26 17:37:04 +02:00
Vincent Petry 56d9df34cb Unit test for etag update on custom share folder 2015-06-26 16:32:28 +02:00
Robin Appelman c338999032 fix getUsersSharingFile with locking 2015-06-26 16:31:52 +02:00
Thomas Müller ac94126393 Merge pull request #17191 from owncloud/issue-17188-group-share-part-file
Correctly check if the real file exists, otherwise try the part file
2015-06-26 16:01:41 +02:00
Björn Schießle b318b9cf17 Merge pull request #17008 from owncloud/fix-17006
Improve splitting of username and remote adress when username contains an `@`
2015-06-26 16:01:16 +02:00
Joas Schilling 9b336765b6 Correctly check if the real file exists, otherwise try the part file 2015-06-26 13:17:23 +02:00
Thomas Müller 796aae4402 Merge pull request #17009 from owncloud/lock-downloadfile
Lock file during download
2015-06-26 13:04:34 +02:00
Thomas Müller 9558562883 Merge pull request #17082 from owncloud/shared-etag-propagate-file
Fix etag propagation for single file shares
2015-06-26 12:36:17 +02:00
Thomas Müller 8cc88fa64f Merge pull request #17190 from owncloud/lock-changelabel
Rename experimental to transactional file locking
2015-06-26 12:27:16 +02:00
Vincent Petry eadf789519 Rename experimental to transactional file locking 2015-06-26 11:10:10 +02:00
Thomas Müller 6c3a4282e5 Merge pull request #17165 from owncloud/federated_cloud_sharing_search_address_book
Search address book for federated cloud id
2015-06-26 10:53:02 +02:00
Morris Jobke 569157d529 Merge pull request #17185 from rullzer/fix_17178
Fix for #17178
2015-06-26 08:21:32 +02:00
Jenkins for ownCloud b1e29c7dde [tx-robot] updated from transifex 2015-06-26 01:55:35 -04:00
Roeland Jago Douma 27d5838fb7 Fix for #17178
If no array of arrays is submitted make sure we still keep $sharedUsers
and $sharedGroups as arrays so the rest of the code keeps functioning as
it should.
2015-06-25 21:16:18 +02:00
Vincent Petry eae08d0adc Release locks after class in tests 2015-06-25 16:33:02 +02:00
Vincent Petry 538e466c30 Keep shared locks in post hooks
Instead of unlocking after the file operation, change exclusive locks
back to shared locks during post hooks, and unlock after that.

Also added unit tests to test locking in pre-hooks, during operation and
post-hooks.
2015-06-25 16:33:02 +02:00
Robin Appelman 0128a86df1 add some docs 2015-06-25 14:29:40 +02:00
Morris Jobke 0032cddb40 add additional email address for Georg 2015-06-25 14:14:14 +02:00
Morris Jobke f63915d0c8 update license headers and authors 2015-06-25 14:13:49 +02:00
Bjoern Schiessle a288d0eea3 ne need to check twice if $row['share_with'] is set 2015-06-25 12:14:46 +02:00
Bjoern Schiessle dd9dfc4461 show nice display name for remote shares if possible 2015-06-25 12:14:03 +02:00
Bjoern Schiessle f9dcb559e9 search address book for federated cloud id 2015-06-25 11:57:03 +02:00
Thomas Müller 9be1d08c3c Merge pull request #17162 from owncloud/LukasReschke-patch-1
Create .htaccess
2015-06-25 11:44:38 +02:00
Morris Jobke cdb0e62e9b [license script] sort names case insensitive 2015-06-25 11:43:07 +02:00
Lukas Reschke 08984154cd Create .htaccess
Ref https://github.com/owncloud/core/pull/16724#discussion_r33236344 – shouldn't hurt also.
2015-06-25 11:23:11 +02:00
Morris Jobke 160d8003f8 Merge pull request #17152 from owncloud/LDAP/AD-Typo
Ldap/ad typo
2015-06-25 07:56:04 +02:00
Jenkins for ownCloud dddbfb903f [tx-robot] updated from transifex 2015-06-25 01:55:15 -04:00
Lukas Reschke a63f6023fd Dropped an S from the mouseover
We had a typo in the ldap initial binding menu mouse over, so changed the text in all references to be correct.
2015-06-24 22:10:10 +02:00
Vincent Petry 58439c337c Merge pull request #17070 from owncloud/lock-movemountbug
Lock correct paths when moving mount
2015-06-24 18:37:48 +02:00
Robin Appelman c87ab65081 fix etag propagation for single file shares 2015-06-24 18:16:03 +02:00
Robin Appelman f847d9409e add unit test for single file share etag propagation 2015-06-24 18:16:03 +02:00
Morris Jobke 5f59393b30 Merge pull request #17110 from owncloud/share-error-handling
[sharing] handle shares of users that aren't available anymore
2015-06-24 17:38:34 +02:00
Lukas Reschke 004280e407 Merge pull request #17136 from rullzer/fix_remove_link_OCS
Allow removing of link password in OCS again
2015-06-24 16:45:00 +02:00
Thomas Müller 1e7a3a4b3b Merge pull request #17139 from owncloud/increase-oracle-init-time
Let's wait a little longer until oracle finally is available
2015-06-24 16:17:23 +02:00
Vincent Petry 8859004a2b Rollback folder scan if an entry was locked 2015-06-24 15:42:00 +02:00
Thomas Müller 047b7a13a3 Let's wait a little longer until oracle finally is available 2015-06-24 14:09:32 +02:00
Thomas Müller 7a3cfbc3c8 Merge pull request #17133 from owncloud/rename-user-webdavauth
Rename user_webdavauth to prevent accidental activation - refs #17112
2015-06-24 13:57:52 +02:00
Thomas Müller 161ca900e0 Merge pull request #17130 from owncloud/update-mime-types
Update wmv and add mts and mt2s
2015-06-24 13:35:58 +02:00
Roeland Jago Douma 6c3da1ec90 Added unit test to verify link password removeal 2015-06-24 12:38:33 +02:00
Roeland Jago Douma 6977eff106 set NULL correctly in password update
Old code used 'NULL' but docterine wants null. Now it is possible again
to remove the password from a link share.
2015-06-24 12:37:59 +02:00
Morris Jobke 6be0f833d0 Merge pull request #17105 from owncloud/app-content-z-index
explicitly set z-index on app-content, fix overlap from navigation
2015-06-24 12:27:29 +02:00
Morris Jobke 300d1c88d0 Merge pull request #17106 from owncloud/htaccess-update-only-once
Only update the htaccess ErrorDocument links when they are not set yet
2015-06-24 12:20:22 +02:00
Thomas Müller 4da1c84296 Rename user_webdavauth to prevent accidental activation - refs #17112 2015-06-24 12:17:17 +02:00
Thomas Müller 9e93d1ed25 Merge pull request #17131 from owncloud/non-zero-exit-code-when-app-is-not-compliant
Use non-zero exit code when app is not compliant (so CIs can detect t…
2015-06-24 12:06:04 +02:00
Joas Schilling e5bc50d156 Use non-zero exit code when app is not compliant (so CIs can detect the status) 2015-06-24 11:59:43 +02:00
Vincent Petry 35047a2300 Fix locked paths in the moveMount case
When moving a mount point directly, the lock must be applied on the
local mount point path instead of the attached storage root.

Other operations will still lock the attached storage root.
2015-06-24 11:33:28 +02:00
Thomas Müller 5c213539af Update wmv and add mts and mt2s - fixes #17128 and owncloud/firewall#107 2015-06-24 11:06:29 +02:00
Jenkins for ownCloud ceb80ac123 [tx-robot] updated from transifex 2015-06-24 01:55:55 -04:00
Morris Jobke 4f2f8a6f28 [sharing] handle shares of users that aren't available anymore
* properly handle the case where an abandoned share is left and
  simply skip it
2015-06-23 18:22:36 +02:00
Morris Jobke 02b2b60581 Merge pull request #17095 from owncloud/proper-error-handling
Proper error handling
2015-06-23 17:40:55 +02:00
Joas Schilling 0db311c9db Only update the htaccess ErrorDocument links when they are not set yet 2015-06-23 16:45:56 +02:00
Vincent Petry e01db549a0 Merge pull request #17048 from owncloud/hotfix/fix-firewall-blocking-dir-message
adding correct blocking logic for ffw
2015-06-23 15:08:47 +02:00
Morris Jobke c86e129ce9 [updater] keep maintenance active on failure and mark failure in red 2015-06-23 14:45:53 +02:00
Björn Schießle cce841c665 Merge pull request #17045 from owncloud/enc_improvements
encryption improvements
2015-06-23 14:30:21 +02:00
Jan-Christoph Borchardt 71e5bc1803 explicitly set z-index on app-content, fix overlap from navigation 2015-06-23 14:03:27 +02:00
Jörn Friedrich Dreyer 4b5324341c Merge pull request #17090 from owncloud/upgrade-app-info
[upgrade] print update message before running the update code
2015-06-23 13:14:35 +02:00
Morris Jobke 1ba9fd3ada [upgrade] print update message before running the update code
* otherwise you don't know during which app update something failed
2015-06-23 13:13:44 +02:00
Joas Schilling e722614639 Merge pull request #17092 from owncloud/fix-language-experimental
Accept this language change "at your own risk"
2015-06-23 12:14:11 +02:00
Bjoern Schiessle 95602d4069 make sure that we always read the header from the original file 2015-06-23 11:41:21 +02:00
Joas Schilling e0fb5f4b5e Accept this language change at your own risk 2015-06-23 10:59:15 +02:00
Morris Jobke fe42553e8a [updater] propagate error case properly
* add $success to the updateEnd hook
* add new return code for a update failure
* add exception class to failure hook message
2015-06-23 10:03:27 +02:00
Morris Jobke fdd01cf15c Added error message on initMountpoints exception 2015-06-23 09:54:03 +02:00
Lukas Reschke 2654696086 Merge pull request #17081 from owncloud/issue-17079-risky-test-sabre-objecttree
Make an assertion in risky test testGetNodeForPathRoot
2015-06-23 09:11:36 +02:00
Morris Jobke a059b090c3 Merge pull request #17085 from owncloud/use-trusted-mimetype
Use trusted mimetype
2015-06-23 08:45:05 +02:00
Jenkins for ownCloud 3cad0d4ed2 [tx-robot] updated from transifex 2015-06-23 01:56:15 -04:00
Thomas Müller 25581c7b63 Merge pull request #16940 from owncloud/ext-s3-touchmtimefix
Properly set mtime on S3 for touch operation
2015-06-22 22:25:45 +02:00
Robin Appelman 5e1865530b take share target into account when updating recipient etags 2015-06-22 18:21:54 +02:00
Clark Tomlinson 5466dcadc0 adding correct blocking logic for fff 2015-06-22 11:42:42 -04:00
VicDeo 5cfcda3e95 Merge pull request #17068 from owncloud/fix_16878
fix search for results only from subfolder
2015-06-22 17:55:56 +03:00
Joas Schilling 45f9083a58 Make an assertion in risky test testGetNodeForPathRoot 2015-06-22 16:49:04 +02:00
Joas Schilling 738b78f1b0 Use \OC\HintException and translate the hint 2015-06-22 15:34:06 +02:00
Jan-Christoph Borchardt 9dde482315 remove whitespace on bottom when no search results, fix laylout, fix #16878 2015-06-22 15:30:29 +02:00
Lukas Reschke 3d2ac6dbb6 Use trusted mimetype
We shall not use untrusted mimetypes in this context
2015-06-22 15:30:27 +02:00
Joas Schilling 2b7e5f841a Merge spliteUserRemote with fixRemoteUrlInShareWith 2015-06-22 15:25:23 +02:00
Bjoern Schiessle d38a378b8c make sure that we split username and server address at the first '@' from the right to allow usernames containing '@' 2015-06-22 15:25:23 +02:00
Björn Schießle a88b370dc8 Merge pull request #12546 from oparoz/patch-1
Send the mime icon if we can't generate a preview
2015-06-22 13:55:17 +02:00
Bjoern Schiessle 8eda9ae83c add filter-empty class if no search result in current folder 2015-06-22 12:13:05 +02:00
Thomas Müller c74c8eff3a Enable x-sendfile only if we do not lock the file system 2015-06-22 12:07:53 +02:00
Thomas Müller ced15c44b4 Merge pull request #16657 from owncloud/view-emit-path
emit hooks from a view as long as the path is inside the default root
2015-06-22 11:29:11 +02:00
Bernhard Posselt 7fe5ab4d4a Merge pull request #17056 from owncloud/appframework-type-cast
Allow multiple whitespace in type hints in AppFramework
2015-06-22 10:35:28 +02:00
Jenkins for ownCloud c77e44117d [tx-robot] updated from transifex 2015-06-22 01:55:00 -04:00
Robin McCorkell 05fb9ceef9 Merge pull request #17025 from owncloud/sftp-rmdir-emptydir
Workaround for empty dir deletion for SFTP
2015-06-21 23:50:58 +01:00
Robin McCorkell 103f8ca6e8 Merge pull request #17052 from owncloud/fix-phpdoc-groupmgm
Use proper type
2015-06-21 23:33:19 +01:00
Robin McCorkell f1e3e25158 AppFramework annotation whitespace unit test 2015-06-21 20:26:57 +01:00
Jenkins for ownCloud 59513ac377 [tx-robot] updated from transifex 2015-06-21 01:55:06 -04:00
Robin McCorkell 04b6f67f07 Allow multiple whitespace in type hints in AppFramework
Type hints such as `@param bool     $doSomething` will now correctly get
parsed, allowing for alignment of docblock parameters if the app developer so
wishes.
2015-06-20 23:52:01 +01:00
Jenkins for ownCloud 183bd6dd49 [tx-robot] updated from transifex 2015-06-20 01:55:10 -04:00
Lukas Reschke 1ead0b6f95 Use proper type
This is a string
2015-06-19 21:00:42 +02:00
Lukas Reschke 00a65e30ce Request approved state for disabled apps with ocsid
In case an application gets disabled the level is set to "experimental" if it does not contain a `shipped` tag. This can for example be reproduced by installing the documents app from the appstore and then disabling it. Or cloning an app from git.

With this change the controller will now load the level of the application from the appstore if a valid OCSID has been provided.

Fixes https://github.com/owncloud/core/issues/17003
2015-06-19 19:04:54 +02:00
Olivier Paroz ba3b6f9be4 Remove unneeded returns from private cropping methods 2015-06-19 15:07:49 +02:00
Morris Jobke 5ed9743570 Merge pull request #17041 from owncloud/ocp-since-checker
Add tool to check OCP for missing @since tag
2015-06-19 14:40:15 +02:00
Bjoern Schiessle ed3dc199ae remove files_encryption from database at the end of the migration process 2015-06-19 14:15:56 +02:00
Thomas Müller 5c2646a4bf Merge pull request #17024 from owncloud/master-verify-if-path-exists-in-upload
[master] Verify if path exists
2015-06-19 13:20:38 +02:00
Thomas Müller 1b7ec7d5ec Merge pull request #17040 from owncloud/fix-param-naming
Fix naming of param in private/server.php
2015-06-19 11:36:40 +02:00
Thomas Müller 78e581d52a Merge pull request #17026 from owncloud/update-config.sample.php
[config.sample.php] set correct default value for skeletondirectory
2015-06-19 11:10:01 +02:00
Morris Jobke fc064212b9 [config.sample.php] set correct default value for skeletondirectory 2015-06-19 11:08:34 +02:00
Morris Jobke b230b8e2c6 move the OCPSinceChecker.php to build/ 2015-06-19 11:03:09 +02:00
Morris Jobke eddbdb8f21 Fix missing @since tags in OCP 2015-06-19 10:51:36 +02:00
Morris Jobke ba43ec974c Add tool to check OCP for missing @since tag
* gets executed in autotest.sh and fails if some PHPDoc is missing
* doesn't check classes/methods that are marked as @deprecated
* iterates over all .php files in lib/public
2015-06-19 10:50:48 +02:00
Morris Jobke 7e046d0595 Fix naming of param in private/server.php 2015-06-19 10:23:04 +02:00
Joas Schilling 6adddb3095 Merge pull request #16889 from owncloud/group-sorting-fixes
Only sort by group name when LDAP is involved
2015-06-19 08:29:25 +02:00
Jenkins for ownCloud a5eb2f01a9 [tx-robot] updated from transifex 2015-06-19 01:55:29 -04:00
Vincent Petry 6697f9524c Merge pull request #16963 from owncloud/fileinfo-lock
Acquire read lock when getting file or directory info
2015-06-18 18:27:20 +02:00
Vincent Petry 0b34d888e6 Merge pull request #17017 from owncloud/cache-update-write-lock
update the file cache within the write lock
2015-06-18 18:27:02 +02:00
Vincent Petry e15dd783ab Workaround for empty dir deletion for SFTP
Explicitly clear the stat cache after deleting an empty folder to make
sure it is properly detected as deleted in subsequent requests.

This works around a problem with phpseclib where the folder is properly
deleted remotely but the stat cache was not updated.
2015-06-18 17:40:38 +02:00
Lukas Reschke ebb5523698 Verify if path exists
We need to check if the path exists and throw an error instead of handling this situation ungraciously.
2015-06-18 16:48:32 +02:00
Robin Appelman 17be0993b4 remove unneeded normalize 2015-06-18 15:33:44 +02:00
Robin Appelman 6018567df2 unlock the file if the file doesnt exists 2015-06-18 15:26:17 +02:00
Robin Appelman d7960d5db6 dont update the cache on rename fail 2015-06-18 14:45:13 +02:00
Robin Appelman 2a50dbd1a1 update noopscanner 2015-06-18 14:42:48 +02:00
Björn Schießle 7a0917e5b2 Merge pull request #16692 from owncloud/add_social_media_buttons
Add social media buttons
2015-06-18 14:41:58 +02:00
Robin Appelman 3e54696f7f extends phpdoc 2015-06-18 14:30:25 +02:00
Robin Appelman 3526b352dc update the file cache within the write lock 2015-06-18 13:47:03 +02:00
Olivier Paroz 64f0fd0889 Remove unneeded returns from private cropping methods 2015-06-18 13:30:10 +02:00
Olivier Paroz 8193e1d7c1 Move media type icon preview creation to its own method 2015-06-18 13:24:15 +02:00
Bjoern Schiessle f9093466bf add id to url 2015-06-18 13:00:50 +02:00
Thomas Müller a04cb82fd9 Merge pull request #16890 from owncloud/fix-16588
the user is gone, userExists will not bring him back. But the user's …
2015-06-18 12:51:06 +02:00
Vincent Petry a9bca9e3aa Lock file before download
This will throw a LockedException if a concurrent request is currently
touching that file.
2015-06-18 12:05:26 +02:00
Olivier Paroz 13617a0475 Send the mime icon if we can't generate a preview 2015-06-18 11:35:08 +02:00
Lukas Reschke 8d4f918671 Merge pull request #16993 from owncloud/verify-if-path-exists
[master] Verify if path exists
2015-06-18 10:05:12 +02:00
Jenkins for ownCloud c4cb34da9d [tx-robot] updated from transifex 2015-06-18 01:55:14 -04:00
Lukas Reschke 3b0b1a7ceb Merge pull request #16973 from owncloud/button-close-sidebar
Let buttons hide the sidebar
2015-06-17 22:37:10 +02:00
Lukas Reschke 9e48f7f3ba Remove MSSQL completely from list 2015-06-17 19:22:14 +02:00
Frank Karlitschek d5ef1f28ce 8.1 RC1 2015-06-17 13:15:33 -04:00
Morris Jobke bfa716acaa Merge pull request #16995 from owncloud/fix-ocp-phpdoc
Fix return value for OCP PHPDoc
2015-06-17 16:53:32 +02:00
Carla Schroder ea9c21f94e remove mssql from supported dbs 2015-06-17 07:33:57 -07:00
Morris Jobke 9a0b0ba488 Merge pull request #16893 from owncloud/fixSlideToggle
Fix childs of slideToggle not sliding the target
2015-06-17 16:06:47 +02:00
Jan-Christoph Borchardt b43bfaf132 fix look of 'Share with me via ownCloud' button, fix wording 2015-06-17 16:05:05 +02:00
Morris Jobke 6856316122 Fix return value for OCP PHPDoc 2015-06-17 15:47:45 +02:00
Lukas Reschke 414896d8a0 Throw nicer error message instead 500 2015-06-17 15:39:13 +02:00
Lukas Reschke 2d648ed0eb Verify if path exists
We need to verify if the specified path exists to gracefully prevent errors.
2015-06-17 15:06:50 +02:00
Jan-Christoph Borchardt 2abedd544b remove unneeded span around Settings text, fixes cursor 2015-06-17 14:37:58 +02:00
Robin Appelman 72eedda16c use old cache data when locked 2015-06-17 14:13:10 +02:00
Robin Appelman 24f0151f81 handle locked exceptions when getting file/directory info in sabre 2015-06-17 14:13:10 +02:00
Arthur Schiwon 0e522a0b01 delete user test to take getHome into account to ensure it is also deleted subsequently 2015-06-17 14:13:01 +02:00
Bjoern Schiessle fa16c1f9b4 fix path to owncloud logo 2015-06-17 13:53:59 +02:00
Bjoern Schiessle ac9733a8b8 make the click actions work 2015-06-17 13:53:59 +02:00
Jan-Christoph Borchardt 4599da9608 federated cloud ID: add icons, fix HTML & layout, fix wording 2015-06-17 13:53:59 +02:00
Bjoern Schiessle 06d0a41915 add social media button for diaspora, twitter, facebook and google+ 2015-06-17 13:53:59 +02:00
Vincent Petry a89bb1d383 Merge pull request #16988 from owncloud/fix-avatar-fail
Fix remaining avatar problems
2015-06-17 13:20:29 +02:00
Lukas Reschke 21d261885d Fix test 2015-06-17 12:11:09 +02:00
Thomas Müller e6e9370eb6 Merge pull request #16985 from owncloud/fix-public-api-phpdoc
Fix OCP PHPDoc
2015-06-17 12:04:08 +02:00
Lukas Reschke 70ca0102f5 Fix PHPDoc annotations 2015-06-17 11:57:12 +02:00
Lukas Reschke 123807bff7 Correc type annotation 2015-06-17 11:55:15 +02:00
Thomas Müller d2305f2527 Merge pull request #16729 from owncloud/scanner-read-lock
keep a read lock while scanning a file or folder
2015-06-17 11:52:54 +02:00
Morris Jobke 9e506abec3 Fix OCP PHPDoc
* was always a string instead of \OCP\IUser
2015-06-17 11:10:55 +02:00
Jenkins for ownCloud 3898b8c9b8 [tx-robot] updated from transifex 2015-06-17 01:55:34 -04:00
Hendrik Leppelsack e8507372e3 let buttons hide the sidebar 2015-06-16 19:41:20 +02:00
Vincent Petry de5c84580b Merge pull request #16955 from owncloud/lock-changelocktrimpath
Trim path in changeLock
2015-06-16 18:18:17 +02:00
Vincent Petry 102c6ffc41 Normalize path in View's lock methods 2015-06-16 17:03:12 +02:00
Vincent Petry e5d34a2733 Merge pull request #16892 from owncloud/lock-returnfullpath
Rethrow LockedException with full path
2015-06-16 16:47:10 +02:00
Lukas Reschke 829f6474ff Merge pull request #16856 from owncloud/issue-15851-fetch-updates-after-page-completion
Load the update information asyncroniously to fix the page load speed
2015-06-16 11:41:44 +02:00
Joas Schilling 497fe93b6c Do not return backends but add a method to check for one 2015-06-16 11:31:04 +02:00
Joas Schilling 171f86ca2e Only sort by group name when LDAP is involved 2015-06-16 11:10:00 +02:00
Joas Schilling fee62ac61c Always keep "Everyone" and "admin" at the top of the list 2015-06-16 11:10:00 +02:00
Joas Schilling 7d8b728066 Merge pull request #16832 from owncloud/memcache-fail
Throw exception if memcache misconfigured or missing
2015-06-16 11:00:18 +02:00
Joas Schilling 60005bea19 Merge pull request #16943 from owncloud/sabre-convertinvalidpath
Convert invalid path exception to sabre exception on MOVE
2015-06-16 10:49:22 +02:00
Vincent Petry 0e3a3dd5d7 Rethrow LockedException with full path
Because the path is converted to md5 from the original exception,
rethrow the exception with the correct full path
2015-06-16 10:48:31 +02:00
Morris Jobke b052eccd9a Merge pull request #16938 from owncloud/ext-s3-opendirduplicate
Skip directory entry in S3 opendir
2015-06-16 09:48:10 +02:00
Jenkins for ownCloud 0a5d73b874 [tx-robot] updated from transifex 2015-06-16 01:55:41 -04:00
Thomas Müller e9d11a65e0 Merge pull request #16944 from owncloud/fix-avatars
Reintroduce user cache
2015-06-15 21:16:04 +02:00
Lukas Reschke fffef529ee Adjust NullCache tests 2015-06-15 19:17:50 +02:00
Lukas Reschke 34f5541088 Add no-store to AppFramework 2015-06-15 18:35:41 +02:00
Lukas Reschke 15ba2a4100 Reintroduce user cache
This was required by avatars and was broken with https://github.com/owncloud/core/pull/16200

Fixes https://github.com/owncloud/core/issues/16942
2015-06-15 17:54:48 +02:00
Vincent Petry 1f91e9e65d Convert invalid path exception to sabre exception on MOVE 2015-06-15 17:49:11 +02:00
Vincent Petry f98030020f Properly set mtime on S3 for touch operation
The code was missing the "MetadataDirective".
Once added, some other parts of the code failed because the format of mtime was wrong.
So this PR uses the RFC format that the S3 library already uses.

Additionally, the code path where mtime is null was missing. Now defaulting to
the current time.
2015-06-15 17:35:09 +02:00
Vincent Petry d3f828af45 Skip directory entry in S3 opendir
The result set contains the directory itself, so skip it to avoid
scanning a non-existing directory
2015-06-15 17:30:09 +02:00
Robin Appelman f02e110aea explain pre-hook scan 2015-06-15 15:43:19 +02:00
Thomas Müller 4bc35286ff Merge pull request #16931 from owncloud/make-security-checks-more-stringent
Align recommended settings
2015-06-15 15:15:28 +02:00
Robin Appelman 567df226e5 fix check if hooks should be emited in runHooks 2015-06-15 15:07:48 +02:00
Robin Appelman 9c0d69a3b2 ensure normalized path form when changing locks 2015-06-15 14:32:29 +02:00
Robin Appelman 5efbab4ab8 ensure we dont have to scan a file in the trash wrapper 2015-06-15 14:32:29 +02:00
Robin Appelman a4f808b11d properly unlock in case of failed fopen 2015-06-15 14:32:29 +02:00
Robin Appelman 7d72f7d8ce keep a read lock while scanning a file or folder 2015-06-15 14:32:29 +02:00
Thomas Müller 911c43e5f9 Merge pull request #16727 from owncloud/file-put-content-lock
add proper locking to file_put_contents when using streams
2015-06-15 14:22:06 +02:00
Thomas Müller 5eb0dace8c Merge pull request #16802 from Brewal/master
Fixed "p" element containing a "div"
2015-06-15 14:10:00 +02:00
Thomas Müller de3ed8e077 Merge pull request #16821 from owncloud/compare-and-delete-locking-watch
Compare and delete locking watch
2015-06-15 14:09:06 +02:00
Thomas Müller 433db48027 Merge pull request #16911 from oparoz/prettier-public-thumbnails
Determine the size we need before asking for a thumbnail
2015-06-15 13:30:44 +02:00
Thomas Müller b8ab6fb68d Merge pull request #16915 from aidanamavi/add-opus-mimetype
Added Opus Mimetype Support
2015-06-15 13:27:44 +02:00
Thomas Müller 3ce616fb03 Merge pull request #16885 from owncloud/files-previewurlresolutionrounding
Truncate preview resolution
2015-06-15 12:53:05 +02:00
Thomas Müller b6165b6865 Merge pull request #16912 from owncloud/webdav-smalltransferlockfix
Webdav PUT small file lock must be shared during hooks
2015-06-15 11:30:59 +02:00
Lukas Reschke eec8d776b7 Align recommended settings
This aligns the recommended setting with the max-age of `15768000` as described in our documentation. Furthermore it fixes some logical problems with the code, unit tests has been added as well.

Fixes https://github.com/owncloud/core/issues/16673
2015-06-15 10:39:25 +02:00
Joas Schilling 5ca6ec7ead Make "include update info" part of the cache key 2015-06-15 10:04:13 +02:00
Jenkins for ownCloud 2806c9476c [tx-robot] updated from transifex 2015-06-15 01:54:58 -04:00
Jenkins for ownCloud fe9b28a800 [tx-robot] updated from transifex 2015-06-14 01:54:49 -04:00
Aidan Amavi 89a7aefad5 Added Opus Mimetype Support
Added Opus audio mimetype support.
2015-06-13 04:39:37 -04:00
Jenkins for ownCloud 51d181f331 [tx-robot] updated from transifex 2015-06-13 01:55:04 -04:00
Olivier Paroz 7b84343cfc floats are not welcome when setting the size of a preview 2015-06-12 18:56:18 +02:00
Vincent Petry 4497aa4c68 Webdav PUT small file lock must be shared during hooks
Fixed code path for Webdav PUT of small files to use shared locks during
hook execution, and exclusive during the file operation

This makes it possible for versions to be copied by accessing the file
in a post_write hook.
2015-06-12 18:52:18 +02:00
Olivier Paroz 8ff4a66f01 Determine the size we need before asking for a thumbnail
We need to set the size of the preview using the devicePixelRatio and use that as arguments when using the preview endpoint or that endpoint will use the default 36x36 and thumbnails will be blurry on high DPI devices
2015-06-12 18:50:21 +02:00
Robin Appelman a9ff242f6a switch to using watch to implement cas and cad on redis 2015-06-12 17:28:09 +02:00
Robin Appelman 520a741876 clear memcache keys in locking 2015-06-12 17:28:09 +02:00
Robin Appelman ac9f998abd add compare-and-delete to the memcache interface 2015-06-12 17:28:09 +02:00
Robin Appelman 1bc56a99e9 compare-and-set and compare-and-delete using lua scripts for redis 2015-06-12 17:28:09 +02:00
Vincent Petry 446f628136 Merge pull request #16886 from owncloud/webdav-verify-path-again
verify path when getting a node for sabredav
2015-06-12 16:45:20 +02:00
Jan-Christoph Borchardt bb0ea6336d Merge pull request #16888 from owncloud/feature/fix-titles
fixing setting page titles
2015-06-12 14:54:42 +02:00
Vincent Petry da96cbbcd4 Merge pull request #16884 from owncloud/issue-16843-stop-locking-encryption-key-storage
Do not lock the encryption key storage
2015-06-12 14:03:37 +02:00
Vincent Petry 3b08b26589 Throw exception if memcache misconfigured or missing
Instead of falling back to null memcache, throw exceptions.
Also throw file locking specific exceptions in case the class is not
available.
2015-06-12 12:33:06 +02:00
Joas Schilling 5586b2db09 Don't use limit on explode to have only 1 code path 2015-06-12 11:58:26 +02:00
Joas Schilling a7d2b3b9ae Add return value to lock methods and check it in tests 2015-06-12 11:41:05 +02:00
Joas Schilling caf16b083e Only lock files in data/username/files/ 2015-06-12 11:09:38 +02:00
Jenkins for ownCloud abd70932c6 [tx-robot] updated from transifex 2015-06-12 01:55:11 -04:00
Hendrik Leppelsack 58afa465f9 fix childs of slideToggle not sliding the target 2015-06-11 18:26:14 +02:00
Arthur Schiwon 97127cd971 the user is gone, userExists will not bring him back. But the user's folder needs to be deleted anyway 2015-06-11 18:24:45 +02:00
Clark Tomlinson 62286f00a1 fixing setting page titles 2015-06-11 11:39:34 -04:00
Robin Appelman 5a5639ab76 tests for getNodeForPath with invalid path 2015-06-11 17:25:06 +02:00
Vincent Petry d256425aba Truncate preview resolution
This prevents having float numbers appear in the URL
2015-06-11 17:17:40 +02:00
Robin Appelman 05cecb101d verify path when getting a node for sabredav 2015-06-11 17:11:33 +02:00
Vincent Petry cda9685c0e Merge pull request #16883 from owncloud/revert-16880-webdav-verify-path
Revert "verify path when getting a node for sabredav"
2015-06-11 15:27:53 +02:00
Vincent Petry f13a2d9251 Revert "verify path when getting a node for sabredav" 2015-06-11 15:25:06 +02:00
Vincent Petry e5c6a9481f Merge pull request #16880 from owncloud/webdav-verify-path
verify path when getting a node for sabredav
2015-06-11 15:17:15 +02:00
Lukas Reschke dbe344ef3d Merge pull request #16879 from jcfischer/jcf_fix_user_delete_message
Fix error message and add 'user' to it
2015-06-11 14:53:50 +02:00
Robin Appelman 4d10dab813 verify path when getting a node for sabredav 2015-06-11 14:12:04 +02:00
Jens-Christian Fischer bffadd069d Fix test message and add 'user' to it 2015-06-11 13:44:38 +02:00
Lukas Reschke fee52f7f44 Merge pull request #16872 from owncloud/missing-nullcache-import
Correctly import NullCache class
2015-06-11 13:35:45 +02:00
Jens-Christian Fischer 0013c4115e Fix error message and add 'user' to it 2015-06-11 13:02:47 +02:00
Joas Schilling afa030c561 Check the query() for all defined services 2015-06-11 12:28:30 +02:00
Joas Schilling 4582d14832 Order all use statements correctly 2015-06-11 11:29:27 +02:00
Joas Schilling 05f1ff8715 Correctly import NullCache class 2015-06-11 10:48:30 +02:00
Morris Jobke 672b8752e4 Merge pull request #16869 from owncloud/php7
Null -> NullCache
2015-06-11 09:29:49 +02:00
Jenkins for ownCloud 88d3c9ad40 [tx-robot] updated from transifex 2015-06-11 01:55:05 -04:00
Thomas Müller 3090348bf7 Null -> NullCache 2015-06-11 00:44:13 +02:00
Thomas Müller 48e915c7be Revert "Null -> NullCache"
This reverts commit ff24554e76.
2015-06-11 00:40:26 +02:00
Thomas Müller ff24554e76 Null -> NullCache 2015-06-11 00:34:03 +02:00
Morris Jobke 5ccacb9b38 Merge pull request #16860 from owncloud/fix-appmenu
fix app menu not showing on mobile, fix #16844
2015-06-10 16:18:31 +02:00
Morris Jobke be6ba653ea Merge pull request #16814 from owncloud/improve-repair
Reduce amount of rows to update
2015-06-10 15:57:21 +02:00
Jan-Christoph Borchardt a8b51fdcbd fix app menu not showing on mobile, fix #16844 2015-06-10 13:43:12 +02:00
Joas Schilling 580155abe7 Load the update information asyncroniously to fix the page load speed 2015-06-10 12:11:05 +02:00
Thomas Müller 4747c7f509 Merge pull request #16736 from owncloud/utilize-member-of
Utilize memberOf to boost loading time on users page (depending on LDAP server config)
2015-06-10 08:47:53 +02:00
Jenkins for ownCloud 4d88302b3a [tx-robot] updated from transifex 2015-06-10 01:54:55 -04:00
Thomas Müller 5f4f7e69cf Merge pull request #16810 from owncloud/disable-search-if-not-implemented
Disable search field in case there is no search available to the curr…
2015-06-09 23:49:25 +02:00
Lukas Reschke b9c7b5575a Merge pull request #16840 from owncloud/fix-video-preview
Disable video preview if previews are disabled
2015-06-09 22:32:13 +02:00
Morris Jobke 7550bf0917 Disable video preview if previews are disabled 2015-06-09 17:49:59 +02:00
Joas Schilling 0235e5edd3 Fix fetching the mimetype id from the query 2015-06-09 16:35:11 +02:00
Thomas Müller e882f5e930 Bring back filtering on apps management page 2015-06-09 15:46:15 +02:00
Thomas Müller 0fde0e6569 Search results have to explicitly be added to the content area of the app 2015-06-09 12:39:40 +02:00
Thomas Müller 9d90421e62 Merge pull request #16803 from owncloud/issue/16801-group-reshare-part-file-enc-keys
Check if the part files has keys when the original file does not
2015-06-09 11:41:36 +02:00
Morris Jobke 7df96f1922 Merge pull request #16818 from owncloud/upgrade-jquery-migrate
Upgrade jquery-migrate to 1.2.1
2015-06-09 10:20:14 +02:00
Morris Jobke bacd5de453 Merge pull request #16811 from espenfjo/master
Fix regression in preview height calculation
2015-06-09 09:31:30 +02:00
Morris Jobke 7b7b21d328 Upgrade jquery-migrate to 1.2.1 2015-06-09 09:14:42 +02:00
Jenkins for ownCloud 75bd040f1c [tx-robot] updated from transifex 2015-06-09 01:55:06 -04:00
Victor Dubiniuk 262d7e659d Reduce amount of rows to update 2015-06-09 01:04:42 +03:00
Morris Jobke 429bd7ce37 Merge pull request #16807 from owncloud/fix-16779
Do not use digits in random index names
2015-06-08 22:28:57 +02:00
Björn Schießle 2ae2da576f Merge pull request #16798 from owncloud/enc_add_hint_to_exception
add hint to exception
2015-06-08 22:28:26 +02:00
Bjoern Schiessle d743d6d356 add hint to exception 2015-06-08 21:16:23 +02:00
Espen Fjellvær Olsen 308b97db4c Fix regression in preview height calculation
Fix regressions introduced in a672e9d regarding the image height calculation
2015-06-08 20:57:19 +02:00
Thomas Müller 0dd990839e Disable search field in case there is no search available to the current selected app - fixes #14544 2015-06-08 20:18:41 +02:00
Victor Dubiniuk c7c6556187 Do not use digits in random index names 2015-06-08 19:02:07 +03:00
Joas Schilling 05c2fc72d8 Add a test for the fallback to the part file keys 2015-06-08 16:35:37 +02:00
Thomas Müller 64c9c27f7e Merge pull request #16382 from oparoz/providers-are-responsible-for-the-size-of-their-preview
Fix max preview, some resizing and caching issues and force preview providers to resize their previews properly
2015-06-08 16:14:35 +02:00
Joas Schilling e6681857d2 Check if the part files has keys when the original file does not 2015-06-08 15:42:38 +02:00
Brewal 6170150ce0 Merge pull request #1 from Brewal/Brewal-patch-1
Changed a p element by a div
2015-06-08 15:32:57 +02:00
Brewal eac117fc8f Changed a p element by a div
A p element cannot contain a div element (here `<div style="clear: both;"></div>`). It should be change by a div element to fits standards.
2015-06-08 15:22:52 +02:00
Olivier Paroz 3d0a523217 Make sure we have a resource before measuring its size 2015-06-08 15:10:29 +02:00
Thomas Müller 1769de0a6d Merge pull request #16796 from owncloud/fix-login-listener-for-file-cache
Fix login handler for file cache - fixes #16795
2015-06-08 14:59:29 +02:00
Thomas Müller 97a3d8c313 Fix login handler for file cache - fixes #16795 2015-06-08 14:13:38 +02:00
Thomas Müller a968b8409d Merge pull request #16158 from owncloud/mountprovider-after-setup
Call newly registered mount providers after the filesystem is setup
2015-06-08 13:42:02 +02:00
Thomas Müller f051b7381b Merge pull request #16402 from owncloud/issue-15956-slow-group-usercount
Sort user groups by group name and hide the user count
2015-06-08 12:11:22 +02:00
Jenkins for ownCloud 2fb1b0864a [tx-robot] updated from transifex 2015-06-08 01:55:01 -04:00
Jenkins for ownCloud 3542148761 [tx-robot] updated from transifex 2015-06-07 01:55:03 -04:00
Olivier Paroz 71d65cb713 Fix max preview, some resizing and caching issues and force preview providers to resize their previews properly
* introduces a method in OC_Image which doesn't stretch images when trying to make them fit in a box
* adds the method to all key providers so that they can do their job, as expected by the Preview class
* improves the caching mechanism of Preview in order to reduce I/O and to avoid filling the available disk space
* fixes some long standing issues
* **contains mostly tests**
2015-06-06 16:25:04 +02:00
Jenkins for ownCloud 16708ae187 [tx-robot] updated from transifex 2015-06-06 01:55:26 -04:00
Lukas Reschke ca10ee4d0d Merge pull request #16771 from owncloud/fix-storage-full-message
Add owner to the storage stats to enable better notifications
2015-06-05 20:09:55 +02:00
Morris Jobke 3b188d0b72 Merge pull request #16768 from owncloud/add-missing-mime-types
Adding mimetype x-h for header files
2015-06-05 20:08:34 +02:00
Lukas Reschke cbb15f3cbd Merge pull request #16767 from owncloud/webdav-preventdeleteroot
Prevent deleting Webdav root
2015-06-05 19:56:20 +02:00
Vincent Petry b97be0ea02 Fix sabre directory test cases
- rely on a mock subfolder instead of the root
- remove obsolete "Shared" limitation tests which did pass but not for the right
  reasons
- added test for the prevention of root deletion
2015-06-05 19:04:59 +02:00
Morris Jobke bd5aebe256 Merge pull request #16770 from owncloud/update-ocp-phpdoc
[OCP] update PHPdoc to contain correct @since tags
2015-06-05 18:55:45 +02:00
Morris Jobke 62ae39208a Add owner to the storage stats to enable better notifications
* getstoragestats.php returns now the owner and it's display name
* show proper storage stats notifications for shared folders
2015-06-05 18:21:41 +02:00
Morris Jobke 0c9604e3b2 [OCP] update PHPdoc to contain correct @since tags 2015-06-05 17:30:45 +02:00
Thomas Müller 5481a846c2 Adding mark down mime type mkd - fixes https://github.com/owncloud/files_texteditor/issues/45 2015-06-05 17:11:14 +02:00
Thomas Müller 5d93353a02 Adding mimetype x-h for header files - fixes https://github.com/owncloud/files_texteditor/issues/70 2015-06-05 16:57:01 +02:00
Vincent Petry 6ae5ae2e31 Prevent deleting Webdav root 2015-06-05 16:55:09 +02:00
Thomas Müller 9899e10a04 Merge pull request #16753 from owncloud/issue-16752-check-for-existing-user-in-expire-tasks
Check whether the user exists before trying to set up his file system
2015-06-05 16:22:03 +02:00
Thomas Müller 85d1ca11d4 Merge pull request #16765 from owncloud/fix-chunked-upload-jenkins
Fix chunked upload jenkins
2015-06-05 16:20:33 +02:00
Vincent Petry ddd067a414 Merge pull request #16755 from owncloud/files-mkcolbackslash
Validate path in getChild
2015-06-05 16:12:03 +02:00
Thomas Müller 680a67712b fix unit test 2015-06-05 15:30:20 +02:00
Thomas Müller cd82b24edd Bring back unit tests for \OC\Cache\File 2015-06-05 14:29:15 +02:00
Thomas Müller 5e60795962 Bring back OC\Cache\File - fixes #16760 2015-06-05 14:21:17 +02:00
Joas Schilling 1df95ea1ca Fix "@throws" tags on doc blocks 2015-06-05 13:55:59 +02:00
Joas Schilling 249e54e34a Add unit tests for InvalidPath Exception being thrown 2015-06-05 13:55:12 +02:00
Joas Schilling bd0b9a0fe0 Add unit tests for non existing users 2015-06-05 13:23:50 +02:00
Vincent Petry 06dda427f3 Validate path in getChild 2015-06-05 12:08:18 +02:00
Thomas Müller ccbb1cce3c Merge pull request #16718 from owncloud/files-catchajaxexceptions
Catch exceptions in files ajax calls
2015-06-05 12:01:01 +02:00
Joas Schilling 4e24486a89 Check whether the user exists before trying to set up his file system 2015-06-05 11:31:49 +02:00
Morris Jobke c747a58978 Merge pull request #16748 from owncloud/fix-ldap-port-detection-regression
port detection needs to take care of now thrown exceptions when LDAP …
2015-06-05 11:10:37 +02:00
Jenkins for ownCloud e544d5b2c6 [tx-robot] updated from transifex 2015-06-05 01:55:04 -04:00
Robin McCorkell 5ea06f31b9 Merge pull request #16746 from owncloud/fix-phpdoc
Fix typo in PHPDoc
2015-06-04 15:36:15 +01:00
Arthur Schiwon 6f69fab384 port detection needs to take care of now thrown exceptions when LDAP server is not available 2015-06-04 16:28:48 +02:00
Morris Jobke ab5ecb3d22 Fix typo in PHPDoc 2015-06-04 15:19:04 +02:00
Jenkins for ownCloud 66a24ff479 [tx-robot] updated from transifex 2015-06-04 01:56:24 -04:00
Arthur Schiwon 090478a95e if possible, getUserGroups should get memberships using memberOf virtual attribute 2015-06-03 17:38:27 +02:00
Joas Schilling bb0cb0aaec Merge pull request #15895 from owncloud/dav-getremoteetag
Get etag from remote OC server
2015-06-03 17:20:25 +02:00
Robin Appelman bcf13aff6f change lock back to shared before updating the cache 2015-06-03 17:18:50 +02:00
Robin Appelman 6b0874203d add proper locking to file_put_contents when using streams 2015-06-03 17:18:50 +02:00
Thomas Müller 8d860e564a Merge pull request #16730 from owncloud/LukasReschke-patch-1
Fix unit tests
2015-06-03 17:18:06 +02:00
Lukas Reschke bf07eb45e2 Fix unit tests
Regression caused by https://github.com/owncloud/core/pull/16721

Failed the unit tests as per https://ci.owncloud.org/job/server-master-linux/database=sqlite,label=SLAVE/1994/testReport/junit/(root)/Test_Encryption_ManagerTest/testGetEncryptionModuleUnknown/:
```
Test\Encryption\ManagerTest::testGetEncryptionModuleUnknown
Failed asserting that exception message 'Module with id: unknown does not exist.' contains 'Module with id: unknown does not exists.'
```
2015-06-03 17:07:30 +02:00
Morris Jobke 5b52670a95 Merge pull request #16703 from owncloud/fix-ie8-ie9
Fix IE8 & IE9 - setup page
2015-06-03 16:15:03 +02:00
Morris Jobke a90a84b0a7 Merge pull request #16691 from owncloud/trash-deleteasrecipientkeepversions
Keep versions when deleting as recipient
2015-06-03 16:03:31 +02:00
Clark Tomlinson 00742a9d68 Merge pull request #16721 from owncloud/fix-grammar-enc-module
Fixing grammar - refs https://www.transifex.com/projects/p/owncloud/t…
2015-06-03 09:54:50 -04:00
Arthur Schiwon 91841bb25d Implement a faster way for checking availability of memberOf. Users tab in the wizard benefits. 2015-06-03 15:23:37 +02:00
Thomas Müller 5dc5b7f86d Catch NotFoundException and return no quota information which simply reflects the current state - no file storage has been initialized for the user. 2015-06-03 15:00:56 +02:00
Thomas Müller 259b6ac2c1 Fixing grammar - refs https://www.transifex.com/projects/p/owncloud/translate/#en_GB/lib/50330746 2015-06-03 14:56:18 +02:00
Thomas Müller 3d289a58cd Merge pull request #16719 from owncloud/fix-encryption-tests
use not deprecated method in tests
2015-06-03 14:36:10 +02:00
Morris Jobke 2edcce7e2a use not deprecated method in tests 2015-06-03 14:33:56 +02:00
Vincent Petry 263bb46ff8 Catch exceptions in files ajax calls 2015-06-03 14:31:58 +02:00
Thomas Müller 739c3f01aa Merge pull request #16434 from owncloud/persist-maintenance-state
Persist the state of the maintenance after an upgrade
2015-06-03 13:56:17 +02:00
Thomas Müller 69d1e7aaf4 Merge pull request #16687 from owncloud/issue-16113-redis-minimum-version
Check for redis to be 2.2.5+
2015-06-03 13:55:26 +02:00
Lukas Reschke 3a233b8698 Merge pull request #16714 from owncloud/fix-cors-test
Fix #16713
2015-06-03 13:52:14 +02:00
Morris Jobke e3440863bc Merge pull request #16708 from owncloud/enc_fix_move_to_trash
make sure that we always use the correct owner for both source and target
2015-06-03 13:49:46 +02:00
Lukas Reschke 9ba5081d47 Merge pull request #16710 from owncloud/move-invoke-private-to-base-class
Move the helpful invokePrivate method to the TestCase class
2015-06-03 13:41:32 +02:00
Thomas Müller 7de2940b42 Merge pull request #16711 from owncloud/files-invalidchar400
Translate invalid path exception to sabre exception for files
2015-06-03 13:40:31 +02:00
Bernhard Posselt 21ce5d034b fix #16713 2015-06-03 12:56:50 +02:00
Joas Schilling d3e3a84cae Move the helpful method to the TestCase class 2015-06-03 12:33:29 +02:00
Vincent Petry 6ab38be40e Translate invalid path exception to sabre exception for files 2015-06-03 12:22:31 +02:00
Bjoern Schiessle 7eb2b31e34 make sure that we always use the correct owner for both source and target 2015-06-03 11:59:06 +02:00
Vincent Petry 500748725c Merge pull request #16698 from owncloud/use-proper-quoting
Properly quote memcache.locking
2015-06-03 10:45:14 +02:00
Morris Jobke 49d6186714 Add min-height to login page for IE8 and IE9 2015-06-03 10:22:57 +02:00
Morris Jobke 99c6f96c69 Revert "fix theme in IE8 and IE9"
This reverts commit a4c9688711.
2015-06-03 10:20:29 +02:00
Jenkins for ownCloud 410a836702 [tx-robot] updated from transifex 2015-06-03 01:55:29 -04:00
Lukas Reschke b806502cdb Properly quote memcache.locking 2015-06-02 21:46:57 +02:00
Vincent Petry 61356b5560 Keep versions when deleting as recipient
The original owner could not be resolved because the original file was
already deleted, so no versions were retained.

This fix passes the owner and path to retainVersions() since it was
already resolved before the file deletion. This reactivates the versions
logic and creates a copy of the versions in each trashbin.
2015-06-02 17:13:00 +02:00
Lukas Reschke 1cccb227c3 Merge pull request #16686 from owncloud/show_cloud_id
show federated cloud id in the personal settings
2015-06-02 17:05:33 +02:00
Morris Jobke 259937680b Merge pull request #16667 from owncloud/issue-16510-fix-encryption-with-s2s-shares
Add tests for the storage wrapper and fix the wrapping
2015-06-02 16:42:32 +02:00
Joas Schilling bdc82dcfb9 Check for redis to be 2.2.5+ 2015-06-02 15:42:48 +02:00
Morris Jobke 70f0cf67a5 L10n for federated cloud ID and rtrim '/' on ID 2015-06-02 15:16:21 +02:00
Vincent Petry 120588dd7a Disable update check test when testing wrappers
The checkUpdate test is intended for testing real storages, not
wrappers.
2015-06-02 15:14:37 +02:00
Robin Appelman a9455be14a more hints 2015-06-02 14:16:37 +02:00
Bjoern Schiessle 6e5ed81064 show federated cloud id in the personal settings 2015-06-02 14:09:53 +02:00
Robin Appelman 0497534a6e more type hints 2015-06-02 14:07:55 +02:00
Robin Appelman 8926bca0c7 phpdoc, strict and type hints 2015-06-02 14:07:55 +02:00
Robin Appelman 6f47a547d8 only use mount provider if we have a valid user 2015-06-02 14:07:54 +02:00
Robin Appelman 24131586d7 call mount providers that are registered after the filesystem is setup 2015-06-02 14:07:54 +02:00
Robin Appelman c91b52d38c move emitter implementation to a trait 2015-06-02 14:07:54 +02:00
Robin Appelman 4b48dd424f emit hooks from a view as long as the path is inside the default root 2015-06-02 14:07:20 +02:00
Thomas Müller 3ebc8f0564 Merge pull request #16107 from owncloud/fix-getLocalFile-encryption-master
Fix get local file encryption master
2015-06-02 13:47:37 +02:00
Joas Schilling be1f319511 Correctly ignore remote shares aswell 2015-06-02 12:33:51 +02:00
Joas Schilling 50a31fa8f9 Add unit tests for wrapStorage 2015-06-02 12:33:17 +02:00
Joas Schilling 9a4040c7ca Move the storage wrapping into a testable method 2015-06-02 12:29:06 +02:00
Vincent Petry c4cb93e644 Added storage backend test for checkUpdate
This helps testing whether checkUpdate properly returns false when no
change exists
2015-06-02 11:42:03 +02:00
Vincent Petry 30d7f92763 Get etag from remote OC server 2015-06-02 11:42:03 +02:00
Morris Jobke d2f3710ede Merge pull request #16623 from owncloud/oparoz-fix-file-conflict-preview
Get a 96x96 preview for file conflict resolution
2015-06-02 09:36:51 +02:00
Morris Jobke cf2c599218 Merge pull request #16200 from owncloud/kill-globalfilecache
Drop file caching
2015-06-02 09:11:33 +02:00
Jenkins for ownCloud baca5c60c0 [tx-robot] updated from transifex 2015-06-02 01:56:23 -04:00
Thomas Müller 1acdef5e34 Merge pull request #16672 from owncloud/tests-xmlupdate
Fix phpunit xml
2015-06-01 21:31:39 +02:00
Vincent Petry ac98480028 Fix phpunit xml
Rename/remove obsolete paths
2015-06-01 20:42:32 +02:00
Joas Schilling 1c47b14651 Merge pull request #16663 from owncloud/no-sense-to-check-for-cli
Remove check for RAW_POPULATE_POST_DATA for unit tests
2015-06-01 17:35:30 +02:00
Lukas Reschke 73875da4b0 Clean application identifier before processing 2015-06-01 17:03:51 +02:00
Lukas Reschke 418f4e1a90 Bump Dropbox library to newest upstream version 2015-06-01 17:03:46 +02:00
Thomas Müller 2f8296875f Merge pull request #16237 from owncloud/file-locking
High level file locking
2015-06-01 16:37:38 +02:00
Lukas Reschke e6b0a7a55a Remove check for RAW_POPULATE_POST_DATA for unit tests
We do have a work around meanwhile and for CLI this is not relevant at all. Can be removedWe do have a work around meanwhile and for CLI this is not relevant at all. Can be removed.
2015-06-01 16:35:54 +02:00
Thomas Müller 50b420446f Merge pull request #16655 from owncloud/fix-search-results-phrase
Fix grammar of search results phrase
2015-06-01 14:57:50 +02:00
Thomas Müller 2104c2ffdd Fixing undefined index 'foo' 2015-06-01 14:10:00 +02:00
Tom Needham 2bf9219be3 Fix grammar of search results phrase 2015-06-01 12:29:12 +01:00
Robin Appelman 8902e2be73 fix nooplockingprovider 2015-06-01 13:25:27 +02:00
Robin Appelman ce04cf6610 shared lock around hooks 2015-06-01 13:24:02 +02:00
Robin Appelman 661c9e2444 add changeLock to the storage api 2015-06-01 13:24:02 +02:00
Robin Appelman a1372b2fb5 add method to atomically change between shared and exclusive lock 2015-06-01 13:24:02 +02:00
Thomas Müller 43772e2a9a Adding information on file locking status to admin section 2015-06-01 13:24:02 +02:00
Vincent Petry 270a10b754 Return 423 instead of 503 for locked files 2015-06-01 13:24:02 +02:00
Vincent Petry 0451a6652d Move locking exceptions 2015-06-01 13:24:02 +02:00
Vincent Petry ba174ac626 Convert LockedException to FileLocked in Sabre connector
For Sabre to be able to return the proper error code instead of 500, the
LockedException is now rethrown as FileLocked exception in the Sabre
connector
2015-06-01 13:22:57 +02:00
Robin Appelman 8665a98744 add locking for non-chunking webdav upload 2015-06-01 13:22:57 +02:00
Robin Appelman 72776b165f use arraycache for locking in unit tests 2015-06-01 13:22:56 +02:00
Robin Appelman 6b965d71d1 add seperate config option for locking memcache backend 2015-06-01 13:22:56 +02:00
Robin Appelman 72847dbc77 always use locking in unit tests 2015-06-01 13:22:56 +02:00
Robin Appelman 437c0b55a6 unlock source file when we cant lock the target in a rename 2015-06-01 13:22:56 +02:00
Robin Appelman 668fafd4d2 close file handle after sending sabre response 2015-06-01 13:22:56 +02:00
Vincent Petry 2f4f468399 Added config switch for file locking 2015-06-01 13:22:56 +02:00
Robin Appelman c72ea9f7d7 unit test for releaseall 2015-06-01 13:22:56 +02:00
Vincent Petry 6df502a5aa Fix Null memcache fallback to match interface 2015-06-01 13:22:56 +02:00
Robin Appelman 006eaa84aa dont release shared lock if we dont have any 2015-06-01 13:22:56 +02:00
Robin Appelman f0b8672729 fix locking root of a view 2015-06-01 13:22:56 +02:00
Robin Appelman b98dd3ceb8 release all locks after test 2015-06-01 13:22:56 +02:00
Robin Appelman e08423f956 release all locks on shutdown 2015-06-01 13:22:56 +02:00
Robin Appelman 2d63fd77de dont apply callback wrapper when fopen failed 2015-06-01 13:22:56 +02:00
Robin Appelman 1270c6800d dont lock on meta data operations 2015-06-01 13:22:56 +02:00
Robin Appelman 35c377f7a9 phpdoc and minor issues 2015-06-01 13:22:56 +02:00
Vincent Petry 8d53dc803f Use md5 + prefix for file locking keys in memcache
Also trim slashes from paths to make sure the locks are based on the
same paths.
2015-06-01 13:22:56 +02:00
Vincent Petry 0775e9c1ca Use md5 for lock key 2015-06-01 13:22:56 +02:00
Vincent Petry 5edf294ce5 Add CAS methods to Null memcache
This prevents breaking ownCloud completely when memcache is not enabled
and the locking code is triggered
2015-06-01 13:22:56 +02:00
Robin Appelman d519aba878 fix test 2015-06-01 13:22:56 +02:00
Robin Appelman a1a25a9b5b fix unlocking when moving mount points 2015-06-01 13:22:56 +02:00
Robin Appelman 7e418c7d69 high level locking wip 2015-06-01 13:22:56 +02:00
Robin Appelman e64360e72d always use arraycache for unit tests 2015-06-01 13:22:56 +02:00
Robin Appelman bf7002bc65 add locking to the view apo 2015-06-01 13:22:56 +02:00
Robin Appelman 536e187e51 add locking to the storage api 2015-06-01 13:22:56 +02:00
Robin Appelman cdf7f91259 expose locking provider in the server container 2015-06-01 13:22:55 +02:00
Thomas Müller 2c86cc821c Merge pull request #16628 from owncloud/webdav-validatepath
Validate target file name for some webdav ops
2015-06-01 13:20:19 +02:00
Thomas Müller b522baaaa6 Merge pull request #16650 from owncloud/fix-sqlite-only-setup
[setup] Disable buttons only in the case they are present
2015-06-01 12:11:49 +02:00
Vincent Petry 5a38964218 Merge pull request #16629 from owncloud/files-renametoreservedname
Check target name on rename with web UI
2015-06-01 11:07:08 +02:00
Morris Jobke b521109881 [setup] Disable buttons only in the case they are present
* fixes #16648
2015-06-01 11:01:42 +02:00
Lukas Reschke 88ee082115 Merge pull request #16638 from owncloud/fix-handlebars-l10n-method-calls
Fix files_external l10n
2015-06-01 09:11:21 +02:00
Lukas Reschke 56eef17fca Merge pull request #16637 from owncloud/fix-l10n-apps-management
Fix L10n in apps management
2015-06-01 09:10:16 +02:00
Jenkins for ownCloud b1ac538679 [tx-robot] updated from transifex 2015-06-01 01:54:54 -04:00
Jenkins for ownCloud 8d23b34402 [tx-robot] updated from transifex 2015-05-31 01:54:44 -04:00
Morris Jobke 80d4309669 Fix files_external l10n
* current l10n..pl script can't extract JS functions that are within a handlebars
  template - therefore they are duplicated until the script is fixed
2015-05-30 14:00:52 +02:00
Morris Jobke 197378d1fd Fix L10n in apps management
* fixes #16632
2015-05-30 13:39:12 +02:00
Jenkins for ownCloud a3bc112412 [tx-robot] updated from transifex 2015-05-30 01:55:46 -04:00
Vincent Petry 13617c8bf1 Check target name on rename with web UI
When renaming over the web UI, check early that the target name is
valid.

This prevents nonsensical error messages when renaming to a name with a
trailing backslash.
2015-05-29 19:30:09 +02:00
Lukas Reschke 4ddc2444bd Add information how to report security bugs 2015-05-29 19:28:45 +02:00
Vincent Petry 06f8c80af6 Validate target file name for some webdav ops 2015-05-29 19:14:38 +02:00
Olivier Paroz f05ac47eb6 Escape single quotes 2015-05-29 18:34:38 +02:00
Olivier Paroz 6aeaa6954b Fix for parenthesis 2015-05-29 17:49:26 +02:00
Björn Schießle 01a241f711 Merge pull request #16622 from owncloud/versions-cancelexpireforunexistingfiles
Abort expiration when file is gone
2015-05-29 15:19:04 +02:00
Olivier Paroz 4e364311f1 Get a 96x96 preview for file conflict resolution 2015-05-29 13:49:51 +02:00
Vincent Petry 9a6d253af3 Abort expiration when file is gone
Sometimes a background job for versions expiration was scheduled for a
file that has been moved or deleted since.

This prevents showing useless warnings in the log and simply bail out.
2015-05-29 13:15:12 +02:00
Thomas Müller c700f42b68 Merge pull request #16517 from owncloud/remove-logo-wide
replace logo-wide on share page as well with better icon + text
2015-05-29 12:15:02 +02:00
Morris Jobke 1152f8b444 Merge pull request #16615 from owncloud/syntaxfix
fix formatting error
2015-05-29 12:01:37 +02:00
Morris Jobke b21cc746c6 Merge pull request #16619 from mmattel/missing_translations_in_ldap
Missing translation in ldap part.wizard-server.php
2015-05-29 11:48:44 +02:00
Martin f084eb07f2 Missing translation in ldap part.wizard-server.php 2015-05-29 10:50:02 +02:00
Jenkins for ownCloud fff0fb66d6 [tx-robot] updated from transifex 2015-05-29 01:56:13 -04:00
Jan-Christoph Borchardt 9194603c31 change tests back to check for logo-wide, make them pass again 2015-05-28 23:39:55 +02:00
Carla Schroder 155150cad3 fix formatting error 2015-05-28 11:55:19 -07:00
Thomas Müller 67cef93fdd Merge pull request #16578 from owncloud/fix_16556
show txt preview when file contains text
2015-05-28 20:48:16 +02:00
Thomas Müller b95ebb76e5 Merge pull request #16607 from owncloud/ie9-textpreviewfallback
Fallback to picture preview for IE <= 9
2015-05-28 20:45:14 +02:00
Thomas Müller 863139c1e2 Merge pull request #16585 from mmattel/Missing_translation_in_External_storage_back_end
Make string 'SFTP with secret key login' translateable
2015-05-28 20:42:08 +02:00
Morris Jobke 7f83829db3 Merge pull request #16592 from owncloud/fix-16574
Add type hint for OC_Channel
2015-05-28 20:36:44 +02:00
Morris Jobke 7b50eb05f3 Merge pull request #16380 from rullzer/fix_16281
Properly format recipients
2015-05-28 20:34:04 +02:00
Vincent Petry cca7d8d561 Merge pull request #16610 from owncloud/s2s-shareinforeturn404whendisabled
Return 404 in shareinfo.php when outgoing s2s disabled
2015-05-28 20:03:18 +02:00
Morris Jobke 54613de31d Merge pull request #16613 from owncloud/quota-onlyforfiles
Only use quota stream wrapper on "files"
2015-05-28 19:44:14 +02:00
Vincent Petry e114d00242 Only use quota stream wrapper on "files"
Prevent using the quota stream wrapper on trashbin folders and other
metadata folders
2015-05-28 18:31:20 +02:00
Vincent Petry 29c68a4e61 Return 404 in shareinfo.php when outgoing s2s disabled 2015-05-28 17:59:43 +02:00
Lukas Reschke 173b147305 Merge pull request #16467 from owncloud/apps-fixsort
Sort apps by level, then by name
2015-05-28 16:10:27 +02:00
Vincent Petry 2daef7c7dc Fallback to picture preview for IE <= 9
IE 9 and below do not provide window.btoa and there is currently no way
to generate base64 strings without introducting further dependencies.

So for now the solution is to fall back to the ugly picture mode for
text files whenever IE <= 9 is used.
2015-05-28 15:36:28 +02:00
Vincent Petry ded62ff693 Merge pull request #16501 from owncloud/enc_fix_move_versions_between_storages
[encryption] fix move versions between storages
2015-05-28 15:28:25 +02:00
Vincent Petry 474c99e19a Merge pull request #16577 from owncloud/enc_improve_migration
only request encryption module for files which are not excluded
2015-05-28 11:31:33 +02:00
Björn Schießle e1483f65c3 Merge pull request #16591 from owncloud/enc_improved_error_message
improved error message for various states
2015-05-28 10:55:53 +02:00
Jenkins for ownCloud 1726d84e73 [tx-robot] updated from transifex 2015-05-28 01:55:22 -04:00
Bjoern Schiessle 68db3059ee detect migration status 2015-05-27 21:00:02 +02:00
Bjoern Schiessle 5549641f1f improve error messages displayed to the user 2015-05-27 21:00:02 +02:00
Lukas Reschke f43f4791ac Merge pull request #16595 from owncloud/scrutinizer-timeout
[scrutinizer] Increase timeout of external code coverage
2015-05-27 19:47:27 +02:00
Lukas Reschke ec7b86623a Merge pull request #16583 from owncloud/fix-code-indentation
Fix indentation
2015-05-27 18:45:32 +02:00
Morris Jobke ba58fe6bfc [scrutinizer] Increase timeout of external code coverage
Hopefully fixes problems with unfinished scrutinizer reports
2015-05-27 18:17:44 +02:00
Victor Dubiniuk 4239054383 Add type hint for OC_Channel 2015-05-27 18:03:11 +03:00
Morris Jobke 7385b5dad9 Merge pull request #16417 from owncloud/master-16415
fix theme in IE8 and IE9
2015-05-27 16:41:13 +02:00
Roeland Jago Douma bf491183c1 Properly format remote recipients
* A list of recipients can now be properly formatted with remote shares.
Before the shares where simply shown in full in the "Shared with others"
section.
* Unit tests updated and added
2015-05-27 16:22:34 +02:00
Bjoern Schiessle 0de59acb49 only request encryption module for files which are not excluded 2015-05-27 15:47:40 +02:00
Martin cdbf472c4d Make string 'SFTP with secret key login' translatable 2015-05-27 15:38:05 +02:00
Lukas Reschke ffd73ef2e4 Fix indentation 2015-05-27 14:57:19 +02:00
Georg Ehrke bb676f2799 show txt preview when file contains text 2015-05-27 14:11:33 +02:00
Morris Jobke 3de945d13d Merge pull request #16527 from owncloud/end-processing-when-404
End processing when file is not found
2015-05-27 09:36:05 +02:00
Jenkins for ownCloud fda0995e4c [tx-robot] updated from transifex 2015-05-27 01:55:34 -04:00
Björn Schießle 9366dde875 Merge pull request #15985 from owncloud/hotfix/fix-encryption-references
[enc2] fix references to legacy encryption app name
2015-05-26 17:28:27 +02:00
Thomas Müller 07c6e523b1 Merge pull request #16565 from owncloud/add-urandom-check
Add check for availability of /dev/urandom
2015-05-26 16:53:11 +02:00
Jan-Christoph Borchardt 8ec292c8b3 Merge pull request #16519 from owncloud/example-theme
add example theme
2015-05-26 15:33:40 +02:00
Thomas Müller 4c4cbd70f8 Merge pull request #16563 from owncloud/revert-16562-revert-15203-revert-15201-webdav-ng-bugfix
Revert "Revert "Revert "FIX for webdav.mediencenter.t-online.de"""
2015-05-26 14:40:16 +02:00
Thomas Müller 4513cf5967 Revert "Revert "Revert "FIX for webdav.mediencenter.t-online.de""" 2015-05-26 14:40:07 +02:00
Oliver Kohl D.Sc. bfdae9e2c7 Merge pull request #16562 from owncloud/revert-15203-revert-15201-webdav-ng-bugfix
FIX for webdav.mediencenter.t-online.de

https://webdav.mediencenter.t-online.de returns invalid response code.

e.g.
{"reqId":"f9a1c394b98108e4e5ca62bf47829c64","remoteAddr":"81.189.45.224","app":"PHP","message":"Undefined offset: 2 at \/var\/www\/owncloud\/3rdparty\/sabre\/dav\/lib\/Sabre\/DAV\/Client.php#569","level":3,"time":"2015-03-25T18:25:48+00:00","method":"GET","url":"\/index.php\/apps\/files\/ajax\/getstoragestats.php?dir=External%2FT-Cloud%2FTests"}

e.g.
{"reqId":"3407d66672b3cef206b0af883e49bff4","remoteAddr":"46.74.125.245","app":"PHP","message":"Undefined index: {DAV:}getlastmodified at \/var\/www\/owncloud\/lib\/private\/files\/storage\/dav.php#563","level":3,"time":"2015-03-25T16:33:21+00:00"}
2015-05-26 14:31:09 +02:00
Lukas Reschke bc6d17ed74 Add check for availability of /dev/urandom
Without /dev/urandom being available to read the medium RNG will rely only on the following components on a Linux system:

1. MicroTime: microtime() . memory_get_usage() as seed and then a garbage collected microtime for loop
2. MTRand: chr((mt_rand() ^ mt_rand()) % 256)
3. Rand: chr((rand() ^ rand()) % 256)
4. UniqId: Plain uniqid()

An adversary with the possibility to predict the seed used by the PHP process may thus be able to predict future tokens which is an unwanted behaviour.

One should note that this behaviour is documented in our documentation to ensure that users get aware of this even without reading our documentation this will add a post setup check to the administrative interface.

Thanks to David Black from d1b.org for bringing this again to our attention.
2015-05-26 14:16:07 +02:00
Oliver Kohl D.Sc f8938f004d Revert "Revert "FIX for webdav.mediencenter.t-online.de"" 2015-05-26 13:36:45 +02:00
Vincent Petry d7c18b04bd Merge pull request #16521 from owncloud/unbold-placeholder-image
use normal font weight instead of bold for image placeholders
2015-05-26 12:55:05 +02:00
Björn Schießle f70c309c2d Merge pull request #16561 from owncloud/add-default-timeout-back
Add connection timeout to default POST options
2015-05-26 12:23:57 +02:00
Vincent Petry f1fc7b155c Merge pull request #16515 from owncloud/deprecate-useless-helper-class
Deprecate useless helper class
2015-05-26 12:22:05 +02:00
Vincent Petry 23bbf287ff Merge pull request #16518 from owncloud/external-link-arrow
use arrow icon for external link to Apps dev docs, like in Help section
2015-05-26 12:17:50 +02:00
Vincent Petry 7b10e7b747 Merge pull request #16520 from owncloud/fix-float-spinner-position
fix float spinner position
2015-05-26 12:13:15 +02:00
Vincent Petry 39c6a36488 Merge pull request #16532 from owncloud/cors-no-cookie-auth
Disallow cookie auth for cors requests
2015-05-26 12:12:04 +02:00
Björn Schießle ab0747113c Merge pull request #16452 from owncloud/enc_ftp_upload
always write file, if fseek doesn't work we write the whole file
2015-05-26 12:02:41 +02:00
Thomas Müller 3babcd0344 Merge pull request #16339 from owncloud/master-override-channel
Allow change update channel via public API
2015-05-26 11:42:41 +02:00
Lukas Reschke dff361dc5c Add connection timeout to default POST options
Fixes https://github.com/owncloud/core/issues/16560
2015-05-26 11:22:50 +02:00
jknockaert a577e723b0 flush() comments + perf opt 2015-05-26 10:22:52 +02:00
Jenkins for ownCloud 6198fb20cb [tx-robot] updated from transifex 2015-05-26 01:54:57 -04:00
Jenkins for ownCloud fe610a65d3 [tx-robot] updated from transifex 2015-05-25 01:55:06 -04:00
Jenkins for ownCloud 06934e7c00 [tx-robot] updated from transifex 2015-05-24 01:55:03 -04:00
Jenkins for ownCloud e189435499 [tx-robot] updated from transifex 2015-05-23 01:55:05 -04:00
Bernhard Posselt 13592921f1 Merge pull request #16536 from rullzer/unit_tests_16511
Unit tests for #16511
2015-05-22 19:08:17 +02:00
Vincent Petry ce34edacfa Merge pull request #16526 from owncloud/enc_fix_versions_webdav_upload
remove part file extension before we read a filekey
2015-05-22 16:42:52 +02:00
Bjoern Schiessle c63f2286c0 copy keys before we move a file between storages to make sure that the new target file reuses the old file key, otherwise versions will break 2015-05-22 15:41:28 +02:00
Roeland Jago Douma 914c74ea9b Unit tests for #16511
Make sure that password is updated on focusout of the password field or
on pressing enter in the password field.
2015-05-22 15:09:21 +02:00
Bernhard Posselt c8e3599cad disallow cookie auth for cors requests
testing ...

fixes

fix test

add php doc

fix small mistake

add another phpdoc

remove not working cors annotations from files app
2015-05-22 14:06:26 +02:00
Bjoern Schiessle fef75e5417 remove part file extension before we read a filekey to reuse a existing key if possible, otherwise stuff like versioning will break 2015-05-22 12:12:31 +02:00
Lukas Reschke 8ce3d6ea57 End processing when file is not found
We have to end the processing when a file is not found or otherwise the method is proceeding and even sending invalid file paths to the sendfile methods.

Due to nginx preventing directory traversals this is luckily not immediately exploitable. We should for hardening purposes however quit the script execution just as we do for 403 cases and others as well.
2015-05-22 11:53:02 +02:00
Vincent Petry b82d902e18 Merge pull request #16493 from owncloud/cache-movewithcorrectmimetype
Get correct mimetype when moving and changing extension
2015-05-22 11:37:11 +02:00
Joas Schilling d7b2bc9e2f Merge pull request #16516 from owncloud/fix-phpdoc-trait
Fix PHPDoc
2015-05-22 09:47:59 +02:00
Jenkins for ownCloud 156881efce [tx-robot] updated from transifex 2015-05-22 01:55:04 -04:00
Jan-Christoph Borchardt 79c5790a72 use normal font weight instead of bold for image placeholders 2015-05-22 03:26:30 +02:00
Jan-Christoph Borchardt 6bba345f34 fix float spinner position 2015-05-22 02:30:55 +02:00
Jan-Christoph Borchardt cd0fa062eb add example theme 2015-05-22 02:17:46 +02:00
Jan-Christoph Borchardt 94e4f448ee use arrow icon for external link to Apps dev docs, like in Help section 2015-05-22 01:17:22 +02:00
Jan-Christoph Borchardt 2fccfbe278 also replace logo-mail with new look 2015-05-22 00:35:12 +02:00
Lukas Reschke 3d8ea96e55 Fix PHPDoc
Use correct parameters
2015-05-22 00:17:38 +02:00
Jan-Christoph Borchardt 78a0464354 replace logo-wide on share page as well with better icon + text 2015-05-22 00:04:47 +02:00
Lukas Reschke c1f8829590 Deprecate useless helper class
The helper class has no real reason anymore with 8.1.0 as we now have better public APIs. No need for an `IHelper` class like that from my opinion.
2015-05-21 23:35:37 +02:00
Jan-Christoph Borchardt 4e93d9e3a2 remove logo-wide from tests 2015-05-21 22:40:26 +02:00
jknockaert bf6151e799 fix calculation of $count, $count is always 8129 so we need to check this
against the unencrypted file size
2015-05-21 14:15:26 +02:00
Bjoern Schiessle 5a20edac82 test to simulate a non-seekable stream wrapper 2015-05-21 14:15:26 +02:00
jknockaert fb51880a4a encrypted filesize calculation in flush() 2015-05-21 14:15:26 +02:00
Bjoern Schiessle 38bceb0d74 distinguish between source and target mount point to allow copy/rename between system wide mount points and user specific mountpoints 2015-05-21 14:06:45 +02:00
Lukas Reschke 94077caea9 Merge pull request #16499 from owncloud/fix-phpdoc-annotations
Fix PHPDoc 🙈
2015-05-21 13:54:01 +02:00
Lukas Reschke 694d639f94 Fix PHPDoc 🙈
*sigh*
2015-05-21 13:07:54 +02:00
Vincent Petry 22968e806c Get correct mimetype when moving and changing extension
Fixes issue when restoring folders from trash cross-storage, as such
folders have an extension ".d12345678".

Fixes issue when moving folders between storages and at the same time
changing their extension.
2015-05-21 10:57:58 +02:00
Joas Schilling 896130b68d Merge pull request #16473 from owncloud/occ_16221
occ option to update all third party apps without disable
2015-05-21 09:47:54 +02:00
Jenkins for ownCloud 42dd40ad80 [tx-robot] updated from transifex 2015-05-21 01:55:57 -04:00
Steffen Lindner 48040c46cb Skip disable3rdParty Apps 2015-05-20 17:06:00 +02:00
Vincent Petry d560d1ef2a Merge pull request #16469 from oparoz/restore-minheight-for-single-public-previews
Restore min-height for single previews
2015-05-20 16:48:27 +02:00
Morris Jobke 39d1e99228 Merge pull request #16322 from owncloud/trash-view
dont go trough the view when moving to trash
2015-05-20 14:44:01 +02:00
Morris Jobke 1a67e5cdc3 Merge pull request #16465 from owncloud/s2s-returnpropererrorwhenpublicwebdavdisabled
Return 401 when accessing public webdav and s2s is disabled
2015-05-20 14:28:45 +02:00
Olivier Paroz 13ab251c6d Restore min-height for single previews 2015-05-20 14:09:31 +02:00
Vincent Petry 7386257676 Merge pull request #16075 from owncloud/skeleton-copy-delay
wait with copying the skeleton untill login and setupfs are done
2015-05-20 13:52:08 +02:00
Vincent Petry 66e426c990 Sort apps by level, then by name
Also properly initialize the level to 0 when no level was returned
2015-05-20 13:43:20 +02:00
Jan-Christoph Borchardt f978474577 Merge pull request #16463 from owncloud/add-support-to-disallow-domains
Add support for disallowing domains to the ContentSecurityPolicy
2015-05-20 13:08:11 +02:00
Vincent Petry f2a900e04c Return 401 when accessing public webdav and s2s is disabled 2015-05-20 12:19:03 +02:00
Morris Jobke 3a4568313f Merge pull request #16326 from owncloud/fix-16192
include base dn test in functionality test
2015-05-20 12:12:52 +02:00
Lukas Reschke a62190a72d Add support for disallowing domains to the ContentSecurityPolicy
For enhanced security it is important that there is also a way to disallow domains, including the default ones.

With this commit every method gets added a new "disallow" function.
2015-05-20 11:44:37 +02:00
Jan-Christoph Borchardt 0d78ebf6cd Merge pull request #16444 from owncloud/close-new-dropdown
Closes "New" dropdown when switching category
2015-05-20 11:15:21 +02:00
Morris Jobke 1e59be2d2d Merge pull request #16453 from cmeh/patch-6
Clean-up of orthography, grammar
2015-05-20 10:26:42 +02:00
Lukas Reschke 9be6d8cd39 Merge pull request #16446 from owncloud/fix-url-generation
Fix URL generation
2015-05-20 08:20:38 +02:00
Jenkins for ownCloud c49a06a684 [tx-robot] updated from transifex 2015-05-20 01:56:19 -04:00
Thomas Müller f9d04f62a8 Merge pull request #16440 from owncloud/scrutinizer-patch-1
Scrutinizer Auto-Fixes
2015-05-19 22:12:35 +02:00
Christian Hoffmann 35207ae363 Clean-up of orthography, grammar
* Changed "instead to" to "instead of".
* Changed "setup" to "set up" (past participle).
2015-05-19 21:15:22 +02:00
Vincent Petry f7a2b5e7a9 Added unit tests for download URL in public sharing page 2015-05-19 17:41:06 +02:00
Robin Appelman 2213d6597c add tests for copyFromStorage with same storage 2015-05-19 17:30:32 +02:00
Thomas Müller f59576c3ca Merge pull request #16447 from owncloud/fix-minor-code-problems
Fix unexisting class and broken doc
2015-05-19 16:23:36 +02:00
Morris Jobke d3d70e5d90 Re-add use statement 2015-05-19 16:15:00 +02:00
Joas Schilling d832c4ae23 Fix unexisting class and broken doc 2015-05-19 15:27:50 +02:00
Lukas Reschke 07483033c1 Fix URL generation
`params` in the `OC.generateUrl` function call only replaces all specified occurences of a key just like the l10n PHP functionality does.

This means that to build a query string we have to use `OC.buildQueryString` instead of the params parameters.

Fixes https://github.com/owncloud/core/issues/16336 which is a regression introduced with https://github.com/owncloud/core/commit/58a87d0babcb91aab75b45e630d2fc2fee15691e of https://github.com/owncloud/core/pull/15652.

Without this fix downloading single files from a public shared folder is not possible.
2015-05-19 15:12:08 +02:00
Thomas Müller 10d1fd1306 Merge pull request #16419 from owncloud/user-group-backend-performance
Reduce the complexity of the search queries in the user/group backends to a minimum
2015-05-19 14:51:13 +02:00
Morris Jobke 581227324a Closes "New" dropdown when switching category
* fixes #16394
* return false - stops all following event callbacks
2015-05-19 14:47:13 +02:00
Robin Appelman 733784ae41 cleanup move/copy logic in trash 2015-05-19 14:22:09 +02:00
Robin Appelman 9c751f1d87 use copy when doing a crossStorageCopy on the same storage 2015-05-19 14:21:58 +02:00
Thomas Müller 12aef31115 Merge pull request #15606 from owncloud/fix-group-list-and-count-primary-group-only
Fixes returns of group memberships and counting if all members have the ...
2015-05-19 14:02:12 +02:00
Scrutinizer Auto-Fixer fdbc21fc6c Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-05-19 11:23:06 +00:00
Arthur Schiwon 76dfc87227 add primary group users to resultset before caching 2015-05-19 12:56:07 +02:00
Arthur Schiwon 6b218039ba Fixes returns of group memberships and counting if all members have the specific groups as primary set. 2015-05-19 12:56:07 +02:00
Thomas Müller 54a6ba47c0 Merge pull request #12401 from owncloud/add-limit-parameter-to-getSharewith
Remove hard coded limit of 15 from getShareWith
2015-05-19 12:40:37 +02:00
Thomas Müller 6d97dfb00c Catch NotFoundException and return no quota information which simply reflects the current state - no file storage has been initialized for the user. 2015-05-19 12:38:03 +02:00
Thomas Müller ad88a7d53d exception class will be logged as well - helps especially in cases where the message contained is empty - e.g. "message":"OCP\\Files\\NotFoundException: at \/home\/deepdiver\/Development\/ownCloud\/core-autotest\/apps\/provisioning_api\/lib\/users.php#354", 2015-05-19 12:35:22 +02:00
Morris Jobke 5f4e0863f5 Merge pull request #16420 from owncloud/update-useconfigtableprefix
Add unit test for migrator with different prefix
2015-05-19 12:19:46 +02:00
Thomas Müller a52afb040a Merge pull request #15965 from owncloud/conditional-logging
Conditional logging
2015-05-19 12:00:19 +02:00
Thomas Müller d90b83725f Merge pull request #16085 from owncloud/encryption-module-rename
rename to 'Default encryption module'
2015-05-19 11:13:33 +02:00
Morris Jobke 064f5204cc Persist the state of the maintenance after an upgrade
* if maintenance mode was enabled before an upgrade
  it will be enabled afterwards too
* fixes #16429
2015-05-19 10:56:04 +02:00
Joas Schilling 9e0cb4460e Merge pull request #16354 from owncloud/remove-browser-from-publicwebdav
Show a empty response for GET on non-files instead of the Browser Plugin
2015-05-19 10:54:11 +02:00
Vincent Petry fabdc4ba9d Add unit test for migrator with different prefix 2015-05-19 10:43:14 +02:00
Morris Jobke 68a593a667 Merge pull request #16181 from owncloud/fix-15982
catch unallowed anonymous auth attempt and show specific error
2015-05-19 10:36:35 +02:00
Morris Jobke aae9274210 Merge pull request #16293 from owncloud/xcache
Mute XCache error when trying to clear the opcode cache
2015-05-19 09:32:17 +02:00
Morris Jobke f0e7ae5da8 Merge pull request #16426 from owncloud/add-database-setup-hint
Add hint about additional PHP database modules
2015-05-19 08:30:35 +02:00
Jenkins for ownCloud 313994a33d [tx-robot] updated from transifex 2015-05-19 01:55:35 -04:00
Morris Jobke 176b9674d2 Add hint about additional PHP database modules
* fixes #16391
2015-05-18 22:59:35 +02:00
Björn Schießle 1c411baf17 Merge pull request #16412 from owncloud/jknockaert-patch-1
fix #16356
2015-05-18 19:26:40 +02:00
Arthur Schiwon cdb0689334 handle unallowed auth exception on port detection 2015-05-18 18:14:05 +02:00
Arthur Schiwon 5a56393657 throw exception on LDAP error 1, which we usually do not see and is pretty generic. AD uses is for uses not enlisted in the RFC, like on issues with anonymous binds. we also try to guess this case and show a hint. 2015-05-18 18:14:05 +02:00
Arthur Schiwon b9e5309757 catch unallowed anonymous auth attempt and show specific error 2015-05-18 18:14:05 +02:00
Robin Appelman 8f1a609512 adjust test 2015-05-18 17:16:13 +02:00
Robin Appelman 89959a856c fix target path for move 2015-05-18 17:16:13 +02:00
Robin Appelman a0854b36f0 update cache after move to trash 2015-05-18 17:16:13 +02:00
Robin Appelman b70e1ffc6d dont go trough the view when moving to trash 2015-05-18 17:16:12 +02:00
Joas Schilling b085f58553 Merge pull request #16405 from owncloud/enc_add_missing_parameter
add missing parameter to constructor
2015-05-18 17:12:48 +02:00
Clark Tomlinson f9b6ee86cd Merge pull request #16399 from owncloud/enc_rmdir_fix
[encryption] only try to delete file keys if it is a valid path
2015-05-18 11:09:36 -04:00
Bjoern Schiessle 1c500487ba add a unit test to make sure that we don't try to read a file during a write operation 2015-05-18 17:00:54 +02:00
Joas Schilling 8efc8c0a96 Reduce the complexity of the search queries in the backends to a minimum 2015-05-18 16:39:21 +02:00
Thomas Müller c28cd03770 Merge pull request #16403 from owncloud/fix-command-loading
Only load commands of enabled apps
2015-05-18 16:16:04 +02:00
Morris Jobke a4c9688711 fix theme in IE8 and IE9 2015-05-18 16:04:33 +02:00
Clark Tomlinson 7d2666699b removing encryption preview check 2015-05-18 09:47:46 -04:00
Clark Tomlinson d557519746 removing deletion of encryption keys
this will be handled in the wrapper now
2015-05-18 09:47:46 -04:00
Joas Schilling 30d165ebf2 Add missing import for the exception 2015-05-18 15:45:47 +02:00
Clark Tomlinson a0c6c01137 fix references to legacy encryption app name 2015-05-18 09:45:41 -04:00
Joas Schilling 4444db61b7 Add a unit test for the decrypt method 2015-05-18 15:45:11 +02:00
Bjoern Schiessle 7676166254 add l10n to constructor 2015-05-18 15:43:53 +02:00
jknockaert 2834971a77 fix #16356 2015-05-18 15:06:55 +02:00
Björn Schießle a1e60e7882 Merge pull request #15980 from owncloud/jknockaert-patch-1
fix bug #15973
2015-05-18 15:01:16 +02:00
Vincent Petry 86cf8e1f68 Merge pull request #16404 from owncloud/enc_encrypt_files_in_trash
also encrypt files in trash bin
2015-05-18 14:59:34 +02:00
Joas Schilling d683752b37 Sort user groups by group name and hide the user count 2015-05-18 12:55:19 +02:00
Bjoern Schiessle 7d492fefae also encrypt files in trash bin 2015-05-18 12:51:47 +02:00
Joas Schilling 85f500f070 Merge pull request #16398 from owncloud/fix-php-doc
Fix PHPDoc of public interface ILockingProvider
2015-05-18 12:43:07 +02:00
Morris Jobke ad3a32edf6 Only load commands of enabled apps 2015-05-18 12:33:56 +02:00
Vincent Petry 5899b7b6ea Fix provisioning API unit tests for login
Properly login the user every time to make sure their FS is properly
setup.
2015-05-18 12:28:54 +02:00
Robin Appelman 724f88d9ff fix tests 2015-05-18 12:11:32 +02:00
Robin Appelman a5d652a6b8 fix tests 2015-05-18 12:11:31 +02:00
Robin Appelman 415f16eb24 fix tests 2015-05-18 12:11:31 +02:00
Robin Appelman 077d41a9ce wait with copying the skeleton untill login and setupfs are done 2015-05-18 12:11:31 +02:00
jknockaert 62e6c46216 correct testSeek 2015-05-18 11:55:48 +02:00
Bjoern Schiessle efa674f10d only try to delete file keys if it is a valid path 2015-05-18 11:54:51 +02:00
Vincent Petry 7e271012b2 Merge pull request #16243 from owncloud/error_if_download_failed
redirect to error page if download failed
2015-05-18 11:42:55 +02:00
Morris Jobke fc2c9e8f5f Fix PHPDoc of public interface ILockingProvider 2015-05-18 11:37:16 +02:00
jknockaert 9a71eddaf9 work on tests
Tests reorganised and extended
2015-05-18 11:32:29 +02:00
Morris Jobke 7ee3f99a4a Merge pull request #16364 from owncloud/add-warning-webdav
Add notice that WebDAV interface is not intended for browsers
2015-05-18 11:28:47 +02:00
Vincent Petry d15471abd4 Merge pull request #15738 from rullzer/fix_15611
Fix to make sure expiration date is properly set
2015-05-18 11:26:12 +02:00
Morris Jobke 8543b21d18 Merge pull request #15870 from rullzer/fix_15812
Reset share dialog values - more
2015-05-18 11:24:42 +02:00
Bjoern Schiessle 887be709f5 a new approach to display the error message 2015-05-18 10:15:17 +02:00
Roeland Jago Douma b090a32d23 Reset share dialog values so we start out clean
* Unit test
2015-05-18 10:08:09 +02:00
Roeland Jago Douma efd6fec57d Fix to make sure expiration date is properly set
This did not happen correctly when the password was enforced since a
different code path was taken.

* moved generation of the default date string to separate function
* added unit test
2015-05-18 09:35:47 +02:00
Jenkins for ownCloud 73a3086945 [tx-robot] updated from transifex 2015-05-18 01:54:58 -04:00
Frank Karlitschek 3abc6e6c44 8.1 beta 2 2015-05-17 14:25:56 -04:00
Jenkins for ownCloud 16c320df26 [tx-robot] updated from transifex 2015-05-17 01:55:56 -04:00
Jenkins for ownCloud 744a9f2c78 [tx-robot] updated from transifex 2015-05-16 01:54:47 -04:00
Thomas Müller 257ee205bb Merge pull request #15978 from owncloud/feature/fix-encryption-tooltips
[enc2]fixing recovery tooltip
2015-05-15 22:39:17 +02:00
Victor Dubiniuk 4c9734f630 Test overriding channel 2015-05-15 22:37:14 +03:00
Thomas Müller 2cafbc803a Merge pull request #16242 from owncloud/use-oc-webroot
Use OC.webroot instead of calculating the URL
2015-05-15 18:10:18 +02:00
Vincent Petry 246000f799 Merge pull request #16176 from owncloud/fix-provisioning-api-set-quota
Validate the quota value to be a correct value
2015-05-15 18:07:13 +02:00
Lukas Reschke 4c60b13d1e Merge pull request #16265 from owncloud/update-bundle
Update CA bundle
2015-05-15 18:05:42 +02:00
Craig Morrissey ca341a8d59 add support for limit request parameter to getShareWith 2015-05-15 18:03:18 +02:00
Thomas Müller 8e61ad0872 Merge pull request #15811 from owncloud/exception-on-lost-ldap-connection
throw exception when LDAP Connection was lost
2015-05-15 17:32:07 +02:00
Thomas Müller 18661ceb63 do not execute integration tests when executing autotest.sh 2015-05-15 16:38:21 +02:00
Thomas Müller c3e066c5eb Merge pull request #16367 from owncloud/fix-facade-autotest
Fix facade autotest
2015-05-15 15:40:34 +02:00
Joas Schilling 0991c0cc02 Merge pull request #16292 from owncloud/webdav-storage-fireprehooks
Fire prehooks when uploading directly to storage
2015-05-15 15:08:27 +02:00
Joas Schilling 03e26a0fbe Merge pull request #16337 from owncloud/versions-expireforowner
Use owner when expiring versions, not the logged in user
2015-05-15 15:02:26 +02:00
Joas Schilling 02912aef58 Merge pull request #16273 from owncloud/trash-fixrestoreuniquename
Fix restoring files from trash with unique name
2015-05-15 14:48:00 +02:00
Lukas Reschke 89b0bc1915 Store in array to allow paths with whitespace 2015-05-15 13:16:16 +02:00
Vincent Petry f86699cd48 Fix restoring files from trash with unique name
When restoring a file, a unique name needs to be generated if a file
with the same name already exists.

Also fixed the restore() method to return false if the file to restore
does not exist.

Added unit tests to cover restore cases.
2015-05-15 12:42:27 +02:00
Vincent Petry eab55aa959 Properly log out test users in unit tests 2015-05-15 12:33:17 +02:00
Vincent Petry f8a4cc0284 Added unit tests for versions storing 2015-05-15 12:24:34 +02:00
Lukas Reschke 8b0c223d6e Add support for facade binary scripts
Fixes https://github.com/owncloud/core/issues/16296
2015-05-15 11:57:40 +02:00
Lukas Reschke e3ac4d7b37 Lint bash script using ShellCheck
Ref http://www.shellcheck.net/about.html
2015-05-15 11:56:34 +02:00
Joas Schilling e1923bac07 Merge pull request #16247 from owncloud/fixrmdirtodeletefolderstotrash
Added rmdir to trashbin storage wrapper
2015-05-15 11:16:13 +02:00
Thomas Müller 937306b416 Merge pull request #16323 from owncloud/enc_webdav_fixes
some encryption fixes
2015-05-15 10:38:22 +02:00
Lukas Reschke 54ef098867 Add unit tests for \OC\Connector\Sabre\DummyGetResponsePlugin 2015-05-15 09:08:10 +02:00
Lukas Reschke 13778893d9 Add notice that WebDAV interface is not intended for browsers
Fixes https://github.com/owncloud/core/issues/16359
2015-05-15 09:07:39 +02:00
Lukas Reschke 8ae8600b1f Merge pull request #16342 from owncloud/fix_16338
fix preview hooks, enable_previews default is true
2015-05-15 08:48:12 +02:00
Jenkins for ownCloud 49c4ee98b4 [tx-robot] updated from transifex 2015-05-15 01:54:49 -04:00
Lukas Reschke e0a136d344 Show a empty response for GET on non-files instead of the Browser Plugin
As discussed in https://github.com/owncloud/core/pull/14151, we missed to add this to the `files_sharing` S2S public WebDAV backend though.
2015-05-14 14:02:32 +02:00
Jenkins for ownCloud 1596a1fd32 [tx-robot] updated from transifex 2015-05-14 01:54:47 -04:00
Georg Ehrke 745c3c64fa fix preview hooks, enable_previews default is true 2015-05-13 19:59:41 +02:00
Victor Dubiniuk af814ba270 Allow change update channel via public API 2015-05-13 20:29:33 +03:00
Bjoern Schiessle ccbefb6e75 delete all file keys doesn't need the encryption module as parameter; implement rmdir; getFileKeyDir should also work for part files and complete directories 2015-05-13 19:06:23 +02:00
Vincent Petry 033b3dac92 Use owner when expiring versions, not the logged in user 2015-05-13 18:40:35 +02:00
Vincent Petry 3cae0135ad Fire prehooks when uploading directly to storage 2015-05-13 17:47:04 +02:00
Arthur Schiwon 2bf92e0a43 include base dn test in functionality test 2015-05-13 16:21:50 +02:00
Robin Appelman 4789e87a53 Merge pull request #16276 from owncloud/dav-quota-root
fix webdav quota check for the root of the dav endpoint
2015-05-13 14:43:02 +02:00
Vincent Petry 1f7df3eba8 Added unit test to quota plugin for free_space argument 2015-05-13 13:58:01 +02:00
Arthur Schiwon e5a91fc185 remove file cache remainings from server container 2015-05-13 12:26:36 +02:00
Lukas Reschke 5941e826b8 Merge pull request #16284 from owncloud/shared-storage-view
dont go trough the view when renaming/copying on shared storages
2015-05-13 10:37:04 +02:00
Lukas Reschke e753e8cc37 Merge pull request #16290 from owncloud/upgrade-info-for-3rdparty-apps
Add info message for upgrade of an 3rdparty app
2015-05-13 08:32:42 +02:00
Jenkins for ownCloud 504586aec6 [tx-robot] updated from transifex 2015-05-13 01:55:14 -04:00
Lukas Reschke b626de0b9f Merge pull request #16289 from owncloud/fix-stupid-mistake
Add NoAdminRequired annotation
2015-05-12 19:30:59 +02:00
Lukas Reschke cbfdbf96d2 Mute XCache error when trying to clear the opcode cache
From https://github.com/owncloud/core/issues/16287:

> This is caused by XCache at https://github.com/owncloud/core/blob/8e59d4c64b48ed7daeebb714e11213f7a22b5740/lib/private/util.php#L1276 where we are trying to reset the opcode cache with `XC_TYPE_PHP`.
> I suspect that while XCache is installed its opcode component is not used. Unfortunately, the XCache API is not really properly documented and thus I don't know what API we would have to call to check whether the `XC_TYPE_PHP` cache is populated. In fact, there is an [open XCache bug](http://xcache.lighttpd.net/ticket/176) since 7 years that discusses this problem and is likely to never get fixed since XCache is abandonware.

Fixes https://github.com/owncloud/core/issues/16287
2015-05-12 19:22:39 +02:00
Morris Jobke dc362823e0 Merge pull request #16269 from owncloud/master-fix-16179
Check if cURL supports the desired features
2015-05-12 18:27:57 +02:00
Arthur Schiwon d6becb8d82 add repair steps to get rid of old background jobs 2015-05-12 18:19:44 +02:00
Lukas Reschke a7a2579c89 Subadmin permissions are also not required 2015-05-12 18:08:10 +02:00
Morris Jobke cb909cda97 Add info message for upgrade of an 3rdparty app 2015-05-12 18:02:31 +02:00
Lukas Reschke cdeb2052bb Add NoAdminRequired annotation
Stupid mistake in master, fixes https://github.com/owncloud/core/issues/16288
2015-05-12 17:49:34 +02:00
Arthur Schiwon e016ed55ff also free joblist and base from file cache code 2015-05-12 17:44:31 +02:00
Robin Appelman 3b1dde7005 dont go trough the view when renaming/copying on shared storages 2015-05-12 17:09:37 +02:00
Morris Jobke d4eff55342 Merge pull request #16283 from owncloud/fix-search-users
fix user mgmt search box position, fix #15928
2015-05-12 16:21:31 +02:00
Morris Jobke 895a1a5efa Merge pull request #16282 from owncloud/fix-multiselect-ellipsize
ellipsize first item in multiselect, fix #16174
2015-05-12 16:08:13 +02:00
Jan-Christoph Borchardt 21a1995ad6 Merge pull request #16104 from owncloud/resize-filepicker
Resize filepicker on window size change
2015-05-12 15:57:23 +02:00
Morris Jobke 44091a1a12 Merge pull request #16277 from owncloud/fix-15971
remove superflous button. fixes #15971
2015-05-12 15:54:49 +02:00
Jan-Christoph Borchardt 76f6f6b6bc fix user mgmt search box position, fix #15928 2015-05-12 15:48:45 +02:00
Jan-Christoph Borchardt 58bce49037 ellipsize first item in multiselect, fix #16174 2015-05-12 15:39:18 +02:00
Jan-Christoph Borchardt 46e4d8818c Merge pull request #16127 from owncloud/fix-file-icons-in-shared-file-view
Enable file icons & previews in "Shared ..." categories
2015-05-12 15:17:43 +02:00
Arthur Schiwon acafc8ca46 remove superflous button. fixes #15971 2015-05-12 14:54:05 +02:00
Robin Appelman 11e1acd8ec fix webdav quota check for the root of the dav endpoint 2015-05-12 14:02:27 +02:00
Jan-Christoph Borchardt 127b0d9edf Merge pull request #16271 from owncloud/use-active
Use active instead of non existing pressed
2015-05-12 13:16:50 +02:00
Björn Schießle fbe4b77c49 Merge pull request #16228 from owncloud/enc_fix_restore
use hooks to update encryption keys
2015-05-12 13:10:16 +02:00
Lukas Reschke 0a3bf3f963 Use active instead of non existing pressed
Fixes https://github.com/owncloud/core/issues/16083
2015-05-12 12:20:28 +02:00
Lukas Reschke 4613456a8a Check if cURL supports the desired features
Older versions of cURL that are unfortunately still bundled by distributors don't support these features which will result in errors and other possibly unpredictable behaviour.

Fixes https://github.com/owncloud/core/issues/16179 for master – stable8 requires another patch.
2015-05-12 12:00:56 +02:00
Vincent Petry beb6a38d85 Added rmdir to trashbin storage wrapper
This makes sure that folders are moved to trash when deleted with
rmdir() instead of unlink().

This happens for example when deleting a folder over WebDAV.
The web UI uses unlink() so it wasn't affected.
2015-05-12 11:09:02 +02:00
Lukas Reschke 8082433474 Update CA bundle 2015-05-12 10:07:10 +02:00
Morris Jobke b11c0c533e Merge pull request #16233 from owncloud/enc_fix_check_if_file_is_excluded
fix check if a file is excluded from encryption
2015-05-12 09:12:38 +02:00
Jenkins for ownCloud deeeca69fe [tx-robot] updated from transifex 2015-05-12 01:55:10 -04:00
Vincent Petry 20d2d8d3dd Merge pull request #15881 from owncloud/share-moveversionsproperly
Fix version rename with files and folders
2015-05-11 18:24:34 +02:00
Lukas Reschke baa9503442 Use OC.webroot instead of calculating the URL
Calculating the URL is error-prone as it doesn't work when for example `public.php` is requested and might even be harmful as it could leak sensitive information.

Since `oc.js` is even available when maintenance mode is available it is better to use the global `OC.webroot` that is not controlled by any user.
2015-05-11 17:01:57 +02:00
Morris Jobke afcec88c6f Merge pull request #16234 from owncloud/issue-16206-fix-app-config-parallel-insert
Issue 16206 fix app config parallel insert
2015-05-11 16:05:30 +02:00
Clark Tomlinson 9727386d8b fixing test 2015-05-11 09:38:23 -04:00
Morris Jobke 90d8e4bc00 Merge pull request #15815 from owncloud/unshare-etag-propagate
Update etag of direct parent on unshare
2015-05-11 13:42:20 +02:00
Bjoern Schiessle 9dd517071e fix check if file is excluded from encryption 2015-05-11 12:38:59 +02:00
Joas Schilling dfed287dc0 Use insertIfNotExists to avoid problems with parallel calls 2015-05-11 12:38:33 +02:00
Joas Schilling 39497b9c3a Add a test for parallel insert 2015-05-11 12:29:28 +02:00
Joas Schilling 2916b0ba76 Always test the object and the legacy class 2015-05-11 12:22:23 +02:00
Bjoern Schiessle 0d5c7a11e2 use hooks to update encryption keys instead of the storage wrapper if a file gets renamed/restored, as long as we
are in the storage wrapper the file cache isn't up-to-date
2015-05-11 12:06:57 +02:00
Thomas Müller 7db994971e Merge pull request #16208 from owncloud/fix-language-selection-sr-latin
Some locales need to be converted to be compliant with CLDR
2015-05-11 11:21:28 +02:00
Morris Jobke f057efc42e Merge pull request #16213 from cmeh/patch-5
Grammar, removal of line break
2015-05-11 09:18:45 +02:00
Jenkins for ownCloud a331f6b83e [tx-robot] updated from transifex 2015-05-11 01:54:43 -04:00
Jenkins for ownCloud 52fc45e6e3 [tx-robot] updated from transifex 2015-05-10 01:56:13 -04:00
Christian Hoffmann 6441721626 Grammar, removal of line break
* Corrected "… if the user forgets their password." to "… if the user forgets his or her password" in line 17.
* Removed line break from line 17 to line 18.
2015-05-09 11:31:21 +02:00
Jenkins for ownCloud 6f5854a8de [tx-robot] updated from transifex 2015-05-09 01:55:35 -04:00
Thomas Müller 57f3557486 Merge pull request #16203 from owncloud/add-warning-for-people-that-cant-read
Add warning to OCC as well in case another PHP version is used there
2015-05-08 23:48:31 +02:00
Thomas Müller 9c57ae89d9 Some locales need to be converted to be compliant with CLDR 2015-05-08 23:45:07 +02:00
Lukas Reschke 4c0a8d327d Add warning to OCC as well in case another PHP version is used there
In regard to a recent rant on social media where users complained about us to have broken the command line tool. Guess reading the documentation is hard…
2015-05-08 16:08:21 +02:00
Morris Jobke e79c255cab Conditional logging
* Log condition for log level increase based on conditions. Once one of these
   conditions is met, the required log level is set to debug. This allows to
   debug specific requests, users or apps

 * Supported conditions (setting `log_condition` in `config.php`):
    - `shared_secret`: if a request parameter with the name `log_secret` is set to
                this value the condition is met
    - `users`:  if the current request is done by one of the specified users,
                this condition is met
    - `apps`:   if the log message is invoked by one of the specified apps,
                this condition is met
 * fix unit test and add app log condition test
2015-05-08 15:58:33 +02:00
Morris Jobke 892b5ceeeb Move log level check to logger parent class
* remove duplicate code from child classes
2015-05-08 15:14:45 +02:00
Arthur Schiwon 3de7f58321 remove file cache classes and its tests 2015-05-08 14:05:54 +02:00
Arthur Schiwon 90611e6594 only use memcache, if available 2015-05-08 13:27:27 +02:00
Lukas Reschke c9921ec127 Merge pull request #16124 from owncloud/issue-16109-fix-share-email-with-shared-folder
Fix the share mail notification when the item is in a folder
2015-05-08 13:03:28 +02:00
Björn Schießle bcbf9a9bb5 Merge pull request #16155 from owncloud/enc_admin_settings
improved admin settings
2015-05-08 12:16:16 +02:00
Lukas Reschke 16a0de6314 Merge pull request #16146 from owncloud/issue-16103-hide-module-already-exists-on-enable-app
Avoid the log entry with the ModuleAlreadyExists exception when enabl…
2015-05-08 11:55:02 +02:00
Bjoern Schiessle 4a450c9d0d improved admin settings 2015-05-08 11:41:38 +02:00
Lukas Reschke ebf3953908 Merge pull request #16168 from owncloud/cron-errors
fix cron errors to only appear in one line instead of introducing another list
2015-05-08 11:23:19 +02:00
Thomas Müller e4c05acf94 Merge pull request #16170 from owncloud/fix-15621
drop global file cache support, fixes #15621
2015-05-08 11:06:00 +02:00
Thomas Müller 4659927d7a Pure numbers are returned as bytes right away 2015-05-08 10:54:54 +02:00
Thomas Müller dfd451777c Merge pull request #16183 from owncloud/fix-16147
check optional parameter before using it, fixes #16147
2015-05-08 10:47:33 +02:00
Morris Jobke 8e565dd3e8 Merge pull request #16159 from owncloud/webdav-cross-storage-miove
use cross storage move when renaming the part file during webdav put
2015-05-08 09:53:12 +02:00
Morris Jobke 1fbf9c3d71 Merge pull request #16160 from owncloud/issue-15924-php-notice-empty-path-pathinfo
Do not run method when the path is empty
2015-05-08 09:49:51 +02:00
Joas Schilling 0577691631 Merge pull request #16175 from owncloud/fix-enc-typo
Fix typo in encryption module message
2015-05-08 09:41:27 +02:00
Jenkins for ownCloud ff0faacf0b [tx-robot] updated from transifex 2015-05-08 01:54:52 -04:00
Frank Karlitschek e9de60f971 8.1.0 beta 1 2015-05-07 18:55:00 -04:00
Arthur Schiwon f2d23d7f02 check optional parameter before using it, fixes #16147 2015-05-07 22:18:29 +02:00
Morris Jobke 5b7e4b3341 Fix typo in encryption module message
* finishes #16021
2015-05-07 18:04:32 +02:00
Thomas Müller 15d134124b Validate the quota value to be a correct value 2015-05-07 17:56:13 +02:00
Jan-Christoph Borchardt 3abaf34709 fix cron errors to only appear in one line instead of introducing another list 2015-05-07 16:19:14 +02:00
Joas Schilling 2b092f2e93 Add a test for getting the versions of an empty path 2015-05-07 16:02:35 +02:00
Joas Schilling 9f2f282191 Merge pull request #16153 from owncloud/CopyEtagHeaderPlugin-noarg
[HHVM] \OC\Connector\Sabre\CopyEtagHeaderPlugin constructor does not take any arguments
2015-05-07 15:38:42 +02:00
Arthur Schiwon 57e8b76f48 drop global file cache support, fixes #15621 2015-05-07 14:52:44 +02:00
Joas Schilling 05fe2006ee Do not run method when the path is empty 2015-05-07 14:31:21 +02:00
Robin Appelman 06a65fab13 use cross storage move when renaming the part file during webdav put 2015-05-07 14:28:31 +02:00
Andreas Fischer 4f6ecd3da6 \OC\Connector\Sabre\CopyEtagHeaderPlugin constructor does not take arguments. 2015-05-07 12:24:06 +02:00
Thomas Müller 2344298954 Merge pull request #16035 from owncloud/issue-15975-occ-encryption-enable-warning-no-module
Display a message when there is a problem with the default module
2015-05-07 12:03:30 +02:00
Joas Schilling 49f94b17f7 Avoid the log entry with the ModuleAlreadyExists exception when enabling the app 2015-05-07 11:00:55 +02:00
Morris Jobke 12b24ee567 Merge pull request #16034 from owncloud/issue-15987-encryption-module-admin-page
Display the module settings in the list of the encryption modules
2015-05-07 10:44:03 +02:00
Jenkins for ownCloud 3dee907b70 [tx-robot] updated from transifex 2015-05-07 01:56:44 -04:00
Thomas Müller 55eaa165f8 Merge pull request #16119 from owncloud/fix-16056
[HHVM] Throw RunTimeException from OC\AppFramework\App::buildAppNamespace()
2015-05-07 00:20:57 +02:00
Morris Jobke b1713b2f75 Enable file icons & previews in "Shared ..." categories
* sharing API returns now the mimetype icon path
* file previews are now lazyloaded by default (as the doc says)
* fixes #16086
2015-05-06 18:32:52 +02:00
Andreas Fischer e418ced656 Check return value of OC_App::getAppPath() and verify info.xml exists. 2015-05-06 17:15:28 +02:00
Morris Jobke cd4b9258fc Merge pull request #16122 from owncloud/fix-15866
Fix broken group presentation in selected groups list
2015-05-06 17:00:31 +02:00
Joas Schilling b4471c2591 Fix the share mail notification when the item is in a folder 2015-05-06 15:44:19 +02:00
Arthur Schiwon 71e6644ec8 fix filter index on selected groups is updated too early 2015-05-06 15:34:44 +02:00
Jan-Christoph Borchardt 35292eb66c rename to 'Default encryption module' 2015-05-06 15:31:05 +02:00
Arthur Schiwon 795a48d45c fix broken group presentation in selected groups list 2015-05-06 15:29:36 +02:00
Björn Schießle 6633514a98 Merge pull request #15628 from owncloud/enc_fix_rename
Encryption - fix moving/copying files between storages
2015-05-06 15:03:59 +02:00
Joas Schilling 892e2a3321 Merge pull request #16099 from labkode/prevent-preview-hooks
Do not trigger preview hooks if enable_previews is false
2015-05-06 14:37:59 +02:00
Joas Schilling aea734aaf1 Fix missing types on doc block and deduplicate the method name 2015-05-06 14:31:10 +02:00
Morris Jobke 193c6a9f98 Merge pull request #16116 from owncloud/encryption-l10n-settings
Add l10n support to encryption settings
2015-05-06 14:30:46 +02:00
Morris Jobke 5a46dad4e0 kill new lines in l10n strings 2015-05-06 14:30:22 +02:00
Bjoern Schiessle e4829a2358 update 'encrypted'-flag in file cache according to the storage settings 2015-05-06 14:20:05 +02:00
Bjoern Schiessle dc39bda870 move/copy from storage 2015-05-06 14:20:02 +02:00
Björn Schießle f2d46693c6 Merge pull request #15880 from owncloud/check_if_encryption_is_enabled
check if encryption is enbaled before we start moving keys
2015-05-06 13:23:55 +02:00
Morris Jobke 5ef4a7606c Add l10n support to encryption settings
* fixes #16111
2015-05-06 12:39:02 +02:00
Bjoern Schiessle 83ed4ee5b6 unit tests 2015-05-06 12:28:15 +02:00
Lukas Reschke 84960feee8 Merge pull request #16098 from owncloud/remove-phpmailer
Remove phpmailer from 3rdparty
2015-05-06 11:44:51 +02:00
Bjoern Schiessle e7a3911c83 check if encryption is enbaled before we start moving keys 2015-05-06 11:35:45 +02:00
Lukas Reschke 9a159372cb Merge pull request #16067 from owncloud/verbosity-in-app-code-check
Add verbosity option to app:check-code
2015-05-06 11:21:23 +02:00
Thomas Müller 35a2fd3f89 Only return cached files if existing 2015-05-06 11:16:44 +02:00
Morris Jobke de04501c97 add max-width of 600px to filepicker 2015-05-06 11:15:48 +02:00
Morris Jobke e0640a0232 Resize filepicker on window size change
* add 20 px space to each direction -> 10px padding to left, right, top and bottom
* fixes #16100
2015-05-06 11:00:23 +02:00
Hugo Gonzalez Labrador 3e647afbd4 Do not trigger preview hooks if enable_previews is false 2015-05-06 10:39:48 +02:00
Morris Jobke 874d35b27a Merge pull request #16070 from owncloud/enc_update_file_cache_on_copy
make sure that we keep the correct encrypted-flag and the (unencrypted)size
2015-05-06 10:28:10 +02:00
Hugo Gonzalez Labrador 3a3a58f248 Do not trigger preview hooks if enable_previews is false 2015-05-06 10:03:18 +02:00
Morris Jobke f1903f61a1 Merge pull request #16072 from owncloud/phpdoc-cache
improve phpdoc of cache classes
2015-05-06 09:38:56 +02:00
Morris Jobke c3fb021acf Merge pull request #16017 from owncloud/proper-update-notification
Use OC.Notification for update notifications
2015-05-06 09:28:42 +02:00
Jörn Friedrich Dreyer 4c0d1b0460 Merge pull request #16050 from owncloud/add-workaround-for-populate-raw-post-data
Don't display errors and log them
2015-05-06 08:55:46 +02:00
Joas Schilling e768b3b138 Remove phpmailer from 3rdparty 2015-05-06 08:34:15 +02:00
Jenkins for ownCloud 910146824e [tx-robot] updated from transifex 2015-05-06 01:55:19 -04:00
Jan-Christoph Borchardt 952a90f2e3 Merge pull request #16037 from owncloud/enc_dont_disable_encryption
don't let the the user disable encryption once it was activated
2015-05-05 18:53:01 +02:00
Thomas Müller a96c2b8354 Only use cached files in case encryption is enabled - in any other case let the underlying storage handle this accordingly - refs #16061 #16062 and others 2015-05-05 16:19:24 +02:00
Bjoern Schiessle 7089af96f2 make sure that we keep the correct encrypted-flag and the (unencrypted)size if a file gets copied 2015-05-05 16:17:14 +02:00
Robin Appelman e0d151505f improve phpdoc of cache classes 2015-05-05 16:06:28 +02:00
Clark Tomlinson 10d7eb56af adding username as param for isrecoveryenabled 2015-05-05 09:42:53 -04:00
blizzz 6783699501 Merge pull request #16069 from owncloud/fix-15933
Fix: user login filter does not take username into account
2015-05-05 15:17:13 +02:00
Jan-Christoph Borchardt 2aaafc134c Merge pull request #16064 from owncloud/fix-empty-mail-address
Allow user to set an empty email address
2015-05-05 14:51:53 +02:00
Arthur Schiwon 0e7fd82e89 cleanup 2015-05-05 14:21:12 +02:00
Arthur Schiwon 1c791e6000 not only send them back but also apply defaults to a new configuration. Fixes #15933 2015-05-05 14:20:58 +02:00
Morris Jobke 767cf2774a Merge pull request #16065 from owncloud/check-binaryops-in-code-checker
Check usage of != and ==
2015-05-05 14:07:25 +02:00
Morris Jobke 56b1c93a79 Add verbosity option to app:check-code
* by default only lists files with errors
* option -v lists all files even if there are no errors
2015-05-05 13:57:23 +02:00
Joas Schilling d36d14366b Add test for setEmailAddress 2015-05-05 13:53:00 +02:00
Morris Jobke 493844eda4 add positive tests for operator in code checker 2015-05-05 13:09:12 +02:00
Thomas Müller aae098c24a Check usage of != and == - refs #16054 2015-05-05 12:59:33 +02:00
Lukas Reschke 11310355ed Don't depend on always_populate_raw_post_data 2015-05-05 12:36:15 +02:00
Lukas Reschke 9530e819eb Don't display errors and log them
Fixes https://github.com/owncloud/core/issues/16014
2015-05-05 12:34:22 +02:00
Morris Jobke 5fd849f545 Allow user to set an empty email address
* fixes #16057
2015-05-05 11:58:19 +02:00
Thomas Müller 5aa3525479 Merge pull request #16045 from owncloud/reduce-autotest-hhvm
Combine autotest-hhvm.sh with autotest.sh
2015-05-05 11:48:20 +02:00
Morris Jobke a1b9444643 Don't highlight disabled labels on hover 2015-05-05 11:17:48 +02:00
Morris Jobke 624c25313e fix label reference 2015-05-05 11:12:56 +02:00
Morris Jobke 179472aeef Merge pull request #16058 from owncloud/fix-app-check-code-parameter-description
Fix the "app-id" parameter description of app:check-code
2015-05-05 10:56:03 +02:00
Joas Schilling efce8ff905 Merge pull request #16052 from owncloud/fix-phpdoc-sharecontroller
Fix PHPDoc for the ext. share controller
2015-05-05 10:52:28 +02:00
Björn Schießle 2ce01ee0bf Merge pull request #15938 from owncloud/enc_update_recovery_share_key
[encryption] check recovery key setting for the correct user
2015-05-05 10:48:09 +02:00
Bjoern Schiessle 8f1e504d79 adjust wording and add button to confirm encryption 2015-05-05 10:38:09 +02:00
Jan-Christoph Borchardt a7deba74a7 Merge pull request #16031 from owncloud/fix-15953-master
No clickable app for local apps
2015-05-05 09:27:47 +02:00
Joas Schilling 87787a3af4 Fix the "app-id" parameter description of app:check-code 2015-05-05 08:23:59 +02:00
Jenkins for ownCloud b60dcd91bb [tx-robot] updated from transifex 2015-05-05 01:55:36 -04:00
Jan-Christoph Borchardt fa6a67ccc1 Merge pull request #15544 from rullzer/fix_15263
[WIP] Only show SSL table header if there are certificates
2015-05-04 20:27:40 +02:00
Lukas Reschke 044ee7ead5 Merge pull request #16048 from owncloud/fix-mb-string
Check `mbstring.func_overload` only if the mb module is installed.
2015-05-04 20:19:11 +02:00
Roeland Jago Douma a9a9adc217 Only show SSL table header if there are certificates 2015-05-04 19:08:43 +02:00
Lukas Reschke d9746d8abd Fix PHPDoc for the ext. share controller 2015-05-04 18:06:16 +02:00
Björn Schießle ed16127a8d Merge pull request #16026 from owncloud/enc_ux_improvements
[encryption] some small ux improvements
2015-05-04 17:40:05 +02:00
Lukas Reschke 7c5558327d Check mbstring.func_overload only if the mb module is installed.
Fixes https://github.com/owncloud/core/issues/14670
2015-05-04 17:13:25 +02:00
Lukas Reschke 64393b4c03 Remove PHP 5.4 warning in checkSetup
This is catched in index.php as older PHP versions will never execute the code path until there due to 5.4 syntax changes.
2015-05-04 17:11:17 +02:00
Thomas Müller 08b98a8ede Merge pull request #16042 from owncloud/fix-output-buffering
Remove hard-dependency on disabled output_buffering
2015-05-04 16:43:32 +02:00
Thomas Müller e5c5c908a3 Merge pull request #16044 from owncloud/issue-15977-occ-encryption-status
Add an occ command to get the status of encryption
2015-05-04 16:40:47 +02:00
Andreas Fischer 636d0635db Combine autotest-hhvm.sh with autotest.sh 2015-05-04 16:37:23 +02:00
Lukas Reschke 51936e68aa Merge pull request #16040 from owncloud/fix-orphaned-shares-job
Fix DeleteOrphanedSharesJob
2015-05-04 16:27:26 +02:00
Lukas Reschke 5c7d15b941 Merge pull request #16043 from owncloud/activity-288-log-entry-when-no-favorite
Fix undefined variable $tagId
2015-05-04 16:22:21 +02:00
Joas Schilling 50f6386c63 Fix undefined variable $tagId 2015-05-04 16:19:26 +02:00
Joas Schilling 5180c2398d Add an occ command to get the status of encryption 2015-05-04 15:31:19 +02:00
Joas Schilling 59c657da53 Merge pull request #15772 from owncloud/issue-15771-dont-restrict-permissions-for-share-owner
Do not restrict permissions for the original owner
2015-05-04 15:07:37 +02:00
Joas Schilling eadc2c330c Display the module settings in the list of the encryption modules 2015-05-04 15:04:03 +02:00
Lukas Reschke 4b9e034968 Remove hard-dependency on disabled output_buffering
This removes the hard-dependency on output buffering as requested at https://github.com/owncloud/core/issues/16013 since a lot of distributions such as Debian and Ubuntu decided to use `4096` instead of the PHP recommended and documented default value of `off`.

However, we still should encourage disabling this setting for improved performance and reliability thus the setting switches in `.user.ini` and `.htaccess` are remaining there. It is very likely that we in other cases also should disable the output buffering but aren't doing it everywhere and thus causing memory problems.

Fixes https://github.com/owncloud/core/issues/16013
2015-05-04 14:15:15 +02:00
Morris Jobke 760ce3bd63 Fix DeleteOrphanedSharesJob
* remove unneeded use statements
* the the interval properly in the constructor
* set the log level to debug (from info) - fixes #16036
2015-05-04 13:58:58 +02:00
Bjoern Schiessle 6dc3682cc2 don't let the the user disable encryption once it was activated 2015-05-04 13:13:31 +02:00
Joas Schilling 10144bd7f5 Display a message when there is a problem with the default module 2015-05-04 12:36:50 +02:00
Bjoern Schiessle f76c055244 some small ux improvements 2015-05-04 11:55:06 +02:00
Lukas Reschke 17fedc80da Merge pull request #15652 from oparoz/better-text-previews
Show a text preview instead of a bitmap preview of text
2015-05-04 11:44:51 +02:00
Thomas Müller 0f7b8dd338 Merge pull request #15752 from owncloud/feature/fix-encryption-return-values
[enc2] fixing return values and adding tests
2015-05-04 11:44:15 +02:00
Thomas Müller 7112824229 fix l10n strings 2015-05-04 11:37:30 +02:00
Thomas Müller c2fd7b1d12 no link if there is no detailpage property set - fixes #15953 2015-05-04 11:35:30 +02:00
Thomas Müller 7376ea9b26 Merge pull request #15584 from owncloud/enc_fix_upload_shared_folder
skip user if we don't have a public key
2015-05-04 09:57:19 +02:00
Clark Tomlinson 3ef2e668ac fixing recovery tooltip 2015-05-04 09:40:59 +02:00
Thomas Müller 870ac88c85 Merge pull request #16020 from owncloud/set-charset-via-ini-set
Try to set required ini values in base.php
2015-05-04 09:35:32 +02:00
Thomas Müller 4de45b5e61 Merge pull request #15958 from owncloud/usage-of-public-log-interface
Use internally \OCP\ILogger instead of \OC\Log
2015-05-04 09:13:26 +02:00
Jenkins for ownCloud 7fa308977b [tx-robot] updated from transifex 2015-05-04 01:54:47 -04:00
Frank Karlitschek 55b2570f64 8.1 alpha 3 2015-05-03 19:04:41 -04:00
Morris Jobke cd516eedcd Use OC.Notification for update notifications
* instead of a static rendering inside PHP use the
  JS OC.Notification.showTemporary to hide the
  notification after 7 seconds automatically
* fixes #14811
2015-05-03 17:26:03 +02:00
Lukas Reschke 8a85d8bc17 Try to set required ini values in base.php
Fixes https://github.com/owncloud/core/issues/16006
2015-05-03 13:23:29 +02:00
Morris Jobke 7a3b74a8b9 Merge pull request #15486 from owncloud/versions-rollbackkeepfileid
Keep fileid when restoring version, using stream copy
2015-05-03 13:12:54 +02:00
Morris Jobke 6bd861910b Merge pull request #16009 from owncloud/fix-searchresults
fix search results from other places, account for margin-bottom in files list
2015-05-03 11:48:00 +02:00
Jenkins for ownCloud 9f76b8b356 [tx-robot] updated from transifex 2015-05-03 01:55:17 -04:00
Morris Jobke 182304591d Merge pull request #16001 from owncloud/add-multiselect-new-title
also add title to multiselect create new element, force multiselect wider width, fix #15954
2015-05-02 21:46:28 +02:00
Morris Jobke c4dc988c2e Merge pull request #16015 from owncloud/add-proper-versioning
Add proper versioning for doc URL
2015-05-02 21:44:09 +02:00
Lukas Reschke 6738c17cb5 Add proper versioning for doc URL
As per 8.1 we have docs for minor versions as well so we need to link to `8.1` here instead to `8.0`.

Fixes https://github.com/owncloud/core/issues/16002
2015-05-02 21:05:11 +02:00
Lukas Reschke 6528a17ea3 Merge pull request #16005 from owncloud/remove-more-apps
remove 'More apps' link from apps mgmt now that we have support for experimental apps
2015-05-02 19:54:42 +02:00
Jan-Christoph Borchardt 954968e9d8 fix search results from other places, account for margin-bottom in files list 2015-05-02 09:07:42 -04:00
Jenkins for ownCloud aa0d439ed9 [tx-robot] updated from transifex 2015-05-02 01:54:49 -04:00
Jan-Christoph Borchardt 4c070b3e12 remove 'More apps' link from apps mgmt now that we have support for experimental apps 2015-05-01 18:07:55 -04:00
Jan-Christoph Borchardt 8ccf1c85d9 force minimum multiselect width to properly show longer groups 2015-05-01 13:51:01 -04:00
Jan-Christoph Borchardt 4dd8a22e51 also add title to multiselect create new element, fix #15954 2015-05-01 13:47:37 -04:00
Thomas Müller 6b691e3840 Merge pull request #15937 from owncloud/file-locking
Add memcache based shared/exclusive locking
2015-05-01 17:47:23 +02:00
Jenkins for ownCloud eda4d45836 [tx-robot] updated from transifex 2015-05-01 01:54:43 -04:00
Morris Jobke 8f117cb89b Merge pull request #15993 from owncloud/admin-documentation
add admin documentation links for Sharing, Encryption and Email server
2015-05-01 00:15:06 +02:00
Jan-Christoph Borchardt 9ec80377e6 fix layout for documentation link hints 2015-04-30 17:12:34 -04:00
Jan-Christoph Borchardt 8b37e25ec2 add admin documentation links for Sharing, Encryption and Email server 2015-04-30 17:10:24 -04:00
Thomas Müller ca8b6f24cb Merge pull request #15955 from owncloud/move-dummy-encryption
Moving encryption_dummy to the apps repo
2015-04-30 18:14:01 +02:00
Thomas Müller e14540c1f1 Merge pull request #15972 from owncloud/enable-scrutinizer-code-coverage
Enable code coverage on scrutinizer
2015-04-30 18:12:36 +02:00
jknockaert f5415653fd fix #15973
Rework of stream_seek handling; there where basically two bugs: 1. seeking to the end of the current file would fail (with SEEK_SET); and 2. if seeking to an undefined position (outside 0,unencryptedSize) then newPosition was not defined. I used the opportunity to simplify the code.
2015-04-30 17:10:18 +02:00
Vincent Petry 972e189605 Use moveFromStorage instead of streamCopy when restoring version 2015-04-30 16:15:18 +02:00
Vincent Petry 2228faaa39 Fix version rollback to keep fileid 2015-04-30 16:15:18 +02:00
Thomas Müller 41d7870d7b Merge pull request #15964 from owncloud/fix-l10n-string-warn
Fix #15962
2015-04-30 15:55:40 +02:00
Robin Appelman ba7d221cff allow getting the path from the lockedexception 2015-04-30 14:48:42 +02:00
Robin Appelman 8119b8b040 add tests for castrait 2015-04-30 14:48:39 +02:00
Robin Appelman a40a237441 use trait for cas polyfill for xcache 2015-04-30 14:48:39 +02:00
Robin Appelman 96f9573a4b add memcache based shared/exclusive locking 2015-04-30 14:48:39 +02:00
Robin Appelman acf30ede95 add compare and swap to memcache 2015-04-30 14:48:39 +02:00
Robin Appelman 29213b6136 extends memcache with add, inc and dec 2015-04-30 14:48:36 +02:00
Thomas Müller 42097bfc6a Merge pull request #15968 from owncloud/enc-wrapper-presetup
use the preSetup hook to ensure the encryption wrapper is applied correctly
2015-04-30 14:14:31 +02:00
Robin Appelman d0ad69aa9c use the preSetup hook to ensure the encryption wrapper is applied correctly 2015-04-30 13:28:06 +02:00
Thomas Müller 4ef797f649 Enable code coverage on scrutinizer 2015-04-30 13:18:15 +02:00
Bernhard Posselt 360d0e3e5e fix #15962 2015-04-30 12:44:45 +02:00
Joas Schilling 4a6808a0f4 Simplify the test 2015-04-30 12:04:02 +02:00
Joas Schilling cf4a6874fb Allow setting protected properties 2015-04-30 12:04:02 +02:00
Bjoern Schiessle 4ef9df8750 skip user if we don't have a public key 2015-04-30 12:04:02 +02:00
Morris Jobke fbba7a61cb Use internally \OCP\ILogger instead of \OC\Log
* this is the preparation for some upcoming logger related changes
* also fixes an issue in the public interface where we request
  an internal class as parameter
2015-04-30 11:52:30 +02:00
Joas Schilling 31b65749dd Allow setting protected properties 2015-04-30 11:38:53 +02:00
Bjoern Schiessle 70a44621be check recovery setting for the right user 2015-04-30 11:38:53 +02:00
Thomas Müller d308ec4f0e Merge pull request #15949 from owncloud/l10n-string-json
Implement json serialize for l10n string
2015-04-30 11:11:16 +02:00
Thomas Müller 7795265d93 Moving encryption_dummy to the apps repo - fixes #15950 2015-04-30 10:51:51 +02:00
Morris Jobke b9c1bf26ee Merge pull request #15951 from owncloud/fix-install-again
Make command optional
2015-04-30 10:45:23 +02:00
Thomas Müller 08aef98e11 Merge pull request #15946 from owncloud/auto-controller-resolve
Make controller automatically assemblable
2015-04-30 10:12:17 +02:00
Morris Jobke 8bc9c56dcf Merge pull request #15947 from owncloud/add-title-to-multiselect
add title to multiselect list items so longer group names are visible
2015-04-30 10:04:43 +02:00
Jenkins for ownCloud ae853445ef [tx-robot] updated from transifex 2015-04-30 03:27:57 -04:00
Joas Schilling 9205a9b52e Merge pull request #15942 from owncloud/revert-15875-multiline-buttons
Revert "fix layout for multiline buttons which are <a class='button'>"
2015-04-30 08:25:43 +02:00
Clark Tomlinson 4209757d61 Merge pull request #15919 from owncloud/enc_handle_empty_files
Encryption improve handling of empty and unencrypted files
2015-04-29 19:32:02 -04:00
Bernhard Posselt 7c0dc06c10 make command optional 2015-04-29 22:53:16 +02:00
Bernhard Posselt 1e58538f0e add aliases to pascal case constructor paramters to make it possible to auto assemble controllers 2015-04-29 22:29:45 +02:00
Bernhard Posselt 5b857a6eab implement json serialize for l10n string 2015-04-29 21:22:42 +02:00
Thomas Müller 8955f38e55 Merge pull request #15926 from owncloud/install-empty-pw
Make it possible to pass empty database passwords to install command
2015-04-29 21:19:28 +02:00
Jan-Christoph Borchardt 3dfa05c0d0 add title to multiselect list items so longer group names are visible, fix #15819 2015-04-29 13:53:29 -04:00
Jan-Christoph Borchardt 9ecfc7c237 Revert "fix layout for multiline buttons which are <a class='button'>" 2015-04-29 11:53:46 -04:00
Bernhard Posselt b0d1d61db2 default to an empty string for database password if ommited
fix null passwords

remove password trimming
2015-04-29 15:39:51 +02:00
Joas Schilling f524ae261a Ignore "parent" shares when the sharee is the owner of the reshare-source 2015-04-29 14:18:46 +02:00
Joas Schilling 3c37cbdfe7 Correctly select file cache values also when checking group shares 2015-04-29 14:12:12 +02:00
Joas Schilling 09d479e79d Add a test to share a subfolder of a folder shared with the owner by group 2015-04-29 13:33:20 +02:00
Vincent Petry 002d74f95a Merge pull request #15908 from owncloud/fix-replace-with-sed
Replace `replace` with `sed` statement
2015-04-29 12:28:23 +02:00
Morris Jobke 8c7db2536d Merge pull request #15596 from owncloud/issue/15589
Correctly generate the feedback URL for remote share
2015-04-29 10:52:43 +02:00
Morris Jobke 7df7a3b360 Merge pull request #15906 from rullzer/fix_15777
Password set via OCS API should not be double escaped
2015-04-29 10:44:25 +02:00
Vincent Petry 93cf51389a Added unit test for reshare by share owner 2015-04-29 10:34:37 +02:00
Joas Schilling 4d53706d4c Do not restrict permissions for the original owner 2015-04-29 10:34:36 +02:00
Morris Jobke 0ab16cb823 Replace replace with sed statement 2015-04-29 09:53:45 +02:00
Björn Schießle 6ebb021359 Merge pull request #15911 from owncloud/enc_create_header_for_new_key
make sure that we create a header for the encrypted private key
2015-04-29 09:43:54 +02:00
Lukas Reschke 3e06fd9342 Merge pull request #15706 from owncloud/fix-15705-master
move creation of shared key to the login handler
2015-04-29 09:36:34 +02:00
Thomas Müller fa6cb494ed Merge pull request #15922 from JostBaron/patch-1
Fix error message when wrong user on console
2015-04-29 09:31:19 +02:00
Thomas Müller 416ef1eb62 Merge pull request #15921 from cmeh/patch-4
Spelling in wizardTabElementary.js: Correct "More then …" to "More than …"
2015-04-29 09:28:27 +02:00
Joas Schilling 52c7758436 Merge pull request #15918 from owncloud/harden-avatar
Filter potential dangerous filenames for avatars
2015-04-29 08:40:49 +02:00
Jenkins for ownCloud 9db338df29 [tx-robot] updated from transifex 2015-04-29 01:54:45 -04:00
Jost Baron 47ddd1794b Fix error message when wrong user on console
Owncloud complains if the user runs a shell script with a user other than the user that owns `config/config.php`. The error message does not reflect this, and instead speaks about the web server user. Related issue: #15920 .
2015-04-28 22:51:19 +02:00
cmeh 5e3fe7fb06 Update wizardTabElementary.js
Corrected "More then …" to "More than …".
2015-04-28 22:11:24 +02:00
Bjoern Schiessle 29bcfb2fdb method shouldn't be static 2015-04-28 20:21:53 +02:00
Bjoern Schiessle d5cbb66b66 also create encryption keys for empty files 2015-04-28 20:21:53 +02:00
Bjoern Schiessle df428b76ac skip update of encryption keys if file is not encrypted 2015-04-28 20:21:53 +02:00
Lukas Reschke 34d0e610cc Filter potential dangerous filenames for avatars
We don't want to have users misusing this API resulting in a potential file disclosure of "avatar.(jpg|png)" files.
2015-04-28 16:57:23 +02:00
Thomas Müller 132ce04f31 Merge pull request #15915 from owncloud/fix-sharing
Fix routes
2015-04-28 15:54:08 +02:00
Joas Schilling b55ef51a27 Add tests for the correct share id on the call aswell 2015-04-28 14:56:13 +02:00
Lukas Reschke 1b84a1cd48 Fix routes
Fixes public sharing as reported on https://github.com/owncloud/core/issues/15913
2015-04-28 14:41:14 +02:00
Joas Schilling 34181c3aef Correctly send Federate-Cloud Share Feedback against the remote share ID 2015-04-28 14:29:04 +02:00
Roeland Jago Douma 02269b6464 Added unit test 2015-04-28 14:00:36 +02:00
Vincent Petry 65fbb5eda0 Update etag of direct parent on unshare
Only call dirname() once instead of twice when propagating etags to the
recipient's parent folders.
2015-04-28 13:11:23 +02:00
Bjoern Schiessle 7d05f387fb make sure that we create a header for the encrypted private key 2015-04-28 13:00:09 +02:00
Joas Schilling 2eecfcbb80 Fix scrutinizer complains and return type doc 2015-04-28 11:28:55 +02:00
Joas Schilling 02c60949dd make scrutinizer happy 2015-04-28 11:28:54 +02:00
Joas Schilling 9fb7d0bca9 Correctly remove the protocol before prepeding it 2015-04-28 11:28:54 +02:00
Joas Schilling d146c13abd Add tests for the remote sharing url 2015-04-28 11:28:54 +02:00
Joas Schilling 66dca76f72 check the called URL 2015-04-28 11:28:54 +02:00
Joas Schilling 8f7c64253e Correctly generate the feedback URL for remote share
The trailing slash was added in c78e3c4a7f
to correctly generate the encryption keys
2015-04-28 11:28:54 +02:00
Thomas Müller 557b4a2cb0 Merge pull request #15892 from owncloud/fix-failed-require-in-l10n-createjs
handle case where the given language is unknown - refs #15794
2015-04-28 11:22:25 +02:00
Morris Jobke de8c15e1a4 Merge pull request #14764 from owncloud/shared-etag-propagate
Propagate etags across shared storages
2015-04-28 10:58:50 +02:00
Thomas Müller 5fa5f46a88 Merge pull request #15773 from owncloud/fix-15766
LDAP Wizard: increasing server numbers and avoid configID collisions, fixes #15766
2015-04-28 10:46:23 +02:00
Thomas Müller b55297a059 Merge pull request #15896 from owncloud/autotest-external-replacecommand
Add check for "replace" command in autotest-external
2015-04-28 10:44:32 +02:00
Morris Jobke b4a15db046 Merge pull request #15901 from owncloud/fix-share-docs
fix several issues with doc blocks on share.php
2015-04-28 10:41:04 +02:00
Roeland Jago Douma 73bb3a22f6 Password set via OCS API should not be double escaped 2015-04-28 10:33:19 +02:00
Thomas Müller 9108c103b2 Merge pull request #15903 from owncloud/issue-15899-fix-getfoortfolder-doc
Fix return type of the getRootFolder() method
2015-04-28 10:04:15 +02:00
Joas Schilling 7c65448377 Fix return type of the getRootFolder() method 2015-04-28 09:36:29 +02:00
Joas Schilling 46083006e1 fix several issues with doc blocks on share.php 2015-04-28 08:40:47 +02:00
Jenkins for ownCloud 6679ef287a [tx-robot] updated from transifex 2015-04-28 01:54:44 -04:00
Morris Jobke 24bb4e3f6f Merge pull request #15893 from owncloud/files-fixnewfilevalidation
Fix file name validation in New menu
2015-04-27 22:59:14 +02:00
Lukas Reschke 28ecc1e9d4 Merge pull request #15891 from owncloud/LukasReschke-patch-1
Rephrase "TL;DR"
2015-04-27 19:50:11 +02:00
Vincent Petry 6d8884e8a1 Add check for "replace" command 2015-04-27 18:03:49 +02:00
Thomas Müller aa2bd28a6a fix typo 2015-04-27 16:34:58 +02:00
Vincent Petry 69f88b38c9 Fix file name validation in New menu 2015-04-27 16:31:18 +02:00
Thomas Müller 66f9811151 handle case where the given language is unknown - refs #15794 2015-04-27 15:40:16 +02:00
Lukas Reschke 4006c1c3d9 Simplify even more 2015-04-27 15:39:37 +02:00
Thomas Müller eb0e9e5646 Merge pull request #15890 from owncloud/fix-helper-docs
Fix several type(hint) errors in private/helper.php
2015-04-27 15:28:50 +02:00
Lukas Reschke 69c041cb63 Rephrase "TL;DR"
"TL;DR" seems not to be understood or respected by everyone. Maybe we should do a try with "Important". Open for alternative suggestions.
2015-04-27 15:19:29 +02:00
Robin Appelman 5304afbecb dont pass floats as timestamp to the changepropagator 2015-04-27 15:18:25 +02:00
Thomas Müller 3b54161164 Merge pull request #15887 from owncloud/issue-15885-empty-getenv-path
Can't use function return value in write context
2015-04-27 15:16:27 +02:00
Thomas Müller 7d0eba7a41 Merge pull request #15886 from owncloud/fix-15848-master
Adjust isLocal() on encryption wrapper
2015-04-27 15:06:26 +02:00
Joas Schilling db6395ae20 Fix several type(hint) errors in private/helper.php 2015-04-27 14:45:05 +02:00
Thomas Müller 678b7d7e4d Merge pull request #15860 from owncloud/enc_fallback_old_encryption
[encryption] handle encrypted files correctly which where encrypted with a old version of ownCloud (<=oc6)
2015-04-27 14:32:19 +02:00
Joas Schilling 1341d03455 Can't use function return value in write context 2015-04-27 14:28:31 +02:00
Thomas Müller 936d564058 fixes #15848 2015-04-27 14:26:05 +02:00
Morris Jobke 93c25a1f4a Merge pull request #15882 from owncloud/fix-type-annotation
Fix type annotation
2015-04-27 14:17:59 +02:00
Robin Appelman 0789a6433e safer teardown 2015-04-27 14:07:16 +02:00
Robin Appelman 32067f9e80 use microtime to prevent race conditions 2015-04-27 14:07:16 +02:00
Robin Appelman 83b8ac0d7b cleanup hooks 2015-04-27 14:07:16 +02:00
Robin Appelman 6bf0579622 fix test 2015-04-27 14:07:16 +02:00
Robin Appelman 2e897f05b1 triger propagation for webdav uploads
use post hooks for share etag propagator
2015-04-27 14:07:16 +02:00
Robin Appelman dd9601ae8f fix merge 2015-04-27 14:07:16 +02:00
Robin Appelman 45784f213f fix propagation when renaming a directly reshared folder 2015-04-27 14:07:16 +02:00
Robin Appelman f488624e5f minor fixes 2015-04-27 14:07:16 +02:00
Robin Appelman 526ea3fcba add rename hook for propagation 2015-04-27 14:07:16 +02:00
Robin Appelman 77fbb4125b propagate changes up reshares 2015-04-27 14:07:16 +02:00
Robin Appelman 8cb40f6043 Make sure the owner mountpoints are setup 2015-04-27 14:07:16 +02:00
Robin Appelman d5434c9c4e more propagation tests 2015-04-27 14:07:16 +02:00
Robin Appelman b5c62cdad6 remove duplicates from rebase 2015-04-27 14:07:15 +02:00
Robin Appelman 19486837b2 adjust test 2015-04-27 14:07:15 +02:00
Robin Appelman be55a90323 dont use our now non existing hook 2015-04-27 14:07:15 +02:00
Robin Appelman 30ad56813a propagate etags for all user of a share 2015-04-27 14:07:15 +02:00
Robin Appelman 518d5aadf5 Allow getting *all* share entries owned by a user 2015-04-27 14:07:15 +02:00
Robin Appelman 849e5521de Make the change propagator an emitter 2015-04-27 14:07:15 +02:00
Robin Appelman 2dc11cf20e unit test for etag propagation across shared storage boundary 2015-04-27 14:07:15 +02:00
Thomas Müller cc331609bf Merge pull request #15411 from mmattel/fix_for_15375_better_message_text
Improve error messge text for app upgrade try (#15375)
2015-04-27 13:38:16 +02:00
Lukas Reschke d0363fe396 Fix type annotation
Obviously should be an int
2015-04-27 13:31:18 +02:00
Morris Jobke 6a7b7caa81 Merge pull request #15681 from owncloud/issue/15667-occ-encryption
OCC commands to manage encryption
2015-04-27 13:28:59 +02:00
Vincent Petry 63e2a4a5fa Fix version rename with files and folders
- fix moving folder into another folder
- fix moving file or folder into shared folder as recipient
2015-04-27 13:17:03 +02:00
Bjoern Schiessle 27683f9442 fall back to the ownCloud default encryption module and aes128 if we read a encrypted file without a header 2015-04-27 13:01:18 +02:00
Joas Schilling e4c24a6b5c Undefined index: default 2015-04-27 12:21:48 +02:00
Joas Schilling 6f5de37f5b Fix module registration 2015-04-27 12:21:27 +02:00
Joas Schilling 25b5adfe87 Fix scrutinizer complain 2015-04-27 11:46:00 +02:00
Joas Schilling 8f61fbb81f Fix new tests 2015-04-27 11:10:31 +02:00
Joas Schilling a4c314622a Use interface 2015-04-27 11:03:51 +02:00
Joas Schilling e4977841b4 Add unit tests for the commands 2015-04-27 11:03:51 +02:00
Joas Schilling 5855d23ff9 Make methods explicit public 2015-04-27 11:03:51 +02:00
Joas Schilling d600955a51 Make getDefaultModuleId public and get module protected 2015-04-27 11:03:51 +02:00
Joas Schilling 4e97228cde Deduplicate module mock 2015-04-27 11:03:51 +02:00
Joas Schilling 4b7ae395f2 Add test for setDefaultEncryptionModule 2015-04-27 11:03:51 +02:00
Joas Schilling b35379515c Add a test that the default module is returned before we fall back 2015-04-27 11:03:50 +02:00
Joas Schilling f6d4bdb1fd Add occ commands to manage the encryption modules 2015-04-27 11:03:50 +02:00
Joas Schilling a09df6d453 Verify that the encryption module exists before setting it 2015-04-27 11:03:50 +02:00
Joas Schilling 802f818c27 Merge pull request #15875 from owncloud/multiline-buttons
fix layout for multiline buttons which are <a class='button'>
2015-04-27 10:04:51 +02:00
Jenkins for ownCloud e58029f8ad [tx-robot] updated from transifex 2015-04-27 01:54:46 -04:00
Jan-Christoph Borchardt 84b41b3a4b fix layout for multiline buttons which are <a class='button'> 2015-04-26 11:05:51 +02:00
Jenkins for ownCloud 37adf6df01 [tx-robot] updated from transifex 2015-04-26 01:54:49 -04:00
Lukas Reschke 4dfdaf741c Merge pull request #15834 from owncloud/make-temporary-file-really-unique
Fix collision on temporary files + adjust permissions
2015-04-25 23:18:26 +02:00
Jenkins for ownCloud 7855174879 [tx-robot] updated from transifex 2015-04-25 01:55:13 -04:00
Lukas Reschke b9df932e3c Merge pull request #15683 from owncloud/block-legacy-clients
Block old legacy clients
2015-04-24 18:21:10 +02:00
Vincent Petry f63a0c99a4 Merge pull request #15774 from owncloud/jknockaert-patch-1
fix encryption header error
2015-04-24 17:24:32 +02:00
Bjoern Schiessle 9a5783b284 fix unit tests 2015-04-24 16:47:27 +02:00
jknockaert 4554df2512 enable testWriteWriteRead 2015-04-24 16:44:00 +02:00
jknockaert 18a1225b0c enable testRewind 2015-04-24 16:44:00 +02:00
jknockaert 49df8ef525 Update encryption.php 2015-04-24 16:44:00 +02:00
jknockaert 27ea23ea6b Update encryption.php 2015-04-24 16:44:00 +02:00
jknockaert d6841aa706 disable r+ test 2015-04-24 16:44:00 +02:00
jknockaert 238302ee7d fixed name 2015-04-24 16:44:00 +02:00
jknockaert 7a34f75da6 add two tests
testRewind tests reading and writing after rewind on an encrypted stream; testWriteWriteRead tests r+ mode
2015-04-24 16:44:00 +02:00
jknockaert 1756562501 Update encryption.php 2015-04-24 16:44:00 +02:00
jknockaert 735f6cc037 fix encryption header error
When moving back the pointer to position 0 (using stream_seek), the pointer on the encrypted stream will be moved to the position immediately after the header. Reading the header again (invoked by stream_read) will cause an error, writing the header again (invoked by stream_write) will corrupt the file. Reading/writing the header should therefore happen when opening the file rather than upon read or write. Note that a side-effect of this PR is that empty files will still get an encryption header; I think that is OK, but it is different from how it was originally implemented.
2015-04-24 16:43:16 +02:00
Arthur Schiwon 9b6a988926 add integration test to ensure correct behaviour on lost connections 2015-04-24 15:50:03 +02:00
Clark Tomlinson 8c0856779b change error codes to 400 2015-04-24 09:42:02 -04:00
Joas Schilling 4334e77035 Merge pull request #15839 from owncloud/enc_fix_moving_shared_files
[encryption] fix moving files to a shared folder
2015-04-24 15:07:36 +02:00
Joas Schilling 8cefc657a1 Merge pull request #15838 from owncloud/code-checker-to-ignore-tests
Ignore test folders when checking the code for compliance
2015-04-24 14:52:40 +02:00
Joas Schilling 411f7893bf Add test "operation on keys failed" 2015-04-24 14:27:23 +02:00
Lukas Reschke a2f9a2dc6d Merge pull request #15855 from owncloud/teardownaftercommand
Tear down FS after running trash expire
2015-04-24 13:52:55 +02:00
Joas Schilling 781cfff221 Deduplicate data provider and fix method visibility 2015-04-24 13:12:45 +02:00
Joas Schilling 1592be117a Use public interfaces for type hinting 2015-04-24 13:06:03 +02:00
Vincent Petry 18506387c0 Tear down FS after running trash expire 2015-04-24 12:09:09 +02:00
Jan-Christoph Borchardt 5b998e13d7 Merge pull request #15835 from owncloud/delete-permission-icon
Show hint if there is no delete permission
2015-04-24 11:57:47 +02:00
Bjoern Schiessle 24128d1384 only update share keys if the file was encrypted 2015-04-24 10:19:09 +02:00
Jenkins for ownCloud 33d197db29 [tx-robot] updated from transifex 2015-04-24 01:55:15 -04:00
Lukas Reschke 6fed28271b Merge pull request #15846 from owncloud/fix-missing-loading-indicator
Add missing loading indicator for enabled apps
2015-04-23 23:30:09 +02:00
blizzz 61c6d64125 Merge pull request #15826 from owncloud/issue-15804-occ-user-delete-exception
Issue 15804 occ user delete exception
2015-04-23 22:58:24 +02:00
Morris Jobke f4bc852db3 Show hint if there is no delete permission
* add class .no-permission which shows the default delete icon
* fixes #15172
* add unit test for no permission and for delete permission
2015-04-23 21:49:59 +02:00
Morris Jobke 62bac7de91 Add missing loading indicator for enabled apps
* happened when an app gets activated, because the
  new appended HTML doesn't contain the loading
  image
* fixes #15806
2015-04-23 21:40:51 +02:00
Olivier Paroz 0729fc2fbc Remove overflow+watermark 2015-04-23 18:19:34 +02:00
Olivier Paroz 58a87d0bab Use authorization headers for better compatibility
+ add ellipsis
+ fix OC.generateUrl calls
2015-04-23 18:19:29 +02:00
Olivier Paroz a968877a8b An idea to suggest that this is just a sample of the full text 2015-04-23 18:19:21 +02:00
Olivier Paroz 530c290555 Use webDAV to have access to HTTP byte ranges 2015-04-23 18:19:17 +02:00
Olivier Paroz e113d67430 Cache the token value 2015-04-23 18:19:12 +02:00
Olivier Paroz 8d3f88cf16 Show a text preview instead of a bitmap preview of text
+ fix the preview height
2015-04-23 18:19:07 +02:00
Bjoern Schiessle 2646bccb83 update share keys if file gets copied 2015-04-23 17:18:48 +02:00
Bjoern Schiessle 2990b0e07e update share keys if a file is moved to a shared folder 2015-04-23 17:18:48 +02:00
Thomas Müller b1bb6a3d36 Ignore test folders when checking the code for compliance 2015-04-23 16:59:26 +02:00
Lukas Reschke ab9ea97d3a Catch not existing User-Agent header
In case of an not sent UA header consider the client as valid
2015-04-23 16:33:51 +02:00
Vincent Petry a672e9d556 Merge pull request #15814 from owncloud/public-reshare-webdav
Fix webdav access for public reshare
2015-04-23 15:28:10 +02:00
Lukas Reschke 155ae44bc6 Fix collision on temporary files + adjust permissions
This changeset hardens the temporary file and directory creation to address multiple problems that may lead to exposure of files to other users, data loss or other unexpected behaviour that is impossible to debug.

**[CWE-668: Exposure of Resource to Wrong Sphere](https://cwe.mitre.org/data/definitions/668.html)**
The temporary file and folder handling as implemented in ownCloud is performed using a MD5 hash over `time()` concatenated with `rand()`. This is insufficiently and leads to the following security problems:
The generated filename could already be used by another user. It is not verified whether the file is already used and thus temporary files might be used for another user as well resulting in all possible stuff such as "user has file of other user".

Effectively this leaves us with:

1. A timestamp based on seconds (no entropy at all)
2. `rand()` which returns usually a number between 0 and 2,147,483,647

Considering the birthday paradox and that we use this method quite often (especially when handling external storage) this is quite error prone and needs to get addressed.

This behaviour has been fixed by using `tempnam` instead for single temporary files. For creating temporary directories an additional postfix will be appended, the solution is for directories still not absolutely bulletproof but the best I can think about at the moment. Improvement suggestions are welcome.

**[CWE-378: Creation of Temporary File With Insecure Permissions](https://cwe.mitre.org/data/definitions/378.html)**

Files were created using `touch()` which defaults to a permission of 0644. Thus other users on the machine may read potentially sensitive information as `/tmp/` is world-readable. However, ownCloud always encourages users to use a dedicated machine to run the ownCloud instance and thus this is no a high severe issue. Permissions have been adjusted to 0600.

**[CWE-379: Creation of Temporary File in Directory with Incorrect Permissions](https://cwe.mitre.org/data/definitions/379.html)**

Files were created using `mkdir()` which defaults to a permission of 0777. Thus other users on the machine may read potentially sensitive information as `/tmp/` is world-readable. However, ownCloud always encourages users to use a dedicated machine to run the ownCloud instance and thus this is no a high severe issue. Permissions have been adjusted to 0700.Please enter the commit message for your changes.
2015-04-23 15:07:54 +02:00
Thomas Müller d1ef96dc9b Merge pull request #15828 from owncloud/smb-1.0.1
update icewind/smb to 1.0.1
2015-04-23 14:48:25 +02:00
Thomas Müller 3b1a3cc27b Merge pull request #15831 from owncloud/enc2-unittestcleanuptmpfile
Delete temp files after testing encryption stream wrapper
2015-04-23 14:43:22 +02:00
Thomas Müller 6d3f120d23 Merge pull request #15617 from mmattel/getenv_system_check_and_warning
Checks if getenv returns proper system environment variable results
2015-04-23 14:42:58 +02:00
Thomas Müller 8997d2f0d1 Merge pull request #15830 from owncloud/enc2-ajaxstatuswhenloggedin
Only get encryption status when logged in
2015-04-23 14:41:06 +02:00
Robin Appelman 7a3a8e4032 fix subfolder reshares over webdav 2015-04-23 13:42:51 +02:00
Vincent Petry b88d0ba0ac Delete temp files after testing encryption stream wrapper 2015-04-23 13:42:18 +02:00
Vincent Petry cc3bc6345b Only get encryption status when logged in
This removes useless warnings in the logs.
2015-04-23 13:06:00 +02:00
Joas Schilling cb641b4c29 Fix file names 2015-04-23 12:53:01 +02:00
Joas Schilling cfa23e60d3 Add tests for occ user:lastseen 2015-04-23 12:41:06 +02:00
Joas Schilling eec92a16d6 Unify the output of the user commands and use DI 2015-04-23 12:40:13 +02:00
Joas Schilling bb5b6e5f63 Add unit tests for occ user:delete 2015-04-23 12:33:12 +02:00
Joas Schilling 07627084e4 Check if the user exists before trying to delete him 2015-04-23 12:32:46 +02:00
root 35dbef55b5 Checks if getenv returns proper system variable results
Updated texts and changed the variable name to match the query

Updated text + info which path for php config is used

removed the term ownCloud and squashed the commits

Updated text
2015-04-23 10:58:13 +02:00
Jenkins for ownCloud f8f354b351 [tx-robot] updated from transifex 2015-04-23 01:54:51 -04:00
Morris Jobke 37a5b62abb Merge pull request #15639 from rullzer/fix_15368
Reset sharedialog values
2015-04-23 00:18:23 +02:00
Robin Appelman 57f49391dc remove unneeded readonlycache 2015-04-22 20:07:54 +02:00
Robin Appelman 7eabd96e4c update icewind/smb to 1.0.1 2015-04-22 20:05:38 +02:00
Clark Tomlinson 29168665cb fix messages from settings crontroller 2015-04-22 13:26:06 -04:00
Clark Tomlinson e3ec1a8bb8 remove status's and adjust js 2015-04-22 11:07:56 -04:00
Clark Tomlinson 1747117edf destupify tests 2015-04-22 10:46:56 -04:00
Clark Tomlinson c81bc152d7 fixing return values and adding tests 2015-04-22 10:46:55 -04:00
Robin Appelman 2adb79c794 resolve reshares in public webdav 2015-04-22 16:19:52 +02:00
Thomas Müller 750f0bc489 Merge pull request #15799 from owncloud/fix-enc-folder-move
Fix enc folder move
2015-04-22 16:04:29 +02:00
Arthur Schiwon b96b0063f6 throw exception when LDAP Connection was lost 2015-04-22 15:39:28 +02:00
Robin Appelman 03b7f1d015 use the permissions mask cache wrapper instead of the read only cache 2015-04-22 15:28:06 +02:00
Morris Jobke 42d9ba0f83 Merge pull request #15787 from owncloud/trash-partfiles
Do not trash part files, delete directly
2015-04-22 14:10:26 +02:00
Morris Jobke a971fa8a90 Merge pull request #15549 from owncloud/jcf-fix-cache-update
don't update identical values
2015-04-22 13:34:08 +02:00
Martin 676e86b314 Improve error messge text for app upgrade try (#15375) 2015-04-22 13:24:11 +02:00
Thomas Müller 0042bdd2e7 fix PHPDoc 2015-04-22 13:12:52 +02:00
Thomas Müller 225cde2183 pass KeyStorage via ctor 2015-04-22 13:09:42 +02:00
Thomas Müller 987bc138df calling renameKeys() on directory level as well - fixes #15778 2015-04-22 12:12:27 +02:00
Thomas Müller fc4127dd62 add $encryptionModuleId to methods of Keys/IStorage 2015-04-22 11:53:05 +02:00
Björn Schießle 570718fb6b Merge pull request #15757 from owncloud/enc-fixfeofforlastblock
Fix encryption feof to not return too early
2015-04-22 11:32:21 +02:00
Jenkins for ownCloud d7bdf60559 [tx-robot] updated from transifex 2015-04-22 01:55:38 -04:00
Thomas Müller 40fcc7480c Merge pull request #15734 from owncloud/add-deprecate-tags
Add @deprecated to all methods with a proper method in \OCP
2015-04-21 23:57:49 +02:00
Vincent Petry ffc796edcb Do not trash part files, delete directly 2015-04-21 18:28:15 +02:00
Morris Jobke 9dc12d40d8 Merge pull request #15782 from owncloud/hide-modified-multiselect
hide modified header when multiselect is active, fix #15779
2015-04-21 16:41:41 +02:00
Thomas Müller 438cb27471 Merge pull request #15721 from oparoz/fix-readonly-cache
Fix read-only cache
2015-04-21 16:30:56 +02:00
Björn Schießle 1ee2ee8432 Merge pull request #15690 from owncloud/enc_fix_upload
[encryption] fix upload to sftp
2015-04-21 15:41:45 +02:00
Jan-Christoph Borchardt 723804ffd7 hide modified header when multiselect is active, fix #15779 2015-04-21 15:38:34 +02:00
Jan-Christoph Borchardt 1d1e188a7a Merge pull request #15769 from owncloud/files-emptycontentreadonly
Added empty content message for empty read-only folders
2015-04-21 15:30:57 +02:00
Morris Jobke 503243e191 Merge pull request #15770 from owncloud/fix-15764
bring back border in host input field for consistency
2015-04-21 14:59:46 +02:00
Bjoern Schiessle 19e8c4fcb1 get dirname from sharePath 2015-04-21 14:58:01 +02:00
Olivier Paroz 9695e33e34 Renamed class + split methods 2015-04-21 14:40:11 +02:00
Vincent Petry 53a23364ef Added empty content message for empty read-only folders 2015-04-21 14:31:13 +02:00
Arthur Schiwon 52025e9839 save configs when requesting a config ID. They are empty, but avoid configID collisioning when creating many new configs in the wizard without saving anything directly. 2015-04-21 13:20:31 +02:00
Arthur Schiwon 8593415c12 LDAP Wizard: have always-increasing 'nth Server' number per full page load, fixes #15766 2015-04-21 13:14:35 +02:00
Morris Jobke 4b968da9e6 Merge pull request #15713 from owncloud/fix-15707-master
[enc2] Fixing JS errors
2015-04-21 12:47:43 +02:00
Arthur Schiwon 19a2a22de1 bring back border in host input field for consistency 2015-04-21 12:22:40 +02:00
Thomas Müller 490e779424 doc and indent 2015-04-21 12:19:15 +02:00
Thomas Müller 4a2f8f81ca Don't pollute the global namespace 2015-04-21 12:01:56 +02:00
Björn Schießle b0fcf0fa0e Merge pull request #15636 from owncloud/enc2_performance_improvement
[encryption2] set size and unencrypted size to zero at the beginning of a write operation
2015-04-21 11:01:33 +02:00
Thomas Müller edbcb834c7 Merge pull request #15753 from owncloud/remove-app-version-from-disabled-list
Remove the app version from disabled app list
2015-04-21 10:26:16 +02:00
Jenkins for ownCloud c548066d2c [tx-robot] updated from transifex 2015-04-21 01:55:37 -04:00
Lukas Reschke 21ad4400af Reword configuration text 2015-04-20 21:08:45 +02:00
Thomas Müller 55962c5f5a make jshint happy
This reverts commit ae681f0061.
2015-04-20 20:51:15 +02:00
Thomas Müller 3bc5c1c3cf use a simple function - OC.Encryption is already defined - fixes #15707
This reverts commit 0ca6398aa3.
2015-04-20 20:50:08 +02:00
Thomas Müller b78e76a1cb Merge pull request #15677 from owncloud/enc_reset_private_key_password
[encryption] let user update the private key password
2015-04-20 20:48:12 +02:00
Vincent Petry a13088818a Merge pull request #15748 from owncloud/fixing-enc-filesize-once-more
Introduce Storage::getData() to allow storage implementations more contr...
2015-04-20 18:36:23 +02:00
Vincent Petry 76dad297ff Fix encryption feof to not return too early
This is because stream_read will pre-cache the next block which causes
feof($this->source) to return true prematurely. So we cannot rely on it.

Fixed encryption stream wrapper unit tests to actually simulate 6k/8k
blocks to make sure we cover the matching logic.

Added two data files with 8192 and 8193 bytes.
2015-04-20 18:32:40 +02:00
Joas Schilling 04674c06cc Dont use the old .status way 2015-04-20 18:26:14 +02:00
Joas Schilling 3f96662609 Fix several minor things 2015-04-20 17:44:34 +02:00
Joas Schilling 2c396a7080 Remove the app version from disabled app list 2015-04-20 17:03:19 +02:00
Lukas Reschke fe2cbc3795 Merge pull request #15744 from owncloud/fix-inverted-path-in-resourcenotfound
Fix wrong path generation
2015-04-20 16:55:36 +02:00
Thomas Müller 32995ace1c move permission related code into getMetaData() 2015-04-20 16:50:12 +02:00
Morris Jobke 3e8f6cdba9 Merge pull request #15635 from owncloud/issue/15634-empty-txt-previews
Scale up the font on larger previews
2015-04-20 15:55:32 +02:00
Thomas Müller a637bd7f2b Avoid function name collision in dropbox external storage 2015-04-20 14:56:51 +02:00
Thomas Müller 23f1bdc3d4 Introduce Storage::getMetaData() to allow storage implementations more control over the data array 2015-04-20 14:54:54 +02:00
Morris Jobke ce2c8533d9 Merge pull request #15735 from owncloud/fix-visibility
Fix visibility of interfaces in \OCP
2015-04-20 14:39:15 +02:00
Thomas Müller 92b60e36de Introduce Storage::getData() to allow storage implementations more control over the data array 2015-04-20 14:25:39 +02:00
Lukas Reschke 3959f8ac4e Merge pull request #15637 from owncloud/migrate-certificate-stuff
Migrate personal certificate handling to AppFramework controllers
2015-04-20 13:56:35 +02:00
Lukas Reschke e9d6807c5c Merge pull request #15733 from owncloud/remove-oc_backgroundjob
Removed OC_BackgroundJob - reduce class overhead
2015-04-20 13:17:58 +02:00
Morris Jobke 0a594cd3a5 Add @deprecated to all methods with a proper method in \OCP 2015-04-20 13:15:45 +02:00
Joas Schilling 5063c1dfe0 Merge pull request #15747 from owncloud/ldap-remove-deprecated-const-usage-group
move away from deprecated consts
2015-04-20 13:12:41 +02:00
Lukas Reschke 9bc48451b9 Adjust tests and statuscode 2015-04-20 13:00:02 +02:00
Morris Jobke 8935369564 fix date variable 2015-04-20 13:00:02 +02:00
Lukas Reschke 21f0476d31 Fix files 2015-04-20 13:00:02 +02:00
Lukas Reschke 1cc2aefa46 Proper return types 2015-04-20 13:00:02 +02:00
Lukas Reschke 20a6073a9f Migrate personal certificate handling into AppFramework controllers
Also added unit-tests and better error-handling
2015-04-20 12:58:58 +02:00
Lukas Reschke 9f61cf60d4 Verify if returned object is an array
The error has to be thrown at this point as otherwise errors and notices are thrown since the time cannot be parsed in L60 and L61
2015-04-20 12:58:57 +02:00
Lukas Reschke ed0b465cf9 Use 403 instead a 50x response 2015-04-20 12:53:40 +02:00
Joas Schilling 6da9e1a742 Fix visibility of public API methods 2015-04-20 12:52:40 +02:00
Joas Schilling ddcd79132d Add tests for correct path 2015-04-20 12:31:35 +02:00
Joas Schilling 0cf13e9b78 Fix phpStorm complains and namespace 2015-04-20 12:31:07 +02:00
Arthur Schiwon 460a78436f move away from deprecated consts 2015-04-20 11:22:11 +02:00
Lukas Reschke 6b31d325d6 Wording 2015-04-20 11:13:05 +02:00
Lukas Reschke 4ea205e262 Block old legacy clients
This Pull Request introduces a SabreDAV plugin that will block all older clients than 1.6.1 to connect and sync with the ownCloud instance.

This has multiple reasons:

1. Old ownCloud client versions before 1.6.0 are not properly working with sticky cookies for load balancers and thus generating sessions en masse
2. Old ownCloud client versions tend to be horrible buggy

In some cases we had in 80minutes about 10'000 sessions created by a single user. While this change set does not really "fix" the problem as 3rdparty legacy clients are affected as well, it is a good work-around and hopefully should force users to update their client
2015-04-20 11:12:17 +02:00
Bjoern Schiessle 7fe0e09d14 set size and unencrypted size to zero on fopen 2015-04-20 11:06:13 +02:00
Morris Jobke 80be3b0c47 Fix wrong path generation
* fixes #15742
2015-04-20 11:01:33 +02:00
Lukas Reschke 930ae11f8e Merge pull request #15629 from owncloud/deprecate-potential-dangerous-methods
Deprecate unused `\OCP\Response::sendFile`
2015-04-20 11:01:32 +02:00
Lukas Reschke a98b819366 Add version to deprecation notice
As requested by @MorrisJobke
2015-04-20 10:30:16 +02:00
Lukas Reschke f672e120fc Deprecate unused \OCP\Response::sendFile
This function is unused in our own code and can be better achieved using the AppFramework. Also very easy to do grave mistaked using this function.
2015-04-20 10:02:34 +02:00
Morris Jobke 9cb260d310 Merge pull request #15717 from owncloud/issue/15716-fixing-ocp-api-namespace-usage
Fixing OCS API namespace usage
2015-04-20 09:43:19 +02:00
Jenkins for ownCloud 75bf03a605 [tx-robot] updated from transifex 2015-04-20 01:54:44 -04:00
Morris Jobke d4ac7ac723 Merge pull request #15739 from DavidPrevot/symfony-2.7
Replace `_method` requirement by {g,s}etMethods()
2015-04-19 23:46:21 +02:00
Thomas Müller 319a3ffd85 Merge pull request #15740 from owncloud/get_rid_of_geo
get rid of OC_Geo
2015-04-19 22:29:30 +02:00
Thomas Müller fad76bd1b8 Merge pull request #15724 from owncloud/ldap-remove-deprecated-const-usage
LDAP - move from constants to class member constants
2015-04-19 21:00:04 +02:00
Georg Ehrke 8f51efc49e get rid of OC_Geo 2015-04-19 20:16:56 +02:00
David Prévot 7f2f92847b Replace _method requirement by {g,s}etMethods()
Make the call compatible with future Symfony version, and avoid
E_USER_DEPRECATED as thrown by the current 2.7.0-beta1:

The "_method" requirement is deprecated since version 2.2 and will be
removed in 3.0. Use getMethods() instead. at
…/Symfony/Component/Routing/Route.php#554

The "_method" requirement is deprecated since version 2.2 and will be
removed in 3.0. Use the setMethods() method instead or the "methods"
option in the route definition. at
…/Symfony/Component/Routing/Route.php#662
2015-04-19 12:08:29 -04:00
Roeland Douma d877c1f1e1 Merge pull request #15736 from owncloud/remove-dependency-on-legacy-code-in-ocp
Reduce call of legacy wrapper by call the OCP directly
2015-04-19 15:42:07 +02:00
Roeland Douma 3cb5dd68e6 Merge pull request #15737 from owncloud/add-deprecated-version
Add version to @deprecated tags
2015-04-19 15:40:53 +02:00
Robin McCorkell 80b892e7ed Merge pull request #15729 from owncloud/remove-unused-variables
Remove unused variables
2015-04-19 12:38:29 +01:00
Jenkins for ownCloud fd3c1484ad [tx-robot] updated from transifex 2015-04-19 01:54:41 -04:00
Morris Jobke c056c52010 Add version to @deprecated tags 2015-04-19 01:04:59 +02:00
Morris Jobke 9b8ebdadf7 Reduce call of legacy wrapper by call the OCP directly
* ref #15734
* reduces the call depth, because the private methods just call OCP stuff
2015-04-19 00:29:09 +02:00
Morris Jobke 96a5b65484 Fix visibility of interfaces in \OCP 2015-04-19 00:26:17 +02:00
Morris Jobke 60b8aa2a83 Removed OC_BackgroundJob - reduce class overhead
* method code is now in the static public namespace (5 sloc)
2015-04-18 23:37:32 +02:00
Morris Jobke f6807337a8 Add @since tag to public namespace constants 2015-04-18 23:19:35 +02:00
Thomas Müller cdf82909b8 Merge pull request #15718 from owncloud/issue/15694-display-name-of-encryption-modules
Issue/15694 display name of encryption modules
2015-04-18 22:51:15 +02:00
Thomas Müller b7a4972218 Merge pull request #15728 from owncloud/update-iurlgenerator-doc
IUrlGenerator - document linkTo properly
2015-04-18 22:48:09 +02:00
Thomas Müller d2a31bcd93 Merge pull request #15727 from owncloud/cleanup-db-interface
DB: remove unused parameter - was forgotten during the migration to doct...
2015-04-18 22:47:40 +02:00
Thomas Müller c922b09f26 Merge pull request #15725 from owncloud/l10n-public-interface
IL10n - add PHPDoc for $options
2015-04-18 22:46:50 +02:00
Morris Jobke d45d246e3b Merge pull request #15722 from owncloud/remove-vardumps
LDAP tests: switch var_dump to exception
2015-04-18 22:04:25 +02:00
Morris Jobke 9dee275033 Merge pull request #15723 from owncloud/fix-decimal-unit-tests
Use data provider instead of hand-crafted for loops
2015-04-18 22:02:20 +02:00
Thomas Müller 7dddff5fe0 Merge pull request #15720 from owncloud/fix-method-visibility
add visibility of methods in server container
2015-04-18 21:04:00 +02:00
Olivier Paroz 80a1f1858e Tests for read-only cache 2015-04-18 19:43:20 +02:00
Morris Jobke e837927ad5 fix followup issues with unneeded parameters 2015-04-18 17:02:39 +02:00
Morris Jobke ccf47f40aa Remove unused variables
* should make scrutinizer a lot more happy
* reduces maybe memory footprint
2015-04-18 16:35:19 +02:00
Morris Jobke eb62e7cc27 IUrlGenerator - document linkTo properly
* parameter $args was there since 6.0.0
* see 61a9098b7d
2015-04-18 16:03:37 +02:00
Morris Jobke 47ecfd98a3 DB: remove unused parameter - was forgotten during the migration to doctrine
* 377e9a8677 <- doctrine merge
2015-04-18 15:57:13 +02:00
Morris Jobke 9ffac12986 IL10n - add PHPDoc for $options
* added in #11549
* undocumented in the public interface
2015-04-18 15:50:17 +02:00
Morris Jobke 58e5878b4d LDAP - move from constants to class member constants
* fixes scrutinizer warnings
* drops the usage of deprecated code usage
2015-04-18 15:29:08 +02:00
Morris Jobke 758b2332f0 Use data provider instead of hand-crafted for loops
* reduces scrutinizer complains
* uses PHPUnit functionality
2015-04-18 15:19:33 +02:00
Morris Jobke 85d0fc5cf6 LDAP tests: swithc var_dump to exception 2015-04-18 15:09:15 +02:00
Morris Jobke f72dabb4eb fix wrong variable names in PHPDoc 2015-04-18 14:31:28 +02:00
Morris Jobke 11f29f6d95 add visibility of methods in server container and interface 2015-04-18 14:19:22 +02:00
Olivier Paroz fcc1b9b3cc Thou shalt not corrupt the answer of a cache request 2015-04-18 12:33:43 +02:00
Joas Schilling 3f3f8c2f99 Fix usage of deprecated private constants 2015-04-18 10:30:02 +02:00
Joas Schilling 491e590165 Fix dummy encryption module registration 2015-04-18 10:20:32 +02:00
Joas Schilling b5c5775626 Fix potential undefined variable 2015-04-18 10:20:13 +02:00
Joas Schilling 4d238c3949 Fix display name of encryption modules 2015-04-18 10:18:58 +02:00
Joas Schilling 6ce1abfa5c Deprecate the OC_API constants in favor of the OCP ones 2015-04-18 09:29:52 +02:00
Joas Schilling 4e58f4892a Move constants to OCP\API so apps can use them 2015-04-18 09:29:51 +02:00
Joas Schilling 8cb0d97b10 Merge pull request #15692 from owncloud/log-exception-type-master
Write the type of exception to the log - really helpful for exceptions w...
2015-04-18 09:28:48 +02:00
Joas Schilling 5acda185bd Correctly prefix OC_API with \ since its not in the namespace 2015-04-18 09:12:42 +02:00
Jenkins for ownCloud 37a871127b [tx-robot] updated from transifex 2015-04-18 01:55:19 -04:00
Morris Jobke 4dd2ad7f4a Merge pull request #15714 from owncloud/fix-ldap-xpmode
always open filter tab in raw mode, when 'Manually enter LDAP filters' i...
2015-04-18 01:27:19 +02:00
Arthur Schiwon fe237fd159 always open filter tab in raw mode, when 'Manually enter LDAP filters' is checked 2015-04-17 23:33:59 +02:00
Morris Jobke 7ab1f807fb Merge pull request #15691 from owncloud/vobject-sabre2.1
Get rid of the obsolete OC_VObject class
2015-04-17 22:33:00 +02:00
Morris Jobke 34841ea5dd Merge pull request #15708 from owncloud/fix-capitalization
fix capitalization for server-side encryption and email server
2015-04-17 21:16:43 +02:00
Bjoern Schiessle d0a6fb1f2c let user update the private key password in case the login password was changed from outside 2015-04-17 20:11:22 +02:00
Thomas Müller ae681f0061 Revert "make jshint happy"
This reverts commit a255866a93.
2015-04-17 18:02:08 +02:00
Thomas Müller 0ca6398aa3 Revert "use a simple function - OC.Encryption is already defined - fixes #15707"
This reverts commit c1a60a2349.
2015-04-17 18:02:00 +02:00
Thomas Müller a255866a93 make jshint happy 2015-04-17 17:59:53 +02:00
Jan-Christoph Borchardt b083b65894 fix capitalization for server-side encryption and email server, fix #15642 2015-04-17 17:57:30 +02:00
Thomas Müller c1a60a2349 use a simple function - OC.Encryption is already defined - fixes #15707 2015-04-17 17:57:17 +02:00
Thomas Müller c6e243928c move creation of shared key to the login handler - fixes #15705 2015-04-17 17:51:18 +02:00
Thomas Müller f2fe9fffd9 Merge pull request #15699 from owncloud/fix-15696-master
Fix 15696 master
2015-04-17 17:36:07 +02:00
Thomas Müller 85dbaeee97 Merge pull request #15695 from owncloud/handle-app-upgrade-of-filesystem-apps
Delay initialization of the OC\Encryption\Update - introducing 'OC\Encry...
2015-04-17 17:07:18 +02:00
Thomas Müller 2e803fd2cd Do not concat translation string 2015-04-17 14:26:58 +02:00
Thomas Müller d9f23c0578 fixing undefined variable 2015-04-17 14:25:57 +02:00
Thomas Müller 295839930a Merge pull request #15686 from owncloud/enc_fix_change_password
fix change password if no user is logged in, occ call
2015-04-17 14:14:29 +02:00
Thomas Müller d9990c2b4e Delay initialization of the OC\Encryption\Update - introducing 'OC\Encryption\HookManager' 2015-04-17 13:55:31 +02:00
Bjoern Schiessle 195a48b2b8 fix change password if no user is logged in, occ call 2015-04-17 13:26:38 +02:00
Thomas Müller d671f13f26 Write the type of exception to the log - really helpful for exceptions which hold no message 2015-04-17 13:10:10 +02:00
Vincent Petry b7e5884b54 Get rid of the obsolete OC_VObject class
The class isn't needed any more since the update to Sabre 2.1
2015-04-17 12:55:31 +02:00
Vincent Petry aef6ecdbf1 Merge pull request #15616 from owncloud/enc_stream_copy
always create a new instance of the encryption module
2015-04-17 11:32:24 +02:00
Bjoern Schiessle 7d4b1b52d0 always create a new instance of the encryption module 2015-04-17 10:31:33 +02:00
Roeland Jago Douma b971029652 Added unit tests 2015-04-17 09:38:09 +02:00
Roeland Jago Douma 595adfd193 moved from html to $('html') to fix unit tests 2015-04-17 09:38:09 +02:00
Roeland Jago Douma c456f5dee1 Reset sharedialog values 2015-04-17 09:38:09 +02:00
Thomas Müller f32d97750c Merge pull request #15679 from owncloud/fix-private-member-access
Fix private member access of parent class in ocsresponse
2015-04-17 09:13:54 +02:00
Thomas Müller 852cc6f2c6 Merge pull request #15680 from owncloud/add-since-tags-to-public-namespace
Add @since tags to all methods in public namespace
2015-04-17 09:13:04 +02:00
Jenkins for ownCloud da44df2cfa [tx-robot] updated from transifex 2015-04-17 01:55:37 -04:00
Morris Jobke 7644950b48 Add @since tags to all methods in public namespace
* enhance the app development experience - you can look up the
  method introduction right inside the code without searching
  via git blame
* easier to write apps for multiple versions
2015-04-16 17:00:08 +02:00
Morris Jobke 1d30efdd73 Fix private member access of parent class in ocsresponse
* noticed while checking PHPDoc
2015-04-16 16:54:01 +02:00
Clark Tomlinson ac133e9faa Merge pull request #15675 from owncloud/enc_error_messages
[encryption] display warning if password changed or if the keys are not initialized
2015-04-16 09:45:09 -04:00
Clark Tomlinson 1174ad0681 Merge pull request #15445 from owncloud/enc2_migration
add migration script from old encryption to new one
2015-04-16 09:34:47 -04:00
Joas Schilling c7e5e30b86 Merge pull request #15674 from owncloud/fix-console-check-output
Convert error and hint to string before writing to the output
2015-04-16 14:51:29 +02:00
Joas Schilling 3e1b58dd3d Merge pull request #15673 from owncloud/issue/15577-transaction-read-committed
[master] Using TRANSACTION_READ_COMMITTED
2015-04-16 14:33:35 +02:00
Bjoern Schiessle e93f262eac display warning if password changed or if the keys are not initialized 2015-04-16 14:30:19 +02:00
Bjoern Schiessle 959665003b decrypt private key for public shares correctly 2015-04-16 14:15:04 +02:00
Bjoern Schiessle b25c06f576 detect system wide mount points correctly 2015-04-16 14:15:04 +02:00
Bjoern Schiessle 67500d5f2f if we start writing a file from the beginning, size should start by zero; result of floor needs to be casted to int in order to compare it with ->size 2015-04-16 14:15:04 +02:00
Bjoern Schiessle d2ef73367c allow user to start migration in admin settings if no external user back-ends are enabled 2015-04-16 14:15:04 +02:00
Bjoern Schiessle 6bcf88ca96 fix decryption of legacy private key 2015-04-16 14:15:04 +02:00
Bjoern Schiessle e7a4f4f3e4 add version 2015-04-16 14:15:04 +02:00
Bjoern Schiessle e3d77c4b01 add migration script from old encryption to new one 2015-04-16 14:15:04 +02:00
Thomas Müller 07243f0482 Convert error and hint to string before writing to the output - fixes https://mailman.owncloud.org/pipermail/devel/2015-April/001184.html 2015-04-16 12:32:17 +02:00
Joas Schilling 99b0c6e525 Merge pull request #15670 from owncloud/encryption-is-an-shipped-app-master
files_encryption -> encryption
2015-04-16 11:57:14 +02:00
Thomas Müller bcf65d9c13 Using TRANSACTION_READ_COMMITTED 2015-04-16 11:49:12 +02:00
Thomas Müller b6f79567aa files_encryption -> encryption 2015-04-16 10:46:34 +02:00
Jörn Friedrich Dreyer 2e06cf49a5 Merge pull request #15623 from t3chguy/master
Redis DB Index via Select
2015-04-16 09:30:07 +02:00
Jenkins for ownCloud 8606b7ca66 [tx-robot] updated from transifex 2015-04-16 01:54:43 -04:00
Frank Karlitschek 59161774e4 8.1.0 alpha 2 2015-04-15 23:55:25 +02:00
Morris Jobke 7b7d05eb74 Merge pull request #15805 from owncloud/fileslist-whitespace
add whitespace to bottom of files list to correctly show dropdowns
2015-04-22 23:53:26 +02:00
Vincent Petry 903d52d45f Merge pull request #15809 from owncloud/view-null-root
dont allow using null as view root
2015-04-22 18:10:26 +02:00
Robin Appelman bd57902d1d typo 2015-04-22 16:24:37 +02:00
Robin Appelman e302213248 add unit tests for null handling in view 2015-04-22 16:24:25 +02:00
Robin Appelman f391f88d7f dont allow using null as view root 2015-04-22 14:51:02 +02:00
Jan-Christoph Borchardt b92dd82e41 add whitespace to bottom of files list to correctly show dropdowns, fix #15801 2015-04-22 13:58:53 +02:00
Michael Telatynski 8ebf9de3f8 Memcache\Redis Add DB Select Functionality 2015-04-15 21:24:38 +01:00
Frank Karlitschek f50798a674 8.1 alpha 1 2015-04-15 22:16:26 +02:00
Morris Jobke 8653da6c16 Merge pull request #15654 from owncloud/enc2_header_system_keys
make sure that encrypted private keys always have a header
2015-04-15 20:28:58 +02:00
Bjoern Schiessle 389a101de6 make sure that encrypted private keys always have a header 2015-04-15 19:52:48 +02:00
Morris Jobke 512558c827 Merge pull request #15644 from owncloud/sftp-defaultport-storageid
Fix SFTP storage id to be compatible with older ids
2015-04-15 17:40:18 +02:00
Morris Jobke 4a5c3eea42 Add visibility for method 2015-04-15 17:40:07 +02:00
Morris Jobke 9e46b7175d Merge pull request #15638 from owncloud/primary-button-disabled
add disabled state to primary action button
2015-04-15 16:43:40 +02:00
Vincent Petry a6c5d65fd6 Fix SFTP storage id to be compatible with older ids
Remove port from SFTP storage id if it is 22.
This will prevent recreating a different storage entry due to id
mismatch after upgrade.
2015-04-15 16:25:47 +02:00
Jan-Christoph Borchardt 14b92c3ce6 Merge pull request #15632 from owncloud/remove-tooltip-fade
remove slow fade animation for remaining tipsy tooltips
2015-04-15 14:42:45 +02:00
Jan-Christoph Borchardt 008e3376c6 add disabled state to primary action button 2015-04-15 14:23:54 +02:00
Joas Schilling 1592f25ed0 Scale up the font on larger previews 2015-04-15 14:03:40 +02:00
Jan-Christoph Borchardt 04ca5b8160 remove slow fade animation for remaining tipsy tooltips 2015-04-15 12:25:10 +02:00
Vincent Petry 75268860fc Merge pull request #15626 from owncloud/remove-tooltip-fade
remove slow fade animation for tipsy tooltip
2015-04-15 12:14:54 +02:00
Thomas Müller 1a2475227b Merge pull request #15613 from owncloud/allow-files-nav-icons
Allow files app nav entries to have a different icon class
2015-04-15 11:18:58 +02:00
Jan-Christoph Borchardt 9332c8c266 remove slow fade animation for tipsy tooltip 2015-04-15 09:10:21 +02:00
Jenkins for ownCloud 1a894bd0d8 [tx-robot] updated from transifex 2015-04-15 01:54:38 -04:00
Morris Jobke e33e5b425a Merge pull request #12006 from owncloud/dav-put-storage
Work directly on the storage when uploading over webdav
2015-04-15 03:08:52 +02:00
Jenkins for ownCloud 843290a0fb [tx-robot] updated from transifex 2015-04-14 18:22:17 -04:00
Jenkins for ownCloud 7f3f191ee9 [tx-robot] updated from transifex 2015-04-14 18:19:31 -04:00
Thomas Müller 70480423ff Merge pull request #15597 from oparoz/another-fallback-for-findbinarypath
Adding a final fallback for findBinaryPath
2015-04-15 00:16:56 +02:00
Thomas Müller 1aa368effe Merge pull request #15592 from owncloud/fix-15590-master
Avoid php message "Invalid argument supplied for foreach()"
2015-04-15 00:14:08 +02:00
Vincent Petry 2a68336952 Merge pull request #15612 from owncloud/fix-transifex-master
files_encryption -> encryption
2015-04-14 18:10:17 +02:00
Björn Schießle 4f0437fbde Merge pull request #15598 from owncloud/fix-enc-file-size-master
Fix file size of encrypted files
2015-04-14 16:48:04 +02:00
Morris Jobke 717723b83e Remove unneeded comments 2015-04-14 16:44:24 +02:00
Robin Appelman eeecca04e6 Keep phpdoc updated. 2015-04-14 16:25:52 +02:00
Thomas Müller 922c3ee975 files_encryption -> encryption 2015-04-14 16:18:12 +02:00
Morris Jobke c53a53f705 Allow files app nav entries to have a different icon class 2015-04-14 16:17:24 +02:00
Robin Appelman 308af8b909 pass a stream to the tests 2015-04-14 15:25:52 +02:00
Morris Jobke 82cab25762 Merge pull request #13360 from owncloud/cross-storage-move
Proper copy/move between multiple local storages
2015-04-14 14:35:08 +02:00
Olivier Paroz bb0c09e994 Adding a final fallback for findBinaryPath 2015-04-14 14:06:58 +02:00
Thomas Müller cbe30f740e remove calculateUnencryptedSize() - not needed 2015-04-14 13:08:59 +02:00
Thomas Müller 967e882757 return size from cache in case the cache entry is marked as encrypted 2015-04-14 13:08:59 +02:00
Robin Appelman 0f21303b75 a bit more phpdoc 2015-04-14 12:35:53 +02:00
Thomas Müller 387984a0d5 preserve filesize on rename after upload 2015-04-14 12:27:12 +02:00
Thomas Müller f816acde27 fix reading of private key 2015-04-14 12:23:25 +02:00
Thomas Müller 88cc52c408 Avoid php message "Invalid argument supplied for foreach()" - refs #15590 2015-04-14 11:00:20 +02:00
Thomas Müller ffa115b517 Merge pull request #15566 from owncloud/fix-filepicker
fix filepicker
2015-04-14 00:39:12 +02:00
Lukas Reschke e36c0a0c12 Merge pull request #15585 from owncloud/fix-user-list
Fix user list
2015-04-13 23:30:37 +02:00
Morris Jobke 5f66f867b6 Merge pull request #15581 from owncloud/deduplicate-oc-repair-namespace
Fix namespace duplication and other issues in repairlegacystorages
2015-04-13 21:51:38 +02:00
Morris Jobke 9eff199a17 Merge pull request #15360 from owncloud/cross-storage-move-cache
Preserve cache data when doing a cross storage move
2015-04-13 21:48:30 +02:00
Morris Jobke 74732cc0d8 Fix user list
* the name cell was changed from td to th because of accessibility
  issues - this adjusts the CSS and JS to behave like before
2015-04-13 21:43:36 +02:00
Robin Appelman f605c98531 Fix cross storage move with shared storages 2015-04-13 17:10:05 +02:00
Robin Appelman 01da6be4d6 upda tests 2015-04-13 17:10:02 +02:00
Robin Appelman addfafd9da Fix moving mount points 2015-04-13 17:10:02 +02:00
Robin Appelman 8688660825 check that we know the parent 2015-04-13 17:10:02 +02:00
Robin Appelman 6b5daca7b7 check for source cache 2015-04-13 17:10:02 +02:00
Robin Appelman caadc8cdd9 reuse cache move logic 2015-04-13 17:10:01 +02:00
Robin Appelman d7b3a1a35a preserve cache data when doing a cross storage move 2015-04-13 17:10:01 +02:00
Joas Schilling 71de1d58cd Fix namespace duplication and other issues in repairlegacystorages 2015-04-13 16:34:10 +02:00
Thomas Müller 660aa7ff1e Merge pull request #15568 from owncloud/cache_user_folder_for_file_search_results
cach user folder for file search results
2015-04-13 15:16:07 +02:00
Robin Appelman c29419e6d7 fix rebase issue 2015-04-13 15:13:03 +02:00
Robin Appelman d4c91dc835 add missing return for shared 2015-04-13 15:13:03 +02:00
Robin Appelman 0772e3b4c1 Properly handle copy/move failures in cross storage copy/move 2015-04-13 15:13:03 +02:00
Robin Appelman 404773940d Detect storage full when doing cross storage copy/move 2015-04-13 15:13:03 +02:00
Robin Appelman d26c6cab90 properly return false if we cant delete the source file 2015-04-13 15:13:03 +02:00
Robin Appelman c4ec8fbeff Make getSourcePath accessible for storage wrappers 2015-04-13 15:13:03 +02:00
Robin Appelman d16ee4138d Fix test 2015-04-13 15:13:03 +02:00
Robin Appelman d726db7459 Implement move/copyFromStorage for shared storage 2015-04-13 15:13:03 +02:00
Robin Appelman 31e94708f8 Improve cross storage copy between local storages 2015-04-13 15:13:02 +02:00
Robin Appelman 8575bb2cb9 Move cross storage copy logic to the storage 2015-04-13 15:13:02 +02:00
Robin Appelman b302592a64 Small cleanup of rename code 2015-04-13 15:11:03 +02:00
Robin Appelman 2fd44dbde4 rewind and update error message 2015-04-13 14:14:48 +02:00
Robin Appelman dcfe014103 use our own stream copy instead 2015-04-13 14:13:21 +02:00
Morris Jobke a88e013f72 Merge pull request #15570 from owncloud/shares-properlyformatmountpoint
Properly add trailing slash to mount point
2015-04-13 13:16:07 +02:00
Vincent Petry b67301ef99 Merge pull request #15564 from rullzer/fix_13709
Do not try to make user subadmin of group twice
2015-04-13 12:46:43 +02:00
Vincent Petry 2822d0579e Properly add trailing slash to mount point
Fixes resolving mount points when shared mount point's target name has
the same prefix as the source name
2015-04-13 12:36:47 +02:00
Roeland Jago Douma b21dc35355 Do not try to make user subadmin of group twice
If the provisioning api is used to make a user subadmin of a group that user
is already a subadmin just return success.

Added unit test to ensure things keep working.
2015-04-13 11:42:56 +02:00
Jörn Friedrich Dreyer b717681e3a cach user folder for file search results 2015-04-13 11:29:10 +02:00
Morris Jobke 59efcb63a3 fix filepicker
* add ability to filter for mimetype
* fixes #15526
* fixes #11563
2015-04-13 10:38:08 +02:00
Morris Jobke c3fbc2b6fd Merge pull request #15563 from owncloud/fix-try-getting-propert-of-non-object-ocsclient
Prevent php message: "Trying to get property of non-object at /xxx/lib/p...
2015-04-13 10:30:31 +02:00
Joas Schilling 0a72e66e9f Merge pull request #15562 from owncloud/fix-15560
Properly import used classes
2015-04-13 10:07:01 +02:00
Thomas Müller 906b6b7337 Prevent php message: "Trying to get property of non-object at /xxx/lib/private/ocsclient.php#282" 2015-04-13 09:43:45 +02:00
Thomas Müller 8450b6aa2d Properly import used classes 2015-04-13 09:26:30 +02:00
Morris Jobke 75adee1ebd Merge pull request #15555 from rullzer/fix_15494
Initial fix for #15494
2015-04-12 23:00:32 +02:00
Lukas Reschke 84041a4fa2 Merge pull request #15541 from owncloud/add-reply-to-support
Add "Reply-To" support for sharing mails as well as refactor code and add unit-tests
2015-04-12 22:30:35 +02:00
Roeland Jago Douma 2b8fc774d0 Initial fix for #15494 2015-04-12 16:29:05 +02:00
Jens-Christian Fischer 9c95315a9e clarify the duplication of the $params array 2015-04-12 14:49:18 +02:00
Morris Jobke 907719200f Merge pull request #15545 from owncloud/fix-fonts
fix wrong typeface being used for some buttons
2015-04-12 10:03:54 +02:00
Jens-Christian Fischer 22c6216f5c don't update identical values
The UPDATE oc_filecache statement blindly overwrites identical data.
Databases like Postgres that create a new row on an update
and mark the old one as dead will suffer from the previous
behaviour, as millions of "new" rows are created in the database.

This patch changes the WHERE clause to test for identical
values and not updating if the values in the DB are identical
to the ones being passed.
2015-04-11 18:06:21 +02:00
Jan-Christoph Borchardt 573c57402f fix wrong typeface being used for some buttons 2015-04-11 13:29:55 +02:00
Morris Jobke 7ce4d2dec9 Merge pull request #15535 from owncloud/smb-1.0.0
update icewind/smb to 1.0.0
2015-04-10 23:43:55 +02:00
Robin McCorkell 2e88f8af43 Merge pull request #15536 from owncloud/fix-mysql-autotest
[autotest.sh] use the DATABASEHOST for the mysql DB drop
2015-04-10 21:56:27 +01:00
Lukas Reschke e3ad99d252 Add "Reply-To" support to sharing mails and refactor code 2015-04-10 17:30:07 +02:00
Lukas Reschke 77afef328d Merge pull request #15458 from owncloud/web-shell-master
Move console application to it's own class - allows reuse in the web shell
2015-04-10 16:33:01 +02:00
Clark Tomlinson 294f14a793 Merge pull request #15538 from owncloud/encryption-crypt-tests
add unit test for crypt.php
2015-04-10 10:24:01 -04:00
Vincent Petry e512a69a59 Merge pull request #15395 from owncloud/fix-imagepath
Fix UrlGenerator::imagePath() for app paths
2015-04-10 16:11:57 +02:00
Thomas Müller 7b2d53603c Merge pull request #15489 from owncloud/dont_hide_exceptions_master
Dont hide exceptions master
2015-04-10 15:49:45 +02:00
Morris Jobke 20a1a110de Merge pull request #15537 from owncloud/master-fixunittestrelatedtoorphanedshares2
Fix master unit test: Clear leftover shares from other tests
2015-04-10 15:42:16 +02:00
Bjoern Schiessle d1fa3c6b32 add unit test for crypt.php 2015-04-10 15:12:57 +02:00
Lukas Reschke a881218fc2 Add "Reply-To" support for mails 2015-04-10 15:05:34 +02:00
Robin Appelman a41fbf7a92 update icewind/smb to 1.0.0 2015-04-10 14:59:16 +02:00
Vincent Petry 4a225aa12c Clear leftover shares from other tests 2015-04-10 14:53:17 +02:00
Morris Jobke 25dd4ec767 Throw ServerNotAvailableException always 2015-04-10 14:51:21 +02:00
Morris Jobke c72ea81137 [autotest.sh] use the DATABASEHOST for the mysql DB drop 2015-04-10 14:46:08 +02:00
Thomas Müller a163243e31 Merge pull request #15510 from owncloud/cron-singleuser
block cron when in single user mode
2015-04-10 14:38:50 +02:00
Morris Jobke 75312f96d4 Merge pull request #15530 from owncloud/davclient-catchmoreexceptions
Catch more exceptions in DAV client
2015-04-10 14:17:42 +02:00
Vincent Petry b51b5b64e6 Fix converting Guzzle error codes in s2s storage 2015-04-10 12:12:05 +02:00
Vincent Petry 73afca6207 Catch more exceptions when connecting to remote DAV server
Added InvalidArgumentException to catch HTML parsing errors when XML was
expected.
Made convertSabreException more generic to be able to handle more
exception cases.
2015-04-10 12:02:06 +02:00
Thomas Müller 79ef54fe00 Merge pull request #15528 from owncloud/share-loading
fix share input loading spinner, fix #15522
2015-04-10 11:45:24 +02:00
Jan-Christoph Borchardt 9c76bcd479 fix share input loading spinner, fix #15522 2015-04-10 11:32:02 +02:00
Thomas Müller a33edcd2f0 Fix singe user mode on public.php - take two 2015-04-10 11:17:33 +02:00
Jörn Friedrich Dreyer fafecd1c05 fix cherrypicking 2015-04-10 11:08:24 +02:00
Jan-Christoph Borchardt bbb2567918 Merge pull request #15398 from Volker-E/master
fixing #15396 & #15397
2015-04-10 10:43:39 +02:00
Morris Jobke 1427ea78d4 fix typo and comment 2015-04-10 09:12:37 +02:00
Jörn Friedrich Dreyer a85bc5538f fix filesystem and encryption tests
Conflicts:
	apps/files_encryption/lib/util.php
	apps/files_encryption/tests/hooks.php
2015-04-10 09:12:37 +02:00
Jörn Friedrich Dreyer b069f33a72 throw exception when backends don't provide a user instead of creating legacy local storages 2015-04-10 09:12:37 +02:00
Morris Jobke 5626a02d69 throw exception if setup is incomplete 2015-04-10 09:12:37 +02:00
Morris Jobke 473d3e14c8 more robust share dialog 2015-04-10 09:12:37 +02:00
Jörn Friedrich Dreyer 077ab27281 fix_tests
Conflicts:
	apps/user_ldap/tests/user_ldap.php
2015-04-10 09:12:37 +02:00
Jörn Friedrich Dreyer 8964c5068c do not disclose information, show generic error on login page
Conflicts:
	core/templates/login.php
	lib/base.php
2015-04-10 09:12:37 +02:00
Jörn Friedrich Dreyer 488405d1ec do not hide exception when ldap server has a hiccup 2015-04-10 09:12:37 +02:00
Morris Jobke 43b503641c Merge pull request #15521 from owncloud/shareinfo-catchguzzle503
Properly catch guzzle 503 when querying share info
2015-04-10 00:23:05 +02:00
Thomas Müller 02614d214e Merge pull request #15437 from owncloud/deleteorphanedfiles
[command] delete orphaned file cache entries
2015-04-10 00:09:56 +02:00
Thomas Müller 13178db465 Merge pull request #15404 from Crote/occ-password-from-env
Add password input from env variable for occ user:{add, resetpassword}
2015-04-10 00:08:40 +02:00
Thomas Müller 20eaadd72b Merge pull request #15182 from rullzer/fix-8231
ajax/share.php should return correct list of suggestions
2015-04-10 00:05:11 +02:00
blizzz c6151053ba Merge pull request #15492 from owncloud/ldap-wizard-overhaul
LDAP Wizard Overhaul
2015-04-09 23:52:53 +02:00
Thomas Müller f05e19348d Fix single user check in case no user is logged in 2015-04-09 23:47:24 +02:00
Thomas Müller 5abbf6d5b0 Merge pull request #13920 from owncloud/sharing_no_user_entry_for_group_shares
only create a db entry for the user in case of a name conflict on group share
2015-04-09 23:37:02 +02:00
Arthur Schiwon 60bf934e6f change default value of ldap_tls to 0. It will be detected anyway, but starting with 0 will lead to errors and unconfigurability 2015-04-09 21:05:20 +02:00
Arthur Schiwon a8b831b018 compile user and login filter on the first time automatically, if a suggestion was provided 2015-04-09 21:05:16 +02:00
Vincent Petry 10ffa3b770 Merge pull request #15512 from owncloud/autoclose-settings-menu
Don't stop event execution for menu item click
2015-04-09 19:53:43 +02:00
Lukas Reschke 0bad8f644a Merge pull request #15511 from owncloud/fix-typos
Fix typos and some other adjustments
2015-04-09 19:23:27 +02:00
Vincent Petry 4feb97d8e4 Properly catch guzzle 503 when querying share info 2015-04-09 18:55:28 +02:00
Morris Jobke de4a81f462 Merge pull request #15517 from owncloud/fixRenameFailDeleteTargetKeepSource
fixes #15326
2015-04-09 18:41:18 +02:00
Morris Jobke 51e4633187 Don't stop event execution for menu item click
* fixes #12326 - the settings menu is closed now, because the event is executed
2015-04-09 18:32:33 +02:00
Thomas Müller 06a5a9d0c2 Fix mock object to return proper type 2015-04-09 18:30:45 +02:00
Vincent Petry 2865f09984 Merge pull request #15282 from owncloud/keepsharerelationshipondelete
Keep shares when deleting shared folders
2015-04-09 18:10:17 +02:00
Thomas Müller 11c3741526 Fix mock object to return proper type 2015-04-09 17:45:57 +02:00
Thomas Müller f7c906902a Throw an exception in case checkServer() returns errors 2015-04-09 16:42:34 +02:00
Lukas Reschke b60d5d3d6f Merge pull request #14540 from owncloud/windows-setup-check
Disallow Windows Server in Server Check
2015-04-09 16:38:11 +02:00
Thomas Müller 890a18e1a6 Introduce own console application class 2015-04-09 16:28:53 +02:00
Robin Appelman a7aba07dc1 block ocs in single user mode 2015-04-09 15:57:27 +02:00
Robin Appelman 8af106cc75 block webdav in single user mode 2015-04-09 15:56:41 +02:00
Lukas Reschke 0abce86b31 Disallow Windows Server in Server Check
Will prevent users from use ownCloud on Windows Server 🙈
2015-04-09 15:56:37 +02:00
Morris Jobke f5a145b410 Merge pull request #15501 from owncloud/better-output-format-console
Add an option to get the output in plain, json or print_r syntax
2015-04-09 15:46:36 +02:00
Jörn Friedrich Dreyer 8af52e3876 fixes #15326 2015-04-09 15:37:00 +02:00
Vincent Petry 5803a1f5f7 Remove trashbin storage wrapper when disabling it for tests 2015-04-09 15:02:24 +02:00
Morris Jobke b9eaa386c4 Merge pull request #15235 from owncloud/remote-share-hint
Hint for remote sharing syntax
2015-04-09 14:54:57 +02:00
Björn Schießle 0710db77bc Merge pull request #13896 from owncloud/share-generatetarget-remove-exclude
Dont create exclude list for generating the share target
2015-04-09 14:51:15 +02:00
Arthur Schiwon ca9426308d escape filter for output 2015-04-09 14:49:11 +02:00
Robin Appelman cbcee34eb0 update tests 2015-04-09 14:46:25 +02:00
Thomas Müller 1d9bd3d31e Merge pull request #15496 from owncloud/enc-check-if-key-exists-before-deleting
Check if the key exists, before trying to delete it
2015-04-09 14:45:40 +02:00
Arthur Schiwon 3abc72dad8 fix number and insert position when adding/copying a config 2015-04-09 14:44:40 +02:00
Joas Schilling 98bdfa1518 change handling in app:list 2015-04-09 14:44:30 +02:00
Joas Schilling def3b687ee Replace print_r() with pretty json 2015-04-09 14:42:44 +02:00
Arthur Schiwon 00c2970547 update back/continue buttons also on tab click 2015-04-09 14:40:00 +02:00
Morris Jobke 9246c7e8ee Merge pull request #15500 from owncloud/installation-hint
add link to installation documentation to setup page
2015-04-09 14:33:55 +02:00
Björn Schießle 5a50a678c9 Merge pull request #15507 from owncloud/remove-uneeded-file
Remove unneeded file
2015-04-09 14:32:53 +02:00
Lukas Reschke ec69f2838c Fix typos and some other adjustments 2015-04-09 14:09:09 +02:00
Arthur Schiwon b4c96e6ba0 cleanup 2015-04-09 14:01:39 +02:00
Arthur Schiwon 630e35d8cc newlines at end of file
yes, IDE is now configured accordingly.
2015-04-09 14:00:34 +02:00
Arthur Schiwon 9ed9741d81 doc 2015-04-09 13:56:20 +02:00
Arthur Schiwon 3354881355 move script and style inclusions into template 2015-04-09 13:52:35 +02:00
Robin Appelman d96e9d174b block cron when in single user mode 2015-04-09 13:50:53 +02:00
Lukas Reschke 96e7f607d5 Remove unneeded file 2015-04-09 13:29:51 +02:00
Thomas Müller 4f97cb9d1b Merge pull request #15503 from owncloud/link-standard-subscription
Help section: fix commercial support link
2015-04-09 13:15:09 +02:00
Arthur Schiwon 8e7081d784 run functionality checks also when host field changes 2015-04-09 12:36:53 +02:00
Vincent Petry 08a9d1d2dc Remove unused $toRemove 2015-04-09 12:34:19 +02:00
Jan-Christoph Borchardt 95890804f1 help section: code style and wording fixes 2015-04-09 12:33:18 +02:00
Joas Schilling 6f51beac23 Correctly generate the doc link via go.php 2015-04-09 12:30:18 +02:00
Jan-Christoph Borchardt 83a0d1b3ba link to proper subsite for Commercial support 2015-04-09 12:29:44 +02:00
Joas Schilling 4a01d5c588 Fix config usage 2015-04-09 12:19:42 +02:00
Jan-Christoph Borchardt c840c18252 Merge pull request #15499 from owncloud/admin-hints
add admin documentation hints to Federated Cloud Sharing and cron
2015-04-09 12:12:53 +02:00
Jan-Christoph Borchardt 7f237223e5 fix remote share info icon for IE8 2015-04-09 12:11:42 +02:00
Lukas Reschke dbbb2546e0 Merge pull request #15497 from owncloud/enforce-type-security
Enforce string as passed type
2015-04-09 12:08:27 +02:00
Jan-Christoph Borchardt 65dc958418 add admin documentation hints to Federated Cloud Sharing and cron 2015-04-09 12:07:05 +02:00
Arthur Schiwon 40edaa5a69 adjust tests 2015-04-09 12:00:11 +02:00
Joas Schilling dd5063bd49 Add an option to get the output in plain, json or print_r syntax 2015-04-09 11:46:52 +02:00
Jan-Christoph Borchardt dd7e519cda add link to installation documentation to setup page 2015-04-09 11:39:46 +02:00
Bjoern Schiessle 332ea77865 only create a db entry for the user in case of a name conflict on group share 2015-04-09 11:16:08 +02:00
Jan-Christoph Borchardt f3efd7a51e fix position of SQLite warning 2015-04-09 11:10:41 +02:00
Jan-Christoph Borchardt 50f9ed78d3 code style fixes 2015-04-09 11:10:15 +02:00
Lukas Reschke 4ca6419475 Fix PHPDoc 2015-04-09 10:54:53 +02:00
Lukas Reschke 3aad47c0f0 Fix code style 2015-04-09 10:46:46 +02:00
Lukas Reschke d869f8212b Enforce string as passed type 2015-04-09 10:45:50 +02:00
Joas Schilling 45575d0135 Check if the key exists, before trying to delete it 2015-04-09 10:28:02 +02:00
Vincent Petry 461302244e Keep shares when deleting shared folders
The share entries will be linked with the fileid while they are kept in
the trashbin.

In the future a background just will scrape orphaned shares and delete
them.
2015-04-09 10:16:40 +02:00
Jan-Christoph Borchardt 000b09ee7a add more present info about remote shares, fix layout of inputs 2015-04-09 10:16:29 +02:00
Lukas Reschke ba52f6f8fc Merge pull request #15314 from owncloud/app-categories-15274
Add different trust levels to AppStore interface
2015-04-09 10:07:32 +02:00
Arthur Schiwon 5355c285fc LDAP Wizard Overhaul
wizard refactor

reimplement save spinners and cursor

implement Port detector

introduced detector queue, added base dn detector

disable input fields when detectors are running

introduce spinners for fields that are being updated by detector

cache jq element objects

consolidate processing of detector results in generic / abstract base class

display notification if a detector discovered a problem

don't run base dn detector if a base is configured

reset detector queue on configuration switch

implement functionality check and update of status indicator

document ConfigModel

jsdoc for controller and main view

more documentation

implement the user filter tab view

so far the multiselects get initialized (not filled yet) and the mode can be switched.

mode is also restored.

reintroduce filter switch confirmation in admin XP mode

new detector for user object classes. so we also load user object classes if necessary and are able to save and show the setting.

multiselect trigger save actions now on close only

show spinners automatically, when a detector is running

20k limit for object classes preselection test

adjust wordings, fix grammar

add group (for users tab) detector

also includes wording fixes

error presentation moved from detectors to view, where it belongs

add info label to users page

missing wording changes

show effective LDAP filter in Assisted Mode

add user filter detector

implement count button for users and limit all count actions to 1001 for performance reasons

make port field a bit bigger. not perfect though.

do not detect port automatically

implement login filter tab view

only load features in assisted mode and don't enable assisted fields while in raw mode

add tooltips on login filter checkbox options for better understanding

permanently show filter on login tab

and also compile login filter in assisted mode

test/verify button on login attributes tab, with backend changes.

only run wizard requests if your an active tab. also run compile filter requests when switching to assisted mode

underline toggle filter links to stress that they are clickable

unity user and group tab functionality in common abstract class, add group filter tab view. only detectors and template adjustments left to have group tab implementation complete

add object class and group detector for groups as well as filter composer

show ldap filter permanently on groups tab

introduce input element that can deal better with many groups, will be used with > 40

fix disabling complex group chooser while detection is running

hide complex group chooser on config switch

fix few more issues with complex chooser

make complex group chooser available on Users tab as well

detect base dn improvements/changes:

- do not look for Base DN automatically, offer a button instead
- fix for alternative way to detect a base dn (if agent dn is not given)
- do not trigger filter composers on config switch

Changes with configuration chooser controls

- "New" was removed out of the configuration list
- and split into buttons "add" and "copy"
- delete button is also now an icon

add test button for Base DN

reimplement advanced tab. The save button is gone.

reimplement expert tab

remove unused methods

implement mail attribute detector

implement user display name attribute detection

implement member group association detector

replace text input with textarea for raw filter input

finish functionality check

auto-enable good configurations, as it was before

cleanup

move save confirmation handling to base class, reduces code duplication

enable tabs only if no running save processes are left.

move onConfigLoaded to base class, avoids code duplication

simplify, save LOCs

Test Configuration button to be dealt with in main view as it is a cross-tab element

require detectorQueue in constructor

cleanup

put bootstrap into a function and thus make it testable

get rid of old stuff
2015-04-09 09:47:49 +02:00
Morris Jobke 56f1ffe820 Merge pull request #14676 from owncloud/deleteorphanedshares
Delete orphaned shares in a background job
2015-04-09 00:18:53 +02:00
Morris Jobke 9c76d068c3 Merge pull request #15196 from owncloud/limit-file-activities-to-favorites
Limit file activities to favorites
2015-04-09 00:18:31 +02:00
Morris Jobke 84ae9532c8 Merge pull request #15448 from owncloud/occ-check-server-env-master
Adding check command to validate server environment
2015-04-09 00:07:08 +02:00
Thomas Müller 4f0769fc07 Merge pull request #15483 from owncloud/maintenance-refresh
Fix maintenance refresh interval
2015-04-08 22:46:35 +02:00
Lukas Reschke 98698e05e8 Add JS unit test for sorting 2015-04-08 22:08:37 +02:00
Morris Jobke f3ef17a963 Merge pull request #15490 from owncloud/remove-debug-logging
remove unessesary logging of methods instantiation
2015-04-08 21:42:47 +02:00
Lukas Reschke eb1cf58d11 Reference $(this) instead 2015-04-08 21:26:12 +02:00
Lukas Reschke 0cd29e00d1 Fix wording 2015-04-08 21:24:03 +02:00
Morris Jobke 4e60b81264 Merge pull request #14120 from owncloud/dav-statcache
Stat cache for DAV storage, improves s2s performance a little bit
2015-04-08 21:09:28 +02:00
Morris Jobke 62936aa323 Merge pull request #15488 from owncloud/files-navigation-icons
add icons to Files sidebar
2015-04-08 21:06:03 +02:00
Morris Jobke 91a90e25ae fix for IE8 2015-04-08 21:05:31 +02:00
Clark Tomlinson 3ffb2d8abd remove unessesary logging of methods instantiation 2015-04-08 14:46:01 -04:00
Jan-Christoph Borchardt 84c2fe85b7 add icons to files sidebar, fix shade, fix position of settings icon and text 2015-04-08 19:25:28 +02:00
Vincent Petry 053c15d1a7 Merge pull request #15481 from owncloud/enc_no_error_if_enc_is_disabled
don't throw exception if a file gets uploaded and encryption is disabled
2015-04-08 18:50:40 +02:00
Morris Jobke 78ec7543d5 Fix maintenance refresh interval
* fix XMLHttpRequest - send after callback is registered
* check for correct type of value - it's a boolean
* return correct content-type in status.php
2015-04-08 18:02:00 +02:00
Bjoern Schiessle c379557e1d don't throw exception if a file gets uploaded and encryption is disabled 2015-04-08 16:41:20 +02:00
Clark Tomlinson fc2711e156 Merge pull request #15472 from owncloud/enc_backward_compatibility
make private key handling backward compatible
2015-04-08 09:38:27 -04:00
Morris Jobke 103d451459 Merge pull request #14987 from rullzer/ocs_password_fix2
OCS Fixes to allow setting of password without removing additional settings
2015-04-08 14:44:17 +02:00
Lukas Reschke d01a2acbcf Merge pull request #15469 from owncloud/fix/15463
Fix language level incompatibilties
2015-04-08 14:30:56 +02:00
Bjoern Schiessle 4ce5669419 read cipher from key header and always write a key header if a new private key is stored 2015-04-08 14:26:00 +02:00
Vincent Petry 69ba67ec0f Merge pull request #15464 from owncloud/fixmasterunittests
Replace originalStorage in tests with a proper teardown
2015-04-08 14:24:42 +02:00
Robin Appelman 6a59502759 Work directly on the storage when uploading over webdav 2015-04-08 14:04:58 +02:00
Lukas Reschke c3c50fb481 Fix language level incompatibilties
Arbitrary expressions in empty are allowed in PHP 5.5 ands upwards. Seems to only affect master.

Fixed https://github.com/owncloud/core/issues/15463
2015-04-08 13:55:10 +02:00
Vincent Petry c12dd2820c Merge pull request #15465 from owncloud/issue/15456-disable-ocs-maintenance
Disable OCS api when in maintenance mode
2015-04-08 13:29:49 +02:00
Vincent Petry 4acf6747d2 Disable trashbin when testing orphaned shares deletion job 2015-04-08 13:04:06 +02:00
Thomas Müller 19834211b4 Merge pull request #15443 from owncloud/encryption-user-hook-tests
adding test for user hooks
2015-04-08 12:56:18 +02:00
Joas Schilling f7dd16f1ac Disable OCS api when in maintenance mode 2015-04-08 12:51:20 +02:00
Vincent Petry f8cfc03f36 Replace originalStorage in tests with a proper teardown
The purpose of $originalStorage in unit tests was to remount the old
root.
However that storage itself is already wrapped by storage wrapper, so
remounting it would rewrap the storage several times.

This fix makes use of "loginAsUser()" and "logout()" from the TestCase
class to properly initialize and cleanup the FS as expected.
2015-04-08 12:45:38 +02:00
Morris Jobke 59322a5037 Merge pull request #15333 from owncloud/copy-cross-device
fix copying folder across devices
2015-04-08 12:35:15 +02:00
Vincent Petry 9c3893ce69 Added FIXME about registering jobs in apps.php 2015-04-08 12:09:42 +02:00
James Anslow d53aa4a816 Fixing issue #15322 - showing Settings button next to gear icon 2015-04-08 11:57:33 +02:00
Morris Jobke dfc0a26e57 Merge pull request #15453 from owncloud/enc2_fix
fix function call
2015-04-08 11:10:00 +02:00
Vincent Petry 17b141337a Delete orphaned shares in a background job 2015-04-08 10:47:55 +02:00
Morris Jobke cefdcea021 [command] delete orphaned file cache entries
* ./occ files:cleanup
* delete file cache entries without an existing storage
2015-04-08 10:23:56 +02:00
Bjoern Schiessle 215a9bcbc3 fix function call 2015-04-08 09:32:55 +02:00
Thomas Müller f099c9883e Adding check command to validate server environment - fixes #15429 2015-04-08 00:19:23 +02:00
Morris Jobke 6c327f8331 Merge pull request #14879 from oparoz/fix-preview-caching
Introducing the maximum size preview
2015-04-07 18:16:24 +02:00
Clark Tomlinson 4098f5f7fd adding test for user hooks 2015-04-07 11:49:50 -04:00
Morris Jobke d28d7c470f Merge pull request #15441 from owncloud/fix-file-headers-master
fixing license headers - encryption code related
2015-04-07 17:15:17 +02:00
Thomas Müller a4483243ac fixing license headers - encryption code related 2015-04-07 17:02:49 +02:00
Thomas Müller 1fbf5d86df Merge pull request #14472 from owncloud/feature/wipencryptionapp
encryption 2.0 app
2015-04-07 16:46:45 +02:00
Olivier Paroz 74bf9806b0 Introducing the maximum size preview
The first time we're asked to generate a preview we'll generate one of the maximum dimension indicated in the configuration and all future resizing requests will be done on that preview in order to not waste time converting the same file over and over.

One of the fixes required for #12465
2015-04-07 16:45:59 +02:00
Thomas Müller 2d2cb09715 fixing unit test - expected value change due to different size being stored in cache table 2015-04-07 14:30:01 +02:00
Morris Jobke 2182ae0d27 Merge pull request #15431 from owncloud/displayname-width
widen displayName input field
2015-04-07 14:24:01 +02:00
Thomas Müller 161d80da5b In case of encryption exceptions we return 503 - this will allow the client to retry 2015-04-07 14:17:42 +02:00
Lukas Reschke dd7c491bff Fix PHPDoc 2015-04-07 13:49:16 +02:00
Lukas Reschke a2182cde90 Deduplicate code 2015-04-07 13:48:33 +02:00
Morris Jobke 6cc3fd9270 Merge pull request #15426 from owncloud/issue/15420-remove-hardcoded-docs-link
Remove hardcoded link to performance docs
2015-04-07 13:47:35 +02:00
Thomas Müller 54a3bdf1c5 fixing unit test execution related to trashbin 2015-04-07 13:30:31 +02:00
Thomas Müller 268d346b36 fixing unit tests 2015-04-07 13:30:31 +02:00
Thomas Müller 4a70ca665c respect mount option while encrypting 2015-04-07 13:30:31 +02:00
Clark Tomlinson d637bffac6 adding user setup test and adding 4 tests to keymanager 2015-04-07 13:30:31 +02:00
Clark Tomlinson 28c8017928 adding recoverFileTest 2015-04-07 13:30:31 +02:00
Clark Tomlinson c7c3caedf5 adding recovery tests 2015-04-07 13:30:31 +02:00
Thomas Müller fce42a3161 fixing unit test execution - test dummy module was behaving wrong 2015-04-07 13:30:31 +02:00
Thomas Müller 870c53ee37 fixing unit test execution 2015-04-07 13:30:31 +02:00
Thomas Müller 111fbabfb4 PHPDoc cleanup - clean code \o/ 2015-04-07 13:30:31 +02:00
Bjoern Schiessle b9e4e61759 userRecovery() was replaced by setRecoveryForUser() 2015-04-07 13:30:31 +02:00
Thomas Müller 69e95531f8 comment change as it broke unit tests 2015-04-07 13:30:31 +02:00
Thomas Müller ba9a797eaa Encryption storage wrapper is enabled by default - necessary to detect encrypted files even if encryption was disabled after files have been encrypted - prevents data corruption 2015-04-07 13:30:31 +02:00
Bjoern Schiessle 9a7fbbbc5a fix versions tests 2015-04-07 13:30:31 +02:00
Bjoern Schiessle 3d7404fe68 add unit tests to the keystorage 2015-04-07 13:30:31 +02:00
Bjoern Schiessle fe74a0cb4f implement webdav copy 2015-04-07 13:30:31 +02:00
Thomas Müller 8991272269 Using stream_get_contents in file_get_contents implementation + close handle 2015-04-07 13:30:31 +02:00
jknockaert ff16e3dbff Adjusting count on read 2015-04-07 13:30:31 +02:00
Thomas Müller 3e3226da4c Properly set size and unencrypted size in the stream unit tests 2015-04-07 13:30:31 +02:00
Bjoern Schiessle a7e7151364 remove unused code 2015-04-07 13:30:31 +02:00
Bjoern Schiessle e8fa3a2370 fix versions download and previews 2015-04-07 13:30:31 +02:00
Thomas Müller b3c5ef3afe Adding unit test for read and write of big file 2015-04-07 13:30:31 +02:00
jknockaert 02404a6a8c Fixing encryption stream wrapper seek - thanks @jknockaert 2015-04-07 13:30:30 +02:00
Thomas Müller 104d11ec4c Fixing encryption storage wrapper tests 2015-04-07 13:30:30 +02:00
Thomas Müller d9c41b00ab Introducing trait LocalTempFileTrait 2015-04-07 13:30:30 +02:00
Bjoern Schiessle d3e887a7cf reset init status before login 2015-04-07 13:30:30 +02:00
Thomas Müller 8cf9b423d5 cleanup 2015-04-07 13:30:30 +02:00
Thomas Müller e8e5bd61ae fixing unit tests for encryption stream wrapper seek 2015-04-07 13:30:30 +02:00
Bjoern Schiessle fac7ec3fc4 fix re-shares with encryption 2015-04-07 13:30:30 +02:00
Bjoern Schiessle 60d8a39f03 store init status per user 2015-04-07 13:30:30 +02:00
Bjoern Schiessle 8b1a12a224 use loginHelper from base class 2015-04-07 13:30:30 +02:00
Thomas Müller 8ffa6db110 fixing unit tests for stream wrapper 2015-04-07 13:30:30 +02:00
Bjoern Schiessle 391fab35f0 reset storage for each unit test 2015-04-07 13:30:30 +02:00
Thomas Müller 4c899238e9 fixing unit test execution 2015-04-07 13:30:30 +02:00
Clark Tomlinson e507dc11a0 adding util test and reducing keymanager instances to one in test 2015-04-07 13:30:30 +02:00
Bjoern Schiessle 2511c32e61 add more descriptive message to the exception, will be displayed to the user 2015-04-07 13:30:30 +02:00
Bjoern Schiessle ee53ba5ed6 remove encryption specific code from files app 2015-04-07 13:30:30 +02:00
Thomas Müller 9d8c07850d fixing unencrypted file size 2015-04-07 13:30:30 +02:00
Bjoern Schiessle a74ee67476 don't wrap share storages 2015-04-07 13:30:30 +02:00
Bjoern Schiessle 5ea94b7c45 add priority to trashbin storage wrapper so that he is always on top 2015-04-07 13:30:30 +02:00
Thomas Müller 664b2bb7af cleaning up exception mess 2015-04-07 13:30:30 +02:00
Thomas Müller c9d6ed3d7d in case the file exists we require the explicit module as specified in the file header - otherwise we need to fail hard to prevent data loss on client side 2015-04-07 13:30:30 +02:00
Bjoern Schiessle de4ec21c39 work arround to make sure that shares are initialized only once 2015-04-07 13:30:30 +02:00
Thomas Müller feb9a6e216 Set human readable module ids 2015-04-07 13:30:30 +02:00
Thomas Müller 43c0af2580 Fix shouldEncrypt and don't throw exception id fileKey not present - can happen 2015-04-07 13:30:30 +02:00
Bjoern Schiessle a057108c0c make recovery key work 2015-04-07 13:30:30 +02:00
Bjoern Schiessle 51302d5812 getUidAndFilename() always get uid from path 2015-04-07 13:30:30 +02:00
Thomas Müller cac83642f2 Finally fixing encryption with public share 2015-04-07 13:30:30 +02:00
Thomas Müller d203296e35 only encrypt files and files_versions 2015-04-07 13:30:30 +02:00
Thomas Müller 035646c0f6 fix exception handling 2015-04-07 13:30:30 +02:00
Thomas Müller a57918fb10 Hook: fixing error message in exception case 2015-04-07 13:30:30 +02:00
Thomas Müller 137c135664 file_put_contents has to return the number of written bytes 2015-04-07 13:30:30 +02:00
Thomas Müller f20844ac89 PHPDoc 2015-04-07 13:30:30 +02:00
Bjoern Schiessle 83cb382b3f pass file helper to encryption wrapper 2015-04-07 13:30:29 +02:00
Bjoern Schiessle d90663704c fix hook registration 2015-04-07 13:30:29 +02:00
Clark Tomlinson 505e0eaf61 remove useless setup base class 2015-04-07 13:30:29 +02:00
Clark Tomlinson 1fb29ec546 adding hook manager test 2015-04-07 13:30:29 +02:00
Bjoern Schiessle c9ca068427 keyManagerTest: remove code which is no longer needed 2015-04-07 13:30:29 +02:00
Bjoern Schiessle 4efbcb0280 cleanup keymanager test and add some additional tests 2015-04-07 13:30:29 +02:00
Bjoern Schiessle dac94679c6 delete recovery keys on disable 2015-04-07 13:30:29 +02:00
Clark Tomlinson ea6b53042d fixing test helper and undoing fubar in class... 2015-04-07 13:30:29 +02:00
Clark Tomlinson 48e3864c77 💯% coverage for session class 2015-04-07 13:30:29 +02:00
Bjoern Schiessle 1358d07d35 let user enable recovery key 2015-04-07 13:30:29 +02:00
Bjoern Schiessle e4895bda01 add helper class accessible for encryption modules to ask for a list of users with access to a file, needed to apply the recovery key to all files 2015-04-07 13:30:29 +02:00
Thomas Müller bd933b1c85 Adding app icon and fixing admin setting 2015-04-07 13:30:29 +02:00
Bjoern Schiessle 6bd83c0422 register settings and hooks only once 2015-04-07 13:30:29 +02:00
Bjoern Schiessle 4b4aeaa5b2 fix set recovery key and implement change password 2015-04-07 13:30:29 +02:00
Thomas Müller a98b7dbf6f Fix double registration of encryption module 2015-04-07 13:30:29 +02:00
Thomas Müller 35b97ed672 Adding renameKeys to IStorage 2015-04-07 13:30:29 +02:00
Thomas Müller 4db75e3407 Setting up the encryption wrapper in a setup hook - temporarily fixes the wrapping order 2015-04-07 13:30:29 +02:00
Thomas Müller 3458b5ab4c Remove old encryption left overs from trashbin 2015-04-07 13:30:29 +02:00
Thomas Müller f5638d9163 Fix settings 2015-04-07 13:30:29 +02:00
Thomas Müller bf809ac85a Removing left overs from old encryption app 2015-04-07 13:30:29 +02:00
Thomas Müller 6ccd3ffa23 adding function getSecureRandom(); to IServerContainer 2015-04-07 13:30:29 +02:00
Bjoern Schiessle 4843e5ce30 use password change logic to userhooks to avoid recursions 2015-04-07 13:30:28 +02:00
Bjoern Schiessle 0f28d538a0 add session class to handle all session operations 2015-04-07 13:30:28 +02:00
Thomas Müller e0ab2c34ea update unit tests after ctor signature change of \OC\Encryption\Util 2015-04-07 13:30:28 +02:00
Clark Tomlinson e6dc6944c2 moving methods to their final places
and updating test some.
2015-04-07 13:30:28 +02:00
Thomas Müller 1b42b492dc kill OC_FileProxy 💥 2015-04-07 13:30:28 +02:00
Thomas Müller dbdd754c3f Further cleanup of files_encryption 2015-04-07 13:30:28 +02:00
Thomas Müller 00338f9dca Removing files_encryption left overs 2015-04-07 13:30:28 +02:00
Thomas Müller 99255ff3a9 Fix - public sharing: in case on user is available - get it from the path 2015-04-07 13:30:28 +02:00
Bjoern Schiessle e7a68d1c21 remove old encryption app 2015-04-07 13:30:28 +02:00
Bjoern Schiessle 0eee3a2618 remove unencrypted_size from the cache, size will contain the unencrypted size 2015-04-07 13:30:28 +02:00
Thomas Müller d185761d31 initializing some variables + update size after writing the headers 2015-04-07 13:30:28 +02:00
Thomas Müller 4441835d18 https://github.com/owncloud/core/pull/15305#discussion_r27382305
Conflicts:
	lib/private/files/stream/encryption.php
2015-04-07 13:30:28 +02:00
Thomas Müller 90487384f7 initializing some variables 2015-04-07 13:30:28 +02:00
Bjoern Schiessle 0c48b069ba call end() before closing the file 2015-04-07 13:30:28 +02:00
Thomas Müller 498625ea3a adding unit tests for stream wrapper 2015-04-07 13:30:28 +02:00
Thomas Müller a905f641b3 various fixes & start to unit test the encryption storage wrapper 2015-04-07 13:30:28 +02:00
jknockaert 3e6eb28ee3 Applying diff as of https://github.com/owncloud/core/pull/15303 2015-04-07 13:30:28 +02:00
Bjoern Schiessle a85e2e0bfd make recovery settings work 2015-04-07 13:30:28 +02:00
Thomas Müller 4aa125cc0a fix unit test execution 2015-04-07 13:30:28 +02:00
Bjoern Schiessle 2331298380 fix parameter declaration and class initialisation 2015-04-07 13:30:28 +02:00
Bjoern Schiessle 937efe856d fix lib/private/encryption/util.php call 2015-04-07 13:30:28 +02:00
Thomas Müller 48fc3f3afe fix unit test execution, variable naming and kill no longer used $cacheFactory 2015-04-07 13:30:28 +02:00
Bjoern Schiessle c266b3b5b7 remove debug code from core 2015-04-07 13:30:28 +02:00
Bjoern Schiessle c64e0af4fb check if recovery key exists and encrypt the file with the recovery key if needed 2015-04-07 13:30:28 +02:00
Bjoern Schiessle 24c6604388 add public link share key to file if it was shared as public link 2015-04-07 13:30:28 +02:00
Bjoern Schiessle bd99042a66 add setting templates 2015-04-07 13:30:28 +02:00
Bjoern Schiessle 37e8268447 make sharing and unsharing work 2015-04-07 13:30:27 +02:00
Thomas Müller 8dde932546 Comment duplicate test methods 2015-04-07 13:30:27 +02:00
Clark Tomlinson d15c2e52b0 cleanup and removing cachefactory 2015-04-07 13:30:27 +02:00
Bjoern Schiessle 2e00acda07 read encrypted files 2015-04-07 13:30:27 +02:00
Bjoern Schiessle 2244ea998d core: documentation fixes 2015-04-07 13:30:27 +02:00
Bjoern Schiessle 6c9251d9f8 make sure that all file keys are written to the key storage 2015-04-07 13:30:27 +02:00
Bjoern Schiessle cb9980823d core: small fixes 2015-04-07 13:30:27 +02:00
Bjoern Schiessle 198b73fe32 write encrypted file to disc 2015-04-07 13:30:27 +02:00
Thomas Müller 7ffd77fac9 enable encryption unit test execution 2015-04-07 13:30:27 +02:00
Bjoern Schiessle c00e728e5f encryption app: remove legacy code, we do only server-side encryption 2015-04-07 13:30:27 +02:00
Thomas Müller ecb3834554 fixing obvious bugs while testing 2015-04-07 13:30:27 +02:00
Bjoern Schiessle 810ca9105c implement rename and delete of encryption keys 2015-04-07 13:30:27 +02:00
Clark Tomlinson 0c2f9ca849 Updating keystorage movement and fixing hooks 2015-04-07 13:30:27 +02:00
Bjoern Schiessle 506222567e add deleteKey methods to key storage 2015-04-07 13:30:27 +02:00
Bjoern Schiessle e2f714263f fix encryption manager to handle more than one encryption module 2015-04-07 13:30:27 +02:00
Bjoern Schiessle 5bc9ababeb fix keystorage and add unit tests 2015-04-07 13:30:27 +02:00
Clark Tomlinson 39733c8da1 Initial commit 2015-04-07 13:30:27 +02:00
Bjoern Schiessle 63e7fe608a create basic interfaces and wrapper to make encryption more modular 2015-04-07 13:30:27 +02:00
Morris Jobke 9694dabd5e Merge pull request #15432 from owncloud/revert-15345-fix_15263
Revert "[WIP] Only show SSL table header if there are certificates"
2015-04-07 13:30:14 +02:00
Morris Jobke 4334cdc973 Revert "[WIP] Only show SSL table header if there are certificates" 2015-04-07 13:30:08 +02:00
Jan-Christoph Borchardt 44a8160b58 widen displayName input field 2015-04-07 13:28:26 +02:00
Jan-Christoph Borchardt 2b6e13d088 Merge pull request #15345 from rullzer/fix_15263
[WIP] Only show SSL table header if there are certificates
2015-04-07 13:19:36 +02:00
Jan-Christoph Borchardt 8e1a51731a apps mgmt: style experimental apps section, small design fixes 2015-04-07 12:27:39 +02:00
Joas Schilling 81ec1c8a1a Remove hardcoded link to performance docs 2015-04-07 12:25:30 +02:00
Jan-Christoph Borchardt 6250365bf4 app mgmt app level design enhancements 2015-04-07 11:55:10 +02:00
Thomas Müller 1f8e6e78cc Merge pull request #15424 from owncloud/failing-master-tests
Fix failing tests related to timezones on master
2015-04-07 11:13:05 +02:00
Joas Schilling 0fcd273714 Select the timezone on the right timestamp and assert it 2015-04-07 10:13:51 +02:00
Joas Schilling 3bde7c2f67 When guessing the timezone, the offset might only be valid on a given timestamp 2015-04-07 10:13:06 +02:00
Joas Schilling e16d61e293 Remove server timezone dependency from files list test 2015-04-07 10:12:15 +02:00
Jenkins for ownCloud 95e55aa4ad [tx-robot] updated from transifex 2015-04-07 01:54:47 -04:00
Jenkins for ownCloud 2bff92ade5 [tx-robot] updated from transifex 2015-04-05 01:54:51 -04:00
Thomas Müller 8062b906b9 Merge pull request #15403 from Crote/occ-user-add-return
Fix occ user:add failure return codes
2015-04-04 16:34:40 +02:00
Laurens Post d9323ca1be Add password input from env variable for occ user:{add, resetpassword}
This commit adds the --password-from-env switch to the `occ user:add` and
`occ user:resetpassword` commands. When this parameter is given, Owncloud
will use the password specified in environment variable OC_PASS. This
is safer than using command line parameters, as those can be read by any
process.
2015-04-04 13:24:57 +02:00
Thomas Müller 4996706078 Merge pull request #15338 from owncloud/encryption-mount-option
Add mount point to disable the encryption wrapper
2015-04-04 12:51:41 +02:00
Laurens Post 6ce790ebbc Fix occ user:add failure return codes 2015-04-04 12:25:34 +02:00
Jenkins for ownCloud 9b250baf9e [tx-robot] updated from transifex 2015-04-04 01:54:43 -04:00
Volker E 7b8c55651f fixing #15397 2015-04-04 02:11:31 +02:00
Volker E b6efee8079 fixing #15396 accessibility of table#userlist 2015-04-04 02:07:05 +02:00
Robin McCorkell fbb84a518f Fix UrlGenerator::imagePath() for app paths 2015-04-03 23:42:18 +01:00
Thomas Müller 3bf269e565 Merge pull request #15229 from owncloud/response-setContentLengthHeader
Add OC_Response::setContentLengthHeader() for Apache PHP SAPI workaround...
2015-04-03 22:51:36 +02:00
Thomas Müller b2b3e1ac94 Merge pull request #15391 from owncloud/fix-language-caching
fix caching of preferred language
2015-04-03 22:51:13 +02:00
Thomas Müller 3d2116dfe7 Merge pull request #15386 from oparoz/yaml-cnf-mediatype
Introducing media types for yml, yaml, cnf, conf
2015-04-03 22:49:41 +02:00
Robin Appelman 712e478cb2 fix caching of preferred language 2015-04-03 15:36:24 +02:00
Lukas Reschke 25531bad88 Make user names clickable 2015-04-03 13:36:03 +02:00
Lukas Reschke 0816cf9142 Add experimental applications switch
Allows administrators to disable or enabled experimental applications as well as show the trust level.
2015-04-03 13:21:24 +02:00
Morris Jobke a2087f30d1 Merge pull request #15383 from owncloud/fix-exception-message
Update exception messages to better reflect and describe the problem
2015-04-03 10:15:23 +02:00
Jenkins for ownCloud 23f1702f24 [tx-robot] updated from transifex 2015-04-03 01:54:53 -04:00
Olivier Paroz 70ec74e88b Introducing media types for yml, yaml, cnf, conf 2015-04-02 21:37:57 +02:00
Lukas Reschke fa079a5959 Merge pull request #12314 from oparoz/patch-3
Make findBinaryPath compatible with open_basedir
2015-04-02 18:54:03 +02:00
Joas Schilling a8d1ede347 Fix the exception messages 2015-04-02 18:40:06 +02:00
Robin Appelman 519d568847 add unit test 2015-04-02 18:31:26 +02:00
Robin Appelman 10b85871cc adjust unt tests 2015-04-02 18:17:28 +02:00
Thomas Müller 9f58097e4d Merge pull request #14113 from owncloud/chunking-chunkpartfiles
Added part files for when writing chunks
2015-04-02 18:15:27 +02:00
Thomas Müller 4a215cad3c Merge pull request #15372 from Volker-E/master
fixing #15344
2015-04-02 18:01:09 +02:00
Thomas Müller 4082436419 Merge pull request #15367 from owncloud/pre-setup-hook
setup storage wrappers before setting up the filesystem
2015-04-02 17:40:23 +02:00
Morris Jobke 914fe89003 Merge pull request #15380 from owncloud/issue/15149-fix-initial-list
Fix the initial list of groups
2015-04-02 16:29:53 +02:00
Joas Schilling 4e50f2b72d Fix the initial list of groups 2015-04-02 15:47:48 +02:00
Morris Jobke 1720fdf5f4 Merge pull request #15346 from oparoz/split-image-provider
Split image provider in one sub-class per media type
2015-04-02 13:40:09 +02:00
Robin Appelman f585994c4b setup mount manager before wrappers 2015-04-02 13:28:36 +02:00
Olivier Paroz 8ec6dfdbf8 Split image provider in one sub-class per media type 2015-04-02 10:31:24 +02:00
Morris Jobke 82f91c50c7 Merge pull request #15349 from oparoz/limit-bitmap-previews-2
The bitmap preview class now takes maxX and maxY into consideration
2015-04-02 10:23:55 +02:00
Thomas Müller 9e5b319ed4 Merge pull request #15362 from owncloud/issue/15359-purge-memcache-console-app-disable
Correctly purge the cache when an app is disabled via cli
2015-04-02 09:26:15 +02:00
Joas Schilling 696c750cfe Fix docs and line breaks 2015-04-02 08:28:42 +02:00
Jenkins for ownCloud cc96105ebe [tx-robot] updated from transifex 2015-04-02 01:54:47 -04:00
Roeland Douma 5ec00dfbec Merge pull request #15364 from rullzer/apps_linkToDocs
Use URLGenerator instead of OC_Helper for linkToDocs
2015-04-01 22:49:24 +02:00
Volker E f4502b4670 fixing #15344 - title has no added value here (not on screen readers not for robots) 2015-04-01 21:10:48 +02:00
Robin McCorkell 60821ee42e Merge pull request #15366 from rullzer/deprecate_util_links
Deprecate functions (OC_Helper + OCP\Util) that only call the urlgenerator anyway
2015-04-01 18:02:10 +01:00
Morris Jobke 46e43d49ac Merge pull request #15358 from owncloud/global-cmd
Allow app:check-code and l10n:createjs commands when not installed
2015-04-01 18:20:09 +02:00
Joas Schilling aa6573cf54 Adjust tests and check whether clear() is called 2015-04-01 17:19:44 +02:00
Robin Appelman 3cb53b7756 setup storage wrappers before setting up the filesystem 2015-04-01 17:12:06 +02:00
Olivier Paroz 1525ecd3dd The bitmap preview class now takes maxX and maxY into consideration
This is a fix for owncloud#13607 and is part of the global programme: owncloud#13609

The image aspect ratio is kept intact.
2015-04-01 15:54:22 +02:00
Joas Schilling d01cfde982 Correctly purge the cache when an app is disabled via cli 2015-04-01 15:43:38 +02:00
Morris Jobke 8001f2abcd Merge pull request #15353 from owncloud/run-cron-with-the-correct-user-master
Cron has to be executed with the correct user
2015-04-01 15:32:14 +02:00
Roeland Jago Douma 9e3dcd01bc Use URLGenerator instread of OC_Helper 2015-04-01 14:57:01 +02:00
Roeland Jago Douma 288da619b1 Deprecate functions that only call the urlgenerator anyway 2015-04-01 14:32:49 +02:00
Robin McCorkell cbbff87d0c Allow app:check-code and l10n:createjs commands when not installed 2015-04-01 13:18:56 +01:00
Thomas Müller 0af2dc7d37 Merge pull request #15354 from pierrejochem/patch-1
More secure proposal
2015-04-01 14:08:03 +02:00
Roeland Douma 8ff94f0d15 Merge pull request #15356 from rullzer/apps_oc_to_ocs
Move core apps from private to public functions (trivial part)
2015-04-01 13:24:54 +02:00
Joas Schilling 730efe25a4 Make scrutinizer happy 2015-04-01 12:13:49 +02:00
Roeland Jago Douma 2b81d0f237 Move core apps from private to public functions
Apps still use OC_Helper and OC_Util functions even when public ones are
already available. Sometimes the public one is even used in the same
file.
2015-04-01 12:06:04 +02:00
Pierre Jochem a1828ff034 More secure proposal 2015-04-01 11:28:53 +02:00
Morris Jobke 297e29248d Merge pull request #15336 from owncloud/revive-15215
Properly quote file names in listFiles query for GDrive
2015-04-01 10:35:39 +02:00
Thomas Müller 5ebd3a9e89 Cron has to be executed with the correct user - fixes 13912 and others 2015-04-01 10:31:48 +02:00
Lukas Reschke c89cf92747 Merge pull request #15351 from owncloud/add-title-to-app-entries
add title to entries in app menu
2015-04-01 10:16:28 +02:00
Morris Jobke 1a06f8df57 add title to entries in app menu 2015-04-01 09:10:19 +02:00
Morris Jobke c5d8d91345 Merge pull request #15331 from owncloud/fix-password
Fix JS reference error for personal password changing
2015-04-01 09:04:37 +02:00
Jenkins for ownCloud f5c7ba6b81 [tx-robot] updated from transifex 2015-04-01 01:55:33 -04:00
Olivier Paroz 0f01de9f7e Use getenv to get the paths for find 2015-03-31 23:49:21 +02:00
Olivier Paroz 7c41c0c13f use ExecutableFinder and find in findBinaryPath
When using open_basedir, commands such as `which`or `command`can fail
because they might try to look outside of the restricted perimeter.
Symfony's ExecutableFinder can be used instead to look in standard
locations and we can use `find` as a last resort

A better solution would be to adopt a mechanism similar to what has
been done for office documents where a configuration parameter is used
to indicate the path where the executable is to be found.
2015-03-31 23:49:16 +02:00
Joas Schilling efcc2e87ab Adjust by/self filter aswell and fix tests 2015-03-31 17:35:04 +02:00
Joas Schilling 116b257b4d DeMorgan applied the wrong transformation 2015-03-31 17:07:44 +02:00
Robin Appelman bac9b54bef Add mount point to disable the encryption wrapper 2015-03-31 16:25:33 +02:00
Lukas Reschke c052ee7584 Only escape single quotes 2015-03-31 15:30:49 +02:00
Vincent Petry 7036309e22 Added rawurlencode for other params in GDrive storage 2015-03-31 15:14:08 +02:00
Vincent Petry 5c9998179f Properly quote file names in listFiles query for GDrive 2015-03-31 15:14:03 +02:00
Lukas Reschke 691c353eed Merge pull request #15335 from owncloud/revert-15215-ext-gdrivelistfilequoting
Revert "Properly quote file names in listFiles query for GDrive"
2015-03-31 15:12:53 +02:00
Lukas Reschke 53f67fc65d Revert "Properly quote file names in listFiles query for GDrive" 2015-03-31 15:12:35 +02:00
Frank Karlitschek b216b3fad0 Merge pull request #15215 from owncloud/ext-gdrivelistfilequoting
Properly quote file names in listFiles query for GDrive
2015-03-31 09:08:59 -04:00
Robin Appelman 068c624b0d fix copying folder across devices 2015-03-31 13:50:11 +02:00
Robin McCorkell 68b4ce568e Fix JS reference error for personal password changing 2015-03-31 12:41:10 +01:00
Roeland Jago Douma d61f688126 Only show SSL table header if there are certificates 2015-03-31 13:00:24 +02:00
Jenkins for ownCloud 1d06d93d27 [tx-robot] updated from transifex 2015-03-31 01:55:55 -04:00
Roeland Jago Douma 3b1f0e6019 Fix unit test 2015-03-30 21:18:24 +02:00
Roeland Jago Douma 0bf06d6691 No injections 2015-03-30 20:07:12 +02:00
Joas Schilling 9233d32834 Move tag related code into a helper so we can test the query without a view 2015-03-30 17:21:06 +02:00
Lukas Reschke 8e0fef74ff Merge pull request #15312 from owncloud/activity-fix-compilation
Correct the app name for sharing events
2015-03-30 17:12:54 +02:00
Morris Jobke bf17ac929d Merge pull request #15169 from rullzer/fix_displayNamesInGroup
Groupmanagers displayNamesInGroup should actually search in displaynames
2015-03-30 17:04:09 +02:00
Robin McCorkell 308a43a10e Merge pull request #15076 from owncloud/fix-smb-oc-admin
Support constructing an SMB_OC without saved session credentials
2015-03-30 15:38:22 +01:00
Lukas Reschke 5fdc1716d2 Merge pull request #15042 from wolfgangkarall/master
.htaccess RewriteRules: use permanent redirect for .well-known/(cal|card)dav, add 'L' flag
2015-03-30 16:22:36 +02:00
Joas Schilling e365ea7ec5 Use DI for the objects where possible 2015-03-30 15:23:10 +02:00
Joas Schilling dd535968e8 Add tests from getCurrentUserId() method and fix the constructor 2015-03-30 15:23:10 +02:00
Joas Schilling 17f882c3cf Add a filter for favorites and allow limiting the all-list to favorites
WARNING: do not use this, when you have a lot of favorites, ~50 should be the
limit
2015-03-30 15:23:09 +02:00
Joas Schilling b95d12700c Add logic for getting the user from the rss token to the Manager 2015-03-30 15:23:09 +02:00
Joas Schilling 4c9c73bef9 Correct the app name for sharing events 2015-03-30 15:14:31 +02:00
Roeland Jago Douma b0aa17b13f OCS Fixes to allow setting of password without removing additional settings
- Added setPassword to share.php
- Fixed OCS API call
- Added unit tests
2015-03-30 14:00:50 +02:00
Robin McCorkell 4f0abd910c Merge pull request #15269 from owncloud/migrate-checksetup-and-add-memcache
Add check for activated local memcache
2015-03-30 11:24:44 +01:00
Morris Jobke cfe241a959 Merge pull request #13964 from rullzer/capabilities
Add OCS sharing info to capabilities - take 2
2015-03-30 10:06:05 +02:00
Morris Jobke 00b2be11dd Merge pull request #15239 from owncloud/see-no-evil
Move federated cloud sharing, files externals and updater to special pos...
2015-03-30 09:05:31 +02:00
Morris Jobke 0edeefd031 Merge pull request #15295 from owncloud/add-more-spacing-dialog
Add more spacing to the file picker dialog
2015-03-30 08:07:40 +02:00
Jenkins for ownCloud da55ff630c [tx-robot] updated from transifex 2015-03-30 01:54:41 -04:00
Jenkins for ownCloud 1db9605afb [tx-robot] updated from transifex 2015-03-29 01:55:31 -04:00
Lukas Reschke 397264f361 Add more spacing to the file picker dialog
Without this the first `>` looked somewhat off, to test this change go to the personal settings and choose a profile picture in a subfolder.
2015-03-28 14:19:27 +01:00
Lukas Reschke 65202d2a18 Add check for activated local memcache
Also used the opportunity to refactor it into an AppFramework controller so that we can unit test it.

Fixes https://github.com/owncloud/core/issues/14956
2015-03-28 13:59:22 +01:00
Vincent Petry d3752ca1e9 Merge pull request #15289 from owncloud/min-upload-limit
Require minimum 1 MiB upload limit
2015-03-28 11:34:11 +01:00
Vincent Petry 3f891c2650 Merge pull request #15288 from owncloud/check-datadir-relative
Check for relative datadirectory path
2015-03-28 11:28:33 +01:00
Jenkins for ownCloud 8b9b600644 [tx-robot] updated from transifex 2015-03-28 01:55:46 -04:00
Robin McCorkell ab991458ad Require minimum 1 MiB upload limit 2015-03-27 23:43:35 +00:00
Robin McCorkell 1511a42da7 Check for relative datadirectory path 2015-03-27 23:29:46 +00:00
Morris Jobke d55b88c043 Merge pull request #15284 from owncloud/revert-master-breakage
Revert "Deprecated \OCP\IAppConfig - add missing methods to IConfig"
2015-03-27 20:01:33 +01:00
Vincent Petry a32c71d25e Revert "Deprecated \OCP\IAppConfig - add missing methods to IConfig"
This reverts commit 012016d331.
2015-03-27 18:50:11 +01:00
Morris Jobke f4dc9e6bf3 Merge pull request #15155 from owncloud/share-donotreturntrashedfiles
Do not return shares for files outside "files"
2015-03-27 17:05:14 +01:00
Thomas Müller 4d12c4a38b Merge pull request #13938 from owncloud/deprecate-iappconfig
Deprecated \OCP\IAppConfig - add missing methods to IConfig
2015-03-27 16:07:41 +01:00
Vincent Petry 23cb8112fc Add logout in share test to avoid nasty side effects 2015-03-27 15:54:29 +01:00
Thomas Müller 722e50a112 Merge pull request #15240 from owncloud/storage-wrapper-priority
add priority to storage wrappers
2015-03-27 15:18:44 +01:00
Thomas Müller 5db932d1e4 Merge pull request #15261 from owncloud/fix-14268-master
use StreamResponse to download the log file
2015-03-27 15:07:50 +01:00
Thomas Müller 98bc1ad70a Merge pull request #15265 from owncloud/enc2_fixes
core improvements for Encryption 2.0
2015-03-27 14:58:33 +01:00
Morris Jobke e918bcf212 Merge pull request #15247 from owncloud/fix_group_share_master_backport
also call generateTarget for group shares
2015-03-27 14:40:52 +01:00
Thomas Müller 0ecc1c89ad Merge pull request #15254 from owncloud/fix-14853-master
Adding a pending indicator to the files summary
2015-03-27 14:18:47 +01:00
Vincent Petry 4d57b7bb3c Merge pull request #15259 from owncloud/fix-change-password-ie8
Show label for password change in IE8
2015-03-27 14:11:14 +01:00
Vincent Petry 80f83ab5e0 Do not return shares for files outside "files" 2015-03-27 13:25:23 +01:00
Vincent Petry 7ad4dfa201 Merge pull request #15227 from owncloud/ocetag-header
Copy Etag header to OC-Etag for sabre calls
2015-03-27 13:10:27 +01:00
Morris Jobke 5aa81833f9 Merge pull request #15260 from owncloud/adjust-controls-bar-width
adjust controls bar width to not overlay scrollbar
2015-03-27 11:56:22 +01:00
Bjoern Schiessle b5fad75e57 add deleteAllFileKeys to public interface and add "uid" as parameter for the
update call
2015-03-27 11:51:53 +01:00
Bjoern Schiessle c6be1ba8d3 fix check if a file is excluded from encryption or not 2015-03-27 11:51:50 +01:00
Thomas Müller b5545932e7 use StreamResponse to download the log file - fixes #14268 2015-03-27 11:30:32 +01:00
Morris Jobke 7e73b25533 Merge pull request #15258 from owncloud/users-addtofilteredgroup
Don't append user in a filtered list if groups don't match
2015-03-27 10:02:33 +01:00
Morris Jobke a62f38a18b Merge pull request #15225 from owncloud/make-setups-for-users-that-tend-to-use-owncloud-on-not-proper-machines-a-little-bit-more-secure
Add some generic default headers as well via PHP
2015-03-27 09:54:40 +01:00
Jan-Christoph Borchardt 701cb27a9e fix scrutinizer issues 2015-03-27 09:38:41 +01:00
Joas Schilling 4608d3def7 Fix link to the updater 2015-03-27 09:38:13 +01:00
Jan-Christoph Borchardt 908538d863 fix layout for Sharing settings 2015-03-27 09:38:13 +01:00
Joas Schilling 495562f40c Move federated cloud sharing, files externals and updater to special positions 2015-03-27 09:38:09 +01:00
Jenkins for ownCloud 880b31c513 [tx-robot] updated from transifex 2015-03-27 01:56:21 -04:00
Jan-Christoph Borchardt d728b85fdd adjust controls bar width to not overlay scrollbar 2015-03-27 01:34:55 +01:00
Thomas Müller fb8994603b Merge pull request #15252 from owncloud/prevent-directory-characters-in-temporary-path
Filter potential dangerous characters in path name
2015-03-27 01:19:55 +01:00
Thomas Müller 710498402f Merge pull request #15256 from owncloud/emptycontent-messages
fine-tuning the empty content messages
2015-03-27 01:17:46 +01:00
Morris Jobke 3e8343c07c Show label for password change in IE8
* fixes #10729
2015-03-27 01:16:31 +01:00
Thomas Müller 2b0906cdff Adding a pending indicator to the files summary - fixes #14853 2015-03-27 01:16:29 +01:00
Morris Jobke f72939df91 Merge pull request #15255 from owncloud/test-namespacesforrepairtests
Fix namespace for repair step tests
2015-03-27 00:16:47 +01:00
Vincent Petry ea93356598 Don't append user in a filtered list if groups don't match 2015-03-27 00:09:35 +01:00
Thomas Müller 055c18a7b4 Merge pull request #15245 from owncloud/fix-14864-master
More elaborate command description for upgrade
2015-03-26 23:50:06 +01:00
Jan-Christoph Borchardt 6b4985f5ad adjust shade of empty content icons, fix files icon shade 2015-03-26 23:49:32 +01:00
Jan-Christoph Borchardt e09fd331eb adjust emptycontent messages for files and files_external 2015-03-26 23:22:26 +01:00
Vincent Petry cf2fd2a825 Fix namespace for repair step tests 2015-03-26 23:19:27 +01:00
Lukas Reschke 9622fbdf29 Filter potential dangerous characters in path name
We should not allow / or \ in the postfix here.
2015-03-26 23:17:18 +01:00
Vincent Petry 670ca68453 Added stat cache for DAV storage
The stat cache stored known states of files/folders to avoid requerying
the DAV server multiple times.
2015-03-26 23:15:53 +01:00
Vincent Petry 746be98e03 Merge pull request #13654 from oparoz/tmpfile-with-extension
Keep the extension in temp files
2015-03-26 23:08:08 +01:00
Morris Jobke d082e37270 Merge pull request #15244 from owncloud/use_default_share_folder
always fall back to default share folder
2015-03-26 22:39:04 +01:00
Robin McCorkell c2909355bf Merge pull request #14925 from owncloud/ext-mountoptions-ui
Mount options GUI for external storage
2015-03-26 21:36:34 +00:00
Lukas Reschke 9d1ce53cb1 Add some generic default headers as well via PHP 2015-03-26 22:32:57 +01:00
Bjoern Schiessle 223cca2a07 also call generateTarget for group share to add the correct prefix if share_folder is defined in config.php 2015-03-26 22:31:45 +01:00
Thomas Müller a4171b295d More elaborate command description for upgrade - fixes #14864 2015-03-26 22:30:35 +01:00
Jan-Christoph Borchardt fc59a37ae7 Merge pull request #14918 from owncloud/fix-password-change-ie8-and-9
Don't use placeholder for password in IE8 & 9
2015-03-26 22:06:22 +01:00
Morris Jobke e8109f0bc3 Merge pull request #13802 from owncloud/share-partfilepermissions
Fix share permission checks
2015-03-26 22:01:05 +01:00
Bjoern Schiessle a3592534ef always fall back to default share folder 2015-03-26 21:56:44 +01:00
Morris Jobke 4c00be4961 Merge pull request #14488 from owncloud/enhancement/security/inline-disposition
Serve all files with a Content-Disposition of 'attachment' via WebDAV
2015-03-26 21:45:30 +01:00
Robin Appelman cb9ead7dde add priority to storage wrappers 2015-03-26 21:26:38 +01:00
Thomas Müller 7bff0681fe Merge pull request #15001 from owncloud/kill-share-proxy
Replace share proxy with a hook
2015-03-26 21:20:05 +01:00
Thomas Müller 232518ac54 Merge pull request #15234 from owncloud/encryption2_core
core part of encryption 2.0
2015-03-26 21:14:59 +01:00
Bjoern Schiessle ff9c85ce60 implement basic encryption functionallity in core to enable multiple encryption modules 2015-03-26 20:56:51 +01:00
Lukas Reschke 8ebe667202 Remove unneeded argument 2015-03-26 20:45:39 +01:00
Jan-Christoph Borchardt 0d3bea37c3 correct remote share hint 2015-03-26 20:30:51 +01:00
Thomas Müller 0cb133003c Merge pull request #15237 from owncloud/remove-ide-autocomplete-fail
Remove IDE autocomplete fail
2015-03-26 20:21:26 +01:00
Morris Jobke d3ed020d34 Merge pull request #15214 from owncloud/no-php-timeouts-on-webdav-master
no php execution timeout for webdav
2015-03-26 20:18:01 +01:00
Lukas Reschke 74a9fc29b4 Merge pull request #14399 from owncloud/ignore-empty-plurals
Ignore empty plurals just like with singulars
2015-03-26 20:15:33 +01:00
Morris Jobke 0a589d938c fix enforced password for share in IE8 2015-03-26 20:05:41 +01:00
Morris Jobke 55e1226dfe Don't use placeholder for password in IE8 & 9
* the placeholder is in IE 8 and 9 just set as text and
  styled a bit grey. If the form is then serialized without
  typing something in the placeholder is sent as value
* this fixes that behaviour for the password field and
  properly detects empyt passwords
* fixes #14912
2015-03-26 20:03:27 +01:00
Lukas Reschke 55fd0082aa Serve all files with a Content-Disposition of 'attachment' via WebDAV
As an additional security hardening it's sensible to serve these files with a Content-Disposition of 'attachment'. Currently they are served 'inline' and get a "secure mimetype" assigned in case of potential dangerous files.

To test this change ensure that:

- [ ] Syncing with the Desktop client still works
- [ ] Syncing with the Android client still works
- [ ] Syncing with the iOS client still works

I verified that the 1.8 OS X and iOS client still work with this change.
2015-03-26 20:01:05 +01:00
Robin Appelman 1be7da4a57 replace share proxy with hook 2015-03-26 19:56:57 +01:00
Robin Appelman 173c31e42a rename proxy test 2015-03-26 19:56:31 +01:00
Lukas Reschke c8c722bc6d Merge pull request #15129 from owncloud/version-command-bus
expire versions in a background command
2015-03-26 19:55:13 +01:00
Lukas Reschke 3e57e9d3e5 Merge pull request #15232 from owncloud/remove-arg-separator-magic
Remove custom `arg_separator.output`
2015-03-26 19:41:22 +01:00
Lukas Reschke 071a339593 Remove IDE autocomplete fail
🙈 *cough* *cough*
2015-03-26 19:39:15 +01:00
Morris Jobke 70e64822b9 Merge pull request #14665 from owncloud/fileid-increment
SQLite autoincrement test
2015-03-26 19:36:18 +01:00
Vincent Petry 58b4c2c0e5 Make sure mountOptions keep their data type
str_replace for $user substitution was converting the data type of
mountOptions to string. This fix prevents this to happen by making sure
only strings are processed by substitution.

Also added a int conversion when reading the watcher policy
2015-03-26 19:24:37 +01:00
Bjoern Schiessle aab5f6b6df add remote share status to the config 2015-03-26 18:32:46 +01:00
Jan-Christoph Borchardt d32e3870d2 add hint in Share placeholder on remote share syntax 2015-03-26 18:30:55 +01:00
Thomas Müller 9c6649f4f1 Merge pull request #15228 from owncloud/add-missing-navigation-for-tips-n-tricks
Add navigation entry for tips and tricks setion
2015-03-26 18:21:44 +01:00
Jan-Christoph Borchardt b95139e5b2 Merge pull request #15230 from owncloud/sqlite-notice
move SQLite notice from warnings to tips & tricks
2015-03-26 18:15:22 +01:00
Jan-Christoph Borchardt e3d60ee5b0 Merge pull request #14958 from owncloud/dropdown-style
popover style for apps and user dropdown menus
2015-03-26 18:07:35 +01:00
Robin Appelman 6447962f2a teardown after we're done 2015-03-26 17:30:43 +01:00
Thomas Müller a8b756154a Merge pull request #14495 from owncloud/update-mailmap-01
Updating .mailmap
2015-03-26 17:17:18 +01:00
Jan-Christoph Borchardt d1db727d1f mock up missing elements in the tests 2015-03-26 17:13:50 +01:00
Robin Appelman 1969c8d5c8 save uid instead of user object in command 2015-03-26 17:11:34 +01:00
Lukas Reschke 73af302d39 Remove custom arg_separator.output
This seems unrequired nowadays and like a legacy fragment. It should be safe to remove.

Fixes https://github.com/owncloud/core/issues/14782
2015-03-26 17:07:26 +01:00
Robin Appelman 8c903c100f check limit of serialized command in unit tests 2015-03-26 17:07:02 +01:00
Robin Appelman 268f249e8d ensure commands can be serialized in unit tests 2015-03-26 17:07:02 +01:00
Robin Appelman 176fba83ea Setup the filesystem in the expire command 2015-03-26 17:07:02 +01:00
Robin Appelman ddd6a67d2a Handle exceptions thrown during hooks when running unit tests 2015-03-26 17:07:02 +01:00
Robin Appelman 3ed6ed3c36 Force test cases using background commands to handle setting up the filesystem 2015-03-26 17:07:02 +01:00
Robin Appelman 7ec8f12ad4 expire versions in a background command 2015-03-26 17:07:01 +01:00
Jan-Christoph Borchardt e7dcc01017 only move dropdown triangle when navigation is opened, fix timing bug 2015-03-26 17:01:35 +01:00
Jan-Christoph Borchardt 82fc754d3f move SQLite notice from warnings to tips & tricks 2015-03-26 16:53:27 +01:00
Joas Schilling 02ffc6c6ee Merge pull request #15226 from owncloud/fix-upload-placeholder
Fix placeholder in files upload
2015-03-26 16:50:43 +01:00
Andreas Fischer 0f58315543 Add OC_Response::setContentLengthHeader() for Apache PHP SAPI workaround.
Do not send Content-Length headers with a value larger than PHP_INT_MAX
(2147483647) on Apache PHP SAPI 32-bit. PHP will eat them and send 2147483647
instead.

When X-Sendfile is enabled, Apache will send a correct Content-Length header,
even for files larger than 2147483647 bytes. When X-Sendfile is not enabled,
ownCloud will not send a Content-Length header. This prevents progress bars
from working, but allows the actual transfer to work properly.
2015-03-26 16:37:38 +01:00
Joas Schilling 39dbf9509b Merge pull request #15224 from owncloud/issue/15191-app-code-checker-error-list
Correctly only send the errors of the current file to the event
2015-03-26 16:35:46 +01:00
Joas Schilling cd09b949a6 Add navigation entry for tips and tricks setion 2015-03-26 16:23:21 +01:00
Vincent Petry 70acd58336 Copy Etag header to OC-Etag for sabre calls 2015-03-26 16:06:43 +01:00
Robin McCorkell a323d781a6 Revert "add https:// placeholder for From Link feature. closes #13255"
This reverts commit 18b5966f3a.
2015-03-26 14:47:21 +00:00
Thomas Müller e66dda83df Merge pull request #15218 from owncloud/revert-oc-etag-master
Revert oc etag master
2015-03-26 15:34:24 +01:00
Joas Schilling db763027bb Correctly only send the errors of the current file to the event 2015-03-26 15:33:31 +01:00
Jan-Christoph Borchardt 6b8f5abf98 detail corrections for search box layout 2015-03-26 15:06:11 +01:00
Vincent Petry a84ade5f32 Revert "adding OC-ETag header"
This reverts commit 30ee8b6f99.
2015-03-26 15:04:41 +01:00
Vincent Petry daceb1a9ac Revert "adding unit tests"
This reverts commit 8d327c94a8.
2015-03-26 15:04:36 +01:00
Jan-Christoph Borchardt fd9214de23 fix user dropdown for IE8 2015-03-26 15:02:31 +01:00
Morris Jobke 0d786c381b Merge pull request #15212 from owncloud/log-width
force log messages to break to alleviate horizontal scroll on Admin page
2015-03-26 14:41:54 +01:00
Vincent Petry 534892d456 Added rawurlencode for other params in GDrive storage 2015-03-26 13:57:28 +01:00
Vincent Petry cda7f7fd61 Merge pull request #15168 from owncloud/oc-etag-master
adding OC-ETag header
2015-03-26 13:52:43 +01:00
Lukas Reschke 468456e168 Merge pull request #14125 from dratini0/master
[nginx] Extending X-Accel-Redirect support
2015-03-26 13:35:00 +01:00
Thomas Müller 7804d0445b Merge pull request #15206 from owncloud/mark-dot-files-gray
Show hidden files (dot files) in gray
2015-03-26 12:40:47 +01:00
Jan-Christoph Borchardt 7c66e17237 force log messages to break to alleviate horizontal scroll on Admin page 2015-03-26 12:34:57 +01:00
Jan-Christoph Borchardt f0b0287333 adjust animations of Share, Versions and others to OC.menuSpeed 2015-03-26 12:21:40 +01:00
Vincent Petry 43588fe2f7 Properly quote file names in listFiles query for GDrive 2015-03-26 12:15:02 +01:00
Jan-Christoph Borchardt 30b745fc59 reintroduce quick animation for menus 2015-03-26 11:59:30 +01:00
Thomas Müller f9525b153e no php execution timeout for webdav 2015-03-26 11:55:26 +01:00
Jenkins for ownCloud b585d87d9d Update license headers 2015-03-26 11:44:36 +01:00
Thomas Müller 653ad63e9b detect MIT licensed files and ignore them for now 2015-03-26 11:38:40 +01:00
Thomas Müller b2b61bdf16 properly break after the first comment ends + allow to pass in one file/folder via commandline argument 2015-03-26 11:38:40 +01:00
Thomas Müller eb066111ed Updating email of nickvergessen and georg 2015-03-26 11:38:40 +01:00
Thomas Müller 1b23f1367b fixing ignorance of 'Not Committed Yet' 2015-03-26 11:38:39 +01:00
Thomas Müller a228b4ccba Updating .mailmap 2015-03-26 11:38:39 +01:00
Vincent Petry ca6b715b31 Added ext storage mount options GUI
Added option to disable autoscan of external storages
Mount option file system scan is now an int
Move priority field to avoid undefined field in storage options

All input elements inside the storage options block get parsed into
storage options.

Moving the priority field outside prevents it to appear in the storage
config, as expected. It is still parsed by special code.
2015-03-26 11:21:03 +01:00
Jan-Christoph Borchardt 07335c844a fix log in issue, fix arrow position, make dropdown work in Firefox 2015-03-26 11:12:02 +01:00
Morris Jobke 69f14f974b update 3rdparty submodule 2015-03-26 11:09:05 +01:00
Morris Jobke 20f5290462 Merge pull request #15195 from owncloud/reanimate-add-guzzle
Add wrapper for Guzzle
2015-03-26 11:06:48 +01:00
Thomas Müller c8f0cbab5a Merge pull request #15194 from owncloud/fix-15146
Do not use APCu when apc.enabled is Off.
2015-03-26 11:03:36 +01:00
Vincent Petry f056558b72 Add repair step to fix SQLite autoincrement
Force Doctrine to generate alter table SQL statements for SQLite to make
sure the code from OCSqlitePlatform is triggered.
2015-03-26 11:00:22 +01:00
Thomas Müller 8d327c94a8 adding unit tests 2015-03-26 10:49:26 +01:00
Morris Jobke 92f0dba3c8 Show hidden files (dot files) in gray 2015-03-26 10:35:27 +01:00
Jan-Christoph Borchardt cd88ddddaf fix accessibility of ownCloud logo and navigation entries, fix #15013g 2015-03-26 10:31:00 +01:00
Jenkins for ownCloud 40b77eb97a [tx-robot] updated from transifex 2015-03-26 01:55:29 -04:00
Morris Jobke 0fb1c5ae03 Merge pull request #15203 from owncloud/revert-15201-webdav-ng-bugfix
Revert "FIX for webdav.mediencenter.t-online.de"
2015-03-26 00:56:12 +01:00
Morris Jobke 24d0dfc727 Revert "FIX for webdav.mediencenter.t-online.de" 2015-03-26 00:56:06 +01:00
Jan-Christoph Borchardt d7414fbf0d move triangle of apps dropdown to align with app name triangle 2015-03-26 00:43:11 +01:00
Jan-Christoph Borchardt dd7eb4c7c3 reduce logo size a bit for a better look 2015-03-26 00:43:11 +01:00
Jan-Christoph Borchardt 4546a33d58 adjust share dropdown border radius to 3px 2015-03-26 00:43:11 +01:00
Jan-Christoph Borchardt 70a4df1418 more small fixes in header 2015-03-26 00:43:11 +01:00
Jan-Christoph Borchardt ad596a0198 further adjustments of header and dropdown styles 2015-03-26 00:41:41 +01:00
Jan-Christoph Borchardt 095197d1a7 popover style for apps and user dropdown menus 2015-03-26 00:40:30 +01:00
Morris Jobke dac4436807 Merge pull request #15170 from owncloud/middleclickbreadcrumb
Fix middle click on breadcrumb
2015-03-26 00:19:52 +01:00
Oliver Kohl D.Sc. 6880160749 Merge pull request #15201 from owncloud/webdav-ng-bugfix
FIX for webdav.mediencenter.t-online.de



https://webdav.mediencenter.t-online.de returns invalid response code.

e.g.
{"reqId":"f9a1c394b98108e4e5ca62bf47829c64","remoteAddr":"81.189.45.224","app":"PHP","message":"Undefined offset: 2 at \/var\/www\/owncloud\/3rdparty\/sabre\/dav\/lib\/Sabre\/DAV\/Client.php#569","level":3,"time":"2015-03-25T18:25:48+00:00","method":"GET","url":"\/index.php\/apps\/files\/ajax\/getstoragestats.php?dir=External%2FT-Cloud%2FTests"}

e.g.
{"reqId":"3407d66672b3cef206b0af883e49bff4","remoteAddr":"46.74.125.245","app":"PHP","message":"Undefined index: {DAV:}getlastmodified at \/var\/www\/owncloud\/lib\/private\/files\/storage\/dav.php#563","level":3,"time":"2015-03-25T16:33:21+00:00"}
2015-03-25 21:30:18 +01:00
Oliver Kohl D.Sc. 9323285987 FIX for webdav.mediencenter.t-online.de
https://webdav.mediencenter.t-online.de returns invalid response code.

e.g.
{"reqId":"f9a1c394b98108e4e5ca62bf47829c64","remoteAddr":"81.189.45.224","app":"PHP","message":"Undefined offset: 2 at \/var\/www\/owncloud\/3rdparty\/sabre\/dav\/lib\/Sabre\/DAV\/Client.php#569","level":3,"time":"2015-03-25T18:25:48+00:00","method":"GET","url":"\/index.php\/apps\/files\/ajax\/getstoragestats.php?dir=External%2FT-Cloud%2FTests"}

e.g.
{"reqId":"3407d66672b3cef206b0af883e49bff4","remoteAddr":"46.74.125.245","app":"PHP","message":"Undefined index: {DAV:}getlastmodified at \/var\/www\/owncloud\/lib\/private\/files\/storage\/dav.php#563","level":3,"time":"2015-03-25T16:33:21+00:00"}
2015-03-25 21:29:29 +01:00
Robin Appelman ac8254de6a Rename platform 2015-03-25 18:33:21 +01:00
Robin Appelman fc0c4990d5 triger db upgrade to set autoincrement for sqlite 2015-03-25 18:33:21 +01:00
Robin Appelman 24a30c10d7 Add custom sqlite platform to set auto increment 2015-03-25 18:33:21 +01:00
Vincent Petry ec2d7cff2f SQLite autoincrement test 2015-03-25 18:33:21 +01:00
Vincent Petry c6494034c8 Merge pull request #15187 from owncloud/connectioncheck-feedback
only show connection checks results if there are errors, fix #11476
2015-03-25 16:28:25 +01:00
Vincent Petry bdd749ba5b Merge pull request #15185 from owncloud/fix-14775-master
tearDown the file system before reinitializing
2015-03-25 16:26:58 +01:00
Lukas Reschke 5f044ebf1b Add wrapper for Guzzle 2015-03-25 16:04:41 +01:00
Morris Jobke 285f9e32e5 Merge pull request #15190 from owncloud/hide-update-notification-on-mobile
do not show update notification on mobile, fix overlapping of header menus
2015-03-25 15:48:34 +01:00
Vincent Petry bdce8524cb Merge pull request #15183 from owncloud/active-usermenu-entry
highlight active user menu entry
2015-03-25 15:47:56 +01:00
Morris Jobke d83741396a Merge pull request #15180 from owncloud/ext-tabbing
Use individual timers for separate config rows
2015-03-25 15:46:59 +01:00
Vincent Petry 13904a7f89 Merge pull request #15179 from owncloud/trash-recreatetrashfolderafterfulldelete
Recreate trashbin folder after full deletion
2015-03-25 14:58:06 +01:00
Andreas Fischer 630b7edc54 Do not use APCu when apc.enabled is Off. 2015-03-25 14:52:01 +01:00
Jan-Christoph Borchardt 090eb832f0 do not show update notification on mobile, fix overlapping of header menus, fix #10544 2015-03-25 12:43:05 +01:00
Thomas Müller 1f6d8f2fdb tearDown the file system before reinitializing - fixes #14775 2015-03-25 10:55:54 +01:00
Jan-Christoph Borchardt 04a4df5065 only show connection checks results if there are errors, fix #11476 2015-03-25 09:34:13 +01:00
Vincent Petry b3de3d7245 Fix breadcrumb click JS unit test 2015-03-25 09:27:55 +01:00
Jan-Christoph Borchardt fa43480b55 highlight active user menu entry 2015-03-25 09:27:43 +01:00
Jan-Christoph Borchardt e188f0e436 Merge pull request #14970 from owncloud/sidebar-enhancements
sidebar fixes
2015-03-25 09:16:49 +01:00
Roeland Jago Douma 9c19a5dbcc Make sure we do not return people that we already shared with
We should use the provided list of users and groups that we already
shared with to filter suggestions.
2015-03-25 09:13:51 +01:00
Thomas Müller 9c151d2136 Merge pull request #15181 from owncloud/simple-fix
Make the link to issue template bold
2015-03-25 08:46:52 +01:00
Jenkins for ownCloud fb61889490 [tx-robot] updated from transifex 2015-03-25 01:55:46 -04:00
Daniel Hansson 1b2df4b836 Make the link to issue template bold
Makes it easier to see the issue template link. And hopefully more we don't have to tell everybody that much that they should use it.
2015-03-25 05:21:43 +01:00
Thomas Müller 43beaba0dc Merge pull request #15171 from owncloud/sabre-logforbiddenasdebug
Log forbidden in debug level
2015-03-24 23:31:35 +01:00
Robin McCorkell c68fd6d5e3 Use individual timers for separate config rows 2015-03-24 22:25:30 +00:00
Lukas Reschke ec12f5e019 Merge pull request #14949 from owncloud/sabre-2.1.3
Update sabre-2.1.3 thirdparty submodule
2015-03-24 23:16:57 +01:00
Vincent Petry f8f543945f Recreate trashbin folder after full deletion 2015-03-24 23:02:14 +01:00
Vincent Petry 72c1c89bcd Log forbidden in debug level 2015-03-24 22:08:11 +01:00
Vincent Petry 2b8ef3aca9 Fix middle click on breadcrumb 2015-03-24 22:05:02 +01:00
Roeland Jago Douma 4163a5efad Call the proper function
* Fix for #6967
2015-03-24 21:45:31 +01:00
Roeland Jago Douma b1c513f000 Fix unit tests
Altough more are required to make sure this does not happen again
2015-03-24 21:42:40 +01:00
Thomas Müller 30ee8b6f99 adding OC-ETag header 2015-03-24 21:36:46 +01:00
Roeland Jago Douma abfb524b29 When searching for displayname then search for displayname 2015-03-24 21:35:44 +01:00
Morris Jobke 1db177b841 Merge pull request #15055 from owncloud/share-activity-grouping
Group sharing activities by user/group and file respectively
2015-03-24 20:23:36 +01:00
Morris Jobke 09ea260957 Merge pull request #15160 from owncloud/deduplicate-external-manager-tests
Deduplicate external manager tests
2015-03-24 20:15:56 +01:00
Morris Jobke 0a84e267f4 Merge pull request #14919 from rullzer/files_thumbnail_fix
Files thumbnail fix
2015-03-24 20:12:19 +01:00
Roeland Jago Douma 0ea3878111 No longer directly output OC_Image for thumbnails
* Only use public interfaces
  - Injected IPreview
* Added unit tests
2015-03-24 18:55:06 +01:00
Robin Appelman 1bd141b655 Merge pull request #15158 from owncloud/fix-failing-master
Fix failing master unit tests
2015-03-24 17:54:11 +01:00
Joas Schilling 8c33f05e93 Merge the two tests into one 2015-03-24 17:26:38 +01:00
Joas Schilling 7de15f3125 *cough* 2015-03-24 17:08:03 +01:00
Morris Jobke 2370af62ea Merge pull request #14998 from rullzer/ocs_api_new_url
OCS API should return fancy OC url
2015-03-24 17:04:31 +01:00
Lukas Reschke 5a9c9b86f8 Merge pull request #15153 from owncloud/uniquename-node
Add `getNonExistingName()` to the node api
2015-03-24 15:51:12 +01:00
Morris Jobke 5e9e2b700d Merge pull request #15112 from owncloud/security-warning-section
consolidate all admin warnings and notices into one section
2015-03-24 15:46:04 +01:00
Morris Jobke 1e26d731b9 Merge pull request #15156 from owncloud/file-summary-align
correctly align file list summary when the list has the favorite feature
2015-03-24 15:44:19 +01:00
Jan-Christoph Borchardt 7ea061e6f0 correctly align file list summary when the list has the favorite feature 2015-03-24 15:26:17 +01:00
Morris Jobke 968fca8b55 Merge pull request #15048 from owncloud/avatar-crop-square
round width and height when cropping avatar
2015-03-24 15:23:14 +01:00
Jan-Christoph Borchardt 6d384e5f7c consolidate all admin warnings and notices into one section 2015-03-24 15:21:49 +01:00
Jan-Christoph Borchardt fcac7d8c13 double padding to account for Deleted files entry, issue with Firefox 2015-03-24 15:14:20 +01:00
Morris Jobke 965d97a8f5 Merge pull request #14580 from owncloud/issue/13765-duplicate-remote-share
"Integrity constraint violation" when sharing the same item twice with the same user
2015-03-24 15:05:58 +01:00
Robin Appelman d11f01fa0f Add getNonExistingName() to the node api 2015-03-24 15:00:36 +01:00
Daniel Hansson cc2092a511 Merge pull request #15151 from owncloud/use-local-time
Don't use hardcoded date and time
2015-03-24 14:31:36 +01:00
Vincent Petry 331f0196e0 Merge pull request #15150 from owncloud/sabre-removerangeexceptionforencryption
Remove range header exception for encryption
2015-03-24 14:29:01 +01:00
Morris Jobke a039768685 Merge pull request #15127 from owncloud/admin-tips-jenkins
add Tips & tricks section to admin settings
2015-03-24 14:18:33 +01:00
Morris Jobke 92791bb8ba Merge pull request #15126 from owncloud/sabre-storagenotavailable
Soft fail in CustomPropertiesBackend whenever storage not available
2015-03-24 14:01:47 +01:00
Joas Schilling 5e71d1558a Merge pull request #15149 from owncloud/fix-enable-for-group
Correctly get array of groups and send OCP\IGroup objects to enable meth...
2015-03-24 13:50:56 +01:00
Daniel Hansson 8ee1fa98df Don't use hardcoded date and time
Use local time instead. http://momentjs.com/
2015-03-24 13:41:55 +01:00
Vincent Petry 302c19067a Merge pull request #15145 from owncloud/fix-15097-master
Properly catch whether a share is `null`
2015-03-24 13:37:47 +01:00
Jan-Christoph Borchardt 83580d08eb Merge pull request #15143 from owncloud/24h-time-format
Use 24h format instead of 12h format
2015-03-24 13:30:52 +01:00
Vincent Petry 46475bf580 Merge pull request #15003 from owncloud/issue/14859-speed-up-favorite-list
Do not walk over the users directory, but over the list of tagged objects
2015-03-24 13:26:59 +01:00
jknockaert a1b68b5a48 Remove range header exception for encryption
revert #10422
2015-03-24 13:19:49 +01:00
Morris Jobke c8af615c01 Merge pull request #15142 from owncloud/issue/15138-feedback-for-empty-apps-list
Issue/15138 feedback for empty apps list
2015-03-24 13:02:56 +01:00
Joas Schilling b262c30fa9 Correctly get array of groups and send OCP\IGroup objects to enable method 2015-03-24 12:56:42 +01:00
Robin Appelman d46b7d73e7 when the path doesnt exist show a proper error page 2015-03-24 12:21:25 +01:00
Morris Jobke e07a2fd8a2 Merge pull request #15012 from Volker-E/master
fixing #15011 by adding ARIA roles where distinct
2015-03-24 12:07:26 +01:00
Joas Schilling 17fbffceeb Use the same style when no search result was found 2015-03-24 11:29:29 +01:00
Joas Schilling f2be172ae8 Do not duplicate the empty content css 2015-03-24 11:29:29 +01:00
Joas Schilling c3c2517131 Display a message when no apps can be found for this oc version 2015-03-24 11:29:28 +01:00
Lukas Reschke e2453d78c0 Properly catch whether a share is null
Despite it's PHPDoc the function might return `null` which was not properly catched and thus in some situations the share was resolved to the sharing users root directory.

To test this perform the following steps:

* Share file in owncloud 7 (7.0.4.2)
* Delete the parent folder of the shared file
* The share stays is in the DB and the share via the sharelink is inaccessible. (which is good)
* Upgrade to owncloud 8 (8.0.2) (This step is crucial. The bug is not reproduceable without upgrading from 7 to 8. It seems like the old tokens are handled different than the newer ones)
* Optional Step: Logout, Reset Browser Session, etc.
* Access the share via the old share url: almost empty page, but there is a dowload button which adds a "/download" to the URL.
* Upon clicking, a download.zip is downloaded which contains EVERYTHING from the owncloud directory (of the user who shared the file)
* No exception is thrown and no error is logged.

This will add a check whether the share is a valid one and also adds unit tests to prevent further regressions in the future. Needs to be backported to ownCloud 8.

Adding a proper clean-up of the orphaned shares is out-of-scope and would probably require some kind of FK or so.

Fixes https://github.com/owncloud/core/issues/15097
2015-03-24 11:21:58 +01:00
Daniel Hansson 946a7c3a83 Use 24h format instead of 12h format
Use correct time format in WebUI
2015-03-24 11:20:20 +01:00
Vincent Petry ce5d2ab7db Revert "Change to 24H format instead of 12H format"
This reverts commit 8279dde97a.
2015-03-24 11:08:53 +01:00
Jenkins for ownCloud 9cb07f126d [tx-robot] updated from transifex 2015-03-24 01:55:24 -04:00
Daniel Hansson 8279dde97a Change to 24H format instead of 12H format
Update how the time shows in WebUI.

My first PR to core, woha. :)
2015-03-23 22:05:44 +01:00
Morris Jobke 10eeb35167 Merge pull request #15121 from owncloud/email-sent-unbold
unbold share email sent notification
2015-03-23 18:57:20 +01:00
Thomas Müller e8d12c1809 Merge pull request #15075 from owncloud/fix-15056-master
remove unneeded status element from json response on /categories
2015-03-23 18:30:40 +01:00
Jan-Christoph Borchardt c2ccaf000a add Tips & tricks section to admin settings 2015-03-23 18:19:13 +01:00
dratini0 d4e5ef4f38 Removed simplified X-accel-redirect even further 2015-03-23 17:51:12 +01:00
blizzz 8906158d3b Merge pull request #15123 from owncloud/fix_14098
offset needs to be considered in computed limit
2015-03-23 17:50:24 +01:00
Vincent Petry eb894e6625 Soft fail in CustomPropertiesBackend whenever storage not available
When a storage is not available, it will not fail the whole call any
more but still return a usable file list.
2015-03-23 17:41:32 +01:00
Lukas Reschke 02c0fe8d43 Merge pull request #13941 from owncloud/fix-folder-upload-on-firefox
Show message if upload of folder isn't allowed
2015-03-23 17:18:46 +01:00
Morris Jobke 0adcb99110 Merge pull request #14862 from owncloud/introduce-shipped.json-master
shipped apps are now defined in core/shipped.json - the shipped tag in i...
2015-03-23 17:17:33 +01:00
Jan-Christoph Borchardt fd8a134dd2 unbold share email sent notification 2015-03-23 16:53:20 +01:00
Arthur Schiwon 7520d0fb3d offset needs to be considered in computed limit 2015-03-23 16:51:40 +01:00
Jan-Christoph Borchardt c93e4c806a Merge pull request #15114 from owncloud/sharing-labels
combine labels with inputs in sharing dialog, fix #14796
2015-03-23 16:46:53 +01:00
Morris Jobke 7f2b06dfa0 Merge pull request #15120 from owncloud/ldap-occ-fix-warnings
fix PHP warnings when using occ with some LDAP commands
2015-03-23 16:29:27 +01:00
Jan-Christoph Borchardt fe5597b76e Merge pull request #15118 from owncloud/user-mgmt-groups
fix long group names overlapping in the sidebar, fix #12649
2015-03-23 16:15:24 +01:00
dratini0 c432b52c74 Changed the disputed while loop to a single if. 2015-03-23 16:12:03 +01:00
Thomas Müller 79f012d262 remove unneeded status element from json response on /categories - fixes 15056 2015-03-23 15:20:06 +01:00
Arthur Schiwon 468fc675a4 fix PHP warnings when using occ with some LDAP commands 2015-03-23 15:19:41 +01:00
Thomas Müller 33cd60ab9a adding enterprise apps to shipped.json 2015-03-23 15:11:16 +01:00
Joas Schilling 1a26263123 Do not walk over the users directory, but over the list of tagged objects
Way quicker
2015-03-23 15:10:58 +01:00
Jan-Christoph Borchardt 23396a52cd fix long group names overlapping in the sidebar, fix #12649 2015-03-23 14:57:07 +01:00
Jan-Christoph Borchardt 5130eca3e3 combine labels with inputs in sharing dialog, fix #14796 2015-03-23 14:40:56 +01:00
Clark Tomlinson 0e4ba618cf Merge pull request #14383 from jknockaert/newbranch
make encryption stream wrapper seekable
2015-03-23 09:22:36 -04:00
Morris Jobke 98e770b68e Merge pull request #15107 from owncloud/user-mgmt-header
fix first user mgmt header jumping around, fix #8873
2015-03-23 14:22:16 +01:00
Thomas Müller f64ddad29d Merge pull request #15108 from owncloud/issue/15049-iran-timezone
The iran timezone removed the DST handling which breaks the timezone lib
2015-03-23 14:21:47 +01:00
Joas Schilling 1686653fdd The iran timezone removed the DST handling which breaks the timezone lib 2015-03-23 14:08:47 +01:00
Morris Jobke 5ec547a05f Merge pull request #15103 from owncloud/link-personal
link back to top on Personal page
2015-03-23 14:03:57 +01:00
Jan-Christoph Borchardt 7079b1b434 fix first user mgmt header jumping around, fix #8873 2015-03-23 13:46:05 +01:00
Jan-Christoph Borchardt f899d77ba5 fix capitalization in Personal settings 2015-03-23 13:42:33 +01:00
Jan-Christoph Borchardt 731c90a033 link back to top on Personal page, fix #14519 2015-03-23 13:41:40 +01:00
Jenkins for ownCloud a9b4f0d842 [tx-robot] updated from transifex 2015-03-23 01:54:48 -04:00
Morris Jobke 21bc8e0c81 Merge pull request #15088 from oparoz/3d-support
Introducing 3D images support (media type)
2015-03-22 23:14:02 +01:00
Jenkins for ownCloud a79d973005 [tx-robot] updated from transifex 2015-03-22 01:55:21 -04:00
Roeland Jago Douma bdde2156da Added extra unit test 2015-03-21 09:47:07 +01:00
Roeland Jago Douma 9ce8e1ddc7 OCS API should return fancy OC url
* Also use the URLGenerator
2015-03-21 09:47:06 +01:00
Volker E 599ee5ce4e fixing #15023, getting comments out of HTML output 2015-03-21 07:10:46 +01:00
Jenkins for ownCloud e36a33c89a [tx-robot] updated from transifex 2015-03-21 01:56:09 -04:00
Olivier Paroz f3fe46685b Introducing 3D images support (media type)
So that people with 3D images can at least see a 2D picture
Full 3D support is possible via an app
2015-03-20 22:11:42 +01:00
Jan-Christoph Borchardt 6c98925621 Merge pull request #14737 from owncloud/app-descriptions-collapsible
collapse app descriptions by default, make expandable, fix #13112
2015-03-20 17:51:51 +01:00
Robin McCorkell 1f3fdf17ef Support constructing an SMB_OC without saved session credentials 2015-03-20 16:24:30 +00:00
Thomas Müller 83e35412e6 Merge pull request #15069 from owncloud/enable-oci-testing-on-pr-master
Adding magic file to enable oci on pull request testing on ci.owncloud.o...
2015-03-20 17:01:04 +01:00
Thomas Müller afa8872955 Merge pull request #14857 from owncloud/preview-provider-registration-in-manager
Preview provider registration in manager
2015-03-20 16:34:22 +01:00
Thomas Müller 4477053818 Adding magic file to enable oci on pull request testing on ci.owncloud.org 2015-03-20 15:00:51 +01:00
Morris Jobke a45e45df1e Merge pull request #14941 from AdamWill/pipeline-apps
fall back to absolute path for pipelined assets (#14940)
2015-03-20 14:56:02 +01:00
Vincent Petry e44ab2dcfe Merge pull request #11884 from owncloud/ext-appframework
Cleanup ext storage CRUD code, introduce storage config id
2015-03-20 14:17:32 +01:00
Thomas Müller 0b1c4bfc3b Merge pull request #15062 from owncloud/fix-15053-master
Handle session initialization errors and display error page
2015-03-20 14:07:15 +01:00
Morris Jobke 7ea5c47b3c Merge pull request #15063 from owncloud/share-readonlyfile-permissions
Do not automatically add "update" permission to shared mounts
2015-03-20 14:06:55 +01:00
Morris Jobke b0cd1b0975 Merge pull request #14938 from owncloud/test-oracle-in-docker
Oracle 11 XE is now fired up in a docker image - looks like we get back ...
2015-03-20 13:02:33 +01:00
Vincent Petry 67160e0861 Do not automatically add "update" permission to shared mounts
In the past it seems the update permission was needed to be able to
rename shared mounts, but it doesn't seem to be the case any more.

Removing the "update" permission that used to be added automatically
fixes the read-only permission check when trying to overwrite a
read-only file over WebDAV.
2015-03-20 12:33:59 +01:00
Thomas Müller 843fef0490 Handle session initialization errors and display error page - fixes #15053 2015-03-20 12:21:03 +01:00
Thomas Müller a87cc90d1e Merge pull request #14993 from owncloud/stop-on-missing-deps
Stop executing, when 3rdparty is missing or apps directory is invalid
2015-03-20 11:36:02 +01:00
Vincent Petry eef5851a67 Fix share permission related unit tests 2015-03-20 11:30:51 +01:00
Robin McCorkell c37913b1d5 Introduce async status checking 2015-03-20 09:48:14 +00:00
Thomas Müller d039e4fd25 Now using a special docker where the database for testing is already available 2015-03-20 10:33:21 +01:00
Thomas Müller cce303ff5c Merge pull request #15047 from owncloud/connect-failed-exception-message
be a little more verbose in the exception message when we cant connect to...
2015-03-20 10:06:06 +01:00
Robin McCorkell 8e536c6762 Merge pull request #15050 from owncloud/user-create-exists
show a better error message when trying to create a user that already exists
2015-03-20 08:54:16 +00:00
Joas Schilling 7776e088d6 Group sharing activities by user/group and file respectively 2015-03-20 09:49:33 +01:00
Robin McCorkell b6676c32d6 Merge pull request #15046 from owncloud/exception-show-type
show exception type in debug mode
2015-03-20 08:48:22 +00:00
Morris Jobke 1de6fa19de Merge pull request #15035 from owncloud/assocmapper
If the execute method on the mapper receives an assoc array, it binds by...
2015-03-20 08:53:14 +01:00
Jenkins for ownCloud e8680e6637 [tx-robot] updated from transifex 2015-03-20 01:55:23 -04:00
Robin Appelman da4ad1c0a2 show a better error message when trying to create a user that already exists 2015-03-20 04:24:50 +01:00
Robin Appelman bd1d7107bb round width and height when cropping avatar 2015-03-20 04:08:24 +01:00
Robin Appelman faa4918355 be a little more verbose in the exception message when we cant connect to the db 2015-03-20 03:56:38 +01:00
Robin Appelman 2df20aaffb show exception type in debug mode 2015-03-20 03:51:21 +01:00
Vincent Petry 5f7b3a4dbe Rename must be possible with update-only permission
and this as long as the rename is done within the same folder.
2015-03-19 21:55:56 +01:00
Wolfgang Karall 6cc50ecfab use permanent redirect for .well-known/(cal|card)dav, add 'L' flag 2015-03-19 21:31:50 +01:00
Vincent Petry 5ba508b346 Fix permission checks in Sabre connector
This fixes moving files in and out of shared folders with some exotic
permission combinations.
2015-03-19 21:18:48 +01:00
Vincent Petry 70115d5b03 Update 3rd party ref for sabre 2.1.3 2015-03-19 18:28:06 +01:00
Morris Jobke 2a8c3798a8 Merge pull request #14947 from oparoz/repairmimetypes-sql
Make repairmimetypes compatible with case sensitive SQL backends
2015-03-19 17:22:25 +01:00
Thomas Müller c57fb62029 Merge pull request #14946 from owncloud/dropbox-root-fix
Fix root request path for Dropbox
2015-03-19 17:19:57 +01:00
Bernhard Posselt df24a014b8 If the execute method on the mapper receives an assoc array, it binds by value instead of index 2015-03-19 17:08:46 +01:00
Thomas Müller 857b22c61b Merge pull request #15025 from rullzer/ocs_respect_enforced_date
Ocs respect enforced date
2015-03-19 17:06:04 +01:00
Thomas Müller 3765af4edf Merge pull request #14986 from owncloud/fixmapperbackw
Fix backwards compatibility for mapper execute method
2015-03-19 17:04:01 +01:00
Jan-Christoph Borchardt bdb4089139 collapse app descriptions by default, make expandable, fix #13112 2015-03-19 16:30:47 +01:00
Robin Appelman 73874ca27f Merge pull request #14704 from owncloud/storage-wrapper-mount
pass mountpoint to storage wrapper callback
2015-03-19 16:20:38 +01:00
Robin Appelman be6edd465a Merge pull request #14537 from owncloud/oci-external-share
Fix external shares without password on oracle
2015-03-19 16:20:12 +01:00
Olivier Paroz f890c3ffb1 Make the method compatible with all types of extensions
Fix existing tests
2015-03-19 16:09:16 +01:00
Olivier Paroz 60b1643f02 Fix the office class
The office converter already replaces the original extension with '.pdf', so we need to switch the extensions of the tmp file instead of appending '.pdf' to it
2015-03-19 16:09:09 +01:00
Olivier Paroz 8d6b2b8867 Keep the extension in temp files
The file extension helps some applications like ImageMagick to properly
process files
2015-03-19 16:09:02 +01:00
Thomas Müller 0868e49663 Merge pull request #14980 from owncloud/fix-fileglobalgc
Fix fileglobalgc unlink parameter warnings
2015-03-19 14:17:20 +01:00
Roeland Jago Douma dd3307dd19 Added unit test
Tests added to make sure that removing an expire date when this is
enforced is not allowed.
2015-03-19 10:47:09 +01:00
Roeland Jago Douma 3c39658a1c When the expiration date is enforced respect this
Make sure that we do not allow removing of the expiration date when this
is enforced in the settings.
2015-03-19 10:07:17 +01:00
Volker E 0e4d52f9d2 fixing #15027, cleaning up obsolete IE5-7 workaround code 2015-03-19 09:10:58 +01:00
Joas Schilling 4a13a84cab Do not add apps2/ directory if it does not exist 2015-03-19 09:07:29 +01:00
Jenkins for ownCloud e40b0701d7 [tx-robot] updated from transifex 2015-03-19 01:55:06 -04:00
Bernhard Posselt f77ae37f23 also use backwards compatible method for mapper 2015-03-18 22:20:23 +01:00
Vincent Petry a9e6eba018 Reenable trashbin after failed rename
After a failed rename, the post_rename hook is not called.
This quickfix makes sure the trashbin storage logic is reenabled
also after a failed rename.
2015-03-18 19:56:31 +01:00
Vincent Petry c2315aa015 Fix shared storage permission checks 2015-03-18 19:56:31 +01:00
Vincent Petry fe8002a7db Merge pull request #14995 from owncloud/remove-unrequired-backtick-removal
Remove unrequired backtick removal
2015-03-18 19:34:49 +01:00
Volker E 0d0c73cf2b fixing #15011 by adding ARIA roles where distinct 2015-03-18 19:29:15 +01:00
Robin McCorkell 693ca9a92f Add unit tests for gc() for \OC\Cache\FileGlobalGC 2015-03-18 16:19:04 +00:00
Morris Jobke bd57fcb539 fix typo in config.sample.php 2015-03-18 17:08:54 +01:00
Morris Jobke bf6a7080e5 Merge pull request #14997 from owncloud/newgroup-empty-disable
disable submit button while groupname is empty
2015-03-18 16:29:13 +01:00
Robin Appelman e2e16249a1 Merge pull request #14999 from owncloud/kill-fileoperations-proxy
kill fileoperations proxy
2015-03-18 15:42:00 +01:00
Lukas Reschke 7310575f07 Merge pull request #14994 from owncloud/sabre-customprops-softfail
Soft fail in custom properties backend
2015-03-18 15:39:35 +01:00
Robin Appelman 8f9ddef435 kill fileoperations proxy
check is now handled by storage backends
2015-03-18 15:04:28 +01:00
Morris Jobke 917145e027 Merge pull request #14992 from owncloud/add-exception-to-memcachbe
Use ArrayCache if ownCloud is not installed
2015-03-18 14:56:43 +01:00
Robin Appelman cb4367b6d5 disable submit button while groupname is empty 2015-03-18 14:19:26 +01:00
Jan-Christoph Borchardt e5fd6816df fix position of 'Deleted files' sidebar entry, fix #10815 2015-03-18 13:31:16 +01:00
Joas Schilling f2f7f178a5 Add test for backticks in path and etag 2015-03-18 13:29:39 +01:00
Morris Jobke 378eef7eb4 migrate share helper method to IConfig 2015-03-18 13:07:39 +01:00
Lukas Reschke bb5c5a3691 Remove unreqired backtick removal
Without this files with a ` (backtick) in the beginning of the filenames where simply not correctly referenced as the ` got removed. This can lead to all possible havoc situations.

Should get backported to stable8 and in future we might consider if it is really worth to backport such changes when it is just for SQLite 🙈

Regression of https://github.com/owncloud/core/pull/14734
2015-03-18 12:38:19 +01:00
Vincent Petry 50194c31b4 Soft fail in custom properties backend
This makes it possible for clients to still receive a file list (minus
the broken files) instead of getting no list at all
2015-03-18 12:36:37 +01:00
Joas Schilling 0bed187613 Stop executing, when 3rdparty is missing or apps directory is invalid 2015-03-18 11:58:18 +01:00
Lukas Reschke 917cb66a5b Use ArrayCache if ownCloud is not installed
If ownCloud has not been installed yet the prefix might otherwise change at this point quite some time and thus the cache runs havoc.

This made installing ownCloud impossible on systems where APCu or so was available. However, I was not able to reproduce the same problem for application upgrades so this patch seems to work fine for this situation as well.

Fixes itself.
2015-03-18 11:47:16 +01:00
Jan-Christoph Borchardt 093efa458c Merge pull request #14981 from Volker-E/master
addressing #14978 - remove html root classes targeting IE6/IE7
2015-03-18 11:24:42 +01:00
Bernhard Posselt c52bd10361 fix backwards compatibility for mapper execute method 2015-03-18 09:25:22 +01:00
Jenkins for ownCloud 8a95bf18b7 [tx-robot] updated from transifex 2015-03-18 01:55:22 -04:00
Volker E 790324b313 addressing #14984 removing redundant type attributes 2015-03-18 05:33:17 +01:00
Volker E 4c46d0c46c addressing #14983 obsolete Google Chrome Frame 2015-03-18 02:11:47 +01:00
Morris Jobke fe137bce1a Merge pull request #14972 from owncloud/add-group-style
User management design details
2015-03-18 01:16:01 +01:00
Morris Jobke c56321e46f Merge pull request #14967 from owncloud/checkbox-alignment
Share dropdown: fix checkbox alignment, more whitespace
2015-03-18 01:12:15 +01:00
Robin McCorkell 42fcd0e8b7 Fix fileglobalgc unlink parameter warnings 2015-03-18 00:07:18 +00:00
Volker E 6ad76b5cc2 addressing #14982 self-closing tags ending slash doesn't have a purpose & should be removed 2015-03-17 23:57:23 +01:00
Thomas Müller c69cd28a73 Merge pull request #14968 from owncloud/files-reallowsinglequote
Reallow single quote in file names
2015-03-17 23:50:16 +01:00
Thomas Müller a4d2c7810e Merge pull request #14975 from owncloud/add-smtp-debug-mode
Add debug mode back to mailer
2015-03-17 23:49:19 +01:00
Volker E 25b77159c4 adressing #14979 meta charset declaration should be first in head 2015-03-17 23:36:05 +01:00
Volker E e8c99a60ec addressing #14978 - remove html root classes targeting IE6/IE7 2015-03-17 23:16:42 +01:00
Volker E f3cd552797 addressing #14978 - remove html root classes targeting IE6/IE7 2015-03-17 22:35:20 +01:00
Lukas Reschke f13216d275 Use FILTER_UNSAFE_RAW instead of FILTER_SANITIZE_STRING
`FILTER_SANITIZE_STRING` will still encode everything else.
2015-03-17 21:56:16 +01:00
Bernhard Posselt 087117d87d Merge pull request #14961 from owncloud/onlyrequireinfo
Only hard depend on the info.xml and not the app.php
2015-03-17 21:27:51 +01:00
Robin McCorkell 760f5fc5e5 Merge pull request #14954 from owncloud/cache-image-path
Cache \OC\URLGenerator::imagePath
2015-03-17 19:36:23 +00:00
Lukas Reschke aea4b3166b Add debug mode back to mailer
This re-adds the debug mode for the mailer which will log the whole SMTP traffic within the log file if enabled.
2015-03-17 19:41:13 +01:00
Jan-Christoph Borchardt 365b0b8cfe slight positioning fixes in user mgmt controls bar 2015-03-17 19:02:55 +01:00
Jan-Christoph Borchardt 075e2b1d1d improve style of 'Add group' input and button 2015-03-17 18:59:39 +01:00
Morris Jobke f4b6f3cfd1 fix unit tests 2015-03-17 18:55:44 +01:00
Jan-Christoph Borchardt ccc9db6c54 add bottom padding to sidebar, fix last element being hidden below settings, fix #13264 2015-03-17 18:42:11 +01:00
Jan-Christoph Borchardt 37a41dad56 add more whitespace to share link options in dropdown for better clickability and look 2015-03-17 18:19:45 +01:00
Jan-Christoph Borchardt 6ac677f17a fix checkbox alignment in share dialog, fix #11515 2015-03-17 18:18:07 +01:00
Vincent Petry e50f13d46b Add positive test for path verification 2015-03-17 18:17:30 +01:00
Morris Jobke fbea83d4eb fix failing unit test 2015-03-17 17:26:03 +01:00
Morris Jobke 012016d331 Deprecated \OCP\IAppConfig - add missing methods to IConfig 2015-03-17 17:19:33 +01:00
Joas Schilling 8ebb198ef3 Add a unit test for the naming conflict on the mountpoint name 2015-03-17 16:55:03 +01:00
Morris Jobke ebb834d879 Merge pull request #14962 from owncloud/safer-deletion
Add whitespace to right of list to prevent accidental deletion when scrolling
2015-03-17 16:54:57 +01:00
Jan-Christoph Borchardt ce89f12566 add whitespace to prevent file deletion when wanting to scroll 2015-03-17 16:54:42 +01:00
Joas Schilling ba3e4ede39 Use insertIfNotExists() instead of manual logic 2015-03-17 16:03:24 +01:00
Joas Schilling 05c4848954 Correctly get the unique mountpoint name when mounting the share
Previously the mount name was checked for uniqueness prior to inserting the
share. This caused problems, when two shares with the same name where done
or folder, mount point, local share with the same name was done, between
sending and accepting of the remote share
2015-03-17 16:03:24 +01:00
Bernhard Posselt 57ceed590a only hard depend on the info.xml and not the app.php
fix comment
2015-03-17 15:43:48 +01:00
Lukas Reschke c3ae01d66f Merge pull request #14957 from owncloud/remove-unused-section
Remove unused section
2015-03-17 14:08:07 +01:00
Thomas Müller 6d5f52484e Merge pull request #14948 from owncloud/prefix-memcache
Add version and path to cache prefix
2015-03-17 13:39:22 +01:00
Lukas Reschke 9926cb36de Remove unused section
This section is now unused as the security configuration has to happen on the webserver layer since https://github.com/owncloud/core/pull/14651
2015-03-17 13:29:51 +01:00
Olivier Paroz bd91546db8 Adding test cases where the extension is using capital letters 2015-03-17 13:25:39 +01:00
Olivier Paroz 4256078017 Make repairmimetypes compatible with case sensitive SQL backends
Change for #14132
Just a word of warning, ILIKE seems to be a Doctrine only clause. The statements are thus not portable.
2015-03-17 13:18:14 +01:00
Lukas Reschke 1f4aa5350a Reuse cache result 2015-03-17 13:15:52 +01:00
Thomas Müller f6363e67c3 Merge pull request #14952 from owncloud/issue/14881-files-app-follow-up
Use a closure for the files app entry and deprecate old methods
2015-03-17 12:59:10 +01:00
Lukas Reschke 4f9b76d821 Read theme only if required 2015-03-17 12:47:46 +01:00
Lukas Reschke c233f2c90b Add version and path to cache prefix
Prevents to have the cache reused by other instances on the server which have possible the same instance ID and also invalidates older cache entries after an upgrade which can cause unwanted side-effects.

Impact for deployment: The same cache will only get used if ownCloud is installed with the same version and under the same path. But this should be a basic requirement anyways.
2015-03-17 12:39:49 +01:00
Lukas Reschke 9e2ebf2dce Cache \OC\URLGenerator::imagePath
\OC\URLGenerator::imagePath is a really expensive operation due to all the I/O handling and can really benefit from caching.
2015-03-17 12:35:47 +01:00
Vincent Petry 5ea8ab3bb0 Fix Principal connector override 2015-03-17 12:22:29 +01:00
Joas Schilling 9c45ab49a1 Use a closure for the files app entry and deprecate old methods 2015-03-17 12:17:09 +01:00
Vincent Petry d5e7218262 Update sabre-2.1.3 thirdparty submodule 2015-03-17 11:58:43 +01:00
Vincent Petry e5e30924b1 Fix PHPDoc in files_external, add missing tag
Fix various PHPDoc issues in external storage app.

Added missing NoAdminRequired tag
2015-03-17 11:42:52 +01:00
Thomas Müller d96b97043b Merge pull request #14944 from owncloud/fix-php-doc-and-co
Fix PHPDoc and Co.
2015-03-17 11:34:07 +01:00
Thomas Müller 98a42dbccc Merge pull request #14927 from oparoz/raw-mimetypes
Introducing the Raw media types
2015-03-17 11:32:09 +01:00
Lukas Reschke e4c6b0abf5 Merge pull request #14931 from owncloud/issue/14881-closures-for-navigation-entries
Issue/14881 closures for navigation entries
2015-03-17 11:28:27 +01:00
Thomas Müller a56e16fdaa Oracle 11 XE is now fired up in a docker image - looks like we get back Oracle Testing on pull requests 2015-03-17 11:20:08 +01:00
Lukas Reschke b1c19f74a1 Merge pull request #12085 from owncloud/add-swift-mailer
Migrate OC_Mail to SwiftMailer
2015-03-17 11:15:39 +01:00
Vincent Petry 5b6ecb2d98 Fix root request path for Dropbox 2015-03-17 10:56:24 +01:00
Lukas Reschke db033e4e19 Fix PHPDoc and Co.
Ref https://github.com/owncloud/core/pull/14929#discussion_r26501240
2015-03-17 10:37:09 +01:00
Vincent Petry 6525911439 Merge pull request #14929 from owncloud/s2s-scanner-warnings
Fix scanFile signature warnings
2015-03-17 09:51:45 +01:00
Jenkins for ownCloud b51b4f0a2c [tx-robot] updated from transifex 2015-03-17 01:55:43 -04:00
Adam Williamson fa1be7d296 fall back to absolute path for pipelined assets (#14940)
If the asset is, for example, in an apps directory that is
outside the $SERVERROOT, we won't be able to get a relative
path. We shouldn't just fail hard in this case. Fall back to
using the absolute path instead (as we used to).
2015-03-16 19:08:11 -07:00
Morris Jobke fc0aa0b6ae Merge pull request #14936 from owncloud/fix-setup-config
Fix setup config namespace
2015-03-16 18:47:42 +01:00
Vincent Petry 7bc09f8f06 Fix setup config 2015-03-16 17:57:34 +01:00
Vincent Petry 6f687fa6ae Merge pull request #14923 from owncloud/fix-preference-key-definition
Fix user preference key definition for insertIfNotExists()
2015-03-16 17:14:09 +01:00
Thomas Müller 54e1edbf03 Merge pull request #13733 from mmattel/Try_to_write_logtimezone_during_installation
Write the parameter 'logtimezone' into config.php during setup
2015-03-16 17:04:06 +01:00
Vincent Petry 669ff45625 Merge pull request #14877 from owncloud/smb-constructor-noconnect
Wait with getting the timezone from the smb server until we need it
2015-03-16 17:01:49 +01:00
Joas Schilling ec1d5011b6 Add tests for the navigation manager (closure) behaviour 2015-03-16 16:46:17 +01:00
Vincent Petry b9d9405135 Fix scanFile signature warnings 2015-03-16 16:45:11 +01:00
Olivier Paroz bef12488c3 Introducing the Raw mimetypes 2015-03-16 16:25:04 +01:00
Joas Schilling 970846624f Allow registering closures for navigation entries
This speeds up all pages that don't use the navigation by 0.04sec per app,
because we don't need to create the routing anymore, unless we really need to.
2015-03-16 16:17:43 +01:00
Joas Schilling c2a5bd6a01 Also add a note that clob does not work in the compare array 2015-03-16 15:41:00 +01:00
Joas Schilling 06b2446269 The key is over configkey, user and app, not the value
stupid me :(
2015-03-16 15:37:12 +01:00
Vincent Petry 847880803e Fix storage priority in JS unit test 2015-03-16 15:07:38 +01:00
Vincent Petry 06448170cf Fix PHPDoc for StoragesController 2015-03-16 14:39:48 +01:00
Robin Appelman 7ab919256b fix test 2015-03-16 14:13:56 +01:00
Lukas Reschke 7a70fffa6c Don't fallback to Plaintext per default for legacy class 2015-03-16 14:10:03 +01:00
Lukas Reschke d7c7808a5e Add debug log message back 2015-03-16 13:01:17 +01:00
Joas Schilling 8f06353882 Remove load*() methods from public interface
We shall add a factory for that in the future
2015-03-16 12:57:15 +01:00
Lukas Reschke e32f1582c7 Show more detailed error message 2015-03-16 12:47:06 +01:00
Lukas Reschke dfd70337d6 Adjust unit test 2015-03-16 12:47:05 +01:00
Lukas Reschke f92f3a1a6e Incorporate review changes 2015-03-16 12:47:05 +01:00
Lukas Reschke 283476a2f7 Use new IMailer and add unit-tests for lostcontroller 2015-03-16 12:47:05 +01:00
Lukas Reschke 13486a5ada Migrate to SwiftMail
Replaces the OC_Mail and phpmailer with SwiftMail allowing us to mock it properly.

Fixes the unit test execution on master on local machines and https://github.com/owncloud/core/issues/12014

Conflicts:
	3rdparty
	lib/private/server.php
	lib/public/iservercontainer.php
	tests/lib/mail.php
	tests/settings/controller/mailsettingscontrollertest.php

Conflicts:
	3rdparty
	lib/private/mail.php
	lib/private/server.php
	lib/public/iservercontainer.php
	settings/ajax/lostpassword.php
	settings/application.php
2015-03-16 12:47:05 +01:00
Joas Schilling 3052b9571e Fix controller test 2015-03-16 12:45:18 +01:00
Joas Schilling 2731b80f74 Only register the core providers when necessary 2015-03-16 12:45:18 +01:00
Joas Schilling 47af533183 Move mimetype check from template to controller 2015-03-16 12:45:18 +01:00
Joas Schilling 8ed27d2ce0 Create an interface for OC_Image and OCP\Image for the public API 2015-03-16 12:45:15 +01:00
Joas Schilling 3b7aec1b7d Only sort the list when required 2015-03-16 12:44:12 +01:00
Joas Schilling 37b827f0b2 Order the providers alphabetically 2015-03-16 12:44:12 +01:00
Joas Schilling 9c86574acf Only do all the "find path" magic when we need to register them 2015-03-16 12:44:11 +01:00
Joas Schilling e38dea3542 Cache result for isMimeTypeSupported() 2015-03-16 12:44:11 +01:00
Joas Schilling e518eacba6 Add more type hinting 2015-03-16 12:44:11 +01:00
Joas Schilling 1a1dc9b335 Use DI for the config 2015-03-16 12:44:11 +01:00
Joas Schilling c1f266db88 Add an interface for the preview providers 2015-03-16 12:44:11 +01:00
Joas Schilling 227ff0a9e3 Clean up some docs 2015-03-16 12:44:11 +01:00
Joas Schilling 0b37d5aea3 Move default provider registration to preview manager 2015-03-16 12:44:11 +01:00
Joas Schilling cae8529359 Register preview providers on the preview manager instead of OC\Preview 2015-03-16 12:44:11 +01:00
Joas Schilling 4c4c0fa120 Use the PreviewManager where possible 2015-03-16 12:44:10 +01:00
Thomas Müller 1075914f8a Merge pull request #14883 from owncloud/imagepng_expects_resource_issue
validate resource's integrity before using it
2015-03-16 12:22:27 +01:00
Vincent Petry 72632ad402 Generate storage config ids when missing
When reading in old mount.json files, they do not contain config ids.
Since these are needed to be able to use the UI and the new service
classes, these will be generated automatically.

The config grouping is based on a config hash.
2015-03-16 12:18:01 +01:00
Thomas Müller c262d0d966 Update shipped.json 2015-03-16 11:59:40 +01:00
Georg Ehrke 09b05373ed validate resource's integrity before using it 2015-03-16 10:57:01 +01:00
Morris Jobke 17b10ef9b4 Add spaces 2015-03-16 10:52:29 +01:00
Morris Jobke 997a7a2668 Merge pull request #14766 from owncloud/fix-insertifnotexists-poc
Allow specifying the compare-array for insertIfNotExists()
2015-03-16 10:31:36 +01:00
Vincent Petry b495ca4924 Added part files for when writing chunks
Whenever a chunk is being written, it is now written to a part file
first. This is to avoid a concurrent chunk upload to believe that the
former chunk already exists, even though it's not fully written.

This makes sure that the final file assembly is only done when all
chunks were successfully written.

Also added an extra unique id to chunk parts in case the same chunk is
uploaded twice concurrently.
2015-03-16 10:13:13 +01:00
Thomas Müller 1e0d8f1774 Merge pull request #14133 from rullzer/fix_10600
Always display max upload size in admin panel
2015-03-16 10:05:57 +01:00
Thomas Müller bbaf97ca43 Merge pull request #14644 from owncloud/trash-expire-command
Expire files from the trash in the background
2015-03-16 10:04:05 +01:00
Thomas Müller 6927773648 Merge pull request #14776 from owncloud/fix-14629-master
verify the file name length not to exceed 255 characters + verify path d...
2015-03-16 09:58:41 +01:00
Thomas Müller b159c7f274 Merge pull request #14848 from owncloud/kill-curl-fallback-master
drop any fallback code related to curl
2015-03-16 09:56:31 +01:00
Jenkins for ownCloud c1a3394f48 [tx-robot] updated from transifex 2015-03-16 01:55:15 -04:00
Morris Jobke 5d74534f06 Merge pull request #14899 from owncloud/setupwarning-text
Put notice about checking logs in setup warning
2015-03-15 20:20:32 +01:00
Jenkins for ownCloud 84b6ca9b81 [tx-robot] updated from transifex 2015-03-15 01:54:38 -04:00
Robin McCorkell 69d376fbf1 Put notice about checking logs in setup warning 2015-03-15 01:25:30 +00:00
Joas Schilling 82138d4255 Merge pull request #14872 from owncloud/issue/14870-avatar-user-non-object
Fix getting the avatar of a non-existing user
2015-03-14 11:43:18 +01:00
Jenkins for ownCloud 8c5be2bc48 [tx-robot] updated from transifex 2015-03-14 01:54:45 -04:00
Thomas Müller 918b86a5bc Merge pull request #14871 from owncloud/use-proper-error-type
Use proper error type and clean-up code
2015-03-13 23:30:49 +01:00
Thomas Müller b8eb0b7cb6 Merge pull request #14880 from owncloud/drop-example-backend
Drop example user backend
2015-03-13 23:00:03 +01:00
Vincent Petry fb4cf53253 Fix mount config unit tests
Fix expected result now that it returns the status.
Added isset for some properties that are not always present.
2015-03-13 17:43:38 +01:00
Joas Schilling 30357aaac0 No user no avatar easy as that 2015-03-13 17:35:34 +01:00
Lukas Reschke e77d2ff2b4 Remove outdated comment 2015-03-13 16:19:52 +01:00
Lukas Reschke bf9030e874 Drop example user backend
We already provide an interface for application developers, this file is outdated and thus should get removed.

Addresses No. 3 from https://github.com/owncloud/core/issues/14847
2015-03-13 16:12:32 +01:00
Morris Jobke 0d9f149dd9 Merge pull request #14867 from owncloud/drop-OC_User_HTTP
Remove OC_User_HTTP
2015-03-13 15:53:22 +01:00
Joas Schilling 5d71eb5670 Color avatars of non-existing users gray and display X instead 2015-03-13 15:29:52 +01:00
Joas Schilling 61ec37431a Fix order of expected and actual on assertEquals() calls 2015-03-13 15:29:52 +01:00
Joas Schilling 8304f5f508 Fix getting the avatar of a non-existing user 2015-03-13 15:29:52 +01:00
Robin Appelman 3159af1983 Wait with getting the timezone from the smb server until we need it 2015-03-13 14:36:34 +01:00
Lukas Reschke f668ed25fe Merge pull request #14874 from owncloud/correct-typehint
Can also be null
2015-03-13 14:36:00 +01:00
Lukas Reschke 38fec9b095 Can also be null
If the user does not exist this returns null and can lead to nasty bugs since the IDE is not indicating this...
2015-03-13 14:01:24 +01:00
Lukas Reschke 4eb118dd33 Use proper error type and clean-up code 2015-03-13 13:21:09 +01:00
blizzz d5e884d629 Merge pull request #14849 from owncloud/fix-11292
support paged results against 389ds.
2015-03-13 13:16:33 +01:00
Vincent Petry 34c8b1ac77 Mount options for ext storage are now passed around
The mount options are now passed to the UI and stored in a hidden field.
The ext storage controllers and services also know how to load/save them
from the legacy config.
2015-03-13 12:49:11 +01:00
Lukas Reschke 93a303970f Remove OC_User_HTTP
Addresses No. 1 from https://github.com/owncloud/core/issues/14847
2015-03-13 12:26:33 +01:00
Thomas Müller 0bd2b3cb0c [WIP] upgrade app store apps during console upgrade 2015-03-13 12:16:16 +01:00
Thomas Müller 40b2889785 shipped apps are now defined in core/shipped.json - the shipped tag in info.xml is ignored from now on - never trust an app 🙊 2015-03-13 11:18:39 +01:00
Thomas Müller c546f0bf46 Merge pull request #14844 from owncloud/fix-14843-master
cron shall not operate in case we are in maintenance mode
2015-03-13 09:25:05 +01:00
Jenkins for ownCloud d17630d6be [tx-robot] updated from transifex 2015-03-13 01:54:55 -04:00
Arthur Schiwon f28f7754ae support paged results against 389ds. 2015-03-12 22:47:20 +01:00
Thomas Müller 5855108e9b drop any fallback code related to curl - refs https://github.com/owncloud/core/pull/14838#issuecomment-78586447 2015-03-12 21:43:41 +01:00
Thomas Müller e3fd13de88 cron shall not operate in case we are in maintenance mode - fixes #14843 2015-03-12 21:03:26 +01:00
Thomas Müller 68a7041348 Merge pull request #14838 from owncloud/add-curl-hard-dependency
Add cURL as hard-dependency
2015-03-12 20:37:14 +01:00
Robin McCorkell 680ec056dc Implement priority on client side in hidden input 2015-03-12 18:51:02 +01:00
Vincent Petry ce94a998dd Use storage id + appframework for ext storage CRUD
- Added StorageConfig class to replace ugly arrays
- Implemented StorageService and StorageController for Global and User
  storages
- Async status checking for storages (from Xenopathic)
- Auto-generate id for external storage configs (not the same as
  storage_id)
- Refactor JS classes for external storage settings, this mostly
  moves/encapsulated existing global event handlers into the
  MountConfigListView class.
- Added some JS unit tests for the external storage UI
2015-03-12 18:51:02 +01:00
Lukas Reschke 00f5025ff1 Add cURL as hard-dependency
It is required by other functionalities such as S2S anyways and ownCloud will fail hard at a lot of places without it.
2015-03-12 18:39:54 +01:00
Morris Jobke 23cc3cc5f2 Merge pull request #14830 from owncloud/kill-locks-table-master
we no longer support webdav locks - no need to keep the column
2015-03-12 16:12:26 +01:00
Thomas Müller 3ff484e695 we no longer support webdav locks - no need to keep the column 2015-03-12 15:23:44 +01:00
Thomas Müller 80ef53eff0 verify the file name length not to exceed 255 characters + verify path during rename 2015-03-12 10:47:47 +01:00
Thomas Müller 5054b8e4aa Merge pull request #14785 from owncloud/issue/14733-active-class-missing-for-admin-navigation-entry
Do not overwrite the active menu entry of the navigation
2015-03-12 10:45:03 +01:00
Morris Jobke 89e1b920cc Merge pull request #14613 from kampka/no-table-prefix
Install command should not require table prefix
2015-03-12 10:06:21 +01:00
Joas Schilling fefcbb966b Also use all keys for an empty array, just in case 2015-03-12 09:18:43 +01:00
Jenkins for ownCloud 454a2563bc [tx-robot] updated from transifex 2015-03-12 01:55:59 -04:00
Thomas Müller 84a5d43ed6 Merge pull request #14809 from rullzer/avatarcontroller_cache_fix
Fix the avatarcontroller cache needing the cache dir
2015-03-11 23:27:47 +01:00
Christian Kampka 277503209a Install command should not require table prefix 2015-03-11 21:06:25 +01:00
Morris Jobke dbd2bb66e9 Merge pull request #14357 from owncloud/fix/1373
Run `updateDataDirectory` after Update
2015-03-11 18:33:51 +01:00
Roeland Jago Douma 3560b32dfc Fix the avatarcontroller cache needing the cache dir
This was removed in 82254ad5ef and
unfortunatly missed by jenkins before mering into master.
2015-03-11 18:18:33 +01:00
Lukas Reschke f9fd1629da Merge pull request #14705 from rullzer/avatarcontroller
Move AvatarController to AppFramework
2015-03-11 17:15:42 +01:00
Morris Jobke 82254ad5ef Merge pull request #13893 from owncloud/create-cachedir-on-user
Only make sure the cache directory exists when we use it
2015-03-11 16:49:24 +01:00
Roeland Jago Douma 1a0f9c375b Avatar controller moved to AppFrameWork
* Original avatarcontroller migrated to the appframework
* Added DataDisplayResponse that show data inline in the browser (used
  to retrun the image)
* Removed some unneeded code
* Added unit tests for the avatarcontroller
2015-03-11 16:37:42 +01:00
Roeland Jago Douma ec31ee9117 Mark functions private 2015-03-11 16:30:54 +01:00
Lukas Reschke 73dc02d42c Merge pull request #14798 from owncloud/enable-oci-autotest-master
Setting oci as supported database
2015-03-11 16:14:54 +01:00
Morris Jobke caa672ceeb Merge pull request #14794 from owncloud/add-console-command-user-add
Add a console command user:add to create users over the console
2015-03-11 16:09:23 +01:00
Morris Jobke 04eef93b25 Merge pull request #13648 from oparoz/sfnt-fonts-preview
Add support for font previews
2015-03-11 15:56:32 +01:00
Thomas Müller 96b223676d Don't play with config values ... 2015-03-11 15:47:24 +01:00
Lukas Reschke cf25e6f569 Merge pull request #14773 from owncloud/allow-iframes-from-self-in-share-view
Allow iframes from same domain in share view
2015-03-11 15:13:59 +01:00
Roeland Jago Douma e9a003fe21 Slight better formatting 2015-03-11 15:11:50 +01:00
Robin Appelman 169031d1c5 fix factory test 2015-03-11 15:07:59 +01:00
Robin Appelman e1f2a6df94 Allow setting the watcher policy as mount option 2015-03-11 15:07:23 +01:00
Robin Appelman 7adda88786 Copy mount options to the storage 2015-03-11 15:06:48 +01:00
Robin Appelman 4f0f175f8b Allow getting all mount options as array 2015-03-11 15:06:12 +01:00
Robin Appelman 82a62fd249 Add test for storage factory 2015-03-11 15:06:12 +01:00
Robin Appelman e5c8fd37df pass mountpoint to storage wrapper callback 2015-03-11 15:06:12 +01:00
Roeland Jago Douma 09ee297356 New array syntax 2015-03-11 15:02:55 +01:00
Roeland Jago Douma c985186246 Added new header 2015-03-11 15:02:55 +01:00
Roeland Jago Douma af76716775 Now added enabled element
This change allows for more generic parsing for the capabilities.
2015-03-11 15:02:55 +01:00
Roeland Jago Douma 0bf1152a51 Added route again 2015-03-11 15:02:55 +01:00
Roeland Jago Douma 39b0f0725e Add file_sharing info to capabilities
Display the capabilities regarding file sharing in the capabilities API.
This will allow the clients to provide users a better experince.
2015-03-11 15:02:55 +01:00
Morris Jobke dbade19362 Merge pull request #13839 from owncloud/issue/13678-improve-remote-domain-detection-in-sharedropdown
Better finding the remote URL from user input in share dropdown
2015-03-11 14:38:41 +01:00
Thomas Müller cba3ec2c7f Setting oci as supported database 2015-03-11 14:29:22 +01:00
Joas Schilling b1ff21ee28 Add a console command user:add to create users over the console 2015-03-11 14:22:23 +01:00
Morris Jobke ad97ceb787 Merge pull request #13513 from owncloud/repair-legacystoragenofatalfail
Do not abort when meeting unfixable legacy storages
2015-03-11 13:32:33 +01:00
Lukas Reschke 8154ed4d2c Merge pull request #14791 from owncloud/fix-14516
Adding a more meaningful message for sabre dav exception
2015-03-11 12:52:18 +01:00
Thomas Müller 0d0f9a52d2 Merge pull request #14788 from cmeh/patch-3
Correct "one invalid characters" to "one invalid character"
2015-03-11 12:26:49 +01:00
Thomas Müller b3bb65eae5 Merge pull request #14662 from owncloud/issue/14661-show-versions-in-occ-applist
Add an option to include the installed app version in "occ app:list"
2015-03-11 12:23:22 +01:00
Thomas Müller 0f3e36fdfd Adding a more meaningful message for sabre dav exception - fixes #14516 2015-03-11 11:53:31 +01:00
Bernhard Posselt abb726c994 Merge pull request #14789 from owncloud/better-app-install-error-messages
display app update error messages
2015-03-11 11:28:28 +01:00
Joas Schilling 6a677ce8fe Do not make setupMounts() public just because of testing 2015-03-11 11:10:43 +01:00
Thomas Müller 3df1d9338e Merge pull request #14778 from owncloud/use-occ-setup-in-autotest-master
Use occ to install ownCloud in autotest.sh
2015-03-11 11:00:49 +01:00
Thomas Müller ffe06ac5c7 display app update error messages - fixes #14611 2015-03-11 09:59:56 +01:00
cmeh 4a0c649c8a Correct "one invalid characters" to "one invalid character"
Corrected "one invalid characters" to "one invalid character" in line 1575.
2015-03-11 09:59:42 +01:00
Joas Schilling 560137ca23 Always include the installed app version in "occ app:list" 2015-03-11 09:47:41 +01:00
Joas Schilling 2af8fea2be Throw a RuntimeException in the cache aswell 2015-03-11 09:33:50 +01:00
Joas Schilling 981c60f5f5 Do not overwrite the active menu entry of the navigation 2015-03-11 09:27:28 +01:00
Thomas Müller 6c1a1234f8 Properly handle available databases at runtime and respect setup checks in command line as well 2015-03-11 09:27:12 +01:00
Thomas Müller 81fa9550a0 No need to restart the web server in cli mode 2015-03-11 09:27:12 +01:00
Thomas Müller 7181840665 Use occ to install ownCloud in autotest.sh 2015-03-11 09:27:12 +01:00
Morris Jobke cfaee93552 Merge pull request #14783 from owncloud/dont-timeout-cron-master
cron.php on cli has no time limitation - fixes #14481
2015-03-11 09:23:22 +01:00
Joas Schilling d1511cdbee Fix doc blocks of insertIfNotExists() method 2015-03-11 09:05:30 +01:00
Jenkins for ownCloud 01ea056ac8 [tx-robot] updated from transifex 2015-03-11 01:55:38 -04:00
Thomas Müller b4cf6e62bf cron.php on cli has no time limitation - fixes #14481 2015-03-11 01:09:12 +01:00
Thomas Müller 1757d01604 Merge pull request #14640 from owncloud/rescanversionsonlyonce
Only rescan versions once in trashbin
2015-03-11 00:54:20 +01:00
Morris Jobke 9a9633f84f update 3rdparty master 2015-03-10 16:06:01 +01:00
Morris Jobke f5a56355fd Merge pull request #14115 from owncloud/update-symphony-components
update symphony components to 2.6.4
2015-03-10 16:05:12 +01:00
Robin Appelman bb97256a79 update symphony components to 2.6.4 2015-03-10 15:34:45 +01:00
Lukas Reschke 284bd6647c Merge pull request #14759 from owncloud/clean-up-code
Clean-up code and use proper exception types
2015-03-10 14:18:21 +01:00
Thomas Müller 4ffca58bc4 don't rely on \OCP\User::getUser() - it is not set properly in case of async operations 2015-03-10 11:47:52 +01:00
Thomas Müller 7cb6811a7b tearDown the filesystem right before setting it up again 2015-03-10 11:47:06 +01:00
Lukas Reschke 6dc59019af Merge pull request #14346 from owncloud/storage-based-path-validation
adding storage specific filename verification
2015-03-10 11:02:47 +01:00
Thomas Müller 214fa44400 Merge pull request #14534 from owncloud/add-child-src
Add support for 'child-src' directive
2015-03-10 10:30:44 +01:00
Robin Appelman dcd2d7aff5 Add unit tests for external share mananger 2015-03-10 10:17:53 +01:00
Lukas Reschke 48243a2949 Allow iframes from same domain in share view
This is required because the PDF Viewer itself is embedded using an iframe from the same domain. The default policy is blocking this.

Going on further, we have to come up with a solution in the future how to handle previews by applications, one example might be that they call their own endpoint and not the generic share page to allow applications to have full control over how to display previews.

Anyways, to test this behaviour use a decent newer browser (such as Chrome 41) and share a PDF file, obviously the PDF viewer needs to be enabled as well. Without this patch publicly shared PDF files should not get previewed and an error is thrown. (if it isn't then your browser is probably not obeying our Content-Security-Policy and you might consider switching to another one ;))
2015-03-10 10:06:15 +01:00
Joas Schilling 87431605b8 Add test for UniqueConstraintViolationException on wrong key 2015-03-10 09:26:45 +01:00
Jenkins for ownCloud e069d9d3f9 [tx-robot] updated from transifex 2015-03-10 01:55:39 -04:00
Thomas Müller c8ed88f4d6 Merge pull request #14689 from owncloud/better-missing-resource-handling
Log errors and create 404 in network list when a css or js is missing
2015-03-09 23:33:25 +01:00
Thomas Müller 2f61884956 Merge pull request #14753 from owncloud/verify-csrf-token-earlier
Verify CSRF token already in update.php and not the EventSource code
2015-03-09 23:06:15 +01:00
Thomas Müller 89be55a672 let insertIfNotExist() throw the native DBALException - no need to hide the real exception 2015-03-09 22:37:49 +01:00
Thomas Müller b966a4eb17 Adding unit test which shows insertIfNotExists to fall apart in certain situations 2015-03-09 22:37:49 +01:00
Joas Schilling 2747a83a49 Get the id before using it 2015-03-09 22:37:49 +01:00
Joas Schilling 3115d66d60 Better save then sorry 2015-03-09 22:37:49 +01:00
Joas Schilling 940163e16b insertIfNotExists() for storage insertion 2015-03-09 22:37:49 +01:00
Joas Schilling c917ea183c Only check unique keys for the comparison on filecache insert & update otherwise 2015-03-09 22:37:49 +01:00
Joas Schilling 8fa692388b Allow specifying the compare-array for insertIfNotExists() 2015-03-09 22:37:49 +01:00
Morris Jobke 94b7fa17c5 Merge pull request #14720 from owncloud/fix-shareetagpropagation
Fix size propagation over shared storage boundary
2015-03-09 16:24:06 +01:00
Morris Jobke d34662122d Merge pull request #14429 from owncloud/issue/14176-validate-timezone-before-using
Etc timezones don't exist for .5 and .75 offsets
2015-03-09 16:16:16 +01:00
Vincent Petry ec19d9c267 Add unit test for size propagation across share boundaries 2015-03-09 12:56:22 +01:00
Joas Schilling 01cd83a902 Merge pull request #14713 from owncloud/issue/14671-preview-delete-check-for-valid-fileid
Check whether the file id is valid, before using it to delete the previews
2015-03-09 11:56:46 +01:00
Lukas Reschke 2ac6f3a4f5 Clean-up code and use proper exception types 2015-03-09 11:48:55 +01:00
Joas Schilling a12e16e985 Check whether the file id is valid, before using it to delete the previews 2015-03-09 11:25:18 +01:00
Thomas Müller 3623f14e73 no translation service in common storage class 2015-03-09 10:38:38 +01:00
Thomas Müller 2367797c17 Respect http header 'Accept-Language' on ocs and remote.php calls 2015-03-09 10:38:38 +01:00
Thomas Müller 33b11682f9 translate error messages 2015-03-09 10:38:38 +01:00
Lukas Reschke 2f18a09a20 Optimize loop 2015-03-09 10:38:38 +01:00
Thomas Müller abacfd84da fixing js unit tests 2015-03-09 10:38:38 +01:00
Thomas Müller e28d314b53 deprecate isValidFileName() 2015-03-09 10:38:38 +01:00
Thomas Müller 49e1a81eba fixing namespaces and PHPDoc 2015-03-09 10:38:37 +01:00
Thomas Müller 4bac595068 adding storage specific filename verification - refs #13640 2015-03-09 10:38:37 +01:00
Lukas Reschke c0a02f1615 Verify CSRF token already in update.php and not the EventSource code
Issue report:
> Hum, well I upgraded the package then visited the web interface to
trigger the update and it failed; the UI would say there was a
possible CSRF attack and after that it'd be stuck in maintenance mode.
Tried a few times (by editing maintenance to false in owncloud.conf)
and same result each time.

That smells partially like an issue caused by our EventSource implementation, due to legacy concerns the CSRF verification happens within the EventSource handling and not when the actual endpoint is called, what happens here then is:

1. User has somehow an invalid CSRF token in session (or none at all)
2. User clicks the update button
3. Invalid CSRF token is sent to update.php - no CSRF check there => Instance gets set in maintenance mode
4. Invalid CSRF token is processed by the EventSource code => Code Execution is stopped and ownCloud is stuck in maintenance mode

I have a work-around for this problem, basically it verifies the CSRF token already in step 3 and cancels execution then. The same error will be shown to the user however he can work around it by refreshing the page – as stated by the error. I think that’s an acceptable behaviour for now: INSERT LINK

To verify this test:

1. Delete your ownCloud cookies
2. Increment the version in version.php
3. Try to upgrade
=> Before the patch: Instance shows an error, is set to upgrade mode and a refresh does not help
=> After the patch: Instance shows an error, a refresh helps though.

This is not really the best fix as a better solution would be to catch such situations when bootstrapping ownCloud, however, I don’t dare to touch base.php for this sake only, you never know what breaks then…

That said: There might be other bugs as well, especially the stacktrace is somewhat confusing but then again it installing ownCloud under /usr/share/owncloud/ and I bet that is part of the whole issue ;-)
2015-03-09 10:07:30 +01:00
Thomas Müller fccede8f50 Merge pull request #14750 from owncloud/possible-fix-for-OC_Version
proper filename for "require version.php"
2015-03-09 09:55:21 +01:00
Morris Jobke 348fe105b1 Merge pull request #14706 from owncloud/ldap-reset-paged-search-on-null-limit
LDAP: set up paged search even if limit is 0
2015-03-09 08:12:25 +01:00
Morris Jobke d550143ba0 proper filename for "require version.php" 2015-03-09 08:03:28 +01:00
Morris Jobke 674654c210 Merge pull request #14743 from owncloud/autoconfig-password
Convert 'abcpassword' to 'abcpass' during setup
2015-03-09 07:54:22 +01:00
Jenkins for ownCloud 174f8cef64 [tx-robot] updated from transifex 2015-03-09 01:54:36 -04:00
Jenkins for ownCloud 377165ae51 [tx-robot] updated from transifex 2015-03-08 01:54:36 -05:00
Robin McCorkell f43b047636 Convert 'abcpassword' to 'abcpass' during setup
This allows autoconfig files to use 'dbpassword' instead of 'dbpass', which
is more consistent with config.php
2015-03-07 13:10:43 +00:00
Jenkins for ownCloud 73c2157171 [tx-robot] updated from transifex 2015-03-07 01:54:37 -05:00
Morris Jobke 81dc550af0 Merge pull request #14736 from owncloud/errors-list
adjust list of errors, more compact and readable
2015-03-06 23:13:44 +01:00
Lukas Reschke 60c507cd4e Merge pull request #14722 from owncloud/master-14711
Fix totally broken AppStore code...
2015-03-06 18:52:12 +01:00
Thomas Müller a77a6f3b48 Merge pull request #14734 from owncloud/unit-test-insertIfNotExist
[sqlite] Use an atomic implementation on sqlite for insertIfNotExist() + use it in the file cache ...
2015-03-06 18:20:22 +01:00
Thomas Müller 1b08b7c726 use insertIfNotExist() in cache put 2015-03-06 15:32:58 +01:00
Jan-Christoph Borchardt db02edd7c8 adjust list of errors, more compact and readable 2015-03-06 15:27:21 +01:00
Thomas Müller 4e37831d85 Fix PHPDoc on the way .... 2015-03-06 14:54:57 +01:00
Thomas Müller 987b683895 Use an atomic implementation on sqlite for insertIfNotExist() 2015-03-06 14:54:54 +01:00
Jenkins for ownCloud d11f040720 [tx-robot] updated from transifex 2015-03-06 01:54:52 -05:00
Lukas Reschke d5a8225c0e Fix totally broken AppStore code...
As it turned out the AppStore code was completely broken when it came from apps delivered from the appstore, this meant:

1. You could not disable and then re-enable an application that was installed from the AppStore. It simply failed hard.
2. You could not disable apps from the categories but only from the "Activated" page
3. It did not show the activation state from any category page

This code is completely static and thus testing it is impossible. We really have to stop with "let's add yet another feature in already existing static code". Such stuff has to get refactored first.

That said, this code works from what I can say when clicking around in the AppStore page GUI. However, it may easily be that it does not work with updates or whatsever as I have no chance to test that since the AppStore code is not open-source and it is impossible to write unit-tests for that.

Fixes https://github.com/owncloud/core/issues/14711
2015-03-06 00:16:17 +01:00
Vincent Petry 4322287fc3 Fix size propagation over shared storage boundary 2015-03-05 22:23:47 +01:00
Arthur Schiwon 42d3ed47e2 set up paged search when limit is 0 2015-03-05 13:15:21 +01:00
Lukas Reschke 9f5433c0c3 Merge pull request #13368 from owncloud/memcache_lowlatency
Refactor \OC\Memcache\Factory
2015-03-05 13:05:17 +01:00
Robin McCorkell 78819da3bf \OC\Memcache\Cache implements \OCP\ICache 2015-03-05 11:36:34 +00:00
Robin McCorkell 0e4933e6d2 Refactor \OC\Memcache\Factory
Caches divided up into two groups: distributed and local. 'Low latency' is an
alias for local caches, while the standard `create()` call tries to get
distributed caches first, then local caches.

Memcache backend is set in `config.php`, with the keys `memcache.local` and
`memcache.distributed`. If not set, `memcache.distributed` defaults to the value
of `memcache.local`.
2015-03-05 11:36:34 +00:00
Jenkins for ownCloud 7e0fd8fb50 [tx-robot] updated from transifex 2015-03-05 01:56:35 -05:00
Morris Jobke bb3901e87a Merge pull request #14691 from owncloud/karma-forcejasmine2
Make sure we use Jasmine 2 for running JS unit tests
2015-03-04 20:36:49 +01:00
Morris Jobke cffc256479 Merge pull request #14672 from Crote/master
Add --show-password option to ldap:show-config
2015-03-04 20:21:14 +01:00
Joas Schilling 716ba49a82 Log errors and create 404 in network list when a css or js is missing 2015-03-04 17:56:33 +01:00
Vincent Petry d772bc56e7 Merge pull request #14693 from owncloud/fix-phpdoc
Fix PHPDoc
2015-03-04 17:55:24 +01:00
Lukas Reschke cdced56f2b Fix PHPDoc
That apparently went lost when changing the signature.
2015-03-04 15:35:41 +01:00
Vincent Petry e56727e27b Merge pull request #14690 from owncloud/trash-deletelink-unittest
Add unit test for selection overlay actions in trashbin
2015-03-04 14:50:11 +01:00
Laurens Post 8149217371 Add --show-password option to ldap:show-config 2015-03-04 14:15:33 +01:00
Vincent Petry 2a5f6a6448 Make sure we use Jasmine 2 for running JS unit tests 2015-03-04 13:50:59 +01:00
Vincent Petry 3f6e7d6a43 Add unit test for selection overlay actions in trashbin 2015-03-04 13:49:19 +01:00
Morris Jobke 299bcf749a Merge pull request #14685 from owncloud/test-noop-scanner
Add a test for ObjectStore\NoopScanner
2015-03-04 13:19:41 +01:00
Thomas Müller 2831a1790c Merge pull request #14675 from owncloud/files-external-smb-windows
adding a windows smb config for testing to ci
2015-03-04 12:27:59 +01:00
Joas Schilling 294724b5da Add a test for ObjectStore\NoopScanner 2015-03-04 11:48:31 +01:00
Morris Jobke f507601e25 Merge pull request #14582 from rullzer/avatar_fixes
Avatars in share dialog fixes
2015-03-04 10:30:09 +01:00
Robin McCorkell ed4dc4db07 Fix slash normalization error in AmazonS3Migration unit test
Since aa821ecc00 leading and trailing slashes are
trimmed in the file cache paths
2015-03-04 09:22:21 +00:00
Vincent Petry aa11b83158 Merge pull request #14682 from owncloud/issue/14681-noop-scanner-outdated
Update scanFile() and scanChildren() to the new signature of the parent ...
2015-03-04 10:07:42 +01:00
Morris Jobke ac10441600 Merge pull request #14326 from owncloud/remove-unnessary-backslashes-from-translation
Remove unnecessary backslashes from translations
2015-03-04 09:58:42 +01:00
Morris Jobke f1d74e8803 Merge pull request #14651 from owncloud/add-some-headers-to-htaccess-for-my-best-friend-jenkins
Let users configure security headers in their Webserver
2015-03-04 09:36:01 +01:00
Joas Schilling 09ac2df1f8 Update scanFile() and scanChildren() to the new signature of the parent class 2015-03-04 09:22:53 +01:00
Jenkins for ownCloud 84785a6a39 [tx-robot] updated from transifex 2015-03-04 01:55:19 -05:00
Roeland Jago Douma c9272be0b9 Avatars in share dialog fixes
* Avatar for "xxxx share with you..." to the left
* Avatars for groups and remote shares (use default placeholder)
* Modified and added unit tests
* Use the same css for all the avatars in the dropdown
2015-03-03 20:57:50 +01:00
Joas Schilling e12c83e3dc Merge pull request #14674 from owncloud/fix-l10n-getlanguagecode-2
Jenkins #14650
2015-03-03 18:33:08 +01:00
Robin McCorkell d6b9b37ddb Use dummy storages instead of real storages in files_external unit tests
We were using the SMB and SFTP backends, which since Icewind's new SMB library
results in an actual attempted connection just by constructing the storage.
This commit replaces all references to real storages (except when necessary)
with a dummy storage class.
2015-03-03 17:29:17 +01:00
Thomas Müller 7d3e228365 adding a windows smb config for testing 2015-03-03 17:29:10 +01:00
Joas Schilling b669bf26d6 Fix the behaviour of getLanguageCode() to match the expectation of the name 2015-03-03 16:47:31 +01:00
Joas Schilling ed4c05c7b5 Use findLanguage() instead of creating the object first 2015-03-03 16:47:31 +01:00
Joas Schilling 5fc004f8ea Add a test of what everyone thinks should be the result of this method 2015-03-03 16:47:31 +01:00
Joas Schilling 1761b162e6 Merge pull request #14660 from metaworx/replace-static-dbtableprefix-with-config-dbtableprefix
use `dbtableprefix` for temp table and index names
2015-03-03 16:43:47 +01:00
Thomas Müller be27188649 Merge pull request #14574 from owncloud/fix-irequest-for-older-php-versions
Read from IRequest instead of reading twice
2015-03-03 14:22:56 +01:00
Vincent Petry b4cfc79b5a Added missing done() calls for async tests 2015-03-03 13:59:03 +01:00
Thomas Müller e30ca8198f Merge pull request #14638 from owncloud/issue/14538-repairstep-drop-old-tables
Add a repair step to delete old tables
2015-03-03 13:37:54 +01:00
Thomas Müller 0af2ea8b28 Merge pull request #14586 from owncloud/proper-appcodechecker-docu
proper description of appcodechecker in config sample
2015-03-03 12:59:51 +01:00
Joas Schilling 8df4077dd7 Add a test for dropping the tables 2015-03-03 11:27:06 +01:00
Thomas Müller 29ecbc8c6c Merge pull request #14496 from owncloud/kill-substr-mssql-master
[Master] Remove hacky Substring support for MSSQL
2015-03-03 11:00:13 +01:00
Morris Jobke 9ddff4cec0 Merge pull request #14653 from sebomoto/fix_loading_feedback
fix for loading spinner reappearing after errors in db-connection
2015-03-03 10:12:48 +01:00
Vincent Petry 133c37fe22 Merge pull request #14652 from owncloud/kill-download-from-url
Remove "Download from URL" feature
2015-03-03 10:10:15 +01:00
Joas Schilling 276d678080 Etc timezones don't exist for .5 and .75 offsets 2015-03-03 09:08:47 +01:00
Jenkins for ownCloud e271fa3ee8 [tx-robot] updated from transifex 2015-03-03 01:55:50 -05:00
martin-rueegg 6be8ab65a5 replace 'oc_' with dbtableprefix form config for temporary table names and indexes 2015-03-03 01:54:15 +01:00
Sebastian Bolt 834f7039f0 fix for loading spinner reappearing after errors in db-connection 2015-03-02 21:58:06 +01:00
Lukas Reschke d620fc8798 Merge pull request #14615 from kampka/cron-command
Allow configuring background job mode from the console
2015-03-02 21:35:57 +01:00
Thomas Müller 345c527ed0 remove $content parameter 2015-03-02 21:33:17 +01:00
Lukas Reschke acabd81f42 Remove "Download from URL" feature
Fixes https://github.com/owncloud/core/issues/13326
2015-03-02 21:06:25 +01:00
Thomas Müller 7f029777a8 Adding dependency labels 2015-03-02 20:56:35 +01:00
Christian Kampka 83e0f84fef Allow configuring background job mode from the console 2015-03-02 20:51:40 +01:00
Lukas Reschke c3c993446e Run updateDataDirectory after Update
Fixes https://github.com/owncloud/core/issues/13731
2015-03-02 19:39:17 +01:00
Lukas Reschke bbd5f28415 Let users configure security headers in their Webserver
Doing this in the PHP code is not the right approach for multiple reasons:

1. A bug in the PHP code prevents them from being added to the response.
2. They are only added when something is served via PHP and not in other cases (that makes for example the newest IE UXSS which is not yet patched by Microsoft exploitable on ownCloud)
3. Some headers such as the Strict-Transport-Security might require custom modifications by administrators. This was not possible before and lead to buggy situations.

This pull request moves those headers out of the PHP code and adds a security check to the admin settings performed via JS.
2015-03-02 19:07:46 +01:00
Thomas Müller 1155ad6e38 Merge pull request #14633 from owncloud/issue/14627-maintenance-mode-message-misleading
Maintenance mode message might be misleading
2015-03-02 06:49:28 -08:00
Robin Appelman c80522ed63 Expire files from the trash in the background 2015-03-02 15:25:50 +01:00
Robin Appelman 00568af74d Allow running the async commands from unit tests 2015-03-02 15:25:31 +01:00
Vincent Petry e61aa3723e Merge pull request #14573 from owncloud/enc-migrate-disable-updater
Disable the cache updater when doing the encryption migration
2015-03-02 14:53:29 +01:00
Lukas Reschke e1f833a611 Merge pull request #14635 from owncloud/cleanup-config.sample.php
Cleanup config.sample.php
2015-03-02 14:35:54 +01:00
Vincent Petry 7432c73f5c Only rescan versions once in trashbin
Whenever versions need to be rescanned, only do it once per PHP request.
Happens whenever multiple files need to be expired.
2015-03-02 12:59:38 +01:00
Joas Schilling 195c577c77 Add a repair step to delete old tables 2015-03-02 12:02:14 +01:00
Morris Jobke 8cf61c09c8 fix link for Preview documentation 2015-03-02 10:45:22 +01:00
Morris Jobke 297285249a fix line breaks in config.sample.php 2015-03-02 10:44:18 +01:00
Thomas Müller 9c79b1fc6d Merge pull request #14608 from kampka/master
Don't swallow errors in console.php
2015-03-02 01:40:57 -08:00
Thomas Müller 58ec0ea734 Merge pull request #14535 from owncloud/fix-files-external
fix files external test run and add common-tests option
2015-03-02 00:51:38 -08:00
Joas Schilling 0f09989824 Maintenance mode message might be misleading 2015-03-02 09:51:25 +01:00
Morris Jobke 4009f15255 Merge pull request #14593 from owncloud/fix/13994
Add detection for invalid CLI configuration for settings page
2015-03-02 09:19:26 +01:00
Morris Jobke 7194952db4 Merge pull request #14570 from rullzer/ocs_sane_permissions
Shares should have a least read permission
2015-03-02 08:38:36 +01:00
Jenkins for ownCloud 3f91e3757f [tx-robot] updated from transifex 2015-03-02 01:55:00 -05:00
Roeland Jago Douma 4436a9ce35 Shares should have a least read permission
* Throw 400 when a share is created or updated without read permissions
* Added unit tests
2015-03-01 17:13:17 +01:00
Lukas Reschke afb0d742b9 Simplify code 2015-03-01 12:35:41 +01:00
Morris Jobke a6f5d3e1e8 Merge pull request #14614 from jakobsack/master
Show time difference of last cron run instead of absolute time
2015-03-01 12:22:39 +01:00
Morris Jobke 36a4ee27ba Merge pull request #14605 from owncloud/checkserver-disable-hhvm
Disable some server checks when running on HHVM
2015-03-01 12:12:01 +01:00
Jakob Sack 97a624dba5 Improve language on backgroundjob admin page 2015-03-01 11:51:40 +01:00
Lukas Reschke faddd1e256 Simplify code 2015-03-01 11:46:39 +01:00
Jenkins for ownCloud ff85d38c2a [tx-robot] updated from transifex 2015-03-01 01:54:38 -05:00
Jakob Sack 7a84c90d71 Rename $human_time to $relative_time in cron settings 2015-02-28 21:49:23 +01:00
Jakob Sack 0efed5c216 Add absolute time of last cronjob as hover tip 2015-02-28 21:48:19 +01:00
Jakob Sack 6e906fc4d4 Use relative time for cron status 2015-02-28 21:09:25 +01:00
Christian Kampka bf01327cd0 Don't swallow errors in console.php 2015-02-28 12:31:11 +01:00
Lukas Reschke b29940d956 Add support for 'child-src' directive
This is required when working with stuff such as PDF.js in the files_pdfviewer application. Opt-in only.

Master change only because the stable CSP policies has a failback that allows nearly anything 🙈
2015-02-28 12:27:46 +01:00
Lukas Reschke d0c6af2cb5 Disable bootstrap.php checks when HHVM is used 2015-02-28 10:11:12 +01:00
Lukas Reschke 4100610390 Disable some server checks when running on HHVM
Ref https://github.com/owncloud/core/issues/10837#issuecomment-76516839
2015-02-28 10:08:41 +01:00
Jenkins for ownCloud 42f6448da2 [tx-robot] updated from transifex 2015-02-28 01:55:32 -05:00
Lukas Reschke d201f1c47e Fix version rev 2015-02-28 00:47:43 +01:00
Frank Karlitschek 270d404ee2 This is 8.0.1 now 2015-02-28 00:39:41 +01:00
Frank Karlitschek 95e3c56d2a This is not 8.1 pre alpha 2015-02-28 00:26:31 +01:00
Lukas Reschke b6d8a48ce1 Add detection for invalid CLI configuration for settings page
This change will log all failures that prevent the CLI cronjob from happening to the database and display a warning to administrators when an error happened.

To test:

1. Configure some invalid CLI php.ini settings
2. Enable the CLI cronjob and run php cron.php
3. See the errors printed and also in the admin page
4. Configure the CLI settings correctly
5. Errors should be gone.

Fixes https://github.com/owncloud/core/issues/13994
2015-02-27 20:20:34 +01:00
Morris Jobke 7452d0434a proper description of appcodechecker in config sample 2015-02-27 20:02:07 +01:00
Lukas Reschke 13b0b7dfaf Merge pull request #14585 from owncloud/fix-avatars-for-users-with-at
Use custom attribute instead of the div identifier
2015-02-27 18:40:53 +01:00
Lukas Reschke 92b5517229 Use custom attribute instead of the div identifier
Otherwise problems arrive when a username contains characters such as an `@`

Fixes https://github.com/owncloud/user_shibboleth/issues/38
2015-02-27 17:38:59 +01:00
Vincent Petry 22bc622f9b Move keys instead of copy during encryption key migration 2015-02-27 17:14:17 +01:00
Robin Appelman 89735ab22b add some tests for disabled updater 2015-02-27 17:14:17 +01:00
Robin Appelman 6f000ffc7b Disable the cache updater when doing the encryption migration 2015-02-27 17:14:16 +01:00
Robin Appelman f6182aa87e Allow disabling the cache updater 2015-02-27 17:14:16 +01:00
Morris Jobke b4dfd043d7 Merge pull request #14575 from owncloud/cache-rename-overwrite
Fix cache update when doing a rename that overwrites the target
2015-02-27 17:11:37 +01:00
Robin Appelman fc027bceb7 Fix cache update when doing a rename that overwrites the target 2015-02-27 16:39:58 +01:00
Bernhard Posselt 970b14d297 Merge pull request #13616 from owncloud/streamresponse
AppFramework StreamResponse
2015-02-27 15:43:01 +01:00
Bernhard Posselt 95239ad21e AppFramework StreamResponse
First stab at the StreamResponse, see #12988

The idea is to use an interface ICallbackResponse (I'm not 100% happy with the name yet, suggestions?) that allow the response to output things in its own way, for instance stream the file using readfile

Unittests are atm lacking, plan is to

check if a mock of ICallbackResponse will be used by calling its callback (also unhappy with this name) method
Usage is:

$response = new StreamResponse('path/to/file');

rename io to output, add additional methods and handle error and not modified cases when using StreamResponse

fix indention and uppercasing, also handle forbidden cases

fix indention

fix indention

no forbidden, figuring out if a file is really readable is too complicated to get to work across OSes and streams

remove useless import

remove useless import

fix intendation
2015-02-27 15:42:33 +01:00
Morris Jobke 0c058490f4 Merge pull request #14566 from owncloud/fix-avatars-in-master
Fix avatars in master
2015-02-27 15:41:40 +01:00
Joas Schilling c5a9bad919 Merge pull request #14567 from owncloud/node-check-fileinfo-interface
Add "throws" lines to calling methods and interface aswell
2015-02-27 15:15:09 +01:00
Lukas Reschke 5c2fafa05f Read from IRequest instead of reading twice
Potentially fixes https://github.com/owncloud/core/issues/14541 and https://github.com/owncloud/core/issues/14506
2015-02-27 14:22:35 +01:00
Vincent Petry 1750e7b76d Fixed expected warning count on repair fail 2015-02-27 13:32:46 +01:00
Robin Appelman c65c717379 Fix external shares without password on oracle 2015-02-27 13:22:57 +01:00
Vincent Petry 32c9139ac2 Detect that the done flag was not set after repair fail 2015-02-27 13:16:38 +01:00
Vincent Petry 22bc37cb82 Properly forward repair errors and warnings
This makes repair errors and warnings visible for the user when
upgrading on the command line or in the web UI.
2015-02-27 12:44:04 +01:00
Thomas Müller 8abb80c642 Merge pull request #14565 from owncloud/more-https
Add more HTTPS endpoints
2015-02-27 03:31:08 -08:00
Joas Schilling 3a6a0501c4 Add "throws" lines to calling methods and interface aswell 2015-02-27 12:16:53 +01:00
Lukas Reschke 8818165e07 Fix avatars in master 2015-02-27 12:03:58 +01:00
Vincent Petry e6abe96374 Do not abort when meeting unfixable legacy storages 2015-02-27 12:03:22 +01:00
Thomas Müller 7fe07e93fe Merge pull request #14437 from owncloud/node-check-fileinfo
Check if we have a proper fileinfo
2015-02-27 02:56:13 -08:00
Lukas Reschke b048e7129a Add more HTTPS endpoints
The doc server can now finally speak SSL...
2015-02-27 11:37:30 +01:00
Thomas Müller 1c6857d92c Merge pull request #14529 from owncloud/intuitive-version-check
Make version check work on the lowest common version denominator
2015-02-27 02:16:23 -08:00
Morris Jobke 06141ed95a Merge pull request #14563 from owncloud/LukasReschke-patch-1
Add notice about Travis Checks
2015-02-27 10:40:02 +01:00
Lukas Reschke b58455241b Add notice about Travis Checks
Maybe it helps in the future so we won't forget it again 🙈
2015-02-27 10:23:20 +01:00
Thomas Müller f72f9e0159 Merge pull request #14530 from owncloud/revert-14403
Revert "Updating license headers"
2015-02-27 00:39:29 -08:00
Thomas Müller 64138b0af5 Merge pull request #14561 from owncloud/fix-sftp
apply suggestions from @atmoz to fix SFTP setup
2015-02-27 00:02:39 -08:00
Jenkins for ownCloud d20061e5b1 [tx-robot] updated from transifex 2015-02-27 01:55:28 -05:00
Morris Jobke 63f5d7d3d6 apply suggestions from @atmoz to fix SFTP setup 2015-02-26 23:49:18 +01:00
Thomas Müller de47a1e329 Merge pull request #14550 from owncloud/gc-warning
Fix warning in filecache gc
2015-02-26 12:02:11 -08:00
Vincent Petry 1777609d47 Merge pull request #14532 from owncloud/defaultvalueforremoteid
Add default value for remote_id
2015-02-26 16:46:12 +01:00
Robin Appelman 5bb1a131e4 fix warning in gc 2015-02-26 16:42:41 +01:00
Lukas Reschke 9baf758150 Merge pull request #14503 from owncloud/quota-preventdatalossforfailedmove
Fix file move/copy when storage space is not enough
2015-02-26 16:35:13 +01:00
Morris Jobke 2d9886d1c3 Merge pull request #14527 from owncloud/clarify-link
clarify link on apps management to the dev documentation
2015-02-26 16:10:58 +01:00
Morris Jobke 18d43f7469 Merge pull request #14474 from owncloud/move-utf-8-check-to-setup
Move UTF-8 check to setup
2015-02-26 16:00:31 +01:00
Morris Jobke 522469614b Merge pull request #14505 from owncloud/dav-copy-fix
Fixes WebDAV copy
2015-02-26 15:42:53 +01:00
Morris Jobke 55b3f6b986 Merge pull request #13969 from raimund-schluessler/master
Append search results to custom container
2015-02-26 15:16:23 +01:00
Vincent Petry 232de3bdc0 Delete target file for unsuccessful copy/rename 2015-02-26 15:11:37 +01:00
Morris Jobke e21df9b99a update 3rdparty to current master 2015-02-26 15:11:03 +01:00
Morris Jobke 0c1e6fad6c Merge pull request #14300 from owncloud/commandbus
Add async command system to handle asynchronous operations
2015-02-26 15:10:13 +01:00
Morris Jobke 27fde80ee6 fix exception message 2015-02-26 15:08:30 +01:00
Vincent Petry 80e5ad3131 Bump up files_sharing version for schema update 2015-02-26 15:04:15 +01:00
Morris Jobke e887f7b9b7 clarify link on apps management to the dev documentation 2015-02-26 15:02:39 +01:00
Morris Jobke a183b5d7e2 Merge pull request #14208 from owncloud/oc-msg-remove-object-dependency
Remove dependency from arbitrary data object structure for easier usage
2015-02-26 14:57:21 +01:00
Morris Jobke 7b2b74d731 Merge pull request #14473 from owncloud/remove-uneeded-assignment
Remove uneeded assignment
2015-02-26 14:01:21 +01:00
Morris Jobke 62d54e4c2a fix files external test run and add common-tests option 2015-02-26 13:32:44 +01:00
Robin Appelman 541c8c092d Add unit test 2015-02-26 12:20:20 +01:00
Vincent Petry ba71ee6059 Add default value for remote_id
Fixes SQLite migration with non-null column.
2015-02-26 12:09:21 +01:00
Bernhard Posselt 876e8bcb55 add phpdoc 2015-02-26 11:49:51 +01:00
Bernhard Posselt 2987d4aec8 make version check work on the lowest common version denominator 2015-02-26 11:42:08 +01:00
Morris Jobke 06aef4e8b1 Revert "Updating license headers"
This reverts commit 6a1a4880f0.
2015-02-26 11:37:37 +01:00
Vincent Petry ae2f37ac06 Removed unused $node variable 2015-02-26 11:16:42 +01:00
Thomas Müller adc986f3e4 Merge pull request #14502 from owncloud/failing-mysql-master-tests
Failing mysql master tests
2015-02-26 01:48:37 -08:00
Joas Schilling fe8df31fa5 Sort the array to be sure 2015-02-26 09:13:09 +01:00
Jenkins for ownCloud 8a4fddeb4a [tx-robot] updated from transifex 2015-02-26 01:55:50 -05:00
Thomas Müller 7ba391cd5a Merge pull request #14468 from owncloud/af-db-cleanup
Clean up AppFramework database layer
2015-02-25 14:18:45 -08:00
Bernhard Posselt 59bbf27253 remove IDb interface from core class usage 2015-02-25 22:21:24 +01:00
Thomas Müller c62eb9d652 owncloud -> ownCloud 2015-02-25 22:21:24 +01:00
Bernhard Posselt 4e29a4d867 deprecate getters for deprecated class 2015-02-25 22:21:24 +01:00
Bernhard Posselt f993ed823e fix tabs and spaces 2015-02-25 22:21:24 +01:00
Bernhard Posselt aaf753bc9a fix mappertestutility 2015-02-25 22:21:24 +01:00
Bernhard Posselt 7b2fdbfb0b use IDBConnection and close cursors after insert/update/delete 2015-02-25 22:21:24 +01:00
Bernhard Posselt fb84e7d282 migrate to IDBConnection 2015-02-25 22:21:24 +01:00
Lukas Reschke 0720cf0ad1 Merge pull request #14494 from owncloud/fix-oracle-master
using Doctrine\DBAL\Connection::executeUpdate()
2015-02-25 21:43:51 +01:00
Lukas Reschke 94bf2c8d6d Merge pull request #14509 from owncloud/fix/14231
Show 404 page when accessing empty share URL
2015-02-25 21:39:49 +01:00
Vincent Petry 64c333c44b Merge pull request #14508 from owncloud/tagmanager-nouser
Return null when requesting tags for null user
2015-02-25 20:53:59 +01:00
Clark Tomlinson e8c3e33154 Merge pull request #14490 from owncloud/remove-unused-deprecated-code
Remove unused and deprecated Code
2015-02-25 14:49:40 -05:00
Lukas Reschke 921a76ae2e Merge pull request #14245 from cmeh/master
Message clean-up
2015-02-25 17:46:41 +01:00
Lukas Reschke fca4628a5c Show 404 page when accessing empty share URL
Testplan:
- [ ] Without: Accessing `public.php?service=files&t=` throws an exception
- [ ] With: No exception thrown and 404 page displayed.

Fixes https://github.com/owncloud/core/issues/14231
2015-02-25 17:29:12 +01:00
Vincent Petry 9ee37169a6 Return null when requesting tags for null user
The TagManager->load() now returns null if the user is not authenticated
instead of failing with an error.
2015-02-25 17:20:26 +01:00
Vincent Petry f39fcbc250 Fixes WebDAV copy
- added existence check for source argument
- removed extra logic for folders, as $view->copy() already supports
  that internally
2015-02-25 16:35:13 +01:00
Vincent Petry 20738d287e Properly detect streamCopy errors
Now checking whether the written bytes match the number of read bytes.
2015-02-25 16:03:15 +01:00
Joas Schilling ac5bb97d04 Reset the group backend aswell 2015-02-25 16:03:12 +01:00
Joas Schilling 6e9f3b2f7e Clear the local cache when we clear the backends 2015-02-25 16:03:12 +01:00
Joas Schilling 993d89b3cc Extend the class so the Filesystem is cleaned up 2015-02-25 16:03:10 +01:00
Robin Appelman f5befbeac6 Check if we have a proper fileinfo 2015-02-25 16:02:08 +01:00
Thomas Müller 14c592fe86 Merge pull request #14500 from owncloud/fileglobalgc-cleanup
Cleanup garbage collection for global file cache
2015-02-25 06:41:57 -08:00
Robin Appelman 3cf237df67 set max argument length to 4000 2015-02-25 15:09:41 +01:00
Robin Appelman bf65b1f18b Rename getAsyncCommandBus to getCommandBus 2015-02-25 15:09:41 +01:00
Robin Appelman 9873ab20af prevent phpunit from messing with the bound $this 2015-02-25 15:09:41 +01:00
Robin Appelman 27d047979d require command that do file access to be run sync when encryption is enabled 2015-02-25 15:09:41 +01:00
Robin Appelman a39c7bf464 Add FileAccess trait for commands 2015-02-25 15:09:41 +01:00
Robin Appelman 8213f8d67d Allow apps to determine which commands should be run synchronous based on traints 2015-02-25 15:09:41 +01:00
Robin Appelman be930e338d add superclosure to thirdparty 2015-02-25 15:09:41 +01:00
Robin Appelman c2a7fff4f6 throw an exception when trying to push a background job that wont fit in the table
otherwise it will lead to failures in json decode and unexpected and hard to debug issues when running the job
2015-02-25 15:08:40 +01:00
Robin Appelman 6fc0eb0236 expand cron argument column to 2048 2015-02-25 15:08:40 +01:00
Robin Appelman 74ae7b8929 Add async command system to handle asynchronous operations 2015-02-25 15:08:40 +01:00
Robin McCorkell 695f43a1ed Merge pull request #10735 from owncloud/use_remote_addr
Use getRemoteAddress which supports reverse proxies
2015-02-25 13:24:39 +00:00
Robin Appelman a848a6b1dd Cleanup garbage collection for global file cache 2015-02-25 14:13:58 +01:00
Lukas Reschke afe087a371 Remove hacky Substring support for MSSQL
Substring() is not required for the core functionality and this allows us to get rid of a huge hack...
2015-02-25 14:00:54 +01:00
Thomas Müller e9d25e4fdb using Doctrine\DBAL\Connection::executeUpdate() 2015-02-25 13:43:26 +01:00
Lukas Reschke de44a2b2ab Remove unused and deprecated Code
Function is not used anymore anywhere in the code base: https://github.com/search?q=user%3Aowncloud+secureRNGAvailable&type=Code&utf8=%E2%9C%93
2015-02-25 12:11:14 +01:00
Thomas Müller f5b6226732 Merge pull request #14462 from owncloud/add-some-php-docs
Add some PHPDocs
2015-02-25 02:53:22 -08:00
Thomas Müller f6044fe429 Merge pull request #14460 from owncloud/revive/12971
Add support for sftp custom port
2015-02-25 02:52:25 -08:00
Thomas Müller bcf3704645 Merge pull request #14458 from owncloud/revive/11157
Get the real protocol behind several proxies
2015-02-25 02:51:46 -08:00
Robin McCorkell af96078153 Merge pull request #14475 from owncloud/fix-ext-owncloud
Fix bugs in ownCloud external storage
2015-02-25 10:39:25 +00:00
Thomas Müller 7f7cdecb1a Merge pull request #13741 from owncloud/autotest_improvements
Better config cleanup in autotest.sh
2015-02-25 02:31:14 -08:00
Thomas Müller 799e144b04 Merge pull request #14151 from owncloud/update-sabre2.1
Sabre Update to 2.1
2015-02-25 02:21:55 -08:00
Robin McCorkell edfeb05a05 Fix bugs in ownCloud external storage 2015-02-25 10:10:13 +00:00
Thomas Müller b3de86d851 Remove locks plugin.
Reasoning:
- a WebDAV server is not required to implement locking support
- WebDAV Locking is know to break the sync algorithm
- the current lock implementation is known to be broken (locks are not moved if a file is moved, locks on shared files don't work)
2015-02-25 10:30:47 +01:00
Vincent Petry fb87b746f0 Merge pull request #14213 from AW-UC/naturalsort_defaultcollator-patch-file-sorting
Update naturalsort_defaultcollator.php. Fixes #13982
2015-02-25 10:30:14 +01:00
Thomas Müller 7e7e0c51fb Merge pull request #14471 from owncloud/always-load-authentication-apps
Always load authentication apps
2015-02-24 23:31:40 -08:00
Jenkins for ownCloud 31f881415b [tx-robot] updated from transifex 2015-02-25 01:55:51 -05:00
Lukas Reschke 06cf93e6ee Move UTF-8 check to setup
Nobody reads the warnings anyways and so we should enforce it at installation time... Also allows us to get rid of some duplicated code.

To test change the `default_charset` to something other than `utf-8` or `UTF-8`, both should work fine with that change here. An error should then get shown.

We already set those default charsets in the shipped .user.ini and .htaccess
2015-02-24 23:51:36 +01:00
AW-UC 0066c6f001 Add PHPunit test for DefaultCollator
This extends Test_NaturalSort to include a basic test for
\OC\NaturalSort_DefaultCollator()
2015-02-24 23:51:08 +01:00
AW-UC d57f5c70e9 Fix sorting for files that only differ in case. 2015-02-24 23:50:38 +01:00
Olivier Paroz f49805eea5 Add support for font previews 2015-02-24 22:00:54 +01:00
Lukas Reschke 5bb0889b30 Remove uneeded assignment
'files' is neither used in the controller or the template
2015-02-24 19:50:23 +01:00
Lukas Reschke c1d7b22d08 Always load authentication apps
The current code path may trigger situations where the LDAP application is not yet loaded and thus problems with the authentication appeared.

In previous versions of ownCloud the authentication mechanism manually loaded these apps which is why this affects ownCloud 8 and master only for my knowledge. (certainly not 6, maybe 7)

Backport to 8 might be something to consider.

Fixes https://github.com/owncloud/core/issues/14469
2015-02-24 18:00:26 +01:00
Thomas Müller 09a06e4f0a Merge pull request #14068 from owncloud/autotest-external-sftp
[files_external] sftp tests
2015-02-24 08:06:27 -08:00
Lukas Reschke 52495dc995 Merge pull request #13740 from owncloud/fix-12190-2
Include primary groups in user and login filter when restricting group access and also fix user counting in primary groups
2015-02-24 16:37:49 +01:00
Lukas Reschke b6289542e8 Merge pull request #14400 from owncloud/fix-cron-deadlock
Use flock instead of just checking if there is a file to prevent deadloc...
2015-02-24 16:16:48 +01:00
Bernhard Posselt 5b506ab518 use flock instead of just checking if there is a file to prevent deadlocks when the process crashed or the unlink wasnt done
move cron.lock into top directory to prevent external storage issues

use tmp directory lock file

use new config interface

incorporate #13770

add dots
2015-02-24 15:41:20 +01:00
Lukas Reschke d43d34c93f Merge pull request #14195 from owncloud/activity-manager-performance-improvements
Activity manager performance improvements
2015-02-24 15:19:15 +01:00
Thomas Müller 7325414481 Merge pull request #14282 from owncloud/disable-non-shipped-apps-master
3rd-party apps are disabled on upgrade
2015-02-24 14:39:45 +01:00
Thomas Müller 48cefd9bd5 Merge pull request #14461 from owncloud/fix-code-that-never-worked
Fix code that never worked
2015-02-24 14:00:43 +01:00
Joas Schilling 88cfe46906 Merge pull request #11555 from goodkiller/patch-1
Update group.php
2015-02-24 13:58:41 +01:00
Lukas Reschke 276824299c Merge pull request #13340 from owncloud/use-http-only
Use "HTTPOnly" for cookies when logging out
2015-02-24 13:50:49 +01:00
Lukas Reschke dbb665a361 Add some PHPDocs
My IDE was crying...
2015-02-24 13:44:40 +01:00
Lukas Reschke 9adcd15cb3 Use [0] instead of current as HHVM might have problems with that 2015-02-24 13:37:34 +01:00
Lukas Reschke 65dcbccee0 Merge pull request #14459 from owncloud/fix-oracle
Dont break code which relies on the cursor being open after insert/updat...
2015-02-24 13:35:07 +01:00
Lukas Reschke 1229184873 Fix code that never worked
Introduced with https://github.com/owncloud/core/commit/1df8a5a774ae5d665849daf74540d967826d5e11 in February 2013…
2015-02-24 13:26:23 +01:00
Lukas Reschke 6dd5bc0379 Fix code style as per review 2015-02-24 13:22:12 +01:00
SA 350f8eb86e Add support for sftp custom port 2015-02-24 13:15:38 +01:00
Bernhard Posselt fd3663f563 Dont break code which relies on the cursor being open after insert/update/delete 2015-02-24 12:58:36 +01:00
Thomas Müller 58cedc07b5 print app upgrade information to console as well 2015-02-24 12:52:16 +01:00
Thomas Müller 80cafe29a8 3rd-party apps are only disabled in case core is upgraded 2015-02-24 12:51:55 +01:00
Lukas Reschke 1c6eae9017 Get the real protocol behind several proxies
X-Forwarded-Proto contains a list of protocols if ownCloud is behind multiple reverse proxies.

This is a revival of https://github.com/owncloud/core/pull/11157 using the new IRequest public API.
2015-02-24 12:24:55 +01:00
Lukas Reschke e08ebe87dc Merge pull request #10830 from Finkregh/patch-1
add question about user-backend
2015-02-24 12:13:55 +01:00
Thomas Müller fe7e7677e9 shipped and 3rd-party apps of type authentication and session will remain enabled during update 2015-02-24 12:02:37 +01:00
Thomas Müller bbf7f56f94 3rd-party apps are disabled on upgrade - refs #14026 2015-02-24 12:02:36 +01:00
Lukas Reschke e5c6af5102 Merge pull request #10599 from owncloud/move_passwordchange_text
Make the password changed msg inline to fix #10242
2015-02-24 11:54:17 +01:00
Lukas Reschke 165afb004b Use getRemoteAddress which supports reverse proxies
Breaking change for 8.1 wiki (Security > Administrators):

The log format for failed logins has changed and uses now the remote address and is considering reverse proxies for such scenarios when configured correctly.
2015-02-24 11:49:40 +01:00
Thomas Müller da8e34cf7f Merge pull request #14009 from owncloud/installing-installed-apps-is-stupid
don't allow installation of already installed apps - fixes #14004
2015-02-24 10:34:06 +01:00
cmeh 649a1ba255 Typo: Missing "n"
A missing "n" was added in line 63.
2015-02-24 10:15:56 +01:00
Joas Schilling a320edaca5 Merge pull request #14419 from owncloud/preview_apostrophe_fix
fix issue with previews not being displayed if filename contains apostrophe
2015-02-24 09:58:53 +01:00
Lukas Reschke 8bd3d55517 Merge pull request #14442 from owncloud/fix-oracle-ci-master
Close the cursor after the affected count has been extracted.
2015-02-24 09:20:59 +01:00
Jenkins for ownCloud cdb4cfd939 [tx-robot] updated from transifex 2015-02-24 01:54:58 -05:00
Thomas Müller b40d4c9cbc app store can be used with any edition 2015-02-23 23:16:28 +01:00
Thomas Müller 39d8406933 don't allow installation of already installed apps - fixes #14004 2015-02-23 23:16:28 +01:00
Thomas Müller 0cdc2cebbf Merge pull request #14433 from owncloud/fix-public-php
Use `getParam` instead of `server`
2015-02-23 22:43:51 +01:00
Thomas Müller e87ada86d1 Merge pull request #14416 from owncloud/setup-command
Setup command
2015-02-23 22:41:10 +01:00
Lukas Reschke 432d7be8cc Show a empty response for GET on non-files instead of the Browser Plugin 2015-02-23 22:27:23 +01:00
Vincent Petry 5b6caf763c Removed broken webdav tests
The encryption webdav tests are too broad and do not qualify as unit
test. Also, since the sabre upgrade they are not fixable.
The matching functionality is already tested in other classes on a
smaller scale.
2015-02-23 22:27:23 +01:00
Vincent Petry 9f6dcb9d3e Sabre Update to 2.1
- VObject fixes for Sabre\VObject 3.3
- Remove VObject property workarounds
- Added prefetching for tags in sabre tags plugin
- Moved oc_properties logic to separate PropertyStorage backend (WIP)
- Fixed Sabre connector namespaces
- Improved files plugin to handle props on-demand
- Moved allowed props from server class to files plugin
- Fixed tags caching for files that are known to have no tags
  (less queries)
- Added/fixed unit tests for Sabre FilesPlugin, TagsPlugin
- Replace OC\Connector\Sabre\Request with direct call to
  httpRequest->setUrl()
- Fix exception detection in DAV client when using Sabre\DAV\Client
- Added setETag() on Node instead of using the static FileSystem
- Also preload tags/props when depth is infinity
2015-02-23 22:27:23 +01:00
Thomas Müller 66e3211fd8 Merge pull request #13439 from owncloud/app-filter
Make the search box filter apps
2015-02-23 21:51:53 +01:00
Thomas Müller 0a9b8242ee properly initialize OC::$WEBROOT and host name 2015-02-23 21:49:35 +01:00
Thomas Müller c350da1a28 Merge pull request #14119 from owncloud/dbal251
Update doctrine/dbal to 2.5.1 #13537
2015-02-23 20:59:51 +01:00
Thomas Müller eae6471105 Fix error handling 2015-02-23 17:46:08 +01:00
Thomas Müller 5bdf42a925 Close the cursor after the affected count has been extracted. 2015-02-23 17:17:20 +01:00
Thomas Müller bcd10d3dc5 implement command maintenance:install 2015-02-23 16:47:47 +01:00
Thomas Müller 1fd1b355e4 Fix namespace of OC_Setup -> \OC\Setup 2015-02-23 16:44:40 +01:00
Lukas Reschke f54cd14c7e Merge pull request #14439 from owncloud/fix-ajax-files-external
Fix Ajax type casting for files_external
2015-02-23 16:29:45 +01:00
Vincent Petry 4290e1990e Merge pull request #13829 from owncloud/appmanager-list
Better caching for enabled apps
2015-02-23 16:03:32 +01:00
Robin McCorkell 9d36959d82 Fix Ajax type casting for files_external 2015-02-23 14:57:37 +00:00
Vincent Petry e144d3aa49 Added unit test for app filter 2015-02-23 15:29:25 +01:00
Lukas Reschke 615bc5a827 Use getParam instead of server
`server` is completely wrong here and this will not work on master. With `getParam` it will work fine though.

Testplan:
- [ ] Without patch: Share a file and try to access `http://localhost/public.php?service=files&t=THESHAREDTOKEN` => Fails
- [ ] With patch: Try the same => Works

Master only.
2015-02-23 14:07:42 +01:00
Bernhard Posselt 8176032176 Merge pull request #14427 from owncloud/fix-some-php-docs
Fix some PHPDocs
2015-02-23 14:04:35 +01:00
Thomas Müller df3c73de72 Merge pull request #14403 from owncloud/update-license-headers
Update license headers
2015-02-23 13:53:16 +01:00
Lukas Reschke c06a94ecc2 Fix some PHPDocs 2015-02-23 12:19:52 +01:00
Jenkins for ownCloud 6a1a4880f0 Updating license headers 2015-02-23 12:13:59 +01:00
Joas Schilling b180724cd0 Extract the remote host from user input in share dropdown
Fix #13678
2015-02-23 11:28:41 +01:00
Thomas Müller f693d439e2 Merge pull request #14422 from owncloud/use-off-and-off
Use "off" and "off" instead of true booleans
2015-02-23 11:12:53 +01:00
Lukas Reschke 9a08c7ecb9 Merge pull request #14275 from chris-se/master
DAV authentication: use Owncloud's internal user instead of HTTP auth one
2015-02-23 10:25:13 +01:00
Lukas Reschke 43641d917b Use "off" and "off" instead of true booleans
Apparently a boolean in php.ini is according to the documentation "on" or "off"…

Fixes itself.
2015-02-23 09:40:15 +01:00
Jenkins for ownCloud f63b09faca [tx-robot] updated from transifex 2015-02-23 01:55:10 -05:00
Thomas Müller fd6d56290e Adding .mailmap - helps to add unified authors to the license header 2015-02-22 20:36:36 +00:00
Thomas Müller b868914354 php script which updates the license header in all php file in the repo 2015-02-22 20:36:36 +00:00
Thomas Müller 0751ee087f Merge pull request #14414 from owncloud/add-ini-helper
Add helper to check for `ini` values in `OC_Util::checkServer`
2015-02-22 20:44:02 +01:00
Thomas Müller 61b00ac821 Merge pull request #14413 from owncloud/verify-php-before-running-tests-2
Check for PHP configuration before executing unit tests
2015-02-22 20:36:07 +01:00
Georg Ehrke 8e02592e3f fix issue with previews not being displayed if filename contains apostrophe 2015-02-22 16:51:16 +01:00
Jenkins for ownCloud ef09e5d395 [tx-robot] updated from transifex 2015-02-22 01:54:42 -05:00
Lukas Reschke 9b46e3b3d5 Add expected values to default config as well 2015-02-21 12:17:59 +01:00
Lukas Reschke 2f0f38761d Add helper to check for ini values in OC_Util::checkServer
This allows to check for specific values in the PHP.ini that ownCloud requires for full compatibility.

`mbstring.func_overload`: https://github.com/owncloud/core/issues/14372
`output_buffering`: http://doc.owncloud.org/server/8.0/admin_manual/configuration/big_file_upload_configuration.html#configuring-php

Fixes https://github.com/owncloud/core/issues/14372 and https://github.com/owncloud/core/issues/14412
2015-02-21 12:12:34 +01:00
Thomas Müller 9aeeb2605b Check for PHP configuration before executing unit tests 2015-02-21 11:51:52 +01:00
Jenkins for ownCloud 906c0e7798 [tx-robot] updated from transifex 2015-02-21 01:54:38 -05:00
Lukas Reschke fcc5f5a4f4 Merge pull request #13777 from owncloud/close-cursor
Close cursor for appframework and manipulation queries if applicable
2015-02-20 20:15:22 +01:00
Thomas Müller 3a6b11d018 Merge pull request #13767 from owncloud/issue/13764-mimetype-racecondition
Use insertIfNotExists() and reload mimetypes after inserting one
2015-02-20 17:39:17 +01:00
Lukas Reschke df2e712a8e Merge pull request #14325 from owncloud/fix-plurals-with-quotes
Correctly create the expected key for plurals with quotes
2015-02-20 16:35:53 +01:00
Lukas Reschke 6e9a2515ea Merge pull request #14278 from owncloud/fix-index
Check if the offset exists before accessing
2015-02-20 14:56:13 +01:00
Lukas Reschke 50208308e3 Merge pull request #14359 from owncloud/add-satisfy-all
Add `Satisfy All`
2015-02-20 14:55:43 +01:00
AW-UC bc668600cd Add constructor to inject collator
Adding the possibility for instantiating \OC\NaturalSort with an
injected collator. This makes the use of a specific collator enforcable.
2015-02-20 14:03:34 +01:00
Morris Jobke 7cb25149c8 Merge pull request #13645 from owncloud/fix-breadcrumb-backslash
Parse backslash as directory separator in breadcrumb
2015-02-20 13:36:38 +01:00
Joas Schilling ae60108692 Revert "Correctly fallback to english, if the plural case is not translated"
This reverts commit cbad5c998b.
2015-02-20 11:51:36 +01:00
Joas Schilling 3ab9ad2d78 Ignore empty plurals just like with singulars
The js and php code of n() has fallbacks for when the key is missing.
However there is no fallback, when the key is defined with an array of empty
strings. So we just don't extract them anymore and use the english language.
2015-02-20 11:36:56 +01:00
Joas Schilling c201bc01bb Remove dependency from arbitrary data object structure for easier usage 2015-02-20 10:43:39 +01:00
Jenkins for ownCloud 79ef5eda96 [tx-robot] updated from transifex 2015-02-20 01:55:01 -05:00
Lukas Reschke 602e563d99 Merge pull request #14366 from owncloud/remove-old-l10n-files
Remove some old l10n files they arent loaded anymore
2015-02-19 23:31:21 +01:00
Thomas Müller b7ff0d44d8 apply backslash fix to _setCurrentDir 2015-02-19 20:20:33 +01:00
jknockaert 755d52d099 fix 3rdparty 2015-02-19 18:04:10 +01:00
Morris Jobke 75a7bcb10c Merge pull request #14199 from owncloud/cast-type-manually
Manually type-cast all AJAX files
2015-02-19 17:19:54 +01:00
jknockaert 261b5eb90f again 2015-02-19 16:36:54 +01:00
Thomas Müller df58eea93f Merge pull request #13505 from owncloud/streamline-scanning-code
Streamline auth and CSRF check in scan.php
2015-02-19 16:35:05 +01:00
Thomas Müller 767dd4bde7 Merge pull request #14267 from owncloud/encode-eventsource
Encode requesttoken
2015-02-19 16:21:12 +01:00
Thomas Müller bdc503b03d Merge pull request #14295 from owncloud/encode-request-token-for-avatars
Encode Requesttoken for avatars
2015-02-19 16:20:41 +01:00
Thomas Müller 7cd3f17d9c Merge pull request #14311 from raimund-schluessler/Fix#14310
Fix #14310
2015-02-19 16:17:19 +01:00
jknockaert 9ff9f27f8a try again 2015-02-19 16:12:01 +01:00
jknockaert a490e21d0d new try 2015-02-19 16:10:41 +01:00
jknockaert 417e40d218 Merge remote-tracking branch 'origin/master'
Conflicts:
	apps/files_encryption/lib/stream.php
2015-02-19 16:08:33 +01:00
jknockaert d5ba6af259 back 2015-02-19 16:08:08 +01:00
Thomas Müller 6e4fa80fe6 Merge pull request #14377 from owncloud/port-14041
Port of #14041 to master
2015-02-19 15:49:30 +01:00
jknockaert 470994ba1e OC8 version 2015-02-19 15:43:22 +01:00
Arthur Schiwon 7ada41259c Port of #14041 to master
on ownCloud upgrade: upgrade all apps in order, load important ones

Fix "other" app update stack
2015-02-19 14:38:22 +01:00
Morris Jobke 0e47d1fcca Merge pull request #14338 from owncloud/fix-nav-heigt
If no link text has been set for the navigation show the link nonetheless
2015-02-19 13:11:53 +01:00
Joas Schilling e52a63eccb Remove some old l10n files they arent loaded anymore 2015-02-19 11:58:40 +01:00
Thomas Müller 84eb00e428 Merge pull request #14342 from owncloud/disallow-path-traversals-in-file-view
Disallow path traversals in file view
2015-02-19 10:27:04 +01:00
Jenkins for ownCloud 294137dda6 [tx-robot] updated from transifex 2015-02-19 01:55:43 -05:00
Lukas Reschke 4decbc2efa Add Satisfy All
Fixes https://github.com/owncloud/core/issues/14356
2015-02-19 02:16:44 +01:00
Thomas Müller b32d31a2f1 Merge pull request #13836 from owncloud/part-no-cache-update
Dont update the cache when working with part files
2015-02-19 00:08:10 +01:00
Robin Appelman 3632962000 Make the search box filter apps 2015-02-19 00:01:03 +01:00
Thomas Müller 88126498a0 Merge pull request #14349 from owncloud/contributetrackerupdate
add documentation issue trackers and use https everywhere
2015-02-18 20:43:16 +01:00
Jan-Christoph Borchardt 83bc951630 Merge pull request #12213 from sebomoto/add-loadfeedback
Add loadfeedback
2015-02-18 19:42:18 +01:00
Volkan Gezer 74ed727b5f add documentation issue trackers and use https everywhere 2015-02-18 19:13:49 +01:00
Lukas Reschke 46ca0fa481 Add some basic PHPDoc to functions 2015-02-18 18:17:33 +01:00
Lukas Reschke 41e5850450 Prevent directory traversals in ctr of \OC\Files\View
This prevents a misusage of \OC\Files\View by calling it with user-supplied input. In such cases an exception is now thrown.
2015-02-18 18:17:33 +01:00
Clark Tomlinson 8d09cc3b91 Merge pull request #13989 from owncloud/enhancment/security/11857
Allow AppFramework applications to specify a custom CSP header
2015-02-18 10:27:29 -05:00
Clark Tomlinson 84cc90a0ee Merge pull request #14335 from owncloud/enable-strict-mode-per-deafult
Fix invalid `ini_set` directives
2015-02-18 10:06:12 -05:00
AW-UC 097d455213 provide case-insensitive natural sorting
This makes OC's naturalsort_defaultcollator case-insensitive
2015-02-18 15:49:03 +01:00
Lukas Reschke e4bf3fcb53 Merge pull request #14330 from owncloud/revert-13879-add_debug_log_for_memcache_instantiation
Revert "add debug log for memcache instantiation"
2015-02-18 15:45:38 +01:00
Clark Tomlinson c4fdb9cc24 Merge pull request #14324 from owncloud/fix/14320
Check if instance is not yet installed
2015-02-18 09:40:32 -05:00
Bernhard Posselt a5074fa629 if no link text has been set for the navigation show the link nonetheless 2015-02-18 15:34:31 +01:00
Lukas Reschke 593681a4a9 Fix invalid ini_set directives
Somehow they got messed up. Because PHP does automatic type juggling this has worked before as well however it's not guaranteed that this might work in the future as well.
2015-02-18 15:18:27 +01:00
Vincent Petry 610761d1f7 Merge pull request #14211 from owncloud/activity/225-files-extension-jenkins
Activity/225 Move displaying of files related activities to files app
2015-02-18 14:47:15 +01:00
Vincent Petry 837365fff2 Merge pull request #14210 from owncloud/activity/225-sharing-extension-jenkins
Activity/225 sharing extension
2015-02-18 14:46:58 +01:00
Robin Appelman 5542fafd36 allow overwriting the appmanager in oc_util by subclassing 2015-02-18 14:24:50 +01:00
Joas Schilling eaccd2a72a Remove unnecessary backslashes from translations 2015-02-18 14:17:53 +01:00
Lukas Reschke cd4c064ebf Revert "add debug log for memcache instantiation" 2015-02-18 14:16:14 +01:00
Lukas Reschke a666f804c7 Use the untrusted domain in the installer 2015-02-18 13:59:37 +01:00
Joas Schilling 602845f33e Correctly create the expected key for plurals with quotes
Ported from the administration repo:
https://github.com/owncloud/administration/commit/c67eaa11c04d0989ee9331c97788a0225a82e7f5
and
https://github.com/owncloud/administration/commit/41b0f9fa3a9c6183972f971eea3875b98e22217a
2015-02-18 13:22:06 +01:00
Lukas Reschke 1a41f8f6f9 Check if instance is not yet installed
Due to a security hardening in 8.1 a missing value of empty trusted domains in the config would provoke an error as this was misused by a lot of users.

This caused a problem where the initial installation happened from another domain than 127.0.0.1 as in this case the domain was considered untrusted as no value was defined. However, this special case should not get intercepted.

To test:
- [ ] Installing ownCloud on 127.0.0.1 works
- [ ] Installing ownCloud on another domain / IP works
- [ ] When setting up ownCloud from 127.0.0.1 and accessing it from the domain above the trusted domain error should be shown if not specified in the config

Fixes https://github.com/owncloud/core/issues/14320
2015-02-18 13:06:46 +01:00
cmeh 46c34d6867 Cleaning-up messages
**Changes:**

* In line 103, the middle "c" of "owncloud" is capitalised to "ownCloud".
* A space is inserted between value and unit in lines 177 and 187 ("4 GB" instead of "4GB").
2015-02-18 12:26:42 +01:00
Thomas Müller caa6d3e2db Merge pull request #13857 from owncloud/phpseclib-0.3.9
Update phpseclib to version 0.3.9.
2015-02-18 10:17:34 +01:00
Thomas Müller 2b1f39cd6b Merge pull request #14308 from owncloud/fix-14247
Add mapping for a broken varchar type.
2015-02-18 10:05:33 +01:00
Jenkins for ownCloud b9c39b60ec [tx-robot] updated from transifex 2015-02-18 01:55:40 -05:00
Andreas Fischer c640e2fa66 Update phpseclib to version 0.3.9. 2015-02-18 01:16:23 +01:00
Lukas Reschke ceaa193df2 Merge pull request #14273 from owncloud/require-at-least-apcu-4-0-6
Use APCu only if available in version 4.0.6 and higher
2015-02-18 01:07:54 +01:00
Morris Jobke 5d7d2adcbf Merge pull request #14207 from owncloud/propfind-optimize
Optimize quota calculation for propfind
2015-02-18 00:18:47 +01:00
Raimund Schlüßler 958c1858f8 Fix #14310 2015-02-17 21:48:10 +01:00
Daniel Hansson c652d3077c Merge pull request #14293 from owncloud/issue/14270-fix-public-share-download-activities
Correctly create activities for public downloads
2015-02-17 21:41:40 +01:00
Victor Dubiniuk 090db867d5 Add mapping for a broken varchar type. Fixes #14247 2015-02-17 23:22:57 +03:00
Joas Schilling 0833a6e332 Correctly create activities for public downloads 2015-02-17 17:26:03 +01:00
Lukas Reschke 3213b04aef Check if the offset exists before accessing
This checks if the offset exists before accessing it and also adds unit tests to this function which would have catched this before 🙈

Fixes https://github.com/owncloud/core/issues/14277
2015-02-17 17:08:23 +01:00
Clark Tomlinson ac13cf04ba Merge pull request #14266 from owncloud/encodeUriComponentPerDefault
Encode parameters in `OC.generateUrl` by itself
2015-02-17 10:37:06 -05:00
Lukas Reschke 0ea6de2f8c Encode Requesttoken for avatars
Fixes new avatar selection in master half, other half will work when https://github.com/owncloud/core/pull/14266 has get merged.

Shocking to see how much places in our code do it wrong 🔫
2015-02-17 15:25:38 +01:00
Robin Appelman e672f8cc8f Use appmanager in OC_App::enable/disable 2015-02-17 15:05:29 +01:00
Robin Appelman 5394a81c05 Dont fatal error test when encryption is enabled 2015-02-17 15:05:29 +01:00
Robin Appelman 04628cf368 better name for getAppsEnabledForUser 2015-02-17 15:05:29 +01:00
Robin Appelman 434835b326 also set user in UserSession when doing OC_User::setUserId 2015-02-17 15:05:29 +01:00
Robin Appelman 4d805b52cc Test improvements 2015-02-17 15:05:29 +01:00
Robin Appelman 409453bc60 better user group caching 2015-02-17 15:05:29 +01:00
Robin Appelman 5c68c81d00 Update cache when enabling/disabling apps 2015-02-17 15:05:25 +01:00
Lukas Reschke 8e6a7350f9 Merge pull request #14289 from owncloud/remove-null-byte-check
Remove Null Byte Check
2015-02-17 14:47:27 +01:00
Lukas Reschke 27c1409be5 Encode parameters in OC.generateUrl by itself
This function is often used in a wrong and potential dangerous way... Thus we should escape the URL per default and offer developers to disable the automatic escaping via an option parameter if they really want that behaviour.

Might break some things, however, those things are then easy to fix and we really have a ton of bugs caused by this...

Fixes https://github.com/owncloud/core/issues/14228
2015-02-17 14:41:06 +01:00
Lukas Reschke 20d57c8bfe Remove Null Byte Check
This is not relevant anymore since we require PHP 5.4
2015-02-17 14:19:20 +01:00
Lukas Reschke b701bbd8c5 Use APCu only if available in version 4.0.6 and higher
APCu before 4.0.6 is unbelievable buggy and tend to segfault the PHP process (i.e. the whole webserver)

This potentially fixes https://github.com/owncloud/core/issues/14175

Requires a backport to stable8
2015-02-17 13:28:02 +01:00
Lukas Reschke 76c511de92 Merge pull request #14056 from owncloud/refactor/13976
Refactor OC_Request into TrustedDomainHelper and IRequest
2015-02-17 13:17:04 +01:00
Vincent Petry e8f16db49d Merge pull request #13866 from rullzer/avatar_share_dialog
Avatars in share dialog
2015-02-17 10:17:36 +01:00
Jenkins for ownCloud 30ca14021c [tx-robot] updated from transifex 2015-02-17 01:56:23 -05:00
Christian Seiler 535757bc42 DAV authentication: also use Owncloud's internal user for short-circuit
It still works otherwise, but without this, the performance optimization
of #13416 is defeated in these situations.
2015-02-16 23:47:39 +01:00
Christian Seiler 1377ebc7e9 DAV authentication: use Owncloud's internal user instead of HTTP-supplied one
Fixes: #14048, #14104, calendar#712
2015-02-16 23:34:49 +01:00
Lukas Reschke cebf9f6a5a Incorporate review changes 2015-02-16 22:13:03 +01:00
Lukas Reschke 992164446c Add blackmagic due to cyclic dependency 🙈 2015-02-16 22:13:01 +01:00
Lukas Reschke 9f91d64918 Make scrutinizer happy 2015-02-16 22:13:00 +01:00
Lukas Reschke 886bda5f81 Refactor OC_Request into TrustedDomainHelper and IRequest
This changeset removes the static class `OC_Request` and moves the functions either into `IRequest` which is accessible via `\OC::$server::->getRequest()` or into a separated `TrustedDomainHelper` class for some helper methods which should not be publicly exposed.

This changes only internal methods and nothing on the public API. Some public functions in `util.php` have been deprecated though in favour of the new non-static functions.

Unfortunately some part of this code uses things like `__DIR__` and thus is not completely unit-testable. Where tests where possible they ahve been added though.

Fixes https://github.com/owncloud/core/issues/13976 which was requested in https://github.com/owncloud/core/pull/13973#issuecomment-73492969
2015-02-16 22:13:00 +01:00
Victor Dubiniuk bdfc9b57bd Skip primary index if the table has one 2015-02-16 20:30:28 +01:00
Victor Dubiniuk 4e9764b122 Submodule update 2015-02-16 20:30:28 +01:00
Lukas Reschke 912a536c17 Encode requesttoken
One cannot make any assumptions about the requesttoken content. Thus we need to encode it.
2015-02-16 20:28:30 +01:00
Lukas Reschke 7f624188a7 Merge pull request #14261 from owncloud/fix-last-login-master
Return milliseconds instead of seconds for lastLogin - refs #14005
2015-02-16 20:22:47 +01:00
Thomas Müller 1a4b9b0c92 Merge pull request #14263 from owncloud/missing-visibility-activity-iextension
Add visibility to interface to make scrutinizer 1 step happier
2015-02-16 19:54:55 +01:00
Thomas Müller 29c8dfe1f8 Merge pull request #13879 from owncloud/add_debug_log_for_memcache_instantiation
add debug log for memcache instantiation
2015-02-16 19:51:40 +01:00
Thomas Müller 4910f3e202 fixing unit tests in UsersControllerTest 2015-02-16 19:45:40 +01:00
Jörn Friedrich Dreyer 87db136508 add debug log for memcache instantiation 2015-02-16 18:05:43 +01:00
Joas Schilling f808acd317 Add visibility to interface to make scrutinizer 1 step happier 2015-02-16 17:46:43 +01:00
Thomas Müller 3c75a440a6 Return milliseconds instead of seconds for lastLogin - refs #14005 2015-02-16 17:41:44 +01:00
Morris Jobke 5a5d6bf4db Merge pull request #14128 from owncloud/drop-unused-methods
Remove unused function and correct PHPDoc
2015-02-16 17:37:36 +01:00
Morris Jobke fadf0a9443 Merge pull request #10673 from owncloud/smb-new
New SMB storage backend
2015-02-16 17:37:20 +01:00
Thomas Müller 9271059195 Merge pull request #13750 from owncloud/enhanced-code-checker
Implement php code checker to detect usage of not allowed private ...
2015-02-16 16:55:57 +01:00
Joas Schilling 8eb804b1f6 Merge pull request #13269 from owncloud/issue/13211-cache-array-implementation
Add an array implementation of cache and use it if we are not debugging
2015-02-16 15:35:20 +01:00
Robin Appelman 23ab25e93a Use the app manager from oc_app 2015-02-16 15:16:13 +01:00
Robin Appelman 2b58e8489f Add getInstalledApps and getAppsForUser to the app manager 2015-02-16 15:15:35 +01:00
Thomas Müller 9c47ab91f2 Merge pull request #14194 from owncloud/url-encode-logout-attribute
URLEncode logout attribute
2015-02-16 15:04:20 +01:00
Joas Schilling 8848b5f067 Add an array implementation of cache and use it if we are not debugging 2015-02-16 14:55:50 +01:00
Thomas Müller bd994cb294 Update 3rdparty commit to master 2015-02-16 14:53:16 +01:00
Lukas Reschke c6705ab574 Merge pull request #13890 from owncloud/add-no-referrer
Add `rel="noreferrer"` where possible and switch to HTTPS
2015-02-16 14:36:44 +01:00
Morris Jobke f7bd543a85 Merge pull request #14243 from owncloud/console-execution-time-master
console commands shall not be limited with respect to execution time
2015-02-16 14:26:14 +01:00
Robin Appelman 6477e39be9 also make sure we have a leading slash for the test root 2015-02-16 14:01:08 +01:00
Thomas Müller 6cdc7a890a Merge pull request #14076 from owncloud/autotest-external-ftp
[files_external] ftp tests
2015-02-16 13:56:40 +01:00
Robin Appelman 6467369cad make sure the root has a trailing slash 2015-02-16 13:52:11 +01:00
Robin Appelman 35077ec34e remove outdated test 2015-02-16 13:52:11 +01:00
Robin Appelman e98983485f handle deleting non existing files 2015-02-16 13:52:11 +01:00
Robin Appelman e5731b6e1a Use better way to check for the existence of smbclient 2015-02-16 13:52:11 +01:00
Robin Appelman d2255a1d30 New SMB storage backend 2015-02-16 13:52:11 +01:00
Lukas Reschke 7e45f5d27b Remove unused function and correct PHPDoc 2015-02-16 13:46:45 +01:00
Lukas Reschke 8791f1992e Add noreferrer to footer URI 2015-02-16 13:37:54 +01:00
Lukas Reschke a9d1a01440 Rename to allowEval 2015-02-16 12:30:21 +01:00
Lukas Reschke cbe31fbf57 Use int instead of string 2015-02-16 12:01:05 +01:00
Thomas Müller 78febb2ee5 Merge pull request #14201 from owncloud/propagator-dont-decrease-mtime
Dont lower the mtime of a folder when propagating changes
2015-02-16 11:32:17 +01:00
Lukas Reschke b20174bdad Allow AppFramework applications to specify a custom CSP header
This change allows AppFramework applications to specify a custom CSP header for example when the default policy is too strict. Furthermore this allows us to partially migrate away from CSS and allowed eval() in our JavaScript components.

Legacy ownCloud components will still use the previous policy. Application developers can use this as following in their controllers:
```php
$response = new TemplateResponse('activity', 'list', []);
$cspHelper = new ContentSecurityPolicyHelper();
$cspHelper->addAllowedScriptDomain('www.owncloud.org');
$response->addHeader('Content-Security-Policy', $cspHelper->getPolicy());
return $response;
```

Fixes https://github.com/owncloud/core/issues/11857 which is a pre-requisite for https://github.com/owncloud/core/issues/13458 and https://github.com/owncloud/core/issues/11925
2015-02-16 11:00:41 +01:00
Thomas Müller 09a33b11a4 Merge pull request #13809 from owncloud/fix-autoloader-message
Properly show the warning about the missing composer autoloader
2015-02-16 10:41:24 +01:00
Thomas Müller d001c4e375 Merge pull request #13922 from owncloud/smb-autotest-external
[files_external] add SMB autotest
2015-02-16 10:27:55 +01:00
Thomas Müller d5ca5c7bcc Merge pull request #14138 from owncloud/fix-image-flip-php53
Don't flip image in PHP 5.4
2015-02-16 10:26:56 +01:00
cmeh 09a0bf22df Update setupchecks.js
Changed *"won't work"* to "will not work" (as proposed by @DeepDiver1975).
2015-02-16 10:25:01 +01:00
cmeh d89cf737ae Message clean-up
*Changes:*

* "… is not yet properly setup" in line 24 is changed to " … is not yet set up properly" (better word order and space in the middle of "set up", as it is a participle of the verb "to set up").
* "internet" is corrected to "Internet" with a capitalized "I" in lines 54 and 59.
* Also in line 54: "3rd party" is changed to "third-party" to for a more coherent spelling across the different ownCloud components.
* "… apps don´t work" is corrected to "… apps won't work" (with a proper (and hopefully correctly escaped) (apostrophe)[http://en.wikipedia.org/wiki/Apostrophe#Typographic_form] instead of the (acute accent)[http://en.wikipedia.org/wiki/Acute_accent]).
* Still in line 54: The negation is corrected from "… might also not work" to "… might not work, either".
2015-02-16 09:59:41 +01:00
Thomas Müller 036a8e3c1f console commands shall not be limited with respect to execution time - fixes #14156 2015-02-16 09:16:32 +01:00
Jenkins for ownCloud 786ff6a5a3 [tx-robot] updated from transifex 2015-02-16 01:54:30 -05:00
Jenkins for ownCloud 31c0cce092 [tx-robot] updated from transifex 2015-02-15 01:54:31 -05:00
Jenkins for ownCloud 2f851ff8bb [tx-robot] updated from transifex 2015-02-14 01:54:42 -05:00
Robin Appelman 7bfe476030 add unit test for webdav quota 2015-02-13 18:00:01 +01:00
Robin Appelman 9abaa0cc61 pass fileinfo to getStorageInfo 2015-02-13 17:59:58 +01:00
Robin Appelman fb2a3284df Cache quota info for directories 2015-02-13 17:50:53 +01:00
Thomas Müller d665b7a4b1 Merge pull request #14206 from owncloud/issue/14204-revert-14171
Issue/14204 revert #14171
2015-02-13 16:06:34 +01:00
Joas Schilling 113fd47a0b Update version to a higher one then before 2015-02-13 15:24:53 +01:00
Joas Schilling 200c0c89dc Do not change behaviour of 'false' 2015-02-13 15:18:07 +01:00
Joas Schilling 3a5b0a8cfc Revert "Improve: Index for file_map"
This reverts commit c9b5608405.
2015-02-13 15:15:28 +01:00
Joas Schilling 6039523cd6 Revert "Incorporate review changes"
This reverts commit f6a452cabf.
2015-02-13 15:15:10 +01:00
Robin Appelman 6ecfcde954 update test 2015-02-13 15:01:05 +01:00
Robin Appelman 134243d3e5 Dont lower the mtime of a folder when propagating changes 2015-02-13 14:30:05 +01:00
Lukas Reschke 4032c7b685 This is an array 2015-02-13 14:23:22 +01:00
Morris Jobke 1393563965 Merge pull request #14178 from RealRancor/fix_config_sample
Removed anchor in config.sample.php
2015-02-13 13:38:56 +01:00
Joas Schilling d20a8fae45 Move displaying of files related activities to files app 2015-02-13 13:37:10 +01:00
Lukas Reschke a7df23ceba Manually type-case all AJAX files
This enforces proper types on POST and GET arguments where I considered it sensible. I didn't update some as I don't know what kind of values they would support 🙈

Fixes https://github.com/owncloud/core/issues/14196 for core
2015-02-13 13:33:20 +01:00
Lukas Reschke 276bfe5f33 Merge pull request #14197 from owncloud/ensure-that-passed-file-path-is-always-a-string
Ensure that passed argument is always a string
2015-02-13 13:30:54 +01:00
Joas Schilling 12fc625885 Fix test with the invalid filter check being added 2015-02-13 13:08:57 +01:00
Roeland Jago Douma 9a6da8e6e2 Extended avatar unit tests 2015-02-13 12:57:24 +01:00
Lukas Reschke 95860d8113 Merge pull request #14086 from hlop/master
App install behind a Proxy
2015-02-13 12:56:01 +01:00
Lukas Reschke 9904b30070 Ensure that passed argument is always a string
Some code paths called the `normalizePath` functionality with types other than a string which resulted in unexpected behaviour.

Thus the function is now manually casting the type to a string and I corrected the usage in list.php as well.
2015-02-13 12:49:34 +01:00
Roeland Jago Douma 90218dcd4c Added config check 2015-02-13 12:17:22 +01:00
Lukas Reschke 025110821f URLEncode logout attribute
Otherwise logout can fail if the requesttoken contains a +
2015-02-13 12:08:23 +01:00
Joas Schilling 6c349c00bb Order methods to by grouped by their task 2015-02-13 11:55:06 +01:00
Joas Schilling be63e18b0a Check whether filter is valid, before doing stuff for it 2015-02-13 11:50:55 +01:00
Roeland Jago Douma bdd785f5e6 Always display max upload size in admin panel 2015-02-13 11:39:30 +01:00
Joas Schilling c02de748e5 Cache some values from the extensions 2015-02-13 11:36:34 +01:00
Joas Schilling b768a70616 Use filterNotificationTypes to filter the types and group the methods 2015-02-13 11:30:36 +01:00
Joas Schilling 9ccfbc14f6 Copy sharing related activity code to Files_Sharing activity extension 2015-02-13 11:16:43 +01:00
Joas Schilling 51f8d240c1 Merge pull request #14171 from owncloud/fix/11639
Improve: Index for file_map
2015-02-13 10:55:21 +01:00
Jenkins for ownCloud 6b1ed4d688 [tx-robot] updated from transifex 2015-02-13 01:55:06 -05:00
RealRancor 840ad708d6 Removed anchor in config.sample.php 2015-02-12 22:00:24 +01:00
Lukas Reschke f6a452cabf Incorporate review changes 2015-02-12 19:14:54 +01:00
windaishi c9b5608405 Improve: Index for file_map
Added two indices for file_map, that improve syncing and uploading and deleting files
2015-02-12 19:12:08 +01:00
Lukas Reschke dfcd4acd5a Merge pull request #13771 from owncloud/fix-humanfileSize
generate valid human readable text for 0
2015-02-12 18:34:54 +01:00
Lukas Reschke bd5440a8a3 Merge pull request #13780 from owncloud/cmreflector-inheritance
Additional controllermethodreflector inheritance tests
2015-02-12 18:34:07 +01:00
Lukas Reschke 8e8acad550 Merge pull request #14145 from owncloud/no-whitespace-from-themes-master
catch any whitespaces which might get written to the output buffer while...
2015-02-12 17:23:28 +01:00
Thomas Müller 738fcdafbe Merge pull request #14159 from owncloud/remove-internal
Remove internal annotation
2015-02-12 17:07:59 +01:00
Roeland Jago Douma ecb7d44775 Small unit test rewrite 2015-02-12 17:05:59 +01:00
Roeland Jago Douma e952687dcd Added unit test 2015-02-12 16:50:14 +01:00
Roeland Jago Douma 47b96c9fa1 Added dependancy for the JS unit tests
Still not correct but it is a small step
2015-02-12 16:50:14 +01:00
Roeland Jago Douma 639a634cfd Display user avatar in share dialog 2015-02-12 16:50:14 +01:00
Thomas Müller fc7f279d90 catch any whitespaces which might get written to the output buffer while loading a theme 2015-02-12 16:42:17 +01:00
Lukas Reschke 2f80be45b0 Remove internal annotation
PHPStorm complained about those functions being declared as Internal. I doubt that this is actually the case since they are even in the public API.
2015-02-12 16:35:47 +01:00
Morris Jobke c751ba0409 Merge pull request #14121 from Zillode/app-favicon
Disable application-specific favicons for non-user pages
2015-02-12 13:19:07 +01:00
Lukas Reschke 4142267a02 Merge pull request #9038 from owncloud/add_tag_file
Add .tag file to make tar balls tracable
2015-02-12 13:17:45 +01:00
Björn Schießle 780024e252 Merge pull request #14071 from owncloud/add_timeout_for_post_requests
add timeout to curl request
2015-02-12 11:38:35 +01:00
Lukas Reschke b68c376e8e Merge pull request #13913 from rullzer/showusergroups
Added overview of groups a user is member of
2015-02-12 11:21:40 +01:00
Morris Jobke 0b38a48bb4 Merge pull request #14135 from cmeh/master
Clean-up of messages (orthography, format)
2015-02-12 11:03:49 +01:00
Morris Jobke f4182d2dc9 Merge pull request #10993 from owncloud/scanner-reuse-fileid
Reuse known fileids and cache data in the scanner
2015-02-12 10:53:00 +01:00
Bjoern Schiessle 4155252379 add timeout to curl request 2015-02-12 10:51:39 +01:00
Roeland Jago Douma 7a8f95be2f Added overview of groups a user is a member of 2015-02-12 10:49:55 +01:00
Morris Jobke 4b2d80a34b add fix for checkmark icon for IE8 2015-02-12 10:31:55 +01:00
Morris Jobke a496c34aea Check if imageflip is available
* imageflip() isn't available in PHP < 5.5
* fixes #14130
2015-02-12 10:21:20 +01:00
Morris Jobke 64216971d4 Merge pull request #14129 from owncloud/deprecate-oc-json
Deprecate `OC_JSON` and `OCP\JSON`
2015-02-12 10:05:30 +01:00
cmeh f24f7f7c74 Orthography: "Back-end" -> Backend (without hyphen) and correction of "users" to the genitive "user's" 2015-02-12 08:18:24 +01:00
cmeh 01f89083ba Adding a missing space between value and unit
Added the missing space between value and unit, as it is formatted in all other places across ownCloud.
2015-02-12 08:14:12 +01:00
Jenkins for ownCloud e929d43bb6 [tx-robot] updated from transifex 2015-02-12 01:54:41 -05:00
Lukas Reschke 86139fcce8 Deprecate OC_JSON and OCP\JSON
This deprecates – but not removes – those two classes and all functions in it. There is no reason that new developments should use those methods as with the AppFramework there is a replacement that allows testable code.

With the `@deprecated` annotation IDEs like PHPStorm will point out to the developer that a functionality is deprecated and that there is a better suited replacement.
2015-02-12 00:56:13 +01:00
Lukas Reschke 2c899f1d43 Merge pull request #14126 from owncloud/remove-that-old-thing
Remove unused file
2015-02-11 23:59:00 +01:00
Thomas Müller 9ecb36e81f integrate code checker in the installer 2015-02-11 23:37:51 +01:00
Lukas Reschke 1c1bd058e4 Remove unused file
This file is unused and has been last modified two years ago. Furthermore it won't evne work anymore properly because it uses things  like `CONFIG_DATEFORMAT` which are gone a long time ago...
2015-02-11 23:26:48 +01:00
dratini0 10e13b172a Extending the X-accel redirect functionality with a more scalable approach. 2015-02-11 22:19:22 +01:00
dratini0 b1594ad1df Revert "Fix: X-Accel-Redirect did not support custom data dir and local mounts"
This reverts commit f2075f803f.
2015-02-11 22:19:22 +01:00
dratini0 80032ec301 Revert "removed a little duplication"
This reverts commit 31970ee740.
2015-02-11 22:19:22 +01:00
Lode Hoste 27b35500a7 Disable application-specific favicons for non-user pages 2015-02-11 20:09:03 +01:00
Thomas Müller 99a97649f2 Merge pull request #14097 from yanntech/fix/utf8-check
in some case charset can be in lower case.
2015-02-11 18:04:54 +01:00
Vincent Petry fbbb9fe0fd Merge pull request #13979 from owncloud/group-share-collition-wrong-type-in-post-hook
Do not overwrite the shareType so the post hook is still correct
2015-02-11 15:23:13 +01:00
Thomas Müller 0e4923b0f9 Merge pull request #14105 from owncloud/second-parameter-is-optional
Second parameter is optional
2015-02-11 15:07:20 +01:00
kondou 95cfe292f4 Make the password changed msg inline to fix #10242 2015-02-11 14:27:05 +01:00
Lukas Reschke 0119d429fc Second parameter is optional
Makes my IDE happier.
2015-02-11 14:01:22 +01:00
Robin Appelman 9df18ffe75 only read permissions once 2015-02-11 13:11:31 +01:00
Robin Appelman 9bbfeada6b Only try to scan the children of directories 2015-02-11 13:11:31 +01:00
Robin Appelman dc6468c2aa Cast mtimes and size to int 2015-02-11 13:11:28 +01:00
Robin Appelman 4242dd0d9d Reuse cache data of existing files during scan 2015-02-11 13:08:28 +01:00
Yann VERRY 1fcea6f1bd in some case charset can be in lower case.
Add strtoupper() in UTF-8 check to avoid error message
2015-02-11 11:59:33 +01:00
Jenkins for ownCloud 9baf7a0a3f [tx-robot] updated from transifex 2015-02-11 01:55:07 -05:00
Witali Rott 531c89a610 App install behind a Proxy 2015-02-11 07:47:50 +01:00
Morris Jobke f65f5e0597 Merge pull request #14074 from RealRancor/documents_preview_notes
Add hint for troubleshooting MS Word previews
2015-02-11 01:11:31 +01:00
Thomas Müller 45dcca2fcb Merge pull request #13861 from owncloud/remove-disabled-files-repair-step
Revert "enabled disabled files app in repair step"
2015-02-10 22:46:53 +01:00
RealRancor c5c632f8ff Add hint for troubleshooting MS Word previews 2015-02-10 22:35:16 +01:00
Morris Jobke 60cadf5647 [files_external] ftp tests 2015-02-10 22:34:58 +01:00
Lukas Reschke e12b982dfc Merge pull request #14072 from owncloud/add-files-external-test-readme
add readme for files external tests
2015-02-10 21:45:21 +01:00
Morris Jobke 64a3e6eb22 add rreadme for files external tests 2015-02-10 20:43:32 +01:00
Morris Jobke 10e91c6a48 [files_external] sftp tests 2015-02-10 19:53:01 +01:00
Morris Jobke 11283c57d9 Merge pull request #11056 from AdamWill/9885-opcode
add function to invalidate one opcache file, use it if possible #9885
2015-02-10 17:21:15 +01:00
Vincent Petry bd01ff135a Merge pull request #13190 from is-apps/master-sftp-key
Add SFTP public key authentication support
2015-02-10 16:44:29 +01:00
Thomas Müller d74662df7d implement php code checker to detect usage of not allowed private APIs - including console command to check local code to be used by developers 2015-02-10 11:51:24 +01:00
Lukas Reschke 5ae03fd650 Merge pull request #14028 from frsela/charset_utf8
Setting default charset to UTF-8 in .htaccess and .user.ini
2015-02-10 10:38:12 +01:00
Morris Jobke f7bbe081b3 [files_external] add SMB autotest 2015-02-10 10:30:10 +01:00
Fernando Rodriguez Sela 66b584ae7e Setting default charset to UTF-8 in .htaccess and .user.ini 2015-02-10 09:39:06 +01:00
Jenkins for ownCloud 124e48aec0 [tx-robot] updated from transifex 2015-02-10 01:55:06 -05:00
Morris Jobke 1bb6de7c1b Merge pull request #13425 from owncloud/phpdoc_cleanup
Cleanup of PHPDoc return types
2015-02-10 01:14:00 +01:00
Morris Jobke 4a99849c6c Merge pull request #13663 from owncloud/issue/13624-notification-when-favorting-fails
Only update favorite icon if the operation was successful
2015-02-10 00:05:39 +01:00
Morris Jobke 068f6107c6 Merge pull request #13842 from owncloud/is_file_2_is_readable
check if cache files are readable
2015-02-09 23:45:32 +01:00
Morris Jobke 297b52fa4c Merge pull request #14007 from owncloud/fix-broken-master
[master] Request requires a second parameter
2015-02-09 23:34:14 +01:00
Thomas Müller c60dabd11b Request requires a second parameter 2015-02-09 23:06:55 +01:00
Thomas Müller 4872d6c08a Merge pull request #13923 from owncloud/l10n-ignore-jsmin
Ignore minified js in translation process
2015-02-09 21:07:13 +01:00
Lukas Reschke 74de345c7f Merge pull request #13511 from owncloud/naturalsort_speeeeeed
NaturalSort performance improvements
2015-02-09 18:39:52 +01:00
Vincent Petry c4d9ae8af4 Merge pull request #13928 from owncloud/prevent_ghost_files_master
prevent creation of ghost directories
2015-02-09 18:15:45 +01:00
Vincent Petry 5296767393 Merge pull request #13921 from owncloud/ocs-af
Add a controller and reponse for ocs
2015-02-09 18:11:47 +01:00
Vincent Petry 605e2357a1 Merge pull request #13852 from owncloud/cache-app-versions
Cache app versions
2015-02-09 18:03:19 +01:00
Vincent Petry c7fcd42edb Merge pull request #13870 from owncloud/drop-oc-preferences-2
drop OC\Preferences
2015-02-09 17:49:05 +01:00
Vincent Petry b7b8c0c2e5 Merge pull request #13869 from owncloud/drop-oc-preferences
drop OC_Preferences
2015-02-09 17:48:36 +01:00
Lukas Reschke 47c7eb4e70 Merge pull request #13973 from owncloud/enhancement/security/13366
Respect `mod_unique_id` and refactor `OC_Request::getRequestId`
2015-02-09 17:35:19 +01:00
Robin McCorkell a79757bc37 Store FileInfo::getType() result for future use 2015-02-09 16:34:11 +00:00
Robin McCorkell 44c330aa5d Performance improvements for NaturalSort
A combination of using isset() instead of count() or strlen(), caching the
chunkify function, and replacing is_numeric() with some comparisons
2015-02-09 16:32:43 +00:00
Vincent Petry 5d8f1a1de3 Merge pull request #13854 from owncloud/avatar-exists
Add a better way to check if an avatar exists for the user
2015-02-09 17:06:24 +01:00
blizzz dc475ab3e0 Merge pull request #13925 from owncloud/fix-13898
no fruitless count attempts, and notification should disappear
2015-02-09 16:55:50 +01:00
Joas Schilling 018f9fddaf Merge pull request #13977 from owncloud/tempmanager-check-handle
Check directory handle before we use it
2015-02-09 16:40:56 +01:00
Joas Schilling 4172ba48d4 Deduplicate template code and do not translate the links 2015-02-09 16:01:52 +01:00
Jan-Christoph Borchardt 0d8b3afc32 Merge pull request #13958 from owncloud/fix-resize-overlap
Avoid dropdown to float under sidebar for mid narrow screens
2015-02-09 14:23:19 +01:00
Vincent Petry 2bb65dd9b1 Merge pull request #13364 from is-apps/files_external_cleanup
Clean up files_external
2015-02-09 13:20:42 +01:00
Joas Schilling c17b236c19 Add a test for the post_shared hook shareType 2015-02-09 13:12:34 +01:00
Joas Schilling 31b93ac19a Do not overwrite the shareType so the post hook is still correct 2015-02-09 12:59:29 +01:00
Robin Appelman 45e3cbefc9 Check directory handle before we use it 2015-02-09 12:36:18 +01:00
Lukas Reschke 770fa761b8 Respect mod_unique_id and refactor OC_Request::getRequestId
When `mod_unique_id` is enabled the ID generated by it will be used for logging. This allows for correlation of the Apache logs and the ownCloud logs.

Testplan:

- [ ] When `mod_unique_id` is enabled the request ID equals the one generated by `mod_unique_id`.
- [ ] When `mod_unique_id` is not available the request ID is a 20 character long random string
- [ ] The generated Id is stable over the lifespan of one request

Changeset looks a little bit larger since I had to adjust every unit test using the HTTP\Request class for proper DI.

Fixes https://github.com/owncloud/core/issues/13366
2015-02-09 11:53:11 +01:00
Jenkins for ownCloud e2d4b3c123 [tx-robot] updated from transifex 2015-02-09 01:54:53 -05:00
Raimund Schlüßler c398e8e42e Fix variable already defined 2015-02-09 07:52:10 +01:00
Raimund Schlüßler fcc144ca74 Append search results to custom container
fixes #13968
2015-02-08 22:42:30 +01:00
Lukas Reschke 0e604aa875 Merge pull request #13948 from owncloud/cache-move-transaction
Use transactions when renaming directory contents
2015-02-08 19:08:52 +01:00
Lukas Reschke f167c3d9f6 Merge pull request #13895 from owncloud/disable-autocomplete-1
Disable autocomplete for SMTP Password
2015-02-08 14:03:57 +01:00
Jenkins for ownCloud 60e771685e [tx-robot] updated from transifex 2015-02-08 01:54:53 -05:00
Morris Jobke 8f8ecd67fd Merge pull request #13963 from RealRancor/external_user_note
external user app: Add note to enable it first
2015-02-07 20:11:17 +01:00
RealRancor 04d6f3e1fb external user app: Add note to enable it first 2015-02-07 14:01:38 +01:00
Morris Jobke 90556cb70b Merge pull request #12283 from oparoz/sfnt-fonts
Updated the media type of some font types
2015-02-07 13:33:49 +01:00
Morris Jobke b05e4e085c Merge pull request #13435 from Zillode/app-favicon
Allow application-specific favicons
2015-02-07 13:29:18 +01:00
Morris Jobke 108f3327e6 Merge pull request #13502 from owncloud/streamline-authentication-in-newfile
Streamline CSRF and login check
2015-02-07 13:27:46 +01:00
Morris Jobke 77c0314503 Merge pull request #13655 from Sugaroverdose/fix_#13632
Do not change color of 'new' button on hover and make new file menu more consistent with button
2015-02-07 13:25:43 +01:00
Morris Jobke 485e2a282b Merge pull request #13753 from owncloud/use-403-instead-of-200
Use 403 instead of 200 response
2015-02-07 13:25:15 +01:00
Morris Jobke 11ded92a73 Merge pull request #13830 from owncloud/fix-redirect-404
Don't encode url unecessary twice
2015-02-07 13:24:47 +01:00
Morris Jobke 57c1b499a1 Merge pull request #13848 from owncloud/ldap-warn
Reduce log level of bind failed to WARN - fixes  #11624
2015-02-07 13:24:11 +01:00
Morris Jobke b2f6b8d62e Merge pull request #13889 from owncloud/catch-exception
Catch exception properly
2015-02-07 13:23:34 +01:00
Jenkins for ownCloud 4bf7b2c130 [tx-robot] updated from transifex 2015-02-07 01:54:35 -05:00
Morris Jobke 8b2e09a77e Avoid dropdown to float under sidebar for mid narrow screens 2015-02-06 22:44:08 +01:00
Robin Appelman 6c00521e8b Use transactions when renaming directory contents 2015-02-06 15:20:53 +01:00
Morris Jobke 4e18b52527 Show message if upload of folder isn't allowed
* current firefox doesn't throw an exception anymore
	* it just reads 0 bytes -> folder or empty file
* upload of folder or empty file isn't supported in every
  browser except Chrome
* fixes #13940
2015-02-06 11:15:09 +01:00
Bjoern Schiessle 1448f281b7 for password protected link shares the password is stored in shareWith, so we need to set this manually to null for the hooks 2015-02-05 17:23:59 +01:00
Arthur Schiwon 2bcb786214 no fruitless count attempts, and notification should disappear 2015-02-05 16:25:22 +01:00
Bernhard Posselt 71f32745b6 ignore minified js, owncloud/news#719 2015-02-05 15:48:58 +01:00
Bernhard Posselt 9873aa3d9e fix license email 2015-02-05 14:10:16 +01:00
Bernhard Posselt b89ddcfe41 fix license email 2015-02-05 14:09:01 +01:00
Bernhard Posselt fdc64e370c add a controller and reponse for ocs 2015-02-05 14:02:17 +01:00
Robin Appelman adf9a4e4eb Dont bother updating the cache when working with part files 2015-02-05 13:59:50 +01:00
Robin Appelman 842d0e227c Dont update the cache after fopen 2015-02-05 13:47:32 +01:00
Sebastian Bolt 7ffd2557ff changed image to classed div for spinner animation 2015-02-04 22:27:38 +01:00
Robin Appelman 2e34db2bb3 Dont create exclude list for generating the share target 2015-02-04 17:08:03 +01:00
Lukas Reschke 40244c9eef Disable autocomplete for SMTP Password
While really nearly no modern browser cares about it anymore too much it's still not wrong to have it here (and also stops some automated scanners reporting this...)
2015-02-04 17:00:39 +01:00
Robin Appelman 4a9c64e96b Only make sure the cache directory exists when we use it 2015-02-04 16:52:50 +01:00
Lukas Reschke b432ea29c9 Add rel="noreferrer" where possible and switch to HTTPS
Just to follow good practise and prevent some automated scanners to complain about "Cross-domain Referer leakage".
2015-02-04 16:25:37 +01:00
Lukas Reschke cc80ce70b4 Catch exception properly
`\OCA\Files\Helper::buildFileStorageStatistics` might throw an exception from `OC_Helper::getStorageInfo`, previously this lead to a uncatched exception being thrown when invoking this methods.

This was user triggable by for example calling `/index.php/apps/files/ajax/delete.php` with a not existing dir (for example `dir=asdf/../&allfiles=true`)
2015-02-04 15:58:16 +01:00
Morris Jobke 4df7c0a1ed drop OC\Preferences 2015-02-04 00:31:09 +01:00
Morris Jobke 909a53e087 drop OC_Preferences 2015-02-04 00:06:29 +01:00
Morris Jobke b168c191bc Revert "enabled disabled files app in repair step"
This reverts commit d70160c607.
2015-02-03 17:06:57 +01:00
Robin Appelman 6f118d7f8d clear app version cache on upgrade 2015-02-03 15:23:51 +01:00
Robin Appelman c644ed89a7 Add a better way to check if an avatar exists for the user 2015-02-03 14:54:06 +01:00
Robin Appelman 70fd3a267f Cache app versions 2015-02-03 14:13:44 +01:00
Morris Jobke 166c4e266f Reduce log level of bind failed to WARN - fixes #11624 2015-02-03 11:44:28 +01:00
Jörn Friedrich Dreyer 86935fab17 readd is_file 2015-02-03 10:13:25 +01:00
Arthur Schiwon ded8cc47cf :camel:case 2015-02-02 23:47:59 +01:00
Jörn Friedrich Dreyer 2d8f57a1ea check if cache files are readable 2015-02-02 23:19:54 +01:00
Lukas Reschke 2bd1c17345 Don't encode url unecessary twice
The URL was previously encoded twice which leads to getting redirected to a 404 page when the password has been entered incorrect at least once.

Testplan:

- [ ] Opening `http://localhost/core/index.php?redirect_url=%2Fcore%2Findex.php%2Fsettings%2Fadmin` redirects to the admin page when providing the correct credentials
- [ ] Opening `http://localhost/core/index.php?redirect_url=%2Fcore%2Findex.php%2Fsettings%2Fadmin` redirects to the admin page when providing the invalid credentials and then providing valid ones.
- [ ] Logging in as admin then going to the admin page and clearing the cookies and refreshing will show the login and when repeating the above test steps you're redirected correctly.

Fixes https://github.com/owncloud/core/issues/9804
2015-02-02 15:09:59 +01:00
Joas Schilling a575dcf78f Use insertIfNotExists() and reload mimetypes after inserting one 2015-02-02 13:20:16 +01:00
Joas Schilling 12f835b198 toggle back when the action was not performed 2015-02-02 11:17:55 +01:00
Morris Jobke 8e2b99c3a9 fix response for tags and show error message 2015-02-02 11:17:54 +01:00
Joas Schilling df75a6e5f3 Only update favorite icon if the operation was successful
Also shows a notification in case an error occured on updating the tags
2015-02-02 11:17:54 +01:00
Morris Jobke 573aa196d4 Properly show the warning about the missing composer autoloader 2015-01-31 20:48:58 +01:00
Bernhard Posselt 81836ccc7e another test for overriding the docblock 2015-01-29 20:35:07 +01:00
Bernhard Posselt 72d2b6f723 additional inheritance tests 2015-01-29 20:33:05 +01:00
Bernhard Posselt 84a47645b9 fix indention 2015-01-29 20:10:29 +01:00
Bernhard Posselt 983563d7d9 add tests for closing the cursor 2015-01-29 19:23:57 +01:00
Bernhard Posselt 37e8969d34 ignore cursorclosing 2015-01-29 19:16:28 +01:00
Thomas Müller ccc1f09627 generate valid human readable text for 0 - fixed #9342 2015-01-29 17:27:28 +01:00
Lukas Reschke b9f180e001 Use 403 instead of 200 response
A forbidden should throw a 403 and this makes it easier for me to do some automated testing.
2015-01-29 12:04:54 +01:00
Arthur Schiwon 73600cfdd8 and escape the search term 2015-01-29 00:27:05 +01:00
Arthur Schiwon 953a88785b 💄 2015-01-28 23:57:04 +01:00
Sugaroverdose e57e273a40 Prevent 1px padding between button and dropdown in ie11 when zooming 2015-01-28 22:44:12 +03:00
Sugaroverdose 0418c9da3d Play with z-index to make proper dropdown overlap 2015-01-28 20:24:12 +03:00
Robin McCorkell 5acbeb9666 Better cleanup in autotest.sh
Configs correctly cleaned, even if phpunit fails or autotest interrupted
2015-01-28 15:06:18 +00:00
Arthur Schiwon 31de757514 fix counting of users in primary group 2015-01-28 15:52:59 +01:00
Arthur Schiwon 323af55b50 inlcude AD primary group in user filter, if a group is selected. fixes #12190 2015-01-28 14:12:12 +01:00
Martin 21e3cd38ae Write the parameter 'logtimezone' into config.php during setup 2015-01-28 13:45:13 +01:00
Sugaroverdose 8605e84547 Fix #13632 and make new file menu more consistent with button 2015-01-25 20:15:08 +03:00
Lukas Reschke b848062d88 Parse backslash as directory separator in breadcrumb
This will parse backslashes as directory separators in breadcrumbs. Thus when accessing something like `/index.php/apps/files?dir=foo\foo` the breadcrumb will properly resolve this instead of showing `foo\foo`

Fixes https://github.com/owncloud/core/issues/13643
2015-01-24 09:56:00 +01:00
Olivier Paroz 7fbf1a20d7 Updated the media type of some font types
TTF and TTF have now the same media type
Official since 2013 and supported by Firefox and Chrome
https://www.iana.org/assignments/media-types/application/font-sfnt

Introducing support for Type1 fonts
2015-01-24 01:49:13 +01:00
Lukas Reschke 3f5d4d82e4 Streamline auth and CSRF check in scan.php
Furthermore a not logged-in user was able to access this page before which resulted in a Fatal PHP error since the filesystem could not get setup properly.
2015-01-20 12:30:16 +01:00
Lukas Reschke e25a0303f4 Streamline CSRF and login check
Let's make this consistent with other pieces of the code to make it easier to auditable.
2015-01-20 12:24:13 +01:00
Lode Hoste 96f81961ed Allow application-specific favicons 2015-01-18 00:19:33 +01:00
Robin McCorkell 2b99fc76ec Cleanup of PHPDoc return types 2015-01-16 20:30:43 +00:00
Ross Nicoll 7620af7550 Updated Dropbox and Google UI Javascript to create input elements instead of anchor. 2015-01-14 17:21:39 +00:00
Ross Nicoll 02c6b72e25 Change from array() to [] style in files_external application info. 2015-01-14 17:16:12 +00:00
Ross Nicoll 64f4f8fc84 Add support for SFTP key authentication
Add support for external files accessed via SFTP using public key exchange authentication.
Keys are generated automatically when the configuration is added, or can be regenerated on demand if a key is compromised.
Creation of a new configuration row now triggers focus on that row. This is used to trigger auto-configuration for SFTP keys.
Generated public keys are saved in user's data directory for easy retrieval by an external application.
Add controller for SFTP key generation AJAX
SFTP class initialisation no longer produces a warning if the password field is missing.
Add unit tests for SFTP with key authentication backend
2015-01-14 17:00:34 +00:00
Lukas Reschke a2e355a7fe Use "HTTPOnly" for cookies when logging out
This has no other reason than preventing some insane automated scanners from reporting this as security bug (which it obviously isn't as the cookie contains nothing of value)

Thus it generally results in an happier Lukas and hopefully less reports to our support and security mail addresses...
2015-01-14 11:20:53 +01:00
jknockaert e426375114 update enc stream 2014-12-17 15:48:05 +01:00
Adam Williamson 013feb8da0 writeData(): correct variable name for config file path
It changed since we wrote this patch.
2014-11-06 18:10:43 -08:00
Adam Williamson 8b2b0aae31 deleteFromOpcodeCache: make parameter mandatory, document parameter
Both pointed out in submission review by @bantu, thanks.
2014-11-06 18:05:20 -08:00
Adam Williamson 3b4823d89c add function to invalidate one opcache file, use it if possible #9885
Issue #9885 appears to be triggered by ownCloud invalidating the entire
PHP opcache. Testing indicates it can be avoided by only invalidating the
single file that was written from the opcache, instead of clearing the
whole thing. In general it is more efficient to invalidate only the single
file that was changed, rather than the whole cache.

This adds a deleteFromOpcodeCache() function which invalidates a single
file from the opcache if possible, returning true if the underlying
function returns true (which may mean 'success', or 'file does not exist',
or 'file exists but is not in opcache', all of which are OK to treat as
good for our purposes). It also changes writeData() in config.php to try
using deleteFromOpcodeCache() and only fall back on clearOpcodeCache() if
that fails.
2014-11-06 17:58:58 -08:00
goodkiller 9f0b99cd17 Update group.php
Here is fox for my LDAP users OW 7.0.2
2014-10-14 01:18:45 +03:00
Oluf Lorenzen 4d23697fc2 add howto dump the ldap-backends' configuration 2014-09-03 09:51:01 +02:00
Oluf Lorenzen 78b4ca146d add question about user-backend 2014-09-03 09:44:07 +02:00
Daniel Molkentin 1efa338a52 Add .tag file to make tar balls tracable
The "git archive" operation will substitute the contents of this
file with the hash sum of the commit that this tar ball is based
on. This improves tracebility and allows to retrospectively set
tags. It has proven to be a valuable asset in mirall.
2014-06-14 17:40:32 +02:00
2909 changed files with 131119 additions and 55290 deletions
+6 -1
View File
@@ -11,6 +11,8 @@
/apps*/*
!/apps/files
!/apps/files_encryption
!/apps/encryption
!/apps/encryption_dummy
!/apps/files_external
!/apps/files_sharing
!/apps/files_trashbin
@@ -27,8 +29,9 @@
# ignore themes except the README
# ignore themes except the example and the README
/themes/*
!/themes/example
!/themes/README
# just sane ignores
@@ -109,3 +112,5 @@ Vagrantfile
/tests/autotest*
/tests/data/lorem-copy.txt
/tests/data/testimage-copy.png
/config/config-autotest-backup.php
/config/autoconfig.php
+26 -15
View File
@@ -1,11 +1,25 @@
# Version: 8.0.0
<IfModule mod_fcgid.c>
<IfModule mod_setenvif.c>
# Version: 8.1.6
<IfModule mod_headers.c>
SetEnvIfNoCase ^Authorization$ "(.+)" XAUTHORIZATION=$1
RequestHeader set XAuthorization %{XAUTHORIZATION}e env=XAUTHORIZATION
</IfModule>
</IfModule>
<IfModule mod_fcgid.c>
<IfModule mod_setenvif.c>
SetEnvIfNoCase ^Authorization$ "(.+)" XAUTHORIZATION=$1
RequestHeader set XAuthorization %{XAUTHORIZATION}e env=XAUTHORIZATION
</IfModule>
</IfModule>
<IfModule mod_env.c>
# Add security and privacy related headers
Header set X-Content-Type-Options "nosniff"
Header set X-XSS-Protection "1; mode=block"
Header set X-Robots-Tag "none"
Header set X-Frame-Options "SAMEORIGIN"
SetEnv modHeadersAvailable true
</IfModule>
# Add cache control for CSS and JS files
<FilesMatch "\.(css|js)$">
Header set Cache-Control "max-age=7200, public"
</FilesMatch>
</IfModule>
<IfModule mod_php5.c>
php_value upload_max_filesize 513M
@@ -13,6 +27,8 @@ php_value post_max_size 513M
php_value memory_limit 512M
php_value mbstring.func_overload 0
php_value always_populate_raw_post_data -1
php_value default_charset 'UTF-8'
php_value output_buffering off
<IfModule mod_env.c>
SetEnv htaccessWorking true
</IfModule>
@@ -22,8 +38,8 @@ RewriteEngine on
RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
RewriteRule ^\.well-known/host-meta /public.php?service=host-meta [QSA,L]
RewriteRule ^\.well-known/host-meta\.json /public.php?service=host-meta-json [QSA,L]
RewriteRule ^\.well-known/carddav /remote.php/carddav/ [R]
RewriteRule ^\.well-known/caldav /remote.php/caldav/ [R]
RewriteRule ^\.well-known/carddav /remote.php/carddav/ [R=301,L]
RewriteRule ^\.well-known/caldav /remote.php/caldav/ [R=301,L]
RewriteRule ^apps/calendar/caldav\.php remote.php/caldav/ [QSA,L]
RewriteRule ^apps/contacts/carddav\.php remote.php/carddav/ [QSA,L]
RewriteRule ^remote/(.*) remote.php [QSA,L]
@@ -40,10 +56,5 @@ DirectoryIndex index.php index.html
AddDefaultCharset utf-8
Options -Indexes
<IfModule pagespeed_module>
ModPagespeed Off
</IfModule>
<IfModule mod_headers.c>
<FilesMatch "\.(css|js)$">
Header set Cache-Control "max-age=7200, public"
</FilesMatch>
ModPagespeed Off
</IfModule>
+409
View File
@@ -0,0 +1,409 @@
Aamir Khan <ak4u2009@gmail.com>
Aaron Reichman <areichman.kde@gmail.com>
Adam Williamson <awilliam@redhat.com>
Aditya Patawari <adimania@gmail.com>
Administrator <Administrator@WINDOWS-2012>
adrien <adrien.waksberg@believedigital.com>
Aldo "xoen" Giambelluca <xoen@xoen.org>
Alessandro Cosentino <cosenal@gmail.com>
Alexander Bergolth <leo@strike.wu.ac.at> root <leo@strike.wu.ac.at>
Alexander Bogdanov <syn@li.ru>
Alexander Wigen <alex@wigen.net>
Aloisio Almeida Jr <aloisio.almeida@openbossa.org>
Anders Nor Berle <anders@berle.cc>
Andreas Fischer <bantu@owncloud.com>
Andreas Schönebeck <aschoenebeck@web.de>
Andreas Ergenzinger <andreas.ergenzinger@gmx.de> AndreasErgenzinger <andreas.ergenzinger@gmx.de>
Andrew Brown <andrew@casabrown.com>
André Gaul <gaul@web-yard.de>
Arthur Schiwon <blizzz@owncloud.com> Arthur Schiwon <blizzz@arthur-schiwon.de>
Arthur Schiwon <blizzz@owncloud.com> blizzz <blizzz@owncloud.com>
Artur Duque de Souza <asouza@kde.org>
Axel Roenn <axel@mpim-bonn.mpg.de>
Bagera <victor@baquero-wihlborg.se>
Bart Visscher <bartv@thisnet.nl> Bart Visscher <bart@thisnet.nl>
Bart Visscher <bartv@thisnet.nl> Bart Visscher <github@thisnet.nl>
Bartek Przybylski <bart.p.pl@gmail.com>
Bastien Ho <bastienho@urbancube.fr>
ben-denham <bend@catalyst.net.nz>
Benjamin Diele <benjamin@diele.be>
Benjamin Liles <benliles@arch.tamu.edu>
Bernhard Posselt <dev@bernhard-posselt.com> Bernhard Posselt <nukeawhale@gmail.com>
Bernhard Posselt <dev@bernhard-posselt.com> Bernhard Posselt <Raydiation@users.noreply.github.com>
Bernhard Reiter <ockham@raz.or.at>
Birk Borkason <daniel.niccoli@gmail.com>
Björn Schießle <schiessle@owncloud.com> Bjoern Schiessle <schiesbn@woody.(none)>
Björn Schießle <schiessle@owncloud.com> Björn Schießle <bjoern@schiessle.org>
Björn Schießle <schiessle@owncloud.com> Björn Schießle <schiesbn@potato.(none)>
Björn Schießle <schiessle@owncloud.com> Björn Schiessle <schiessle@owncloud.com>
Björn Schießle <schiessle@owncloud.com> Bjoern Schießle <schiessle@owncloud.com>
Björn Schießle <schiessle@owncloud.com> Bjoern Schiessle <schiessle@owncloud.com>
BlackEagle <ike.devolder@gmail.com>
Boris Rybalkin <ribalkin@gmail.com>
Borjan Tchakaloff <borjan@tchakaloff.fr>
Brice Maron <brice@bmaron.net>
brumsel <brumsel@losecatcher.de> brumsoel <brumsel@losecatcher.de>
Byron Marohn <combustible@live.com> eMerzh <brice@bmaron.net>
Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
Carla Schroder <carla@owncloud.com>
Carlos Cerrillo <ccerrillo@gmail.com>
cbhp <cbhp@users.noreply.github.com>
cbojar <chris@cbojar.net>
Ceri Davies <ceri@submonkey.net>
cetra3 <peter@parashift.com.au>
Charles-Edouard Coste <contact@ccoste.fr>
CharlyCoste <contact@ccoste.fr>
chli1 <chli1@users.noreply.github.com>
Chris Kankiewicz <Chris@ChrisKankiewicz.com>
Chris LeBlanc <chris@leblaaanc.com>
Chris Wilson <chris+github@qwirx.com>
Christian Berendt <berendt@b1-systems.de>
Christian Kampka <christian@kampka.net>
Christian Koch <koch.chris@gmail.com>
Christian Reiner <github@christian-reiner.info> Christian Reiner <arkascha@balder.site>
Christopher Bunn <b11.chris@gmail.com>
Christopher Schäpers <kondou@ts.unde.re> Christopher <kondou@ts.unde.re>
Christopher Schäpers <kondou@ts.unde.re> kondou <kondou@ts.unde.re>
Christopher Schäpers <kondou@ts.unde.re> root <kondou@ts.unde.re>
Christopher T. Johnson <ctjctj@gmail.com>
Clark Tomlinson <fallen013@gmail.com>
Cloud Dumper <clouddumper@gmail.com>
cmeh <cmeh@users.noreply.github.com>
Cornelius Schumacher <schumacher@kde.org>
Craig Morrissey <craig@owncloud.com>
Côme BERNIGAUD <come.bernigaud@laposte.net>
dampfklon <me@dampfklon.de>
Dan Bartram <daneybartram@gmail.com>
Dan Callahan <dan.callahan@gmail.com>
Dan Jones <dan@danneh.org>
Daniel <daniel@mars.(none)>
Daniel Hansson <enoch85@gmail.com>
Daniel Köb <daniel.koeb@peony.at>
Daniel Molkentin <daniel@molkentin.de>
Daniele E. Domenichelli <daniele.domenichelli@gmail.com>
David <davidventura>
David Iwanowitsch <david+git@unclouded.de> David Iwanowitsch <diw@gmx.de>
David Prévot <taffit@debian.org>
David Reagan <reagand@lanecc.edu>
davidak <davidak@gmx.de>
davidgumberg <davidnoizgumberg@gmail.com>
Dawid Opis <ncore@ncore.com.pl>
Deepak Mittal <dpac.mittal2@gmail.com>
DeLtAfOx <edo@ravers.it>
denis-b <denis.bonnenfant@diderot.org>
Der-Jan <de@r-jan.de>
derkostka <sebastian.kostka@gmail.com>
Diederik de Haas <diederik@cknow.org>
Dominik Schmidt <dev@dominik-schmidt.de>
Donald Buczek <buczek@molgen.mpg.de>
Doug Neiner <doug@pixelgraphics.us>
drarko <drarko@users.noreply.github.com>
dratini0 <dratini0@gmail.com>
Duane Johnson <duane.johnson@gmail.com>
eduardo <eduardo@vnexu.net>
elchi <niklas1b@yahoo.de>
Elias Probst <mail@eliasprobst.eu>
Florian <ente@baer.rwth-aachen.de> ente <ente@baer.rwth-aachen.de>
Erik Sargent <esthepiking@gmail.com>
Evgeni Golov <evgeni@golov.de>
fabian <fabian@web2.0-apps.de>
Fabian Henze <flyser42@gmx.de>
Felix Böhm <felixboehm@gmx.de> felixboehm <felixboehm@gmx.de>
Felix Eckhofer <felix@eckhofer.com>
Felix Moeller <mail@felixmoeller.de>
Felix Niklas <mrflix@gmail.com>
Fernando Rodriguez Sela <frsela@tid.es>
fibsifan <fi@volans.uberspace.de>
Florian Hülsmann <fh@cbix.de>
Florian Jacob <fjacob@lavabit.com>
Florian Preinstorfer <nblock@archlinux.us>
Florian Pritz <bluewind@xinu.at>
Florian Scholz <FlorianScholz@bgstyle.de> Florian Scholz <work@bgstyle.de>
Florian Vichot <florian.vichot@gmail.com>
Florin Peter <github@florin-peter.de> Florin Peter <fp@datawerk.de>
Florin Peter <github@florin-peter.de> FlorinPeter <github@florin-peter.de>
Francesco Piraneo G. <fpiraneo@iface.ch>
Frank Karlitschek <frank@owncloud.org> Frank Karlitschek <frank@dev.(none)>
Frank Karlitschek <frank@owncloud.org> Frank Karlitschek <frank@devel.(none)>
Frank Karlitschek <frank@owncloud.org> Frank Karlitschek <frank@oc.(none)>
Frank Karlitschek <frank@owncloud.org> Frank Karlitschek <karlitschek@gmx.de>
Frank Karlitschek <frank@owncloud.org> Frank Karlitschek <karlitschek@kde.org>
François Kubler <francois@kubler.org>
Frederik Gladhorn <gladhorn@kde.org>
Gadzy <dev@gadzy.fr>
ganomi <ganomi@gmail.com>
Gaël Beaudoin <gaboo@home.gaboo.org>
geez0x1 <geez0x1@users.noreply.github.com>
gekmihesg <markus@gekmihesg.de>
Georg Ehrke <georg@owncloud.com> Georg Ehrke <dev@georgswebsite.de>
Georg Ehrke <georg@owncloud.com> Georg Ehrke <developer@georgehrke.com>
Georg Ehrke <georg@owncloud.com> Georg Ehrke <georg.stefan.germany@googlemail.com>
Georg Ehrke <georg@owncloud.com> Georg Ehrke <ownclouddev@georgswebsite.de>
Georg Ehrke <georg@owncloud.com> Georg Ehrke <devgeorg@ownCloud.com>
Georg Ehrke <georg@owncloud.com> Georg Ehrke <georg@ownCloud.com>
Golnaz Nilieh <g382nilieh@gmail.com>
Grundik <grundik@ololo.cc>
Guillaume AMAT <guillaume.amat@informatique-libre.com>
Hans Bakker <hansmbakker@gmail.com>
helix84 <helix84@centrum.sk>
Hendrik Langer <hendrik.langer@gmx.de>
Henning Becker <h.becker@oedenstockach.de>
Henning Oschwald <h.oschwald@gmx.de>
Henrik Kjölhede <hkjolhede@gmail.com>
herbrechtsmeier <stefan@herbrechtsmeier.net>
hkjolhede <hkjolhede@gmail.com>
IchEben <andreas@reichster.de>
ideaship <ideaship@users.noreply.github.com>
Ignacio Daniel Rostagno <ignaciorostagno@vijona.com.ar>
infoneo <infoneo@yahoo.pl>
Insanemal <insanemal@gmail.com>
Tobias Ramforth <tobias@ramforth.com> Tobias Ramforth <tobias.ramforth@udo.edu>
Tobias Ramforth <tobias@ramforth.com> irgsmirx <tobias.ramforth@udo.edu>
Isaac Rosenberg <irosenb7@gmail.com>
itheiss <ingo.theiss@i-matrixx.de>
j-ed <juergen@eisfair.org>
Jake Wilson <jakew@huebnerpetersen.com>
Jakob Sack <mail@jakobsack.de> Jakob Sack <kde@jakobsack.de>
jamesryanbell <james@james-bell.co.uk>
Jamie McClelland <jm@mayfirst.org>
Jan-Christoph Borchardt <hey@jancborchardt.net> Jan-Christoph Borchardt <jan@unhosted.org>
Jan-Christoph Borchardt <hey@jancborchardt.net> Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>
jbtbnl <jbtbnl@users.noreply.github.com>
Jean-Louis Dupond <jean-louis@dupond.be>
Jenkins for ownCloud <owncloud-bot@tmit.eu> Jenkins for ownCloud <thomas.mueller@tmit.eu>
Jens-Christian Fischer <jens-christian.fischer@switch.ch>
Jernej Virag <jernej.virag@gmail.com>
Jesus Macias <jmacias@full-on-net.com>
Jesus Macias Portela <jesus.macias.portela@gmail.com>
jknockaert <jasper@knockaert.nl>
Joan <aseques@gmail.com>
Joar Wandborg <git@wandborg.com>
Joas Schilling <nickvergessen@owncloud.com> Joas Schilling <nickvergessen@gmx.de>
joel hansson <joel.hansson@gmail.com>
Johan Björk <johanimon@gmail.com>
Johannes Twittmann <github.com@deryo.de>
Johannes Willnecker <johannes@willnecker.com>
John Kristensen <John.Kristensen@dpipwe.tas.gov.au>
Jonathan Riddell <jriddell@ubuntu.com>
Jonny007-MKD <1-23-4-5@web.de>
josh4trunks <joshruehlig@gmail.com>
Joshua Medeiros <Jammerx2@gmail.com>
Juan Carlos Cornejo <jc2@paintblack.com>
Julian Müller <julian.mueller.ffb@kabelmail.de>
Jörn Friedrich Dreyer <jfd@butonic.de> jfd <jfd@lance>
Jörn Friedrich Dreyer <jfd@butonic.de> jfd <jfd@underverse>
Kamil Domanski <kdomanski@kdemail.net>
Kees Huiberts <snowy@derideal.com>
Klaas Freitag <freitag@owncloud.com> Klaas Freitag <freitag@suse.de>
Konstantin Popov <konstantin.popov@globalpointagency.comv> Konstantin.Popov <konstantin.popov@globalpointagency.comv>
krzaczek <pawel@freshmind.pl>
Kshitij Parajuli <kshitijparajuli@gmail.com>
Kunal Ghosh <kunal.t2@gmail.com>
Tobia De Koninck <tobia@ledfan.be> LEDfan <tobia@ledfan.be>
Lennart Rosam <lennart.rosam@medien-systempartner.de>
Sebastian Döll <sebastian.doell@libasys.de> libasys <sebastian.doell@libasys.de>
Lode Hoste <zillode@zillode.be>
lolozere <laurent@chedanne.pro>
Lorenzo M. Catucci <lorenzo@sancho.ccd.uniroma2.it>
Lukas Reschke <lukas@owncloud.com> Lukas Reschke <lukas@owncloud.org>
Lukas Reschke <lukas@owncloud.com> Lukas Reschke <lukas@statuscode.ch>
Luke Policinski <lpolicinski@gmail.com>
Lyonel Vincent <lyonel@ezix.org>
macjohnny <estebanmarin@gmx.ch>
maelzx <maelzx@gmail.com>
marc0s <marcos@tenak.net>
Marco B <beinbrech@solutica.de>
Marco Michelino <michelinux@gmail.com>
Markus Goetz <markus@woboq.com>
Markus Kalkbrenner <markus.kalkbrenner@bio.logis.de>
Martial Saunois <saunois.martial@gmail.com>
Martin Mattel <martin.mattel@diemattels.at> Martin <martin.mattel@diemattels.at>
Martin Mattel <martin.mattel@diemattels.at> root <martin.mattel@diemattels.at>
Martin Grohmann <martin@medi-inf.org>
# TODO: the same person
Martin Konrad <info@martin-konrad.net>
Martin Konrad <konrad@frib.msu.edu>
Martin Sandsmark <martin.sandsmark@kde.org> Martin T. H. Sandsmark <sandsmark@samfundet.no>
Marvin Thomas Rabe <mrabe@marvinrabe.de> Marvin Thomas Rabe <m.rabe@echtzeitraum.de>
Masaki Kawabata Neto <masaki.kawabata@gmail.com> Masaki <masaki.kawabata@gmail.com>
Mat Lipe <mat@lipeimagination.info>
Matthew Caron <matt@mattcaron.net>
Matthew Dawson <matthew@mjdsystems.ca>
Matthias Rieber <matthias@zu-con.org>
Maximilian Ruta <mr@xtain.net>
mh <mh@immerda.ch>
Michael Gapczynski <GapczynskiM@gmail.com> Michael Gapczynski <mtgap@owncloud.com>
Michael Göhler <somebody.here@gmx.de>
Michael Kent <mike@draftx.net>
Michael Kuhn <suraia@ikkoku.de>
Michael Monreal <michael.monreal@gmail.com>
Michael Roitzsch <reactorcontrol@icloud.com>
michag86 <micha_g@arcor.de>
Michiel de Jong <michiel@unhosted.org> Michiel@unhosted <michiel@unhosted.org>
Miguel Prokop <miguel.prokop@vtu.com>
miicha <pfitzner@physik.hu-berlin.de>
Miquel Rodríguez Telep / Michael Rodríguez-Torrent <miquel@designunbound.co.uk>
Morris Jobke <hey@morrisjobke.de> Morris Jobke <morris.jobke@gmail.com>
MTRichards <matt@owncloud.com>
mvn23 <schopdiedwaas@gmail.com>
Myles McNamara <myles@hostt.net> Myles McNamara <myles@smyl.es>
NARUKAWA Hiroki <nhirokinet@nhiroki.net>
Nathan Dauber <nathan@radialogica.com>
Nazar Mokrynskyi <nazar@mokrynskyi.com>
nhirokinet <nhirokinet@nhiroki.net>
Nico Kaiser <nico.kaiser@boerse-go.de>
Nicolai Ehemann <en@enlightened.de>
Nicolas Stamm <nicolas.stamm@gmail.com>
NIEK Antoine <antoineniek@gmail.com>
Niklas Sombert <niklas1b@yahoo.de>
Nils Jansen <nilsjansen@gmail.com>
nishiki <nishiki@yaegashi.fr>
Nmz <nemesiz@nmz.lt>
Normal Ra <normalraw@gmail.com> Normal Ra <NormalRa@users.noreply.github.com>
Oliver Gasser <oliver.gasser@gmail.com> Oliver Gasser <oliver@flowriver.net>
Oliver Kohl D.Sc. <oliver@kohl.bz>
Olivier Paroz <github@oparoz.com> Olivier Paroz <oparoz@users.noreply.github.com>
Olivier Tétard <olivier.tetard@miskin.fr>
Aaron Larisch <aaron.larisch@gmx.de> OpenLarry <aaron.larisch@gmx.de>
opensaucesystems <ashley@opensaucesystems.com>
Oskar Hollmann <oskarhollmann@gmail.com>
Otto Sabart <ottosabart@seberm.com>
Owen Winkler <a_github@midnightcircus.com> Owen Winkler <epithet@gmail.com>
Owen Winkler <a_github@midnightcircus.com> ringmaster <epithet@gmail.com>
Pascal de Bruijn <pmjdebruijn@pcode.nl>
Patrick Paysant <ppaysant@linagora.com>
Patrick Stricker <stricker@hera.dev.iks-hagen.de>
Paul Brown <paul90brown@gmail.com>
pdessauw <pdessauw@gmail.com>
Pellaeon Lin <nfsmwlin@gmail.com>
Pete McFarlane <peterjohnmcfarlane@gmail.com> petemcfarlane <peterjohnmcfarlane@gmail.com>
Philipp Kapfer <philipp.kapfer@gmx.at>
Philipp Knechtges <philipp-dev@knechtges.com>
Philipp Roggan <philipp.roggan@newsletter4free.de>
Philipp Schmitt <philipp@schmitt.co>
Philippe Jung <phil.jung@free.fr>
Philippe Kueck <pk@plusline.de>
prcrst <prcrst@hush.com>
pzy <pzy@d1sturbed.org>
Qingping Hou <dave2008713@gmail.com>
Raghu Nayyar <me@iraghu.com> Raghu Nayyar <raghu.nayyar.007@gmail.com>
Raghu Nayyar <me@iraghu.com> raghunayyar <me@iraghu.com>
Raimund Schlüßler <raimund.schluessler@googlemail.com>
Ramiro Aparicio <rapariciog@gmail.com>
Randolph Carter <RandolphCarter@fantasymail.de>
RealRancor <Fisch.666@gmx.de>
Remco Brenninkmeijer <requist1@starmail.nl>
Riccardo Iaconelli <riccardo@kde.org>
Richard Clarkson <robert@trash-mail.com>
rnveach <rveach02@gmail.com>
Robert Jäckel <rjaeckel@users.noreply.github.com>
Robin Appelman <icewind@owncloud.com> icewind1991 <icewind1991@gmail.com>
Robin Appelman <icewind@owncloud.com> icewind1991 <robin@icewind.nl>
Robin Appelman <icewind@owncloud.com> Robin <Robin Appelman icewind1991@gmail.com>
Robin Appelman <icewind@owncloud.com> Robin <robin@Amaya.(none)>
Robin Appelman <icewind@owncloud.com> Robin Appelman <icewind1991@gmail.com>
Robin Appelman <icewind@owncloud.com> Robin Appelman <icewind1991@gmail>
Robin Appelman <icewind@owncloud.com> Robin Appelman <robin@icewind.nl>
Robin McCorkell <rmccorkell@karoshi.org.uk>
Rodrigo Hjort <rodrigo.hjort@gmail.com>
Roeland Jago Douma <roeland@famdouma.nl>
rok <brejktru@gmail.com>
Roland Hager <roland.hager@tu-berlin.de>
Roland van Laar <roland@micite.net>
rolandgeider <roland@geider.net>
Roman Geber <rgeber@owncloudapps.com>
root <root@asterisk03.ceschia.de>
root <root@dev.(none)>
root <root@oc.(none)>
root <root@plug.(none)>
Ross Nicoll <jrn@jrn.me.uk>
runky <philipp.boersteken@googlemail.com>
Sam Tuke <mail@samtuke.com> Sam Tuke <sam@donttravelempty.com>
Sam Tuke <mail@samtuke.com> Sam Tuke <samtuke@jack-laptop.(none)>
Sam Tuke <mail@samtuke.com> Sam Tuke <samtuke@owncloud.com>
Sander <brantje@gmail.com>
Sandro Knauß <bugs@sandroknauss.de> Sandro <hefee@taurin.(none)>
Sascha Schmidt <realriot@realriot.de>
Sascha Schneider <development@suntsu.org>
scambra <sergio@entrecables.com>
scolebrook <scolebrook@mac.com>
Scott Arciszewski <scott@arciszewski.me>
Scott Barnett <scott.n.barnett@gmail.com>
Scott Shambarger <gitorious@shambarger.net>
Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
Sean Comeau <sean@ftlnetworks.ca>
Sean Leonard <meanderingcode@silverleafstudios.net>
Sebastian Bolt <sebastian.bolt@gmx.de>
Serge Martin <edb@sigluy.net>
Sergei Shuykov <n1nj4p0w3r@gmail.com>
Sergi Almacellas Abellana <sergi@koolpi.com>
sherbrecher <oss@herbrecher.de>
shkdee <louis.traynard@m4x.org>
Simon Birnbach <simon@simon-birnbach.de>
Simon Könnecke <simonkoennecke@gmail.com>
Simon Whittaker <simon@swbh.net>
Sjors van der Pluijm <sjors@desjors.nl> Sjors van der Pluijm <sjors@youngguns.nl>
st3so <st3so@server.fake>
Stefan <mu.stefan@googlemail.com>
Stefan Göckeritz <admin@s-goecker.de>
Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>
Stefan Rado <owncloud@sradonia.net>
Stefan Seidel <android@stefanseidel.info>
Steffen Lindner <mail@steffen-lindner.de> Steffen Lindner <gomez@flexiabel.de>
Stephan Arts <stephan@xfce.org>
Stephan Bergemann <st.bergemann@htw-berlin.de>
Stephan Peijnik <speijnik@anexia-it.com>
Stephane Martin <stef.martin@gmail.com> Stephane Martin <stephane.martin@vesperal.eu>
Stephane V <stephane@vergeylen.eu>
Stephen Rees-Carter <stephen@rees-carter.net>
Steven <wokste@gmail.com>
Steven <wokste@Komkommer.(none)>
Steven <wwjd2@web.de>
Sugaroverdose <n1nj4p0w3r@gmail.com>
Susinthiran Sithamparanathan <chesusin@gmail.com>
tbelau666 <thomas.belau@gmx.de>
TheSFReader <TheSFReader@gmail.com>
Thibaut GRIDEL <tgridel@free.fr>
thomas <thomas@thomas-VirtualBox.(none)>
Thomas Müller <thomas.mueller@tmit.eu> Thomas Mueller <thomas.mueller@tmit.eu>
Thomas Olsen <tol@tanghus>
Thomas Schmidt <tschmidt@suse.de>
Thomas Tanghus <thomas@tanghus.net>
Thomas Zander <zander@kde.org>
tiezdne <oswald.84@t-online.de>
Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
Tobias Kaminsky <tobias@kaminsky.me> tobiasKaminsky <tobias@kaminsky.me>
Tom Needham <tom@owncloud.com> Tom Needham <needham.thomas@gmail.com>
Tom Needham <tom@owncloud.com> Tom Needham <tom@tre.tomneedham.com>
Tom Needham <tom@owncloud.com> tomneedham <needham.thomas@gmail.com>
Tom Needham <tom@owncloud.com> tomneedham <tom@owncloud.com>
Tony Zelenoff <antonz@parallels.com>
tsumi <mail@tsumi.it>
twood8 <ted.wood@gtri.gatech.edu>
Türker Sezer <turkersezer@tsdesign.info>
unclejamal3000 <andreas.pramhaas@posteo.de>
unknown <Alain@Alain-PC.(none)>
unknown <pnd@.nist.gov>
Valerio Ponte <valerio.ponte@gmail.com>
Victor Dubiniuk <dubiniuk@owncloud.com> Victor Dubiniuk <victor.dubiniuk@gmail.com>
Victor Dubiniuk <dubiniuk@owncloud.com> VicDeo <dubiniuk@owncloud.com>
Victor Dubiniuk <dubiniuk@owncloud.com> VicDeo <victor.dubiniuk@gmail.com>
Vincent Cloutier <vincent1cloutier@gmail.com>
Vincent Petry <pvince81@owncloud.com> Vincent Petry <PVince81@yahoo.fr>
Vincent Petry <pvince81@owncloud.com> Vincent Petry <vincent@vvortex.site>
Vitaly Kuznetsov <vitty@altlinux.ru>
Vladimir Sapronov <vladimir.sapronov@gmail.com>
Volkan Gezer <volkangezer@gmail.com> Volkan Gezer <wakeup@users.noreply.github.com>
Volker E. <open@temporaer.net>
voxsim <Simon Vocella>
vsapronov <vladimir.sapronov@gmail.com>
Vsevolod Kukol <v.kukol@rubologic.de>
Weng Xuetian <wengxt@gmail.com>
Wikinaut <mail@tgries.de>
Willi Ballenthin <willi.ballenthin@gmail.com>
windaishi <manuel.strider@web.de>
Witali Rott <info@hlop.eu>
Yann VERRY <yann@verry.org>
yannickoo <github@yannickoo.de>
zafi <zafirakis.daniel@gmail.com>
zombiehugs <gerdsen@gmail.com>
+4
View File
@@ -18,3 +18,7 @@ filter:
imports:
- javascript
- php
tools:
external_code_coverage:
timeout: 7200 # Timeout in seconds. 120 minutes
+1
View File
@@ -0,0 +1 @@
$Format:%H$
+2
View File
@@ -3,3 +3,5 @@ post_max_size=513M
memory_limit=512M
mbstring.func_overload=0
always_populate_raw_post_data=-1
default_charset='UTF-8'
output_buffering=off
+13 -8
View File
@@ -2,9 +2,9 @@
If you have questions about how to install or use ownCloud, please direct these to the [mailing list][mailinglist] or our [forum][forum]. We are also available on [IRC][irc].
### TL;DR
### Short version
* The [issue template can be found here][template] but be aware of the different repositories! See list below.
* The [**issue template can be found here**][template] but be aware of the different repositories! See list below. Please always use the issue template when reporting issues.
### Guidelines
* Please search the existing issues first, it's likely that your issue was already reported or even fixed.
@@ -12,29 +12,34 @@ If you have questions about how to install or use ownCloud, please direct these
- You can also filter by appending e. g. "state:open" to the search string.
- More info on [search syntax within github](https://help.github.com/articles/searching-issues)
* This repository ([core](https://github.com/owncloud/core/issues)) is *only* for issues within the ownCloud core code. This also includes the apps: files, encryption, external storage, sharing, deleted files, versions, LDAP, and WebDAV Auth
* __SECURITY__: Report any potential security bug to security@owncloud.com following our [security policy](https://owncloud.org/security/) instead of filing an issue in our bug tracker
* The issues in other components should be reported in their respective repositories:
- [Android client](https://github.com/owncloud/android/issues)
- [iOS client](https://github.com/owncloud/ios-issues/issues)
- [Desktop client](https://github.com/owncloud/mirall/issues)
- [Documentation](https://github.com/owncloud/documentation/issues)
- Apps:
- [Activity](https://github.com/owncloud/activity/issues)
- [Bookmarks](https://github.com/owncloud/bookmarks/issues)
- [Calendar](https://github.com/owncloud/calendar/issues)
- [Contacts](https://github.com/owncloud/contacts/issues)
- [Documents](https://github.com/owncloud/documents/issues)
- [Gallery](https://github.com/owncloud/gallery/issues)
- [Mail](https://github.com/owncloud/mail/issues)
- [Music](https://github.com/owncloud/music/issues)
- [News](https://github.com/owncloud/news/issues)
- [Notes](https://github.com/owncloud/notes/issues)
- [Shorty](https://github.com/owncloud/shorty/issues)
- [All other apps](https://github.com/owncloud/apps/issues) (e.g. Pictures, Tasks, ...)
- [Tasks](https://github.com/owncloud/tasks/issues)
- [All other apps](https://github.com/owncloud/apps/issues)
* Report the issue using our [template][template], it includes all the information we need to track down the issue.
Help us to maximize the effort we can spend fixing issues and adding new features, by not reporting duplicate issues.
[template]: https://raw.github.com/owncloud/core/master/issue_template.md
[mailinglist]: http://mailman.owncloud.org/mailman/listinfo/owncloud
[forum]: http://forum.owncloud.org/
[irc]: http://webchat.freenode.net/?channels=owncloud&uio=d4
[mailinglist]: https://mailman.owncloud.org/mailman/listinfo/owncloud
[forum]: https://forum.owncloud.org/
[irc]: https://webchat.freenode.net/?channels=owncloud&uio=d4
## Contributing to Source Code
@@ -48,8 +53,8 @@ In order to constantly increase the quality of our software we can no longer acc
It is a must have that changed and added code segments are unit tested.
In some areas unit testing is hard (aka almost impossible) as of today - in these areas refactoring WHILE fixing a bug is encouraged to enable unit testing.
[agreement]: http://owncloud.org/about/contributor-agreement/
[devmanual]: http://owncloud.org/dev
[agreement]: https://owncloud.org/about/contributor-agreement/
[devmanual]: https://owncloud.org/dev
## Translations
Please submit translations via [Transifex][transifex].
+11 -5
View File
@@ -10,15 +10,21 @@ Quality:
- Scrutinizer: [![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/owncloud/core/badges/quality-score.png?s=ce2f5ded03d4ac628e9ee5c767243fa7412e644f)](https://scrutinizer-ci.com/g/owncloud/core/)
- CodeClimate: [![Code Climate](https://codeclimate.com/github/owncloud/core/badges/gpa.svg)](https://codeclimate.com/github/owncloud/core)
Depencencies:
[![Dependency Status](https://www.versioneye.com/user/projects/54f4a2384f3108959a000a16/badge.svg?style=flat)](https://www.versioneye.com/user/projects/54f4a2384f3108959a000a16)
[![Dependency Status](https://www.versioneye.com/user/projects/54d1f76f3ca0840b190000c0/badge.svg?style=flat)](https://www.versioneye.com/user/projects/54d1f76f3ca0840b190000c0)
### Installation instructions
http://doc.owncloud.org/server/8.0/developer_manual/app/index.html
https://doc.owncloud.org/server/8.1/developer_manual/app/index.html
### Contribution Guidelines
http://owncloud.org/contribute/
https://owncloud.org/contribute/
### Get in touch
* [Forum](http://forum.owncloud.org)
* [Mailing list](http://mailman.owncloud.org/mailman/listinfo)
* [Forum](https://forum.owncloud.org)
* [Mailing list](https://mailman.owncloud.org/mailman/listinfo)
* [IRC channel](https://webchat.freenode.net/?channels=owncloud)
* [Twitter](https://twitter.com/ownClouders)
@@ -29,4 +35,4 @@ https://www.transifex.com/projects/p/owncloud/
[![Transifex](https://www.transifex.com/projects/p/owncloud/resource/core/chart/image_png)](https://www.transifex.com/projects/p/owncloud/)
For more detailed information about translations:
http://doc.owncloud.org/server/8.0/developer_manual/core/translation.html
http://doc.owncloud.org/server/8.1/developer_manual/core/translation.html
+35
View File
@@ -0,0 +1,35 @@
<?php
/**
* @author Björn Schießle <schiessle@owncloud.com>
* @author Clark Tomlinson <fallen013@gmail.com>
* @author Thomas Müller <thomas.mueller@tmit.eu>
*
* @copyright Copyright (c) 2015, ownCloud, Inc.
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3,
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License, version 3,
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
namespace OCA\Encryption\AppInfo;
\OCP\Util::addscript('encryption', 'encryption');
$encryptionSystemReady = \OC::$server->getEncryptionManager()->isReady();
$app = new Application([], $encryptionSystemReady);
if ($encryptionSystemReady) {
$app->registerEncryptionModule();
$app->registerHooks();
$app->registerSettings();
}
+233
View File
@@ -0,0 +1,233 @@
<?php
/**
* @author Björn Schießle <schiessle@owncloud.com>
* @author Clark Tomlinson <fallen013@gmail.com>
* @author Lukas Reschke <lukas@owncloud.com>
* @author Morris Jobke <hey@morrisjobke.de>
* @author Thomas Müller <thomas.mueller@tmit.eu>
*
* @copyright Copyright (c) 2015, ownCloud, Inc.
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3,
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License, version 3,
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
namespace OCA\Encryption\AppInfo;
use OC\Files\View;
use OCA\Encryption\Controller\RecoveryController;
use OCA\Encryption\Controller\SettingsController;
use OCA\Encryption\Controller\StatusController;
use OCA\Encryption\Crypto\Crypt;
use OCA\Encryption\Crypto\Encryption;
use OCA\Encryption\HookManager;
use OCA\Encryption\Hooks\UserHooks;
use OCA\Encryption\KeyManager;
use OCA\Encryption\Recovery;
use OCA\Encryption\Session;
use OCA\Encryption\Users\Setup;
use OCA\Encryption\Util;
use OCP\App;
use OCP\AppFramework\IAppContainer;
use OCP\Encryption\IManager;
use OCP\IConfig;
class Application extends \OCP\AppFramework\App {
/** @var IManager */
private $encryptionManager;
/** @var IConfig */
private $config;
/**
* @param array $urlParams
* @param bool $encryptionSystemReady
*/
public function __construct($urlParams = array(), $encryptionSystemReady = true) {
parent::__construct('encryption', $urlParams);
$this->encryptionManager = \OC::$server->getEncryptionManager();
$this->config = \OC::$server->getConfig();
$this->registerServices();
if($encryptionSystemReady === false) {
/** @var Session $session */
$session = $this->getContainer()->query('Session');
$session->setStatus(Session::RUN_MIGRATION);
}
}
/**
* register hooks
*/
public function registerHooks() {
if (!$this->config->getSystemValue('maintenance', false)) {
$container = $this->getContainer();
$server = $container->getServer();
// Register our hooks and fire them.
$hookManager = new HookManager();
$hookManager->registerHook([
new UserHooks($container->query('KeyManager'),
$server->getUserManager(),
$server->getLogger(),
$container->query('UserSetup'),
$server->getUserSession(),
$container->query('Util'),
$container->query('Session'),
$container->query('Crypt'),
$container->query('Recovery'))
]);
$hookManager->fireHooks();
} else {
// Logout user if we are in maintenance to force re-login
$this->getContainer()->getServer()->getUserSession()->logout();
}
}
public function registerEncryptionModule() {
$container = $this->getContainer();
$this->encryptionManager->registerEncryptionModule(
Encryption::ID,
Encryption::DISPLAY_NAME,
function() use ($container) {
return new Encryption(
$container->query('Crypt'),
$container->query('KeyManager'),
$container->query('Util'),
$container->getServer()->getLogger(),
$container->getServer()->getL10N($container->getAppName())
);
});
}
public function registerServices() {
$container = $this->getContainer();
$container->registerService('Crypt',
function (IAppContainer $c) {
$server = $c->getServer();
return new Crypt($server->getLogger(),
$server->getUserSession(),
$server->getConfig());
});
$container->registerService('Session',
function (IAppContainer $c) {
$server = $c->getServer();
return new Session($server->getSession());
}
);
$container->registerService('KeyManager',
function (IAppContainer $c) {
$server = $c->getServer();
return new KeyManager($server->getEncryptionKeyStorage(),
$c->query('Crypt'),
$server->getConfig(),
$server->getUserSession(),
new Session($server->getSession()),
$server->getLogger(),
$c->query('Util')
);
});
$container->registerService('Recovery',
function (IAppContainer $c) {
$server = $c->getServer();
return new Recovery(
$server->getUserSession(),
$c->query('Crypt'),
$server->getSecureRandom(),
$c->query('KeyManager'),
$server->getConfig(),
$server->getEncryptionKeyStorage(),
$server->getEncryptionFilesHelper(),
new View());
});
$container->registerService('RecoveryController', function (IAppContainer $c) {
$server = $c->getServer();
return new RecoveryController(
$c->getAppName(),
$server->getRequest(),
$server->getConfig(),
$server->getL10N($c->getAppName()),
$c->query('Recovery'));
});
$container->registerService('StatusController', function (IAppContainer $c) {
$server = $c->getServer();
return new StatusController(
$c->getAppName(),
$server->getRequest(),
$server->getL10N($c->getAppName()),
$c->query('Session')
);
});
$container->registerService('SettingsController', function (IAppContainer $c) {
$server = $c->getServer();
return new SettingsController(
$c->getAppName(),
$server->getRequest(),
$server->getL10N($c->getAppName()),
$server->getUserManager(),
$server->getUserSession(),
$c->query('KeyManager'),
$c->query('Crypt'),
$c->query('Session'),
$server->getSession()
);
});
$container->registerService('UserSetup',
function (IAppContainer $c) {
$server = $c->getServer();
return new Setup($server->getLogger(),
$server->getUserSession(),
$c->query('Crypt'),
$c->query('KeyManager'));
});
$container->registerService('Util',
function (IAppContainer $c) {
$server = $c->getServer();
return new Util(
new View(),
$c->query('Crypt'),
$server->getLogger(),
$server->getUserSession(),
$server->getConfig(),
$server->getUserManager());
});
}
public function registerSettings() {
// Register settings scripts
App::registerAdmin('encryption', 'settings/settings-admin');
App::registerPersonal('encryption', 'settings/settings-personal');
}
}
+31
View File
@@ -0,0 +1,31 @@
<?xml version="1.0"?>
<info>
<id>encryption</id>
<description>
In order to use this encryption module you need to enable server-side
encryption in the admin settings. Once enabled this module will encrypt
all your files transparently. The encryption is based on AES 256 keys.
The module won't touch existing files, only new files will be encrypted
after server-side encryption was enabled. It is also not possible to
disable the encryption again and switch back to a unencrypted system.
Please read the documentation to know all implications before you decide
to enable server-side encryption.
</description>
<name>Default encryption module</name>
<license>AGPL</license>
<author>Bjoern Schiessle, Clark Tomlinson</author>
<requiremin>8</requiremin>
<shipped>true</shipped>
<documentation>
<user>user-encryption</user>
<admin>admin-encryption</admin>
</documentation>
<rememberlogin>false</rememberlogin>
<types>
<filesystem/>
</types>
<dependencies>
<lib>openssl</lib>
</dependencies>
</info>
@@ -0,0 +1,30 @@
<?php
/**
* @author Björn Schießle <schiessle@owncloud.com>
* @author Morris Jobke <hey@morrisjobke.de>
*
* @copyright Copyright (c) 2015, ownCloud, Inc.
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3,
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License, version 3,
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
use OCA\Encryption\Command\MigrateKeys;
$userManager = OC::$server->getUserManager();
$view = new \OC\Files\View();
$config = \OC::$server->getConfig();
$connection = \OC::$server->getDatabaseConnection();
$logger = \OC::$server->getLogger();
$application->add(new MigrateKeys($userManager, $view, $connection, $config, $logger));
+57
View File
@@ -0,0 +1,57 @@
<?php
/**
* @author Björn Schießle <schiessle@owncloud.com>
* @author Clark Tomlinson <fallen013@gmail.com>
* @author Morris Jobke <hey@morrisjobke.de>
* @author Thomas Müller <thomas.mueller@tmit.eu>
*
* @copyright Copyright (c) 2015, ownCloud, Inc.
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3,
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License, version 3,
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
namespace OCA\Encryption\AppInfo;
(new Application())->registerRoutes($this, array('routes' => array(
[
'name' => 'Recovery#adminRecovery',
'url' => '/ajax/adminRecovery',
'verb' => 'POST'
],
[
'name' => 'Settings#updatePrivateKeyPassword',
'url' => '/ajax/updatePrivateKeyPassword',
'verb' => 'POST'
],
[
'name' => 'Recovery#changeRecoveryPassword',
'url' => '/ajax/changeRecoveryPassword',
'verb' => 'POST'
],
[
'name' => 'Recovery#userSetRecovery',
'url' => '/ajax/userSetRecovery',
'verb' => 'POST'
],
[
'name' => 'Status#getStatus',
'url' => '/ajax/getStatus',
'verb' => 'GET'
]
)));
+1
View File
@@ -0,0 +1 @@
1.0.0
+127
View File
@@ -0,0 +1,127 @@
<?php
/**
* @author Björn Schießle <schiessle@owncloud.com>
* @author Morris Jobke <hey@morrisjobke.de>
*
* @copyright Copyright (c) 2015, ownCloud, Inc.
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3,
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License, version 3,
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
namespace OCA\Encryption\Command;
use OC\DB\Connection;
use OC\Files\View;
use OC\User\Manager;
use OCA\Encryption\Migration;
use OCP\IConfig;
use OCP\ILogger;
use OCP\IUserBackend;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
class MigrateKeys extends Command {
/** @var \OC\User\Manager */
private $userManager;
/** @var View */
private $view;
/** @var \OC\DB\Connection */
private $connection;
/** @var IConfig */
private $config;
/** @var ILogger */
private $logger;
/**
* @param Manager $userManager
* @param View $view
* @param Connection $connection
* @param IConfig $config
* @param ILogger $logger
*/
public function __construct(Manager $userManager,
View $view,
Connection $connection,
IConfig $config,
ILogger $logger) {
$this->userManager = $userManager;
$this->view = $view;
$this->connection = $connection;
$this->config = $config;
$this->logger = $logger;
parent::__construct();
}
protected function configure() {
$this
->setName('encryption:migrate')
->setDescription('initial migration to encryption 2.0')
->addArgument(
'user_id',
InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
'will migrate keys of the given user(s)'
);
}
protected function execute(InputInterface $input, OutputInterface $output) {
// perform system reorganization
$migration = new Migration($this->config, $this->view, $this->connection, $this->logger);
$users = $input->getArgument('user_id');
if (!empty($users)) {
foreach ($users as $user) {
if ($this->userManager->userExists($user)) {
$output->writeln("Migrating keys <info>$user</info>");
$migration->reorganizeFolderStructureForUser($user);
} else {
$output->writeln("<error>Unknown user $user</error>");
}
}
} else {
$output->writeln("Reorganize system folder structure");
$migration->reorganizeSystemFolderStructure();
$migration->updateDB();
foreach($this->userManager->getBackends() as $backend) {
$name = get_class($backend);
if ($backend instanceof IUserBackend) {
$name = $backend->getBackendName();
}
$output->writeln("Migrating keys for users on backend <info>$name</info>");
$limit = 500;
$offset = 0;
do {
$users = $backend->getUsers('', $limit, $offset);
foreach ($users as $user) {
$output->writeln(" <info>$user</info>");
$migration->reorganizeFolderStructureForUser($user);
}
$offset += $limit;
} while(count($users) >= $limit);
}
}
$migration->finalCleanUp();
}
}
@@ -0,0 +1,194 @@
<?php
/**
* @author Björn Schießle <schiessle@owncloud.com>
* @author Clark Tomlinson <fallen013@gmail.com>
* @author Lukas Reschke <lukas@owncloud.com>
* @author Morris Jobke <hey@morrisjobke.de>
* @author Thomas Müller <thomas.mueller@tmit.eu>
*
* @copyright Copyright (c) 2015, ownCloud, Inc.
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3,
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License, version 3,
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
namespace OCA\Encryption\Controller;
use OCA\Encryption\Recovery;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http;
use OCP\IConfig;
use OCP\IL10N;
use OCP\IRequest;
use OCP\AppFramework\Http\DataResponse;
class RecoveryController extends Controller {
/**
* @var IConfig
*/
private $config;
/**
* @var IL10N
*/
private $l;
/**
* @var Recovery
*/
private $recovery;
/**
* @param string $AppName
* @param IRequest $request
* @param IConfig $config
* @param IL10N $l10n
* @param Recovery $recovery
*/
public function __construct($AppName,
IRequest $request,
IConfig $config,
IL10N $l10n,
Recovery $recovery) {
parent::__construct($AppName, $request);
$this->config = $config;
$this->l = $l10n;
$this->recovery = $recovery;
}
/**
* @param string $recoveryPassword
* @param string $confirmPassword
* @param string $adminEnableRecovery
* @return DataResponse
*/
public function adminRecovery($recoveryPassword, $confirmPassword, $adminEnableRecovery) {
// Check if both passwords are the same
if (empty($recoveryPassword)) {
$errorMessage = (string)$this->l->t('Missing recovery key password');
return new DataResponse(['data' => ['message' => $errorMessage]],
Http::STATUS_BAD_REQUEST);
}
if (empty($confirmPassword)) {
$errorMessage = (string)$this->l->t('Please repeat the recovery key password');
return new DataResponse(['data' => ['message' => $errorMessage]],
Http::STATUS_BAD_REQUEST);
}
if ($recoveryPassword !== $confirmPassword) {
$errorMessage = (string)$this->l->t('Repeated recovery key password does not match the provided recovery key password');
return new DataResponse(['data' => ['message' => $errorMessage]],
Http::STATUS_BAD_REQUEST);
}
if (isset($adminEnableRecovery) && $adminEnableRecovery === '1') {
if ($this->recovery->enableAdminRecovery($recoveryPassword)) {
return new DataResponse(['data' => ['message' => (string)$this->l->t('Recovery key successfully enabled')]]);
}
return new DataResponse(['data' => ['message' => (string)$this->l->t('Could not enable recovery key. Please check your recovery key password!')]], Http::STATUS_BAD_REQUEST);
} elseif (isset($adminEnableRecovery) && $adminEnableRecovery === '0') {
if ($this->recovery->disableAdminRecovery($recoveryPassword)) {
return new DataResponse(['data' => ['message' => (string)$this->l->t('Recovery key successfully disabled')]]);
}
return new DataResponse(['data' => ['message' => (string)$this->l->t('Could not disable recovery key. Please check your recovery key password!')]], Http::STATUS_BAD_REQUEST);
}
// this response should never be sent but just in case.
return new DataResponse(['data' => ['message' => (string)$this->l->t('Missing parameters')]], Http::STATUS_BAD_REQUEST);
}
/**
* @param string $newPassword
* @param string $oldPassword
* @param string $confirmPassword
* @return DataResponse
*/
public function changeRecoveryPassword($newPassword, $oldPassword, $confirmPassword) {
//check if both passwords are the same
if (empty($oldPassword)) {
$errorMessage = (string)$this->l->t('Please provide the old recovery password');
return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST);
}
if (empty($newPassword)) {
$errorMessage = (string)$this->l->t('Please provide a new recovery password');
return new DataResponse (['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST);
}
if (empty($confirmPassword)) {
$errorMessage = (string)$this->l->t('Please repeat the new recovery password');
return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST);
}
if ($newPassword !== $confirmPassword) {
$errorMessage = (string)$this->l->t('Repeated recovery key password does not match the provided recovery key password');
return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST);
}
$result = $this->recovery->changeRecoveryKeyPassword($newPassword,
$oldPassword);
if ($result) {
return new DataResponse(
[
'data' => [
'message' => (string)$this->l->t('Password successfully changed.')]
]
);
}
return new DataResponse(
[
'data' => [
'message' => (string)$this->l->t('Could not change the password. Maybe the old password was not correct.')
]
], Http::STATUS_BAD_REQUEST);
}
/**
* @NoAdminRequired
*
* @param string $userEnableRecovery
* @return DataResponse
*/
public function userSetRecovery($userEnableRecovery) {
if ($userEnableRecovery === '0' || $userEnableRecovery === '1') {
$result = $this->recovery->setRecoveryForUser($userEnableRecovery);
if ($result) {
if ($userEnableRecovery === '0') {
return new DataResponse(
[
'data' => [
'message' => (string)$this->l->t('Recovery Key disabled')]
]
);
}
return new DataResponse(
[
'data' => [
'message' => (string)$this->l->t('Recovery Key enabled')]
]
);
}
}
return new DataResponse(
[
'data' => [
'message' => (string)$this->l->t('Could not enable the recovery key, please try again or contact your administrator')
]
], Http::STATUS_BAD_REQUEST);
}
}
@@ -0,0 +1,147 @@
<?php
/**
* @author Björn Schießle <schiessle@owncloud.com>
* @author Joas Schilling <nickvergessen@owncloud.com>
* @author Morris Jobke <hey@morrisjobke.de>
*
* @copyright Copyright (c) 2015, ownCloud, Inc.
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3,
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License, version 3,
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
namespace OCA\Encryption\Controller;
use OCA\Encryption\Crypto\Crypt;
use OCA\Encryption\KeyManager;
use OCA\Encryption\Session;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\DataResponse;
use OCP\IL10N;
use OCP\IRequest;
use OCP\ISession;
use OCP\IUserManager;
use OCP\IUserSession;
class SettingsController extends Controller {
/** @var IL10N */
private $l;
/** @var IUserManager */
private $userManager;
/** @var IUserSession */
private $userSession;
/** @var KeyManager */
private $keyManager;
/** @var Crypt */
private $crypt;
/** @var Session */
private $session;
/** @var ISession */
private $ocSession;
/**
* @param string $AppName
* @param IRequest $request
* @param IL10N $l10n
* @param IUserManager $userManager
* @param IUserSession $userSession
* @param KeyManager $keyManager
* @param Crypt $crypt
* @param Session $session
* @param ISession $ocSession
*/
public function __construct($AppName,
IRequest $request,
IL10N $l10n,
IUserManager $userManager,
IUserSession $userSession,
KeyManager $keyManager,
Crypt $crypt,
Session $session,
ISession $ocSession) {
parent::__construct($AppName, $request);
$this->l = $l10n;
$this->userSession = $userSession;
$this->userManager = $userManager;
$this->keyManager = $keyManager;
$this->crypt = $crypt;
$this->session = $session;
$this->ocSession = $ocSession;
}
/**
* @NoAdminRequired
* @UseSession
*
* @param string $oldPassword
* @param string $newPassword
* @return DataResponse
*/
public function updatePrivateKeyPassword($oldPassword, $newPassword) {
$result = false;
$uid = $this->userSession->getUser()->getUID();
$errorMessage = $this->l->t('Could not update the private key password.');
//check if password is correct
$passwordCorrect = $this->userManager->checkPassword($uid, $newPassword);
if ($passwordCorrect === false) {
// if check with uid fails we need to check the password with the login name
// e.g. in the ldap case. For local user we need to check the password with
// the uid because in this case the login name is case insensitive
$loginName = $this->ocSession->get('loginname');
$passwordCorrect = $this->userManager->checkPassword($loginName, $newPassword);
}
if ($passwordCorrect !== false) {
$encryptedKey = $this->keyManager->getPrivateKey($uid);
$decryptedKey = $this->crypt->decryptPrivateKey($encryptedKey, $oldPassword);
if ($decryptedKey) {
$encryptedKey = $this->crypt->symmetricEncryptFileContent($decryptedKey, $newPassword);
$header = $this->crypt->generateHeader();
if ($encryptedKey) {
$this->keyManager->setPrivateKey($uid, $header . $encryptedKey);
$this->session->setPrivateKey($decryptedKey);
$result = true;
}
} else {
$errorMessage = $this->l->t('The old password was not correct, please try again.');
}
} else {
$errorMessage = $this->l->t('The current log-in password was not correct, please try again.');
}
if ($result === true) {
$this->session->setStatus(Session::INIT_SUCCESSFUL);
return new DataResponse(
['message' => (string) $this->l->t('Private key password successfully updated.')]
);
} else {
return new DataResponse(
['message' => (string) $errorMessage],
Http::STATUS_BAD_REQUEST
);
}
}
}
@@ -0,0 +1,99 @@
<?php
/**
* @author Björn Schießle <schiessle@owncloud.com>
* @author Morris Jobke <hey@morrisjobke.de>
* @author Thomas Müller <thomas.mueller@tmit.eu>
*
* @copyright Copyright (c) 2015, ownCloud, Inc.
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3,
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License, version 3,
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
namespace OCA\Encryption\Controller;
use OCA\Encryption\Session;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\DataResponse;
use OCP\IL10N;
use OCP\IRequest;
class StatusController extends Controller {
/** @var IL10N */
private $l;
/** @var Session */
private $session;
/**
* @param string $AppName
* @param IRequest $request
* @param IL10N $l10n
* @param Session $session
*/
public function __construct($AppName,
IRequest $request,
IL10N $l10n,
Session $session
) {
parent::__construct($AppName, $request);
$this->l = $l10n;
$this->session = $session;
}
/**
* @NoAdminRequired
* @return DataResponse
*/
public function getStatus() {
$status = 'error';
$message = 'no valid init status';
switch( $this->session->getStatus()) {
case Session::RUN_MIGRATION:
$status = 'interactionNeeded';
$message = (string)$this->l->t(
'You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run \'occ encryption:migrate\' or contact your administrator'
);
break;
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.'
);
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'
);
break;
case Session::INIT_SUCCESSFUL:
$status = 'success';
$message = (string)$this->l->t('Encryption App is enabled and ready');
}
return new DataResponse(
[
'status' => $status,
'data' => [
'message' => $message]
]
);
}
}
+23
View File
@@ -0,0 +1,23 @@
/**
* @author Björn Schießle <schiessle@owncloud.com>
*
* @copyright Copyright (c) 2015, ownCloud, Inc.
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3,
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License, version 3,
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
#encryptionAPI input[type=password] {
width: 300px;
}
+34
View File
@@ -0,0 +1,34 @@
<?php
/**
* @author Clark Tomlinson <fallen013@gmail.com>
* @author Morris Jobke <hey@morrisjobke.de>
* @author Thomas Müller <thomas.mueller@tmit.eu>
*
* @copyright Copyright (c) 2015, ownCloud, Inc.
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3,
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License, version 3,
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
namespace OCA\Encryption\Hooks\Contracts;
interface IHook {
/**
* Connects Hooks
*
* @return null
*/
public function addHooks();
}
+299
View File
@@ -0,0 +1,299 @@
<?php
/**
* @author Björn Schießle <schiessle@owncloud.com>
* @author Clark Tomlinson <fallen013@gmail.com>
* @author Thomas Müller <thomas.mueller@tmit.eu>
*
* @copyright Copyright (c) 2015, ownCloud, Inc.
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3,
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License, version 3,
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
namespace OCA\Encryption\Hooks;
use OCP\IUserManager;
use OCP\Util as OCUtil;
use OCA\Encryption\Hooks\Contracts\IHook;
use OCA\Encryption\KeyManager;
use OCA\Encryption\Crypto\Crypt;
use OCA\Encryption\Users\Setup;
use OCP\App;
use OCP\ILogger;
use OCP\IUserSession;
use OCA\Encryption\Util;
use OCA\Encryption\Session;
use OCA\Encryption\Recovery;
class UserHooks implements IHook {
/**
* @var KeyManager
*/
private $keyManager;
/**
* @var IUserManager
*/
private $userManager;
/**
* @var ILogger
*/
private $logger;
/**
* @var Setup
*/
private $userSetup;
/**
* @var IUserSession
*/
private $user;
/**
* @var Util
*/
private $util;
/**
* @var Session
*/
private $session;
/**
* @var Recovery
*/
private $recovery;
/**
* @var Crypt
*/
private $crypt;
/**
* UserHooks constructor.
*
* @param KeyManager $keyManager
* @param IUserManager $userManager
* @param ILogger $logger
* @param Setup $userSetup
* @param IUserSession $user
* @param Util $util
* @param Session $session
* @param Crypt $crypt
* @param Recovery $recovery
*/
public function __construct(KeyManager $keyManager,
IUserManager $userManager,
ILogger $logger,
Setup $userSetup,
IUserSession $user,
Util $util,
Session $session,
Crypt $crypt,
Recovery $recovery) {
$this->keyManager = $keyManager;
$this->userManager = $userManager;
$this->logger = $logger;
$this->userSetup = $userSetup;
$this->user = $user;
$this->util = $util;
$this->session = $session;
$this->recovery = $recovery;
$this->crypt = $crypt;
}
/**
* Connects Hooks
*
* @return null
*/
public function addHooks() {
OCUtil::connectHook('OC_User', 'post_login', $this, 'login');
OCUtil::connectHook('OC_User', 'logout', $this, 'logout');
OCUtil::connectHook('OC_User',
'post_setPassword',
$this,
'setPassphrase');
OCUtil::connectHook('OC_User',
'pre_setPassword',
$this,
'preSetPassphrase');
OCUtil::connectHook('OC_User',
'post_createUser',
$this,
'postCreateUser');
OCUtil::connectHook('OC_User',
'post_deleteUser',
$this,
'postDeleteUser');
}
/**
* Startup encryption backend upon user login
*
* @note This method should never be called for users using client side encryption
* @param array $params
* @return bool
*/
public function login($params) {
if (!App::isEnabled('encryption')) {
return true;
}
// ensure filesystem is loaded
if (!\OC\Files\Filesystem::$loaded) {
\OC_Util::setupFS($params['uid']);
}
// setup user, if user not ready force relogin
if (!$this->userSetup->setupUser($params['uid'], $params['password'])) {
return false;
}
$this->keyManager->init($params['uid'], $params['password']);
}
/**
* remove keys from session during logout
*/
public function logout() {
$this->session->clear();
}
/**
* setup encryption backend upon user created
*
* @note This method should never be called for users using client side encryption
* @param array $params
*/
public function postCreateUser($params) {
if (App::isEnabled('encryption')) {
$this->userSetup->setupUser($params['uid'], $params['password']);
}
}
/**
* cleanup encryption backend upon user deleted
*
* @param array $params : uid, password
* @note This method should never be called for users using client side encryption
*/
public function postDeleteUser($params) {
if (App::isEnabled('encryption')) {
$this->keyManager->deletePublicKey($params['uid']);
}
}
/**
* If the password can't be changed within ownCloud, than update the key password in advance.
*
* @param array $params : uid, password
* @return bool
*/
public function preSetPassphrase($params) {
if (App::isEnabled('encryption')) {
$user = $this->userManager->get($params['uid']);
if ($user && !$user->canChangePassword()) {
$this->setPassphrase($params);
}
}
}
/**
* Change a user's encryption passphrase
*
* @param array $params keys: uid, password
* @return bool
*/
public function setPassphrase($params) {
// Get existing decrypted private key
$privateKey = $this->session->getPrivateKey();
$user = $this->user->getUser();
// current logged in user changes his own password
if ($user && $params['uid'] === $user->getUID() && $privateKey) {
// Encrypt private key with new user pwd as passphrase
$encryptedPrivateKey = $this->crypt->symmetricEncryptFileContent($privateKey,
$params['password']);
// Save private key
if ($encryptedPrivateKey) {
$this->keyManager->setPrivateKey($this->user->getUser()->getUID(),
$this->crypt->generateHeader() . $encryptedPrivateKey);
} else {
$this->logger->error('Encryption could not update users encryption password');
}
// NOTE: Session does not need to be updated as the
// private key has not changed, only the passphrase
// used to decrypt it has changed
} else { // admin changed the password for a different user, create new keys and re-encrypt file keys
$user = $params['uid'];
$recoveryPassword = isset($params['recoveryPassword']) ? $params['recoveryPassword'] : null;
// we generate new keys if...
// ...we have a recovery password and the user enabled the recovery key
// ...encryption was activated for the first time (no keys exists)
// ...the user doesn't have any files
if (
($this->recovery->isRecoveryEnabledForUser($user) && $recoveryPassword)
|| !$this->keyManager->userHasKeys($user)
|| !$this->util->userHasFiles($user)
) {
// backup old keys
//$this->backupAllKeys('recovery');
$newUserPassword = $params['password'];
$keyPair = $this->crypt->createKeyPair();
// Save public key
$this->keyManager->setPublicKey($user, $keyPair['publicKey']);
// Encrypt private key with new password
$encryptedKey = $this->crypt->symmetricEncryptFileContent($keyPair['privateKey'],
$newUserPassword);
if ($encryptedKey) {
$this->keyManager->setPrivateKey($user, $this->crypt->generateHeader() . $encryptedKey);
if ($recoveryPassword) { // if recovery key is set we can re-encrypt the key files
$this->recovery->recoverUsersFiles($recoveryPassword, $user);
}
} else {
$this->logger->error('Encryption Could not update users encryption password');
}
}
}
}
/**
* after password reset we create a new key pair for the user
*
* @param array $params
*/
public function postPasswordReset($params) {
$password = $params['password'];
$this->keyManager->replaceUserKeys($params['uid']);
$this->userSetup->setupServerSide($params['uid'], $password);
}
}

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

+38
View File
@@ -0,0 +1,38 @@
/**
* Copyright (c) 2014
* Bjoern Schiessle <schiessle@owncloud.com>
* This file is licensed under the Affero General Public License version 3 or later.
* See the COPYING-README file.
*/
if (!OC.Encryption) {
OC.Encryption = {};
}
/**
* @namespace
* @memberOf OC
*/
OC.Encryption = {
displayEncryptionWarning: function () {
if (!OC.currentUser || !OC.Notification.isHidden()) {
return;
}
$.get(
OC.generateUrl('/apps/encryption/ajax/getStatus'),
function (result) {
if (result.status === "interactionNeeded") {
OC.Notification.show(result.data.message);
}
}
);
}
};
$(document).ready(function() {
// wait for other apps/extensions to register their event handlers and file actions
// in the "ready" clause
_.defer(function() {
OC.Encryption.displayEncryptionWarning();
});
});
+79
View File
@@ -0,0 +1,79 @@
/**
* Copyright (c) 2013
* Sam Tuke <samtuke@owncloud.com>
* Robin Appelman <icewind1991@gmail.com>
* Bjoern Schiessle <schiessle@owncloud.com>
* This file is licensed under the Affero General Public License version 3 or later.
* See the COPYING-README file.
*/
$(document).ready(function () {
$('input:button[name="enableRecoveryKey"]').click(function () {
var recoveryStatus = $(this).attr('status');
var newRecoveryStatus = (1 + parseInt(recoveryStatus)) % 2;
var buttonValue = $(this).attr('value');
var recoveryPassword = $('#encryptionRecoveryPassword').val();
var confirmPassword = $('#repeatEncryptionRecoveryPassword').val();
OC.msg.startSaving('#encryptionSetRecoveryKey .msg');
$.post(
OC.generateUrl('/apps/encryption/ajax/adminRecovery'),
{
adminEnableRecovery: newRecoveryStatus,
recoveryPassword: recoveryPassword,
confirmPassword: confirmPassword
}
).done(function (data) {
OC.msg.finishedSuccess('#encryptionSetRecoveryKey .msg', data.data.message);
if (newRecoveryStatus === 0) {
$('p[name="changeRecoveryPasswordBlock"]').addClass("hidden");
$('input:button[name="enableRecoveryKey"]').attr('value', 'Enable recovery key');
$('input:button[name="enableRecoveryKey"]').attr('status', '0');
} else {
$('input:password[name="changeRecoveryPassword"]').val("");
$('p[name="changeRecoveryPasswordBlock"]').removeClass("hidden");
$('input:button[name="enableRecoveryKey"]').attr('value', 'Disable recovery key');
$('input:button[name="enableRecoveryKey"]').attr('status', '1');
}
})
.fail(function (jqXHR) {
$('input:button[name="enableRecoveryKey"]').attr('value', buttonValue);
$('input:button[name="enableRecoveryKey"]').attr('status', recoveryStatus);
OC.msg.finishedError('#encryptionSetRecoveryKey .msg', JSON.parse(jqXHR.responseText).data.message);
});
});
$("#repeatEncryptionRecoveryPassword").keyup(function (event) {
if (event.keyCode == 13) {
$("#enableRecoveryKey").click();
}
});
// change recovery password
$('button:button[name="submitChangeRecoveryKey"]').click(function () {
var oldRecoveryPassword = $('#oldEncryptionRecoveryPassword').val();
var newRecoveryPassword = $('#newEncryptionRecoveryPassword').val();
var confirmNewPassword = $('#repeatedNewEncryptionRecoveryPassword').val();
OC.msg.startSaving('#encryptionChangeRecoveryKey .msg');
$.post(
OC.generateUrl('/apps/encryption/ajax/changeRecoveryPassword'),
{
oldPassword: oldRecoveryPassword,
newPassword: newRecoveryPassword,
confirmPassword: confirmNewPassword
}
).done(function (data) {
OC.msg.finishedSuccess('#encryptionChangeRecoveryKey .msg', data.data.message);
})
.fail(function (jqXHR) {
OC.msg.finishedError('#encryptionChangeRecoveryKey .msg', JSON.parse(jqXHR.responseText).data.message);
});
});
});
+73
View File
@@ -0,0 +1,73 @@
/**
* Copyright (c) 2013, Sam Tuke <samtuke@owncloud.com>
* This file is licensed under the Affero General Public License version 3 or later.
* See the COPYING-README file.
*/
if (!OC.Encryption) {
OC.Encryption = {};
}
OC.Encryption = {
updatePrivateKeyPassword: function () {
var oldPrivateKeyPassword = $('input:password[id="oldPrivateKeyPassword"]').val();
var newPrivateKeyPassword = $('input:password[id="newPrivateKeyPassword"]').val();
OC.msg.startSaving('#ocDefaultEncryptionModule .msg');
$.post(
OC.generateUrl('/apps/encryption/ajax/updatePrivateKeyPassword'),
{
oldPassword: oldPrivateKeyPassword,
newPassword: newPrivateKeyPassword
}
).done(function (data) {
OC.msg.finishedSuccess('#ocDefaultEncryptionModule .msg', data.message);
})
.fail(function (jqXHR) {
OC.msg.finishedError('#ocDefaultEncryptionModule .msg', JSON.parse(jqXHR.responseText).message);
});
}
};
$(document).ready(function () {
// Trigger ajax on recoveryAdmin status change
$('input:radio[name="userEnableRecovery"]').change(
function () {
var recoveryStatus = $(this).val();
OC.msg.startAction('#userEnableRecovery .msg', 'Updating recovery keys. This can take some time...');
$.post(
OC.generateUrl('/apps/encryption/ajax/userSetRecovery'),
{
userEnableRecovery: recoveryStatus
}
).done(function (data) {
OC.msg.finishedSuccess('#userEnableRecovery .msg', data.data.message);
})
.fail(function (jqXHR) {
OC.msg.finishedError('#userEnableRecovery .msg', JSON.parse(jqXHR.responseText).data.message);
});
// Ensure page is not reloaded on form submit
return false;
}
);
// update private key password
$('input:password[name="changePrivateKeyPassword"]').keyup(function (event) {
var oldPrivateKeyPassword = $('input:password[id="oldPrivateKeyPassword"]').val();
var newPrivateKeyPassword = $('input:password[id="newPrivateKeyPassword"]').val();
if (newPrivateKeyPassword !== '' && oldPrivateKeyPassword !== '') {
$('button:button[name="submitChangePrivateKeyPassword"]').removeAttr("disabled");
if (event.which === 13) {
OC.Encryption.updatePrivateKeyPassword();
}
} else {
$('button:button[name="submitChangePrivateKeyPassword"]').attr("disabled", "true");
}
});
$('button:button[name="submitChangePrivateKeyPassword"]').click(function () {
OC.Encryption.updatePrivateKeyPassword();
});
});
+26
View File
@@ -0,0 +1,26 @@
OC.L10N.register(
"encryption",
{
"Recovery key successfully enabled" : "تم بنجاح تفعيل مفتاح الاستعادة",
"Could not enable recovery key. Please check your recovery key password!" : "لا يمكن تفعيل مفتاح الاستعادة, يرجى التحقق من كلمة مرور مفتاح الاستعادة!",
"Recovery key successfully disabled" : "تم تعطيل مفتاح الاستعادة بنجاح",
"Could not disable recovery key. Please check your recovery key password!" : "لا يمكن تعطيل مفتاح الاستعادة, يرجى التحقق من كلمة مرور مفتاح الاستعادة!",
"Password successfully changed." : "تم تغيير كلمة المرور بنجاح.",
"Could not change the password. Maybe the old password was not correct." : "تعذر تغيير كلمة المرور. من الممكن ان كلمة المرور القديمة غير صحيحة.",
"Private key password successfully updated." : "تم تحديث كلمة المرور للمفتاح الخاص بنجاح.",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "المفتاح الخاص بتشفير التطبيقات غير صالح. يرجى تحديث كلمة السر الخاصة بالمفتاح الخاص من الإعدادت الشخصية حتى تتمكن من الوصول للملفات المشفرة.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "تم تمكين تشفير البرامج لكن لم يتم تهيئة المفاتيح لذا يرجى تسجيل الخروج ثم تسجيل الدخول مرة آخرى.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "لا يمكن فك التشفير من هذا الملف, من الممكن ان يكون هذا الملف مُشارك. يرجى سؤال صاحب الملف لإعادة مشاركتة معك.",
"Recovery key password" : "استعادة كلمة مرور المفتاح",
"Change recovery key password:" : "تعديل كلمة المرور استعادة المفتاح:",
"Change Password" : "عدل كلمة السر",
" If you don't remember your old password you can ask your administrator to recover your files." : "اذا كنت لاتتذكر كلمة السر تستطيع ان تطلب من المدير ان يستعيد ملفاتك.",
"Old log-in password" : "كلمة المرور القديمة الخاصة بالدخول",
"Current log-in password" : "كلمة المرور الحالية الخاصة بالدخول",
"Update Private Key Password" : "تحديث كلمة المرور لـ المفتاح الخاص",
"Enable password recovery:" : "تفعيل استعادة كلمة المرور:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "تفعيل هذا الخيار يمكنك من اعادة الوصول الى ملفاتك المشفرة عند فقدان كلمة المرور",
"Enabled" : "مفعلة",
"Disabled" : "معطلة"
},
"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;");
+24
View File
@@ -0,0 +1,24 @@
{ "translations": {
"Recovery key successfully enabled" : "تم بنجاح تفعيل مفتاح الاستعادة",
"Could not enable recovery key. Please check your recovery key password!" : "لا يمكن تفعيل مفتاح الاستعادة, يرجى التحقق من كلمة مرور مفتاح الاستعادة!",
"Recovery key successfully disabled" : "تم تعطيل مفتاح الاستعادة بنجاح",
"Could not disable recovery key. Please check your recovery key password!" : "لا يمكن تعطيل مفتاح الاستعادة, يرجى التحقق من كلمة مرور مفتاح الاستعادة!",
"Password successfully changed." : "تم تغيير كلمة المرور بنجاح.",
"Could not change the password. Maybe the old password was not correct." : "تعذر تغيير كلمة المرور. من الممكن ان كلمة المرور القديمة غير صحيحة.",
"Private key password successfully updated." : "تم تحديث كلمة المرور للمفتاح الخاص بنجاح.",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "المفتاح الخاص بتشفير التطبيقات غير صالح. يرجى تحديث كلمة السر الخاصة بالمفتاح الخاص من الإعدادت الشخصية حتى تتمكن من الوصول للملفات المشفرة.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "تم تمكين تشفير البرامج لكن لم يتم تهيئة المفاتيح لذا يرجى تسجيل الخروج ثم تسجيل الدخول مرة آخرى.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "لا يمكن فك التشفير من هذا الملف, من الممكن ان يكون هذا الملف مُشارك. يرجى سؤال صاحب الملف لإعادة مشاركتة معك.",
"Recovery key password" : "استعادة كلمة مرور المفتاح",
"Change recovery key password:" : "تعديل كلمة المرور استعادة المفتاح:",
"Change Password" : "عدل كلمة السر",
" If you don't remember your old password you can ask your administrator to recover your files." : "اذا كنت لاتتذكر كلمة السر تستطيع ان تطلب من المدير ان يستعيد ملفاتك.",
"Old log-in password" : "كلمة المرور القديمة الخاصة بالدخول",
"Current log-in password" : "كلمة المرور الحالية الخاصة بالدخول",
"Update Private Key Password" : "تحديث كلمة المرور لـ المفتاح الخاص",
"Enable password recovery:" : "تفعيل استعادة كلمة المرور:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "تفعيل هذا الخيار يمكنك من اعادة الوصول الى ملفاتك المشفرة عند فقدان كلمة المرور",
"Enabled" : "مفعلة",
"Disabled" : "معطلة"
},"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"
}
+27
View File
@@ -0,0 +1,27 @@
OC.L10N.register(
"encryption",
{
"Recovery key successfully enabled" : "Habilitóse la recuperación de ficheros",
"Could not enable recovery key. Please check your recovery key password!" : "Nun pudo habilitase la clave de recuperación. Por favor comprueba la contraseña.",
"Recovery key successfully disabled" : "Clave de recuperación deshabilitada",
"Could not disable recovery key. Please check your recovery key password!" : "Nun pudo deshabilitase la clave de recuperación. Por favor comprueba la contraseña!",
"Password successfully changed." : "Camudóse la contraseña",
"Could not change the password. Maybe the old password was not correct." : "Nun pudo camudase la contraseña. Comprueba que la contraseña actual seya correuta.",
"Private key password successfully updated." : "Contraseña de clave privada anovada correchamente.",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Clave privada non válida pa Encryption. Por favor, anueva la to contraseña de clave nos tos axustes personales pa recuperar l'accesu a los tos ficheros cifraos.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'aplicación Encryption ta habilitada pero les tos claves nun s'aniciaron, por favor zarra sesión y aníciala de nueves",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Nun pudo descifrase esti ficheru, dablemente seya un ficheru compartíu. Solicita al propietariu del mesmu que vuelva a compartilu contigo.",
"Recovery key password" : "Contraseña de clave de recuperación",
"Change recovery key password:" : "Camudar la contraseña de la clave de recuperación",
"Change Password" : "Camudar contraseña",
"Set your old private key password to your current log-in password:" : "Afita la contraseña de clave privada vieya pa la to contraseña d'aniciu de sesión actual:",
" If you don't remember your old password you can ask your administrator to recover your files." : "Si nun recuerdes la contraseña vieya, pues pidir a alministrador que te recupere los ficheros.",
"Old log-in password" : "Contraseña d'accesu vieya",
"Current log-in password" : "Contraseña d'accesu actual",
"Update Private Key Password" : "Anovar Contraseña de Clave Privada",
"Enable password recovery:" : "Habilitar la recuperación de contraseña:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Habilitar esta opción va permitite volver a tener accesu a los ficheros cifraos en casu de perda de contraseña",
"Enabled" : "Habilitar",
"Disabled" : "Deshabilitáu"
},
"nplurals=2; plural=(n != 1);");
+25
View File
@@ -0,0 +1,25 @@
{ "translations": {
"Recovery key successfully enabled" : "Habilitóse la recuperación de ficheros",
"Could not enable recovery key. Please check your recovery key password!" : "Nun pudo habilitase la clave de recuperación. Por favor comprueba la contraseña.",
"Recovery key successfully disabled" : "Clave de recuperación deshabilitada",
"Could not disable recovery key. Please check your recovery key password!" : "Nun pudo deshabilitase la clave de recuperación. Por favor comprueba la contraseña!",
"Password successfully changed." : "Camudóse la contraseña",
"Could not change the password. Maybe the old password was not correct." : "Nun pudo camudase la contraseña. Comprueba que la contraseña actual seya correuta.",
"Private key password successfully updated." : "Contraseña de clave privada anovada correchamente.",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Clave privada non válida pa Encryption. Por favor, anueva la to contraseña de clave nos tos axustes personales pa recuperar l'accesu a los tos ficheros cifraos.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'aplicación Encryption ta habilitada pero les tos claves nun s'aniciaron, por favor zarra sesión y aníciala de nueves",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Nun pudo descifrase esti ficheru, dablemente seya un ficheru compartíu. Solicita al propietariu del mesmu que vuelva a compartilu contigo.",
"Recovery key password" : "Contraseña de clave de recuperación",
"Change recovery key password:" : "Camudar la contraseña de la clave de recuperación",
"Change Password" : "Camudar contraseña",
"Set your old private key password to your current log-in password:" : "Afita la contraseña de clave privada vieya pa la to contraseña d'aniciu de sesión actual:",
" If you don't remember your old password you can ask your administrator to recover your files." : "Si nun recuerdes la contraseña vieya, pues pidir a alministrador que te recupere los ficheros.",
"Old log-in password" : "Contraseña d'accesu vieya",
"Current log-in password" : "Contraseña d'accesu actual",
"Update Private Key Password" : "Anovar Contraseña de Clave Privada",
"Enable password recovery:" : "Habilitar la recuperación de contraseña:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Habilitar esta opción va permitite volver a tener accesu a los ficheros cifraos en casu de perda de contraseña",
"Enabled" : "Habilitar",
"Disabled" : "Deshabilitáu"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+37
View File
@@ -0,0 +1,37 @@
OC.L10N.register(
"encryption",
{
"Missing recovery key password" : "Bərpa açarının şifrəsi çatışmır",
"Please repeat the recovery key password" : "Xahiş olunur bərpa açarı şifrəsini təkrarlayasınız",
"Repeated recovery key password does not match the provided recovery key password" : "Təkrar daxil edilən bərpa açarı şifrəsi, öncə daxil edilən bərpa açarı ilə üst-üstə düşmür ",
"Recovery key successfully enabled" : "Bərpa açarı uğurla aktivləşdi",
"Could not enable recovery key. Please check your recovery key password!" : "Geriqaytarılma açarının aktivləşdirilməsi mümkün olmadı. Xahiş olunur geriqaytarılma açarı üçün tələb edilən şifrəni yoxlayasınız.",
"Recovery key successfully disabled" : "Bərpa açarı uğurla söndürüldü",
"Could not disable recovery key. Please check your recovery key password!" : "Geriqaytarılma açarını sondürmək olmur. Xahiş edirik geriqaytarılma key açarınızı yoxlayın.",
"Please provide the old recovery password" : "Xahiş olunur köhnə bərpa açarını daxil edəsiniz",
"Please provide a new recovery password" : "Xahiş olunur yeni bərpa açarı şifrəsini daxil esəsiniz",
"Please repeat the new recovery password" : "Xahiş olunur yeni bərpa açarını təkrarlayasınız",
"Password successfully changed." : "Şifrə uğurla dəyişdirildi.",
"Could not change the password. Maybe the old password was not correct." : "Şifrəni dəyişmək olmur, ola bilər ki, köhnə şifrə düzgün olmayıb.",
"Could not update the private key password." : "Gizli açarın şifrəsini yeniləmək mümkün olmadı.",
"The old password was not correct, please try again." : "Köhnə şifrə düzgün deyildi, xahiş olunur yenidən cəhd edəsiniz.",
"The current log-in password was not correct, please try again." : "Hal-hazırki istifadəçi şifrəsi düzgün deyildi, xahiş olunur yenidən cəhd edəsiniz.",
"Private key password successfully updated." : "Gizli aşar şifrəsi uğurla yeniləndi.",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Şifrələnmə proqramı üçün yalnış şəxsi açar. Xahiş olunur öz şəxsi quraşdırmalarınızda şəxsi açarınızı yeniləyəsiniz ki, şifrələnmiş fayllara yetki ala biləsiniz. ",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Proqram şifrələnməsi işə salınıb ancaq, sizin açarlar inisializasiya edilməyib. Xahiş edilir çıxıb yenidən daxil olasınız",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Bu faylı deşifrə etmək olmur və ola bilər ki, bu paylaşımda olan fayldır. Xahiş olunur faylın sahibinə həmin faylı sizinlə yenidən paylaşım etməsini bildirəsiniz. ",
"Recovery key password" : "Açar şifrənin bərpa edilməsi",
"Change recovery key password:" : "Bərpa açarın şifrəsini dəyişdir:",
"Change Password" : "Şifrəni dəyişdir",
"Your private key password no longer matches your log-in password." : "Sizin gizli açar şifrəsi, artıq giriş adınızla uyğun gəlmir.",
"Set your old private key password to your current log-in password:" : "Köhnə açar şifrənizi, sizin hal-hazırki giriş şifrənizə təyin edin: ",
" If you don't remember your old password you can ask your administrator to recover your files." : "Əgər siz köhnə şifrənizi xatırlamırsınızsa, öz inzibatçınızdan fayllarınızın bərpasını istəyə bilərsiniz.",
"Old log-in password" : "Köhnə giriş şifrəsi",
"Current log-in password" : "Hal-hazırki giriş şifrəsi",
"Update Private Key Password" : "Gizli açar şifrəsini yenilə",
"Enable password recovery:" : "Şifrə bərpasını işə sal:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Bu opsiyanın aktiv edilməsi sizə, şifrənin itdiyi hallarda bütün şifrələnmiş fayllarınıza yetkinin yenidən əldə edilməsinə şərait yaradacaq",
"Enabled" : "İşə salınıb",
"Disabled" : "Dayandırılıb"
},
"nplurals=2; plural=(n != 1);");
+35
View File
@@ -0,0 +1,35 @@
{ "translations": {
"Missing recovery key password" : "Bərpa açarının şifrəsi çatışmır",
"Please repeat the recovery key password" : "Xahiş olunur bərpa açarı şifrəsini təkrarlayasınız",
"Repeated recovery key password does not match the provided recovery key password" : "Təkrar daxil edilən bərpa açarı şifrəsi, öncə daxil edilən bərpa açarı ilə üst-üstə düşmür ",
"Recovery key successfully enabled" : "Bərpa açarı uğurla aktivləşdi",
"Could not enable recovery key. Please check your recovery key password!" : "Geriqaytarılma açarının aktivləşdirilməsi mümkün olmadı. Xahiş olunur geriqaytarılma açarı üçün tələb edilən şifrəni yoxlayasınız.",
"Recovery key successfully disabled" : "Bərpa açarı uğurla söndürüldü",
"Could not disable recovery key. Please check your recovery key password!" : "Geriqaytarılma açarını sondürmək olmur. Xahiş edirik geriqaytarılma key açarınızı yoxlayın.",
"Please provide the old recovery password" : "Xahiş olunur köhnə bərpa açarını daxil edəsiniz",
"Please provide a new recovery password" : "Xahiş olunur yeni bərpa açarı şifrəsini daxil esəsiniz",
"Please repeat the new recovery password" : "Xahiş olunur yeni bərpa açarını təkrarlayasınız",
"Password successfully changed." : "Şifrə uğurla dəyişdirildi.",
"Could not change the password. Maybe the old password was not correct." : "Şifrəni dəyişmək olmur, ola bilər ki, köhnə şifrə düzgün olmayıb.",
"Could not update the private key password." : "Gizli açarın şifrəsini yeniləmək mümkün olmadı.",
"The old password was not correct, please try again." : "Köhnə şifrə düzgün deyildi, xahiş olunur yenidən cəhd edəsiniz.",
"The current log-in password was not correct, please try again." : "Hal-hazırki istifadəçi şifrəsi düzgün deyildi, xahiş olunur yenidən cəhd edəsiniz.",
"Private key password successfully updated." : "Gizli aşar şifrəsi uğurla yeniləndi.",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Şifrələnmə proqramı üçün yalnış şəxsi açar. Xahiş olunur öz şəxsi quraşdırmalarınızda şəxsi açarınızı yeniləyəsiniz ki, şifrələnmiş fayllara yetki ala biləsiniz. ",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Proqram şifrələnməsi işə salınıb ancaq, sizin açarlar inisializasiya edilməyib. Xahiş edilir çıxıb yenidən daxil olasınız",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Bu faylı deşifrə etmək olmur və ola bilər ki, bu paylaşımda olan fayldır. Xahiş olunur faylın sahibinə həmin faylı sizinlə yenidən paylaşım etməsini bildirəsiniz. ",
"Recovery key password" : "Açar şifrənin bərpa edilməsi",
"Change recovery key password:" : "Bərpa açarın şifrəsini dəyişdir:",
"Change Password" : "Şifrəni dəyişdir",
"Your private key password no longer matches your log-in password." : "Sizin gizli açar şifrəsi, artıq giriş adınızla uyğun gəlmir.",
"Set your old private key password to your current log-in password:" : "Köhnə açar şifrənizi, sizin hal-hazırki giriş şifrənizə təyin edin: ",
" If you don't remember your old password you can ask your administrator to recover your files." : "Əgər siz köhnə şifrənizi xatırlamırsınızsa, öz inzibatçınızdan fayllarınızın bərpasını istəyə bilərsiniz.",
"Old log-in password" : "Köhnə giriş şifrəsi",
"Current log-in password" : "Hal-hazırki giriş şifrəsi",
"Update Private Key Password" : "Gizli açar şifrəsini yenilə",
"Enable password recovery:" : "Şifrə bərpasını işə sal:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Bu opsiyanın aktiv edilməsi sizə, şifrənin itdiyi hallarda bütün şifrələnmiş fayllarınıza yetkinin yenidən əldə edilməsinə şərait yaradacaq",
"Enabled" : "İşə salınıb",
"Disabled" : "Dayandırılıb"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
@@ -1,13 +1,13 @@
OC.L10N.register(
"files_encryption",
"encryption",
{
"Unknown error" : "Непозната грешка.",
"Missing recovery key password" : "Липсва парола за възстановяване",
"Please repeat the recovery key password" : "Повтори новата парола за възстановяване",
"Repeated recovery key password does not match the provided recovery key password" : "Повторената парола за възстановяване не съвпада със зададената парола за възстановяване",
"Recovery key successfully enabled" : "Успешно включване на опцията ключ за възстановяване.",
"Could not disable recovery key. Please check your recovery key password!" : "Неуспешно изключване на ключа за възстановяване. Моля, провери паролата за ключа за възстановяване!",
"Could not enable recovery key. Please check your recovery key password!" : "Неуспешно включване на опцията ключ за възстановяване. Моля, провери паролата за ключа за възстановяване.",
"Recovery key successfully disabled" : "Успешно изключване на ключа за възстановяване.",
"Could not disable recovery key. Please check your recovery key password!" : "Неуспешно изключване на ключа за възстановяване. Моля, провери паролата за ключа за възстановяване!",
"Please provide the old recovery password" : "Моля, въведи старата парола за възстановяване",
"Please provide a new recovery password" : "Моля, задай нова парола за възстановяване",
"Please repeat the new recovery password" : "Моля, въведи повторна новата парола за възстановяване",
@@ -17,29 +17,11 @@ OC.L10N.register(
"The old password was not correct, please try again." : "Старата парола е грешна, опитай отново.",
"The current log-in password was not correct, please try again." : "Грешна парола за вписване, опитай отново.",
"Private key password successfully updated." : "Успешно променена тайната парола за ключа.",
"File recovery settings updated" : "Настройките за възстановяване на файлове са променени.",
"Could not update file recovery" : "Неуспешна промяна на настройките за възстановяване на файлове.",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Неуспешна инициализация на криптиращото приложение! Може би криптиращото приложение бе включено по време на твоята сесия. Отпиши се и се впиши обратно за да инциализираш криптиращото приложение.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Твоят таен ключ е невалиден! Вероятно твоята парола беше променена извън %s(пр. твоята корпоративна директория). Можеш да промениш своят таен ключ в Лични настройки, за да възстановиш достъпа до криптираните файлове.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Неуспешно разшифроване на този файл, вероятно това е споделен файл. Моля, поискай собственика на файла да го сподели повторно с теб.",
"Unknown error. Please check your system settings or contact your administrator" : "Непозната грешка. Моля, провери системните настройки или се свържи с администратора.",
"Initial encryption started... This can take some time. Please wait." : "Първоначалното криптиране започна... Това може да отнеме време. Моля изчакай.",
"Initial encryption running... Please try again later." : "Тече първоначално криптиране... Моля опитай по-късно.",
"Missing requirements." : "Липсва задължителна информация.",
"Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Моля уверете се че OpenSSL заедно с PHP разширене са включени и конфигурирани правилно. За сега, криптиращото приложение е изключено.",
"Following users are not set up for encryption:" : "Следните потребители не са настроени за криптиране:",
"Go directly to your %spersonal settings%s." : "Отиде направо към твоите %sлични настройки%s.",
"Server-side Encryption" : "Криптиране от страна на сървъра",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Невалиден личен ключ за Криптиращата Програма. Моля, обнови личния си ключ в Лични настройки, за да възстановиш достъпа до криптираните си файловете.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Програмата за криптиране е включена, но твоите ключове не са зададени, моля отпиши си и се впиши отново.",
"Enable recovery key (allow to recover users files in case of password loss):" : "Включи опцията възстановяване на ключ (разрешава да възстанови файловете на потребителите в случай на загубена парола):",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Неуспешно разшифроване на този файл, вероятно това е споделен файл. Моля, поискай собственика на файла да го сподели повторно с теб.",
"Recovery key password" : "Парола за възстановяане на ключа",
"Repeat Recovery key password" : "Повтори паролата за възстановяване на ключа",
"Enabled" : "Включено",
"Disabled" : "Изключено",
"Change recovery key password:" : "Промени паролата за въстановяване на ключа:",
"Old Recovery key password" : "Старата парола за въстановяване на ключа",
"New Recovery key password" : "Новата парола за възстановяване на ключа",
"Repeat New Recovery key password" : "Повтори новата паролза за възстановяване на ключа",
"Change Password" : "Промени Паролата",
"Your private key password no longer matches your log-in password." : "Личният ти ключ не съвпада с паролата за вписване.",
"Set your old private key password to your current log-in password:" : "Промени паролата за тайния ти включ на паролата за вписване:",
@@ -48,6 +30,8 @@ OC.L10N.register(
"Current log-in password" : "Текуща парола за вписване",
"Update Private Key Password" : "Промени Тайната Парола за Ключа",
"Enable password recovery:" : "Включи опцията възстановяване на паролата:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Избирането на тази опция ще ти позволи да възстановиш достъпа си до файловете в случай на изгубена парола."
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Избирането на тази опция ще ти позволи да възстановиш достъпа си до файловете в случай на изгубена парола.",
"Enabled" : "Включено",
"Disabled" : "Изключено"
},
"nplurals=2; plural=(n != 1);");
@@ -1,11 +1,11 @@
{ "translations": {
"Unknown error" : "Непозната грешка.",
"Missing recovery key password" : "Липсва парола за възстановяване",
"Please repeat the recovery key password" : "Повтори новата парола за възстановяване",
"Repeated recovery key password does not match the provided recovery key password" : "Повторената парола за възстановяване не съвпада със зададената парола за възстановяване",
"Recovery key successfully enabled" : "Успешно включване на опцията ключ за възстановяване.",
"Could not disable recovery key. Please check your recovery key password!" : "Неуспешно изключване на ключа за възстановяване. Моля, провери паролата за ключа за възстановяване!",
"Could not enable recovery key. Please check your recovery key password!" : "Неуспешно включване на опцията ключ за възстановяване. Моля, провери паролата за ключа за възстановяване.",
"Recovery key successfully disabled" : "Успешно изключване на ключа за възстановяване.",
"Could not disable recovery key. Please check your recovery key password!" : "Неуспешно изключване на ключа за възстановяване. Моля, провери паролата за ключа за възстановяване!",
"Please provide the old recovery password" : "Моля, въведи старата парола за възстановяване",
"Please provide a new recovery password" : "Моля, задай нова парола за възстановяване",
"Please repeat the new recovery password" : "Моля, въведи повторна новата парола за възстановяване",
@@ -15,29 +15,11 @@
"The old password was not correct, please try again." : "Старата парола е грешна, опитай отново.",
"The current log-in password was not correct, please try again." : "Грешна парола за вписване, опитай отново.",
"Private key password successfully updated." : "Успешно променена тайната парола за ключа.",
"File recovery settings updated" : "Настройките за възстановяване на файлове са променени.",
"Could not update file recovery" : "Неуспешна промяна на настройките за възстановяване на файлове.",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Неуспешна инициализация на криптиращото приложение! Може би криптиращото приложение бе включено по време на твоята сесия. Отпиши се и се впиши обратно за да инциализираш криптиращото приложение.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Твоят таен ключ е невалиден! Вероятно твоята парола беше променена извън %s(пр. твоята корпоративна директория). Можеш да промениш своят таен ключ в Лични настройки, за да възстановиш достъпа до криптираните файлове.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Неуспешно разшифроване на този файл, вероятно това е споделен файл. Моля, поискай собственика на файла да го сподели повторно с теб.",
"Unknown error. Please check your system settings or contact your administrator" : "Непозната грешка. Моля, провери системните настройки или се свържи с администратора.",
"Initial encryption started... This can take some time. Please wait." : "Първоначалното криптиране започна... Това може да отнеме време. Моля изчакай.",
"Initial encryption running... Please try again later." : "Тече първоначално криптиране... Моля опитай по-късно.",
"Missing requirements." : "Липсва задължителна информация.",
"Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Моля уверете се че OpenSSL заедно с PHP разширене са включени и конфигурирани правилно. За сега, криптиращото приложение е изключено.",
"Following users are not set up for encryption:" : "Следните потребители не са настроени за криптиране:",
"Go directly to your %spersonal settings%s." : "Отиде направо към твоите %sлични настройки%s.",
"Server-side Encryption" : "Криптиране от страна на сървъра",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Невалиден личен ключ за Криптиращата Програма. Моля, обнови личния си ключ в Лични настройки, за да възстановиш достъпа до криптираните си файловете.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Програмата за криптиране е включена, но твоите ключове не са зададени, моля отпиши си и се впиши отново.",
"Enable recovery key (allow to recover users files in case of password loss):" : "Включи опцията възстановяване на ключ (разрешава да възстанови файловете на потребителите в случай на загубена парола):",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Неуспешно разшифроване на този файл, вероятно това е споделен файл. Моля, поискай собственика на файла да го сподели повторно с теб.",
"Recovery key password" : "Парола за възстановяане на ключа",
"Repeat Recovery key password" : "Повтори паролата за възстановяване на ключа",
"Enabled" : "Включено",
"Disabled" : "Изключено",
"Change recovery key password:" : "Промени паролата за въстановяване на ключа:",
"Old Recovery key password" : "Старата парола за въстановяване на ключа",
"New Recovery key password" : "Новата парола за възстановяване на ключа",
"Repeat New Recovery key password" : "Повтори новата паролза за възстановяване на ключа",
"Change Password" : "Промени Паролата",
"Your private key password no longer matches your log-in password." : "Личният ти ключ не съвпада с паролата за вписване.",
"Set your old private key password to your current log-in password:" : "Промени паролата за тайния ти включ на паролата за вписване:",
@@ -46,6 +28,8 @@
"Current log-in password" : "Текуща парола за вписване",
"Update Private Key Password" : "Промени Тайната Парола за Ключа",
"Enable password recovery:" : "Включи опцията възстановяване на паролата:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Избирането на тази опция ще ти позволи да възстановиш достъпа си до файловете в случай на изгубена парола."
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Избирането на тази опция ще ти позволи да възстановиш достъпа си до файловете в случай на изгубена парола.",
"Enabled" : "Включено",
"Disabled" : "Изключено"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+12
View File
@@ -0,0 +1,12 @@
OC.L10N.register(
"encryption",
{
"Recovery key successfully enabled" : "পূনরুদ্ধার চাবি সার্থকভাবে কার্যকর করা হয়েছে",
"Recovery key successfully disabled" : "পূনরুদ্ধার চাবি সার্থকভাবে অকার্যকর করা হয়েছে",
"Password successfully changed." : "আপনার কূটশব্দটি সার্থকভাবে পরিবর্তন করা হয়েছে ",
"Change recovery key password:" : "পূণরূদ্ধার কি এর কুটশব্দ পরিবর্তন করুন:",
"Change Password" : "কূটশব্দ পরিবর্তন করুন",
"Enabled" : "কার্যকর",
"Disabled" : "অকার্যকর"
},
"nplurals=2; plural=(n != 1);");
+10
View File
@@ -0,0 +1,10 @@
{ "translations": {
"Recovery key successfully enabled" : "পূনরুদ্ধার চাবি সার্থকভাবে কার্যকর করা হয়েছে",
"Recovery key successfully disabled" : "পূনরুদ্ধার চাবি সার্থকভাবে অকার্যকর করা হয়েছে",
"Password successfully changed." : "আপনার কূটশব্দটি সার্থকভাবে পরিবর্তন করা হয়েছে ",
"Change recovery key password:" : "পূণরূদ্ধার কি এর কুটশব্দ পরিবর্তন করুন:",
"Change Password" : "কূটশব্দ পরিবর্তন করুন",
"Enabled" : "কার্যকর",
"Disabled" : "অকার্যকর"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
@@ -1,7 +1,7 @@
OC.L10N.register(
"files_encryption",
"encryption",
{
"Unknown error" : "Nepoznata greška",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Neispravan privatni ključ za šifriranje. Molim ažurirajte lozinku svoga privatnog ključa u svojim osobnim postavkama da biste obnovili pristup svojim šifriranim datotekama.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija šifriranja je uključena, ali vaši ključevi nisu inicializirani, molim odjavite se i ponovno prijavite",
"Enabled" : "Aktivirano",
"Disabled" : "Onemogućeno"
@@ -1,5 +1,5 @@
{ "translations": {
"Unknown error" : "Nepoznata greška",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Neispravan privatni ključ za šifriranje. Molim ažurirajte lozinku svoga privatnog ključa u svojim osobnim postavkama da biste obnovili pristup svojim šifriranim datotekama.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija šifriranja je uključena, ali vaši ključevi nisu inicializirani, molim odjavite se i ponovno prijavite",
"Enabled" : "Aktivirano",
"Disabled" : "Onemogućeno"
+28
View File
@@ -0,0 +1,28 @@
OC.L10N.register(
"encryption",
{
"Recovery key successfully enabled" : "La clau de recuperació s'ha activat",
"Could not enable recovery key. Please check your recovery key password!" : "No s'ha pogut activar la clau de recuperació. Comproveu contrasenya de la clau de recuperació!",
"Recovery key successfully disabled" : "La clau de recuperació s'ha descativat",
"Could not disable recovery key. Please check your recovery key password!" : "No s'ha pogut desactivar la calu de recuperació. Comproveu la contrasenya de la clau de recuperació!",
"Password successfully changed." : "La contrasenya s'ha canviat.",
"Could not change the password. Maybe the old password was not correct." : "No s'ha pogut canviar la contrasenya. Potser la contrasenya anterior no era correcta.",
"Private key password successfully updated." : "La contrasenya de la clau privada s'ha actualitzat.",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "La clau privada de l'aplicació d'encriptació no és vàlida! Actualitzeu la contrasenya de la clau privada a l'arranjament personal per recuperar els fitxers encriptats.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'aplicació d'encriptació està activada però les claus no estan inicialitzades, sortiu i acrediteu-vos de nou.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No es pot desencriptar aquest fitxer, probablement és un fitxer compartit. Demaneu al propietari del fitxer que el comparteixi de nou amb vós.",
"Recovery key password" : "Clau de recuperació de la contrasenya",
"Change recovery key password:" : "Canvia la clau de recuperació de contrasenya:",
"Change Password" : "Canvia la contrasenya",
"Your private key password no longer matches your log-in password." : "La clau privada ja no es correspon amb la contrasenya d'accés:",
"Set your old private key password to your current log-in password:" : "Establiu la vostra antiga clau privada a l'actual contrasenya d'accés:",
" If you don't remember your old password you can ask your administrator to recover your files." : "Si no recordeu la contrasenya anterior podeu demanar a l'administrador que recuperi els vostres fitxers.",
"Old log-in password" : "Contrasenya anterior d'accés",
"Current log-in password" : "Contrasenya d'accés actual",
"Update Private Key Password" : "Actualitza la contrasenya de clau privada",
"Enable password recovery:" : "Habilita la recuperació de contrasenya:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Activar aquesta opció us permetrà obtenir de nou accés als vostres fitxers encriptats en cas de perdre la contrasenya",
"Enabled" : "Activat",
"Disabled" : "Desactivat"
},
"nplurals=2; plural=(n != 1);");
@@ -1,32 +1,16 @@
{ "translations": {
"Unknown error" : "Error desconegut",
"Recovery key successfully enabled" : "La clau de recuperació s'ha activat",
"Could not disable recovery key. Please check your recovery key password!" : "No s'ha pogut desactivar la calu de recuperació. Comproveu la contrasenya de la clau de recuperació!",
"Could not enable recovery key. Please check your recovery key password!" : "No s'ha pogut activar la clau de recuperació. Comproveu contrasenya de la clau de recuperació!",
"Recovery key successfully disabled" : "La clau de recuperació s'ha descativat",
"Could not disable recovery key. Please check your recovery key password!" : "No s'ha pogut desactivar la calu de recuperació. Comproveu la contrasenya de la clau de recuperació!",
"Password successfully changed." : "La contrasenya s'ha canviat.",
"Could not change the password. Maybe the old password was not correct." : "No s'ha pogut canviar la contrasenya. Potser la contrasenya anterior no era correcta.",
"Private key password successfully updated." : "La contrasenya de la clau privada s'ha actualitzat.",
"File recovery settings updated" : "S'han actualitzat els arranjaments de recuperació de fitxers",
"Could not update file recovery" : "No s'ha pogut actualitzar la recuperació de fitxers",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "L'aplicació d'encriptació no està inicialitzada! Potser l'aplicació d'encriptació ha estat reiniciada durant la sessió. Intenteu sortir i acreditar-vos de nou per reinicialitzar l'aplicació d'encriptació.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "La clau privada no és vàlida! Probablement la contrasenya va ser canviada des de fora de %s (per exemple, en el directori de l'empresa). Vostè pot actualitzar la contrasenya de clau privada en la seva configuració personal per poder recuperar l'accés en els arxius xifrats.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No es pot desencriptar aquest fitxer, probablement és un fitxer compartit. Demaneu al propietari del fitxer que el comparteixi de nou amb vós.",
"Unknown error. Please check your system settings or contact your administrator" : "Error desconegut. Comproveu l'arranjament del sistema o aviseu a l'administrador",
"Initial encryption started... This can take some time. Please wait." : "La encriptació inicial ha començat... Pot trigar una estona, espereu.",
"Initial encryption running... Please try again later." : "encriptació inicial en procés... Proveu-ho més tard.",
"Missing requirements." : "Manca de requisits.",
"Following users are not set up for encryption:" : "Els usuaris següents no estan configurats per a l'encriptació:",
"Go directly to your %spersonal settings%s." : "Vés directament a l'%sarranjament personal%s.",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "La clau privada de l'aplicació d'encriptació no és vàlida! Actualitzeu la contrasenya de la clau privada a l'arranjament personal per recuperar els fitxers encriptats.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'aplicació d'encriptació està activada però les claus no estan inicialitzades, sortiu i acrediteu-vos de nou.",
"Enable recovery key (allow to recover users files in case of password loss):" : "Activa la clau de recuperació (permet recuperar fitxers d'usuaris en cas de pèrdua de contrasenya):",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No es pot desencriptar aquest fitxer, probablement és un fitxer compartit. Demaneu al propietari del fitxer que el comparteixi de nou amb vós.",
"Recovery key password" : "Clau de recuperació de la contrasenya",
"Repeat Recovery key password" : "Repetiu la clau de recuperació de contrasenya",
"Enabled" : "Activat",
"Disabled" : "Desactivat",
"Change recovery key password:" : "Canvia la clau de recuperació de contrasenya:",
"Old Recovery key password" : "Antiga clau de recuperació de contrasenya",
"New Recovery key password" : "Nova clau de recuperació de contrasenya",
"Repeat New Recovery key password" : "Repetiu la nova clau de recuperació de contrasenya",
"Change Password" : "Canvia la contrasenya",
"Your private key password no longer matches your log-in password." : "La clau privada ja no es correspon amb la contrasenya d'accés:",
"Set your old private key password to your current log-in password:" : "Establiu la vostra antiga clau privada a l'actual contrasenya d'accés:",
@@ -35,6 +19,8 @@
"Current log-in password" : "Contrasenya d'accés actual",
"Update Private Key Password" : "Actualitza la contrasenya de clau privada",
"Enable password recovery:" : "Habilita la recuperació de contrasenya:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Activar aquesta opció us permetrà obtenir de nou accés als vostres fitxers encriptats en cas de perdre la contrasenya"
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Activar aquesta opció us permetrà obtenir de nou accés als vostres fitxers encriptats en cas de perdre la contrasenya",
"Enabled" : "Activat",
"Disabled" : "Desactivat"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
@@ -1,53 +1,52 @@
OC.L10N.register(
"files_encryption",
"encryption",
{
"Unknown error" : "Neznámá chyba",
"Missing recovery key password" : "Chybí heslo klíče pro obnovu",
"Please repeat the recovery key password" : "Zopakujte prosím heslo klíče pro obnovu",
"Repeated recovery key password does not match the provided recovery key password" : "Opakované heslo pro obnovu nesouhlasí se zadaným heslem",
"Recovery key successfully enabled" : "Záchranný klíč byl úspěšně povolen",
"Could not disable recovery key. Please check your recovery key password!" : "Nelze zakázat záchranný klíč. Zkontrolujte prosím heslo vašeho záchranného klíče!",
"Could not enable recovery key. Please check your recovery key password!" : "Nepodařilo se povolit záchranný klíč. Zkontrolujte prosím vaše heslo záchranného klíče!",
"Recovery key successfully disabled" : "Záchranný klíč byl úspěšně zakázán",
"Could not disable recovery key. Please check your recovery key password!" : "Nelze zakázat záchranný klíč. Zkontrolujte prosím heslo svého záchranného klíče!",
"Missing parameters" : "Chybějící parametry",
"Please provide the old recovery password" : "Zadejte prosím staré heslo pro obnovu",
"Please provide a new recovery password" : "Zadejte prosím nové heslo pro obnovu",
"Please repeat the new recovery password" : "Zopakujte prosím nové heslo pro obnovu",
"Password successfully changed." : "Heslo bylo úspěšně změněno.",
"Could not change the password. Maybe the old password was not correct." : "Změna hesla se nezdařila. Pravděpodobně nebylo stávající heslo zadáno správně.",
"Recovery Key disabled" : "Záchranný klíč není povolen",
"Recovery Key enabled" : "Záchranný klíč povolen",
"Could not enable the recovery key, please try again or contact your administrator" : "Nelze povolit záchranný klíč. Zkuste to prosím znovu nebo kontaktujte svého správce.",
"Could not update the private key password." : "Nelze aktualizovat heslo soukromého klíče.",
"The old password was not correct, please try again." : "Staré heslo nebylo zadáno správně, zkuste to prosím znovu.",
"The current log-in password was not correct, please try again." : "Současné přihlašovací heslo nebylo zadáno správně, zkuste to prosím znovu.",
"Private key password successfully updated." : "Heslo soukromého klíče úspěšně aktualizováno.",
"File recovery settings updated" : "Možnosti záchrany souborů aktualizovány",
"Could not update file recovery" : "Nelze nastavit záchranu souborů",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Aplikace pro šifrování není inicializována! Je možné, že aplikace byla znovu aktivována během vašeho přihlášení. Zkuste se prosím odhlásit a znovu přihlásit pro provedení inicializace šifrovací aplikace.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Váš soukromý klíč není platný! Pravděpodobně bylo vaše heslo změněno vně systému %s (např. ve vašem firemním adresáři). Heslo vašeho soukromého klíče můžete změnit ve svém osobním nastavení pro obnovení přístupu k vašim zašifrovaným souborům.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tento soubor se nepodařilo dešifrovat, pravděpodobně je sdílený. Požádejte prosím majitele souboru, aby jej s vámi znovu sdílel.",
"Unknown error. Please check your system settings or contact your administrator" : "Neznámá chyba. Zkontrolujte nastavení systému nebo kontaktujte vašeho správce.",
"Initial encryption started... This can take some time. Please wait." : "Počáteční šifrování zahájeno... Toto může chvíli trvat. Počkejte prosím.",
"Initial encryption running... Please try again later." : "Probíhá počáteční šifrování... Zkuste to prosím znovu později.",
"Missing requirements." : "Nesplněné závislosti.",
"Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Ujistěte se prosím, že máte povolené a správně nakonfigurované OpenSSL včetně jeho rozšíření pro PHP. Aplikace pro šifrování byla prozatím vypnuta.",
"Following users are not set up for encryption:" : "Následující uživatelé nemají nastavené šifrování:",
"Go directly to your %spersonal settings%s." : "Přejít přímo do svého %sosobního nastavení%s.",
"Server-side Encryption" : "Šifrování na serveru",
"You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Musíte přenést své šifrovací klíče ze staré verze šifrování (ownCloud <= 8.0) na novou. Spusťte příkaz 'occ encryption:migrate' nebo kontaktujte svého administrátora.",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chybný soukromý klíč pro šifrovací aplikaci. Aktualizujte prosím heslo svého soukromého klíče ve vašem osobním nastavení, abyste znovu získali přístup k vašim zašifrovaným souborům.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikace pro šifrování je zapnuta, ale vaše klíče nejsou inicializované. Prosím odhlaste se a znovu přihlaste",
"Enable recovery key (allow to recover users files in case of password loss):" : "Povolit klíč pro obnovu (umožňuje obnovu uživatelských souborů v případě ztráty hesla)",
"Encryption App is enabled and ready" : "Aplikace šifrování je již povolena",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tento soubor se nepodařilo dešifrovat, pravděpodobně je sdílený. Požádejte prosím majitele souboru, aby jej s vámi znovu sdílel.",
"Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Soubor nelze načíst, pravděpodobně se jedná o sdílený soubor. Požádejte prosím vlastníka souboru, aby vám jej znovu sdílel.",
"Enable recovery key" : "Povolit záchranný klíč",
"Disable recovery key" : "Vypnout záchranný klíč",
"The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Záchranný klíč je dodatečný šifrovací klíč použitý pro\nšifrování souborů. S jeho pomocí lze obnovit soubory uživatele při zapomenutí hesla.",
"Recovery key password" : "Heslo klíče pro obnovu",
"Repeat Recovery key password" : "Zopakujte heslo klíče pro obnovu",
"Enabled" : "Povoleno",
"Disabled" : "Zakázáno",
"Repeat recovery key password" : "Zopakovat heslo záchranného klíče",
"Change recovery key password:" : "Změna hesla klíče pro obnovu:",
"Old Recovery key password" : "Původní heslo klíče pro obnovu",
"New Recovery key password" : "Nové heslo klíče pro obnovu",
"Repeat New Recovery key password" : "Zopakujte nové heslo klíče pro obnovu",
"Old recovery key password" : "Staré heslo záchranného klíče",
"New recovery key password" : "Nové heslo záchranného klíče",
"Repeat new recovery key password" : "Zopakujte nové heslo záchranného klíče",
"Change Password" : "Změnit heslo",
"ownCloud basic encryption module" : "ownCloud základní šifrovací modul",
"Your private key password no longer matches your log-in password." : "Heslo vašeho soukromého klíče se již neshoduje s vaším přihlašovacím heslem.",
"Set your old private key password to your current log-in password:" : "Změňte vaše staré heslo soukromého klíče na stejné, jako je vaše současné přihlašovací heslo:",
" If you don't remember your old password you can ask your administrator to recover your files." : "Pokud si nepamatujete vaše původní heslo, můžete požádat správce o obnovu vašich souborů.",
"Set your old private key password to your current log-in password:" : "Změňte své staré heslo soukromého klíče na stejné, jako je vaše současné přihlašovací heslo:",
" If you don't remember your old password you can ask your administrator to recover your files." : "Pokud si nepamatujete své původní heslo, můžete požádat správce o obnovu vašich souborů.",
"Old log-in password" : "Původní přihlašovací heslo",
"Current log-in password" : "Aktuální přihlašovací heslo",
"Update Private Key Password" : "Změnit heslo soukromého klíče",
"Enable password recovery:" : "Povolit obnovu hesla:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Zapnutí této volby vám umožní znovu získat přístup k vašim zašifrovaným souborům pokud ztratíte heslo"
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Zapnutí této volby vám umožní znovu získat přístup k vašim zašifrovaným souborům pokud ztratíte heslo",
"Enabled" : "Povoleno",
"Disabled" : "Zakázáno"
},
"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
@@ -1,51 +1,50 @@
{ "translations": {
"Unknown error" : "Neznámá chyba",
"Missing recovery key password" : "Chybí heslo klíče pro obnovu",
"Please repeat the recovery key password" : "Zopakujte prosím heslo klíče pro obnovu",
"Repeated recovery key password does not match the provided recovery key password" : "Opakované heslo pro obnovu nesouhlasí se zadaným heslem",
"Recovery key successfully enabled" : "Záchranný klíč byl úspěšně povolen",
"Could not disable recovery key. Please check your recovery key password!" : "Nelze zakázat záchranný klíč. Zkontrolujte prosím heslo vašeho záchranného klíče!",
"Could not enable recovery key. Please check your recovery key password!" : "Nepodařilo se povolit záchranný klíč. Zkontrolujte prosím vaše heslo záchranného klíče!",
"Recovery key successfully disabled" : "Záchranný klíč byl úspěšně zakázán",
"Could not disable recovery key. Please check your recovery key password!" : "Nelze zakázat záchranný klíč. Zkontrolujte prosím heslo svého záchranného klíče!",
"Missing parameters" : "Chybějící parametry",
"Please provide the old recovery password" : "Zadejte prosím staré heslo pro obnovu",
"Please provide a new recovery password" : "Zadejte prosím nové heslo pro obnovu",
"Please repeat the new recovery password" : "Zopakujte prosím nové heslo pro obnovu",
"Password successfully changed." : "Heslo bylo úspěšně změněno.",
"Could not change the password. Maybe the old password was not correct." : "Změna hesla se nezdařila. Pravděpodobně nebylo stávající heslo zadáno správně.",
"Recovery Key disabled" : "Záchranný klíč není povolen",
"Recovery Key enabled" : "Záchranný klíč povolen",
"Could not enable the recovery key, please try again or contact your administrator" : "Nelze povolit záchranný klíč. Zkuste to prosím znovu nebo kontaktujte svého správce.",
"Could not update the private key password." : "Nelze aktualizovat heslo soukromého klíče.",
"The old password was not correct, please try again." : "Staré heslo nebylo zadáno správně, zkuste to prosím znovu.",
"The current log-in password was not correct, please try again." : "Současné přihlašovací heslo nebylo zadáno správně, zkuste to prosím znovu.",
"Private key password successfully updated." : "Heslo soukromého klíče úspěšně aktualizováno.",
"File recovery settings updated" : "Možnosti záchrany souborů aktualizovány",
"Could not update file recovery" : "Nelze nastavit záchranu souborů",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Aplikace pro šifrování není inicializována! Je možné, že aplikace byla znovu aktivována během vašeho přihlášení. Zkuste se prosím odhlásit a znovu přihlásit pro provedení inicializace šifrovací aplikace.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Váš soukromý klíč není platný! Pravděpodobně bylo vaše heslo změněno vně systému %s (např. ve vašem firemním adresáři). Heslo vašeho soukromého klíče můžete změnit ve svém osobním nastavení pro obnovení přístupu k vašim zašifrovaným souborům.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tento soubor se nepodařilo dešifrovat, pravděpodobně je sdílený. Požádejte prosím majitele souboru, aby jej s vámi znovu sdílel.",
"Unknown error. Please check your system settings or contact your administrator" : "Neznámá chyba. Zkontrolujte nastavení systému nebo kontaktujte vašeho správce.",
"Initial encryption started... This can take some time. Please wait." : "Počáteční šifrování zahájeno... Toto může chvíli trvat. Počkejte prosím.",
"Initial encryption running... Please try again later." : "Probíhá počáteční šifrování... Zkuste to prosím znovu později.",
"Missing requirements." : "Nesplněné závislosti.",
"Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Ujistěte se prosím, že máte povolené a správně nakonfigurované OpenSSL včetně jeho rozšíření pro PHP. Aplikace pro šifrování byla prozatím vypnuta.",
"Following users are not set up for encryption:" : "Následující uživatelé nemají nastavené šifrování:",
"Go directly to your %spersonal settings%s." : "Přejít přímo do svého %sosobního nastavení%s.",
"Server-side Encryption" : "Šifrování na serveru",
"You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Musíte přenést své šifrovací klíče ze staré verze šifrování (ownCloud <= 8.0) na novou. Spusťte příkaz 'occ encryption:migrate' nebo kontaktujte svého administrátora.",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chybný soukromý klíč pro šifrovací aplikaci. Aktualizujte prosím heslo svého soukromého klíče ve vašem osobním nastavení, abyste znovu získali přístup k vašim zašifrovaným souborům.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikace pro šifrování je zapnuta, ale vaše klíče nejsou inicializované. Prosím odhlaste se a znovu přihlaste",
"Enable recovery key (allow to recover users files in case of password loss):" : "Povolit klíč pro obnovu (umožňuje obnovu uživatelských souborů v případě ztráty hesla)",
"Encryption App is enabled and ready" : "Aplikace šifrování je již povolena",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tento soubor se nepodařilo dešifrovat, pravděpodobně je sdílený. Požádejte prosím majitele souboru, aby jej s vámi znovu sdílel.",
"Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Soubor nelze načíst, pravděpodobně se jedná o sdílený soubor. Požádejte prosím vlastníka souboru, aby vám jej znovu sdílel.",
"Enable recovery key" : "Povolit záchranný klíč",
"Disable recovery key" : "Vypnout záchranný klíč",
"The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Záchranný klíč je dodatečný šifrovací klíč použitý pro\nšifrování souborů. S jeho pomocí lze obnovit soubory uživatele při zapomenutí hesla.",
"Recovery key password" : "Heslo klíče pro obnovu",
"Repeat Recovery key password" : "Zopakujte heslo klíče pro obnovu",
"Enabled" : "Povoleno",
"Disabled" : "Zakázáno",
"Repeat recovery key password" : "Zopakovat heslo záchranného klíče",
"Change recovery key password:" : "Změna hesla klíče pro obnovu:",
"Old Recovery key password" : "Původní heslo klíče pro obnovu",
"New Recovery key password" : "Nové heslo klíče pro obnovu",
"Repeat New Recovery key password" : "Zopakujte nové heslo klíče pro obnovu",
"Old recovery key password" : "Staré heslo záchranného klíče",
"New recovery key password" : "Nové heslo záchranného klíče",
"Repeat new recovery key password" : "Zopakujte nové heslo záchranného klíče",
"Change Password" : "Změnit heslo",
"ownCloud basic encryption module" : "ownCloud základní šifrovací modul",
"Your private key password no longer matches your log-in password." : "Heslo vašeho soukromého klíče se již neshoduje s vaším přihlašovacím heslem.",
"Set your old private key password to your current log-in password:" : "Změňte vaše staré heslo soukromého klíče na stejné, jako je vaše současné přihlašovací heslo:",
" If you don't remember your old password you can ask your administrator to recover your files." : "Pokud si nepamatujete vaše původní heslo, můžete požádat správce o obnovu vašich souborů.",
"Set your old private key password to your current log-in password:" : "Změňte své staré heslo soukromého klíče na stejné, jako je vaše současné přihlašovací heslo:",
" If you don't remember your old password you can ask your administrator to recover your files." : "Pokud si nepamatujete své původní heslo, můžete požádat správce o obnovu vašich souborů.",
"Old log-in password" : "Původní přihlašovací heslo",
"Current log-in password" : "Aktuální přihlašovací heslo",
"Update Private Key Password" : "Změnit heslo soukromého klíče",
"Enable password recovery:" : "Povolit obnovu hesla:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Zapnutí této volby vám umožní znovu získat přístup k vašim zašifrovaným souborům pokud ztratíte heslo"
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Zapnutí této volby vám umožní znovu získat přístup k vašim zašifrovaným souborům pokud ztratíte heslo",
"Enabled" : "Povoleno",
"Disabled" : "Zakázáno"
},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
}
@@ -1,46 +1,43 @@
OC.L10N.register(
"files_encryption",
"encryption",
{
"Unknown error" : "Ukendt fejl",
"Missing recovery key password" : "Der mangler kodeord for gendannelsesnøgle",
"Please repeat the recovery key password" : "Gentag venligst kodeordet for gendannelsesnøglen",
"Repeated recovery key password does not match the provided recovery key password" : "Det gentagne kodeord for gendannelsesnøglen stemmer ikke med det angivne kodeord for gendannelsesnøglen",
"Recovery key successfully enabled" : "Gendannelsesnøgle aktiveret med succes",
"Could not disable recovery key. Please check your recovery key password!" : "Kunne ikke deaktivere gendannelsesnøgle. Kontroller din gendannelsesnøgle kodeord!",
"Could not enable recovery key. Please check your recovery key password!" : "Kunne ikke aktivere gendannelsesnøgle. Kontroller venligst dit gendannelsesnøgle kodeord!",
"Recovery key successfully disabled" : "Gendannelsesnøgle deaktiveret succesfuldt",
"Could not disable recovery key. Please check your recovery key password!" : "Kunne ikke deaktivere gendannelsesnøgle. Kontroller din gendannelsesnøgle kodeord!",
"Missing parameters" : "Manglende parametre",
"Please provide the old recovery password" : "Angiv venligst det gamle kodeord for gendannelsesnøglen",
"Please provide a new recovery password" : "Angiv venligst et nyt kodeord til gendannelse",
"Please repeat the new recovery password" : "Gentag venligst det nye kodeord til gendannelse",
"Password successfully changed." : "Kodeordet blev ændret succesfuldt",
"Could not change the password. Maybe the old password was not correct." : "Kunne ikke ændre kodeordet. Måske var det gamle kodeord ikke korrekt.",
"Recovery Key disabled" : "Gendannelsesnøgle er slået fra",
"Recovery Key enabled" : "Gendannalsesnøgle aktiv",
"Could not enable the recovery key, please try again or contact your administrator" : "Kunne ikke aktivere gendannelsesnøglen, venligst prøv igen eller kontakt din administrator",
"Could not update the private key password." : "Kunne ikke opdatere kodeordet til den private nøgle.",
"The old password was not correct, please try again." : "Det gamle kodeord var ikke korrekt, prøv venligst igen.",
"The current log-in password was not correct, please try again." : "Det nuværende kodeord til log-in var ikke korrekt, prøv venligst igen.",
"Private key password successfully updated." : "Privat nøgle kodeord succesfuldt opdateret.",
"File recovery settings updated" : "Filgendannelsesindstillinger opdateret",
"Could not update file recovery" : "Kunne ikke opdatere filgendannelse",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Krypteringsprogrammet er ikke igangsat. Det kan skyldes at krypteringsprogrammet er blevet genaktiveret under din session. Prøv at logge ud og ind igen for at aktivere krypteringsprogrammet. ",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Din private nøgle er ikke gyldig. Sandsynligvis er dit kodeord blevet ændret uden for %s (f.eks dit firmas adressebog). Du kan opdatere din private nøglekode i dine personlige indstillinger for at genskabe adgang til dine krypterede filer.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke kryptere denne fil, sandsynligvis fordi filen er delt. Bed venligst filens ejer om at dele den med dig på ny.",
"Unknown error. Please check your system settings or contact your administrator" : "Ukendt fejl. Venligst tjek dine systemindstillinger eller kontakt din systemadministrator",
"Initial encryption started... This can take some time. Please wait." : "Førstegangskrypteringen er påbegyndt... Dette kan tage nogen tid. Vent venligst.",
"Initial encryption running... Please try again later." : "Kryptering foretages... Prøv venligst igen senere.",
"Missing requirements." : "Manglende betingelser.",
"Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Sørg for at OpenSSL, sammen med PHP-udvidelsen, er aktiveret og korrekt konfigureret. Indtil videre er krypteringsprogrammet deaktiveret.",
"Following users are not set up for encryption:" : "Følgende brugere er ikke sat op til kryptering:",
"Go directly to your %spersonal settings%s." : "Gå direkte til dine %spersonlige indstillinger%s.",
"Server-side Encryption" : "Kryptering på serverdelen",
"You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Du skal overflytte dine krypteringsnøgler fra den gamle kryptering (ownCloud <= 8.0) til den nye af slagsen. Kør venligst \"occ encryption:migrate\" eller kontakt din administrator.",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ugyldig privat nøgle for krypteringsprogrammet. Opdater venligst dit kodeord for den private nøgle i dine personlige indstillinger. Det kræves for at få adgang til dine krypterede filer.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet er aktiveret, men din nøgler er ikke igangsat. Log venligst ud og ind igen.",
"Enable recovery key (allow to recover users files in case of password loss):" : "Aktiver gendannelsesnøgle (Tillad gendannelse af brugerfiler i tilfælde af tab af kodeord):",
"Encryption App is enabled and ready" : "App til kryptering er slået til og er klar",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke kryptere denne fil, sandsynligvis fordi filen er delt. Bed venligst filens ejer om at dele den med dig på ny.",
"Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke læse denne fil, sandsynligvis fordi det er en delt fil. Bed venligst ejeren af filen om at dele filen med dig påny.",
"Enable recovery key" : "Aktivér gendannelsesnøgle",
"Disable recovery key" : "Deaktivér gendannelsesnøgle",
"The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Gendannelsesnøglen er en ekstra krypteringsnøgle, der bruges til at kryptere filer. Den tillader gendannelse af en brugers filer, hvis brugeren glemmer sin adgangskode.",
"Recovery key password" : "Gendannelsesnøgle kodeord",
"Repeat Recovery key password" : "Gentag gendannelse af nøglekoden",
"Enabled" : "Aktiveret",
"Disabled" : "Deaktiveret",
"Repeat recovery key password" : "Gentag adgangskode for gendannelsesnøgle",
"Change recovery key password:" : "Skift gendannelsesnøgle kodeord:",
"Old Recovery key password" : "Gammel Gendannelsesnøgle kodeord",
"New Recovery key password" : "Ny Gendannelsesnøgle kodeord",
"Repeat New Recovery key password" : "Gentag det nye gendannaleses nøglekodeord",
"Old recovery key password" : "Gammel adgangskode for gendannelsesnøgle",
"New recovery key password" : "Ny adgangskode for gendannelsesnøgle",
"Repeat new recovery key password" : "Gentag ny adgangskode for gendannelsesnøgle",
"Change Password" : "Skift Kodeord",
"ownCloud basic encryption module" : "ownCloud basis krypteringsmodul",
"Your private key password no longer matches your log-in password." : "Dit private nøglekodeord stemmer ikke længere overens med dit login-kodeord.",
"Set your old private key password to your current log-in password:" : "Sæt dit gamle, private nøglekodeord til at være dit nuværende login-kodeord. ",
" If you don't remember your old password you can ask your administrator to recover your files." : "Hvis du ikke kan huske dit gamle kodeord kan du bede din administrator om at gendanne dine filer.",
@@ -48,6 +45,8 @@ OC.L10N.register(
"Current log-in password" : "Nuvrende login kodeord",
"Update Private Key Password" : "Opdater Privat Nøgle Kodeord",
"Enable password recovery:" : "Aktiver kodeord gendannelse:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Aktivering af denne valgmulighed tillader dig at generhverve adgang til dine krypterede filer i tilfælde af tab af kodeord"
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Aktivering af denne valgmulighed tillader dig at generhverve adgang til dine krypterede filer i tilfælde af tab af kodeord",
"Enabled" : "Aktiveret",
"Disabled" : "Deaktiveret"
},
"nplurals=2; plural=(n != 1);");
@@ -1,44 +1,41 @@
{ "translations": {
"Unknown error" : "Ukendt fejl",
"Missing recovery key password" : "Der mangler kodeord for gendannelsesnøgle",
"Please repeat the recovery key password" : "Gentag venligst kodeordet for gendannelsesnøglen",
"Repeated recovery key password does not match the provided recovery key password" : "Det gentagne kodeord for gendannelsesnøglen stemmer ikke med det angivne kodeord for gendannelsesnøglen",
"Recovery key successfully enabled" : "Gendannelsesnøgle aktiveret med succes",
"Could not disable recovery key. Please check your recovery key password!" : "Kunne ikke deaktivere gendannelsesnøgle. Kontroller din gendannelsesnøgle kodeord!",
"Could not enable recovery key. Please check your recovery key password!" : "Kunne ikke aktivere gendannelsesnøgle. Kontroller venligst dit gendannelsesnøgle kodeord!",
"Recovery key successfully disabled" : "Gendannelsesnøgle deaktiveret succesfuldt",
"Could not disable recovery key. Please check your recovery key password!" : "Kunne ikke deaktivere gendannelsesnøgle. Kontroller din gendannelsesnøgle kodeord!",
"Missing parameters" : "Manglende parametre",
"Please provide the old recovery password" : "Angiv venligst det gamle kodeord for gendannelsesnøglen",
"Please provide a new recovery password" : "Angiv venligst et nyt kodeord til gendannelse",
"Please repeat the new recovery password" : "Gentag venligst det nye kodeord til gendannelse",
"Password successfully changed." : "Kodeordet blev ændret succesfuldt",
"Could not change the password. Maybe the old password was not correct." : "Kunne ikke ændre kodeordet. Måske var det gamle kodeord ikke korrekt.",
"Recovery Key disabled" : "Gendannelsesnøgle er slået fra",
"Recovery Key enabled" : "Gendannalsesnøgle aktiv",
"Could not enable the recovery key, please try again or contact your administrator" : "Kunne ikke aktivere gendannelsesnøglen, venligst prøv igen eller kontakt din administrator",
"Could not update the private key password." : "Kunne ikke opdatere kodeordet til den private nøgle.",
"The old password was not correct, please try again." : "Det gamle kodeord var ikke korrekt, prøv venligst igen.",
"The current log-in password was not correct, please try again." : "Det nuværende kodeord til log-in var ikke korrekt, prøv venligst igen.",
"Private key password successfully updated." : "Privat nøgle kodeord succesfuldt opdateret.",
"File recovery settings updated" : "Filgendannelsesindstillinger opdateret",
"Could not update file recovery" : "Kunne ikke opdatere filgendannelse",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Krypteringsprogrammet er ikke igangsat. Det kan skyldes at krypteringsprogrammet er blevet genaktiveret under din session. Prøv at logge ud og ind igen for at aktivere krypteringsprogrammet. ",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Din private nøgle er ikke gyldig. Sandsynligvis er dit kodeord blevet ændret uden for %s (f.eks dit firmas adressebog). Du kan opdatere din private nøglekode i dine personlige indstillinger for at genskabe adgang til dine krypterede filer.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke kryptere denne fil, sandsynligvis fordi filen er delt. Bed venligst filens ejer om at dele den med dig på ny.",
"Unknown error. Please check your system settings or contact your administrator" : "Ukendt fejl. Venligst tjek dine systemindstillinger eller kontakt din systemadministrator",
"Initial encryption started... This can take some time. Please wait." : "Førstegangskrypteringen er påbegyndt... Dette kan tage nogen tid. Vent venligst.",
"Initial encryption running... Please try again later." : "Kryptering foretages... Prøv venligst igen senere.",
"Missing requirements." : "Manglende betingelser.",
"Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Sørg for at OpenSSL, sammen med PHP-udvidelsen, er aktiveret og korrekt konfigureret. Indtil videre er krypteringsprogrammet deaktiveret.",
"Following users are not set up for encryption:" : "Følgende brugere er ikke sat op til kryptering:",
"Go directly to your %spersonal settings%s." : "Gå direkte til dine %spersonlige indstillinger%s.",
"Server-side Encryption" : "Kryptering på serverdelen",
"You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Du skal overflytte dine krypteringsnøgler fra den gamle kryptering (ownCloud <= 8.0) til den nye af slagsen. Kør venligst \"occ encryption:migrate\" eller kontakt din administrator.",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ugyldig privat nøgle for krypteringsprogrammet. Opdater venligst dit kodeord for den private nøgle i dine personlige indstillinger. Det kræves for at få adgang til dine krypterede filer.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet er aktiveret, men din nøgler er ikke igangsat. Log venligst ud og ind igen.",
"Enable recovery key (allow to recover users files in case of password loss):" : "Aktiver gendannelsesnøgle (Tillad gendannelse af brugerfiler i tilfælde af tab af kodeord):",
"Encryption App is enabled and ready" : "App til kryptering er slået til og er klar",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke kryptere denne fil, sandsynligvis fordi filen er delt. Bed venligst filens ejer om at dele den med dig på ny.",
"Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke læse denne fil, sandsynligvis fordi det er en delt fil. Bed venligst ejeren af filen om at dele filen med dig påny.",
"Enable recovery key" : "Aktivér gendannelsesnøgle",
"Disable recovery key" : "Deaktivér gendannelsesnøgle",
"The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Gendannelsesnøglen er en ekstra krypteringsnøgle, der bruges til at kryptere filer. Den tillader gendannelse af en brugers filer, hvis brugeren glemmer sin adgangskode.",
"Recovery key password" : "Gendannelsesnøgle kodeord",
"Repeat Recovery key password" : "Gentag gendannelse af nøglekoden",
"Enabled" : "Aktiveret",
"Disabled" : "Deaktiveret",
"Repeat recovery key password" : "Gentag adgangskode for gendannelsesnøgle",
"Change recovery key password:" : "Skift gendannelsesnøgle kodeord:",
"Old Recovery key password" : "Gammel Gendannelsesnøgle kodeord",
"New Recovery key password" : "Ny Gendannelsesnøgle kodeord",
"Repeat New Recovery key password" : "Gentag det nye gendannaleses nøglekodeord",
"Old recovery key password" : "Gammel adgangskode for gendannelsesnøgle",
"New recovery key password" : "Ny adgangskode for gendannelsesnøgle",
"Repeat new recovery key password" : "Gentag ny adgangskode for gendannelsesnøgle",
"Change Password" : "Skift Kodeord",
"ownCloud basic encryption module" : "ownCloud basis krypteringsmodul",
"Your private key password no longer matches your log-in password." : "Dit private nøglekodeord stemmer ikke længere overens med dit login-kodeord.",
"Set your old private key password to your current log-in password:" : "Sæt dit gamle, private nøglekodeord til at være dit nuværende login-kodeord. ",
" If you don't remember your old password you can ask your administrator to recover your files." : "Hvis du ikke kan huske dit gamle kodeord kan du bede din administrator om at gendanne dine filer.",
@@ -46,6 +43,8 @@
"Current log-in password" : "Nuvrende login kodeord",
"Update Private Key Password" : "Opdater Privat Nøgle Kodeord",
"Enable password recovery:" : "Aktiver kodeord gendannelse:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Aktivering af denne valgmulighed tillader dig at generhverve adgang til dine krypterede filer i tilfælde af tab af kodeord"
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Aktivering af denne valgmulighed tillader dig at generhverve adgang til dine krypterede filer i tilfælde af tab af kodeord",
"Enabled" : "Aktiveret",
"Disabled" : "Deaktiveret"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
@@ -1,46 +1,43 @@
OC.L10N.register(
"files_encryption",
"encryption",
{
"Unknown error" : "Unbekannter Fehler",
"Missing recovery key password" : "Schlüsselpasswort zur Wiederherstellung fehlt",
"Please repeat the recovery key password" : "Schlüsselpasswort zur Wiederherstellung bitte wiederholen",
"Repeated recovery key password does not match the provided recovery key password" : "Das wiederholte Schlüsselpasswort zur Wiederherstellung stimmt nicht mit dem geforderten Schlüsselpasswort zur Wiederherstellung überein",
"Recovery key successfully enabled" : "Wiederherstellungsschlüssel wurde erfolgreich aktiviert",
"Could not disable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Überprüfe Dein Wiederherstellungspasswort!",
"Could not enable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Überprüfe Dein Wiederherstellungspasswort!",
"Recovery key successfully disabled" : "Wiederherstellungsschlüssel deaktiviert.",
"Could not disable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Überprüfe Dein Wiederherstellungspasswort!",
"Missing parameters" : "Fehlende Parameter",
"Please provide the old recovery password" : "Bitte das alte Passwort zur Wiederherstellung eingeben",
"Please provide a new recovery password" : "Bitte das alte Passwort zur Wiederherstellung eingeben",
"Please repeat the new recovery password" : "Bitte das neue Passwort zur Wiederherstellung wiederholen",
"Password successfully changed." : "Dein Passwort wurde geändert.",
"Could not change the password. Maybe the old password was not correct." : "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort falsch.",
"Recovery Key disabled" : "Wiederherstellungsschlüssel deaktiviert",
"Recovery Key enabled" : "Wiederherstellungsschlüssel aktiviert",
"Could not enable the recovery key, please try again or contact your administrator" : "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden, bitte versuche es noch einmal oder kontaktiere Deinen Administrator",
"Could not update the private key password." : "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden.",
"The old password was not correct, please try again." : "Das alte Passwort war nicht korrekt, bitte versuche es noch einmal.",
"The current log-in password was not correct, please try again." : "Das aktuelle Anmeldepasswort war nicht korrekt, bitte versuche es noch einmal.",
"Private key password successfully updated." : "Passwort des privaten Schlüssels erfolgreich aktualisiert",
"File recovery settings updated" : "Einstellungen zur Wiederherstellung von Dateien wurden aktualisiert",
"Could not update file recovery" : "Dateiwiederherstellung konnte nicht aktualisiert werden",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Verschlüsselung-App ist nicht initialisiert! Vielleicht wurde die Verschlüsselung-App in der aktuellen Sitzung reaktiviert. Bitte versuche Dich ab- und wieder anzumelden, um die Verschlüsselung-App zu initialisieren.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Dein privater Schlüssel ist ungültig. Möglicher Weise wurde außerhalb von %s Dein Passwort geändert (z.B. in Deinem gemeinsamen Verzeichnis). Du kannst das Passwort Deines privaten Schlüssels in den persönlichen Einstellungen aktualisieren, um wieder an Deine Dateien zu gelangen.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Die Datei kann nicht entschlüsselt werden, da die Datei möglicherweise eine geteilte Datei ist. Bitte frage den Dateibesitzer, ob er die Datei nochmals mit Dir teilt.",
"Unknown error. Please check your system settings or contact your administrator" : "Unbekannter Fehler. Bitte prüfe Deine Systemeinstellungen oder kontaktiere Deinen Administrator",
"Initial encryption started... This can take some time. Please wait." : "Initialverschlüsselung gestartet... Dies kann einige Zeit dauern. Bitte warten.",
"Initial encryption running... Please try again later." : "Anfangsverschlüsselung läuft … Bitte versuche es später wieder.",
"Missing requirements." : "Fehlende Vorraussetzungen",
"Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Bitte stelle sicher, dass OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Die Verschlüsselungsanwendung ist vorerst deaktiviert.",
"Following users are not set up for encryption:" : "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:",
"Go directly to your %spersonal settings%s." : "Direkt zu Deinen %spersonal settings%s wechseln.",
"Server-side Encryption" : "Serverseitige Verschlüsselung",
"You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Du musst Deine Verschlüsselungsschlüssel von der alten Verschlüsselung (ownCloud <= 8.0) zur neuen migrieren. Bitte führe 'occ encryption:migrate' aus oder kontaktiere Deinen Administrator.",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ungültiger privater Schlüssel für die Verschlüsselung-App. Bitte aktualisiere Dein privates Schlüssel-Passwort, um den Zugriff auf Deine verschlüsselten Dateien wiederherzustellen.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Die Verschlüsselung-App ist aktiviert, aber Deine Schlüssel sind nicht initialisiert. Bitte melde Dich nochmals ab und wieder an.",
"Enable recovery key (allow to recover users files in case of password loss):" : "Wiederherstellungsschlüssel aktivieren (ermöglicht das Wiederherstellen von Dateien, falls das Passwort vergessen wurde):",
"Encryption App is enabled and ready" : "Verschlüsselungs-App ist aktiviert und bereit",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht entschlüsselt werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktiere den Eigentümer der Datei und bitte darum, die Datei noch einmal mit Dir zu teilen.",
"Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht gelesen werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktiere den Eigentümer der Datei und bitte darum, die Datei noch einmal mit Dir zu teilen.",
"Enable recovery key" : "Wiederherstellungsschlüssel aktivieren",
"Disable recovery key" : "Wiederherstellungsschlüssel deaktivieren",
"The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Der Wiederherstellungsschlüssel ist ein zusätzlicher Verschlüsselungsschlüssel, der zum Verschlüsseln von Dateien benutzt wird. Er erlaubt die Wiederherstellung von Benutzerdateien auch dann, wenn der Benutzer sein oder ihr Passwort vergessen hat.",
"Recovery key password" : "Wiederherstellungsschlüssel-Passwort",
"Repeat Recovery key password" : "Schlüssel-Passwort zur Wiederherstellung wiederholen",
"Enabled" : "Aktiviert",
"Disabled" : "Deaktiviert",
"Repeat recovery key password" : "Passwort für den Wiederherstellungsschlüssel wiederholen",
"Change recovery key password:" : "Wiederherstellungsschlüssel-Passwort ändern:",
"Old Recovery key password" : "Altes Wiederherstellungsschlüssel-Passwort",
"New Recovery key password" : "Neues Wiederherstellungsschlüssel-Passwort",
"Repeat New Recovery key password" : "Neues Schlüssel-Passwort zur Wiederherstellung wiederholen",
"Old recovery key password" : "Altes Passwort für den Wiederherstellungsschlüssel",
"New recovery key password" : "Neues Passwort für den Wiederherstellungsschlüssel",
"Repeat new recovery key password" : "Neues Passwort für den Wiederherstellungsschlüssel wiederholen",
"Change Password" : "Passwort ändern",
"ownCloud basic encryption module" : "ownCloud-Basisverschlüsselungsmodul",
"Your private key password no longer matches your log-in password." : "Dein Passwort für Deinen privaten Schlüssel stimmt nicht mehr mit Deinem Loginpasswort überein.",
"Set your old private key password to your current log-in password:" : "Dein altes Passwort für Deinen privaten Schlüssel auf Dein aktuelles Anmeldepasswort einstellen:",
" If you don't remember your old password you can ask your administrator to recover your files." : "Wenn Du Dein altes Passwort vergessen hast, könntest Du Deinen Administrator bitten, Deine Daten wiederherzustellen.",
@@ -48,6 +45,8 @@ OC.L10N.register(
"Current log-in password" : "Aktuelles Passwort",
"Update Private Key Password" : "Passwort für den privaten Schlüssel aktualisieren",
"Enable password recovery:" : "Passwortwiederherstellung aktivieren:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Wenn Du diese Option aktivierst, kannst Du Deine verschlüsselten Dateien wiederherstellen, falls Du Dein Passwort vergisst"
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Wenn Du diese Option aktivierst, kannst Du Deine verschlüsselten Dateien wiederherstellen, falls Du Dein Passwort vergisst",
"Enabled" : "Aktiviert",
"Disabled" : "Deaktiviert"
},
"nplurals=2; plural=(n != 1);");
@@ -1,44 +1,41 @@
{ "translations": {
"Unknown error" : "Unbekannter Fehler",
"Missing recovery key password" : "Schlüsselpasswort zur Wiederherstellung fehlt",
"Please repeat the recovery key password" : "Schlüsselpasswort zur Wiederherstellung bitte wiederholen",
"Repeated recovery key password does not match the provided recovery key password" : "Das wiederholte Schlüsselpasswort zur Wiederherstellung stimmt nicht mit dem geforderten Schlüsselpasswort zur Wiederherstellung überein",
"Recovery key successfully enabled" : "Wiederherstellungsschlüssel wurde erfolgreich aktiviert",
"Could not disable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Überprüfe Dein Wiederherstellungspasswort!",
"Could not enable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Überprüfe Dein Wiederherstellungspasswort!",
"Recovery key successfully disabled" : "Wiederherstellungsschlüssel deaktiviert.",
"Could not disable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Überprüfe Dein Wiederherstellungspasswort!",
"Missing parameters" : "Fehlende Parameter",
"Please provide the old recovery password" : "Bitte das alte Passwort zur Wiederherstellung eingeben",
"Please provide a new recovery password" : "Bitte das alte Passwort zur Wiederherstellung eingeben",
"Please repeat the new recovery password" : "Bitte das neue Passwort zur Wiederherstellung wiederholen",
"Password successfully changed." : "Dein Passwort wurde geändert.",
"Could not change the password. Maybe the old password was not correct." : "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort falsch.",
"Recovery Key disabled" : "Wiederherstellungsschlüssel deaktiviert",
"Recovery Key enabled" : "Wiederherstellungsschlüssel aktiviert",
"Could not enable the recovery key, please try again or contact your administrator" : "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden, bitte versuche es noch einmal oder kontaktiere Deinen Administrator",
"Could not update the private key password." : "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden.",
"The old password was not correct, please try again." : "Das alte Passwort war nicht korrekt, bitte versuche es noch einmal.",
"The current log-in password was not correct, please try again." : "Das aktuelle Anmeldepasswort war nicht korrekt, bitte versuche es noch einmal.",
"Private key password successfully updated." : "Passwort des privaten Schlüssels erfolgreich aktualisiert",
"File recovery settings updated" : "Einstellungen zur Wiederherstellung von Dateien wurden aktualisiert",
"Could not update file recovery" : "Dateiwiederherstellung konnte nicht aktualisiert werden",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Verschlüsselung-App ist nicht initialisiert! Vielleicht wurde die Verschlüsselung-App in der aktuellen Sitzung reaktiviert. Bitte versuche Dich ab- und wieder anzumelden, um die Verschlüsselung-App zu initialisieren.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Dein privater Schlüssel ist ungültig. Möglicher Weise wurde außerhalb von %s Dein Passwort geändert (z.B. in Deinem gemeinsamen Verzeichnis). Du kannst das Passwort Deines privaten Schlüssels in den persönlichen Einstellungen aktualisieren, um wieder an Deine Dateien zu gelangen.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Die Datei kann nicht entschlüsselt werden, da die Datei möglicherweise eine geteilte Datei ist. Bitte frage den Dateibesitzer, ob er die Datei nochmals mit Dir teilt.",
"Unknown error. Please check your system settings or contact your administrator" : "Unbekannter Fehler. Bitte prüfe Deine Systemeinstellungen oder kontaktiere Deinen Administrator",
"Initial encryption started... This can take some time. Please wait." : "Initialverschlüsselung gestartet... Dies kann einige Zeit dauern. Bitte warten.",
"Initial encryption running... Please try again later." : "Anfangsverschlüsselung läuft … Bitte versuche es später wieder.",
"Missing requirements." : "Fehlende Vorraussetzungen",
"Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Bitte stelle sicher, dass OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Die Verschlüsselungsanwendung ist vorerst deaktiviert.",
"Following users are not set up for encryption:" : "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:",
"Go directly to your %spersonal settings%s." : "Direkt zu Deinen %spersonal settings%s wechseln.",
"Server-side Encryption" : "Serverseitige Verschlüsselung",
"You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Du musst Deine Verschlüsselungsschlüssel von der alten Verschlüsselung (ownCloud <= 8.0) zur neuen migrieren. Bitte führe 'occ encryption:migrate' aus oder kontaktiere Deinen Administrator.",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ungültiger privater Schlüssel für die Verschlüsselung-App. Bitte aktualisiere Dein privates Schlüssel-Passwort, um den Zugriff auf Deine verschlüsselten Dateien wiederherzustellen.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Die Verschlüsselung-App ist aktiviert, aber Deine Schlüssel sind nicht initialisiert. Bitte melde Dich nochmals ab und wieder an.",
"Enable recovery key (allow to recover users files in case of password loss):" : "Wiederherstellungsschlüssel aktivieren (ermöglicht das Wiederherstellen von Dateien, falls das Passwort vergessen wurde):",
"Encryption App is enabled and ready" : "Verschlüsselungs-App ist aktiviert und bereit",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht entschlüsselt werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktiere den Eigentümer der Datei und bitte darum, die Datei noch einmal mit Dir zu teilen.",
"Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht gelesen werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktiere den Eigentümer der Datei und bitte darum, die Datei noch einmal mit Dir zu teilen.",
"Enable recovery key" : "Wiederherstellungsschlüssel aktivieren",
"Disable recovery key" : "Wiederherstellungsschlüssel deaktivieren",
"The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Der Wiederherstellungsschlüssel ist ein zusätzlicher Verschlüsselungsschlüssel, der zum Verschlüsseln von Dateien benutzt wird. Er erlaubt die Wiederherstellung von Benutzerdateien auch dann, wenn der Benutzer sein oder ihr Passwort vergessen hat.",
"Recovery key password" : "Wiederherstellungsschlüssel-Passwort",
"Repeat Recovery key password" : "Schlüssel-Passwort zur Wiederherstellung wiederholen",
"Enabled" : "Aktiviert",
"Disabled" : "Deaktiviert",
"Repeat recovery key password" : "Passwort für den Wiederherstellungsschlüssel wiederholen",
"Change recovery key password:" : "Wiederherstellungsschlüssel-Passwort ändern:",
"Old Recovery key password" : "Altes Wiederherstellungsschlüssel-Passwort",
"New Recovery key password" : "Neues Wiederherstellungsschlüssel-Passwort",
"Repeat New Recovery key password" : "Neues Schlüssel-Passwort zur Wiederherstellung wiederholen",
"Old recovery key password" : "Altes Passwort für den Wiederherstellungsschlüssel",
"New recovery key password" : "Neues Passwort für den Wiederherstellungsschlüssel",
"Repeat new recovery key password" : "Neues Passwort für den Wiederherstellungsschlüssel wiederholen",
"Change Password" : "Passwort ändern",
"ownCloud basic encryption module" : "ownCloud-Basisverschlüsselungsmodul",
"Your private key password no longer matches your log-in password." : "Dein Passwort für Deinen privaten Schlüssel stimmt nicht mehr mit Deinem Loginpasswort überein.",
"Set your old private key password to your current log-in password:" : "Dein altes Passwort für Deinen privaten Schlüssel auf Dein aktuelles Anmeldepasswort einstellen:",
" If you don't remember your old password you can ask your administrator to recover your files." : "Wenn Du Dein altes Passwort vergessen hast, könntest Du Deinen Administrator bitten, Deine Daten wiederherzustellen.",
@@ -46,6 +43,8 @@
"Current log-in password" : "Aktuelles Passwort",
"Update Private Key Password" : "Passwort für den privaten Schlüssel aktualisieren",
"Enable password recovery:" : "Passwortwiederherstellung aktivieren:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Wenn Du diese Option aktivierst, kannst Du Deine verschlüsselten Dateien wiederherstellen, falls Du Dein Passwort vergisst"
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Wenn Du diese Option aktivierst, kannst Du Deine verschlüsselten Dateien wiederherstellen, falls Du Dein Passwort vergisst",
"Enabled" : "Aktiviert",
"Disabled" : "Deaktiviert"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
@@ -1,46 +1,43 @@
OC.L10N.register(
"files_encryption",
"encryption",
{
"Unknown error" : "Unbekannter Fehler",
"Missing recovery key password" : "Schlüsselpasswort zur Wiederherstellung fehlt",
"Please repeat the recovery key password" : "Schlüsselpasswort zur Wiederherstellung bitte wiederholen",
"Repeated recovery key password does not match the provided recovery key password" : "Das wiederholte Schlüsselpasswort zur Wiederherstellung stimmt nicht mit dem geforderten Schlüsselpasswort zur Wiederherstellung überein",
"Recovery key successfully enabled" : "Der Wiederherstellungsschlüssel wurde erfolgreich aktiviert.",
"Could not disable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
"Could not enable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
"Recovery key successfully disabled" : "Der Wiederherstellungsschlüssel wurde erfolgreich deaktiviert.",
"Could not disable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
"Missing parameters" : "Fehlende Parameter",
"Please provide the old recovery password" : "Bitte das alte Passwort zur Wiederherstellung eingeben",
"Please provide a new recovery password" : "Bitte das neue Passwort zur Wiederherstellung eingeben",
"Please repeat the new recovery password" : "Bitte das neue Passwort zur Wiederherstellung wiederholen",
"Password successfully changed." : "Das Passwort wurde erfolgreich geändert.",
"Could not change the password. Maybe the old password was not correct." : "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort nicht richtig.",
"Recovery Key disabled" : "Wiederherstellungsschlüssel deaktiviert",
"Recovery Key enabled" : "Wiederherstellungsschlüssel aktiviert",
"Could not enable the recovery key, please try again or contact your administrator" : "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden, bitte versuchen Sie es noch einmal oder kontaktieren Sie Ihren Administrator",
"Could not update the private key password." : "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden.",
"The old password was not correct, please try again." : "Das alte Passwort war nicht korrekt, bitte versuchen Sie es noch einmal.",
"The current log-in password was not correct, please try again." : "Das aktuelle Anmeldepasswort war nicht korrekt, bitte versuchen Sie es noch einmal.",
"Private key password successfully updated." : "Das Passwort des privaten Schlüssels wurde erfolgreich aktualisiert.",
"File recovery settings updated" : "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert.",
"Could not update file recovery" : "Die Dateiwiederherstellung konnte nicht aktualisiert werden.",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Verschlüsselung-App ist nicht initialisiert! Vielleicht wurde die Verschlüsselung-App in der aktuellen Sitzung reaktiviert. Bitte versuchen Sie sich ab- und wieder anzumelden, um die Verschlüsselung-App zu initialisieren.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Ihr privater Schlüssel ist ungültig. Möglicher Weise wurde außerhalb von %s Ihr Passwort geändert (z.B. in Ihrem gemeinsamen Verzeichnis). Sie können das Passwort Ihres privaten Schlüssels in den persönlichen Einstellungen aktualisieren, um wieder an Ihre Dateien zu gelangen.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Die Datei kann nicht entschlüsselt werden, da die Datei möglicherweise eine geteilte Datei ist. Bitte fragen Sie den Dateibesitzer, dass er die Datei nochmals mit Ihnen teilt.",
"Unknown error. Please check your system settings or contact your administrator" : "Unbekannter Fehler. Bitte prüfen Sie die Systemeinstellungen oder kontaktieren Sie Ihren Administrator",
"Initial encryption started... This can take some time. Please wait." : "Anfangsverschlüsselung gestartet … Dieses kann einige Zeit dauern. Bitte warten.",
"Initial encryption running... Please try again later." : "Anfangsverschlüsselung läuft … Bitte versuchen Sie es später wieder.",
"Missing requirements." : "Fehlende Voraussetzungen",
"Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Bitte stellen Sie sicher, dass OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Die Verschlüsselungsanwendung ist vorerst deaktiviert.",
"Following users are not set up for encryption:" : "Für folgende Benutzer ist keine Verschlüsselung eingerichtet:",
"Go directly to your %spersonal settings%s." : "Wechseln Sie direkt zu Ihren %spersonal settings%s.",
"Server-side Encryption" : "Serverseitige Verschlüsselung",
"You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Sie müssen Ihre Verschlüsselungsschlüssel von der alten Verschlüsselung (ownCloud <= 8.0) zur neuen migrieren. Bitte führen Sie 'occ encryption:migrate' aus oder kontaktieren Sie Ihren Administrator.",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ungültiger privater Schlüssel für die Verschlüsselungs-App. Bitte aktualisieren Sie Ihr privates Schlüsselpasswort, um den Zugriff auf Ihre verschlüsselten Dateien wiederherzustellen.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Verschlüsselung-App ist aktiviert, aber Ihre Schlüssel sind nicht initialisiert. Bitte nochmals ab- und wieder anmelden.",
"Enable recovery key (allow to recover users files in case of password loss):" : "Aktivieren Sie den Wiederherstellungsschlüssel (erlaubt die Wiederherstellung des Zugangs zu den Benutzerdateien, wenn das Passwort verloren geht):",
"Encryption App is enabled and ready" : "Verschlüsselungs-App ist aktiviert und bereit",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht entschlüsselt werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktieren Sie den Eigentümer der Datei und bitten Sie darum, die Datei noch einmal mit Ihnen zu teilen.",
"Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht gelesen werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktieren Sie den Eigentümer der Datei und bitten Sie darum, die Datei noch einmal mit Ihnen zu teilen.",
"Enable recovery key" : "Wiederherstellungsschlüssel aktivieren",
"Disable recovery key" : "Wiederherstellungsschlüssel deaktivieren",
"The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Der Wiederherstellungsschlüssel ist ein zusätzlicher Verschlüsselungsschlüssel, der zum Verschlüsseln von Dateien benutzt wird. Er erlaubt die Wiederherstellung von Benutzerdateien auch dann, wenn der Benutzer sein Passwort vergessen hat.",
"Recovery key password" : "Wiederherstellungschlüsselpasswort",
"Repeat Recovery key password" : "Schlüsselpasswort zur Wiederherstellung wiederholen",
"Enabled" : "Aktiviert",
"Disabled" : "Deaktiviert",
"Repeat recovery key password" : "Passwort für den Wiederherstellungsschlüssel wiederholen",
"Change recovery key password:" : "Wiederherstellungsschlüsselpasswort ändern",
"Old Recovery key password" : "Altes Wiederherstellungsschlüsselpasswort",
"New Recovery key password" : "Neues Wiederherstellungsschlüsselpasswort ",
"Repeat New Recovery key password" : "Neues Schlüsselpasswort zur Wiederherstellung wiederholen",
"Old recovery key password" : "Altes Passwort für den Wiederherstellungsschlüssel",
"New recovery key password" : "Neues Passwort für den Wiederherstellungsschlüssel",
"Repeat new recovery key password" : "Neues Passwort für den Wiederherstellungsschlüssel wiederholen",
"Change Password" : "Passwort ändern",
"ownCloud basic encryption module" : "ownCloud-Basisverschlüsselungsmodul",
"Your private key password no longer matches your log-in password." : "Das Privatschlüsselpasswort stimmt nicht länger mit dem Anmeldepasswort überein.",
"Set your old private key password to your current log-in password:" : "Ihr altes Privatschlüsselpasswort auf Ihr aktuelles Anmeldepasswort stellen:",
" If you don't remember your old password you can ask your administrator to recover your files." : "Falls Sie sich nicht an Ihr altes Passwort erinnern können, fragen Sie bitte Ihren Administrator, um Ihre Dateien wiederherzustellen.",
@@ -48,6 +45,8 @@ OC.L10N.register(
"Current log-in password" : "Aktuelles Anmeldepasswort",
"Update Private Key Password" : "Das Passwort des privaten Schlüssels aktualisieren",
"Enable password recovery:" : "Die Passwort-Wiederherstellung aktivieren:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben."
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben.",
"Enabled" : "Aktiviert",
"Disabled" : "Deaktiviert"
},
"nplurals=2; plural=(n != 1);");
@@ -1,44 +1,41 @@
{ "translations": {
"Unknown error" : "Unbekannter Fehler",
"Missing recovery key password" : "Schlüsselpasswort zur Wiederherstellung fehlt",
"Please repeat the recovery key password" : "Schlüsselpasswort zur Wiederherstellung bitte wiederholen",
"Repeated recovery key password does not match the provided recovery key password" : "Das wiederholte Schlüsselpasswort zur Wiederherstellung stimmt nicht mit dem geforderten Schlüsselpasswort zur Wiederherstellung überein",
"Recovery key successfully enabled" : "Der Wiederherstellungsschlüssel wurde erfolgreich aktiviert.",
"Could not disable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
"Could not enable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
"Recovery key successfully disabled" : "Der Wiederherstellungsschlüssel wurde erfolgreich deaktiviert.",
"Could not disable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
"Missing parameters" : "Fehlende Parameter",
"Please provide the old recovery password" : "Bitte das alte Passwort zur Wiederherstellung eingeben",
"Please provide a new recovery password" : "Bitte das neue Passwort zur Wiederherstellung eingeben",
"Please repeat the new recovery password" : "Bitte das neue Passwort zur Wiederherstellung wiederholen",
"Password successfully changed." : "Das Passwort wurde erfolgreich geändert.",
"Could not change the password. Maybe the old password was not correct." : "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort nicht richtig.",
"Recovery Key disabled" : "Wiederherstellungsschlüssel deaktiviert",
"Recovery Key enabled" : "Wiederherstellungsschlüssel aktiviert",
"Could not enable the recovery key, please try again or contact your administrator" : "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden, bitte versuchen Sie es noch einmal oder kontaktieren Sie Ihren Administrator",
"Could not update the private key password." : "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden.",
"The old password was not correct, please try again." : "Das alte Passwort war nicht korrekt, bitte versuchen Sie es noch einmal.",
"The current log-in password was not correct, please try again." : "Das aktuelle Anmeldepasswort war nicht korrekt, bitte versuchen Sie es noch einmal.",
"Private key password successfully updated." : "Das Passwort des privaten Schlüssels wurde erfolgreich aktualisiert.",
"File recovery settings updated" : "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert.",
"Could not update file recovery" : "Die Dateiwiederherstellung konnte nicht aktualisiert werden.",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Verschlüsselung-App ist nicht initialisiert! Vielleicht wurde die Verschlüsselung-App in der aktuellen Sitzung reaktiviert. Bitte versuchen Sie sich ab- und wieder anzumelden, um die Verschlüsselung-App zu initialisieren.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Ihr privater Schlüssel ist ungültig. Möglicher Weise wurde außerhalb von %s Ihr Passwort geändert (z.B. in Ihrem gemeinsamen Verzeichnis). Sie können das Passwort Ihres privaten Schlüssels in den persönlichen Einstellungen aktualisieren, um wieder an Ihre Dateien zu gelangen.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Die Datei kann nicht entschlüsselt werden, da die Datei möglicherweise eine geteilte Datei ist. Bitte fragen Sie den Dateibesitzer, dass er die Datei nochmals mit Ihnen teilt.",
"Unknown error. Please check your system settings or contact your administrator" : "Unbekannter Fehler. Bitte prüfen Sie die Systemeinstellungen oder kontaktieren Sie Ihren Administrator",
"Initial encryption started... This can take some time. Please wait." : "Anfangsverschlüsselung gestartet … Dieses kann einige Zeit dauern. Bitte warten.",
"Initial encryption running... Please try again later." : "Anfangsverschlüsselung läuft … Bitte versuchen Sie es später wieder.",
"Missing requirements." : "Fehlende Voraussetzungen",
"Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Bitte stellen Sie sicher, dass OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Die Verschlüsselungsanwendung ist vorerst deaktiviert.",
"Following users are not set up for encryption:" : "Für folgende Benutzer ist keine Verschlüsselung eingerichtet:",
"Go directly to your %spersonal settings%s." : "Wechseln Sie direkt zu Ihren %spersonal settings%s.",
"Server-side Encryption" : "Serverseitige Verschlüsselung",
"You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Sie müssen Ihre Verschlüsselungsschlüssel von der alten Verschlüsselung (ownCloud <= 8.0) zur neuen migrieren. Bitte führen Sie 'occ encryption:migrate' aus oder kontaktieren Sie Ihren Administrator.",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ungültiger privater Schlüssel für die Verschlüsselungs-App. Bitte aktualisieren Sie Ihr privates Schlüsselpasswort, um den Zugriff auf Ihre verschlüsselten Dateien wiederherzustellen.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Verschlüsselung-App ist aktiviert, aber Ihre Schlüssel sind nicht initialisiert. Bitte nochmals ab- und wieder anmelden.",
"Enable recovery key (allow to recover users files in case of password loss):" : "Aktivieren Sie den Wiederherstellungsschlüssel (erlaubt die Wiederherstellung des Zugangs zu den Benutzerdateien, wenn das Passwort verloren geht):",
"Encryption App is enabled and ready" : "Verschlüsselungs-App ist aktiviert und bereit",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht entschlüsselt werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktieren Sie den Eigentümer der Datei und bitten Sie darum, die Datei noch einmal mit Ihnen zu teilen.",
"Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht gelesen werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktieren Sie den Eigentümer der Datei und bitten Sie darum, die Datei noch einmal mit Ihnen zu teilen.",
"Enable recovery key" : "Wiederherstellungsschlüssel aktivieren",
"Disable recovery key" : "Wiederherstellungsschlüssel deaktivieren",
"The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Der Wiederherstellungsschlüssel ist ein zusätzlicher Verschlüsselungsschlüssel, der zum Verschlüsseln von Dateien benutzt wird. Er erlaubt die Wiederherstellung von Benutzerdateien auch dann, wenn der Benutzer sein Passwort vergessen hat.",
"Recovery key password" : "Wiederherstellungschlüsselpasswort",
"Repeat Recovery key password" : "Schlüsselpasswort zur Wiederherstellung wiederholen",
"Enabled" : "Aktiviert",
"Disabled" : "Deaktiviert",
"Repeat recovery key password" : "Passwort für den Wiederherstellungsschlüssel wiederholen",
"Change recovery key password:" : "Wiederherstellungsschlüsselpasswort ändern",
"Old Recovery key password" : "Altes Wiederherstellungsschlüsselpasswort",
"New Recovery key password" : "Neues Wiederherstellungsschlüsselpasswort ",
"Repeat New Recovery key password" : "Neues Schlüsselpasswort zur Wiederherstellung wiederholen",
"Old recovery key password" : "Altes Passwort für den Wiederherstellungsschlüssel",
"New recovery key password" : "Neues Passwort für den Wiederherstellungsschlüssel",
"Repeat new recovery key password" : "Neues Passwort für den Wiederherstellungsschlüssel wiederholen",
"Change Password" : "Passwort ändern",
"ownCloud basic encryption module" : "ownCloud-Basisverschlüsselungsmodul",
"Your private key password no longer matches your log-in password." : "Das Privatschlüsselpasswort stimmt nicht länger mit dem Anmeldepasswort überein.",
"Set your old private key password to your current log-in password:" : "Ihr altes Privatschlüsselpasswort auf Ihr aktuelles Anmeldepasswort stellen:",
" If you don't remember your old password you can ask your administrator to recover your files." : "Falls Sie sich nicht an Ihr altes Passwort erinnern können, fragen Sie bitte Ihren Administrator, um Ihre Dateien wiederherzustellen.",
@@ -46,6 +43,8 @@
"Current log-in password" : "Aktuelles Anmeldepasswort",
"Update Private Key Password" : "Das Passwort des privaten Schlüssels aktualisieren",
"Enable password recovery:" : "Die Passwort-Wiederherstellung aktivieren:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben."
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben.",
"Enabled" : "Aktiviert",
"Disabled" : "Deaktiviert"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
@@ -1,43 +1,43 @@
OC.L10N.register(
"files_encryption",
"encryption",
{
"Unknown error" : "Άγνωστο σφάλμα",
"Missing recovery key password" : "Λείπει το κλειδί επαναφοράς κωδικού",
"Please repeat the recovery key password" : "Παρακαλώ επαναλάβετε το κλειδί επαναφοράς κωδικού",
"Repeated recovery key password does not match the provided recovery key password" : "Η επανάληψη του κλειδιού επαναφοράς κωδικού δεν ταιριάζει με το δοσμένο κλειδί επαναφοράς κωδικού",
"Recovery key successfully enabled" : "Επιτυχής ενεργοποίηση κλειδιού ανάκτησης",
"Could not disable recovery key. Please check your recovery key password!" : "Αποτυχία απενεργοποίησης κλειδιού ανάκτησης. Παρακαλώ ελέγξτε τον κωδικό του κλειδιού ανάκτησής σας!",
"Could not enable recovery key. Please check your recovery key password!" : "Αποτυχία ενεργοποίησης κλειδιού ανάκτησης. Παρακαλώ ελέγξτε τον κωδικό του κλειδιού ανάκτησής σας!",
"Recovery key successfully disabled" : "Επιτυχής απενεργοποίηση κλειδιού ανάκτησης",
"Could not disable recovery key. Please check your recovery key password!" : "Αποτυχία απενεργοποίησης κλειδιού ανάκτησης. Παρακαλώ ελέγξτε τον κωδικό του κλειδιού ανάκτησής σας!",
"Missing parameters" : "Ελλιπείς παράμετροι",
"Please provide the old recovery password" : "Παρακαλώ παρέχετε τον παλιό κωδικό επαναφοράς",
"Please provide a new recovery password" : "Παρακαλώ παρέχετε ένα νέο κωδικό επαναφοράς",
"Please repeat the new recovery password" : "Παρακαλώ επαναλάβετε το νέο κωδικό επαναφοράς",
"Password successfully changed." : "Ο κωδικός αλλάχτηκε επιτυχώς.",
"Could not change the password. Maybe the old password was not correct." : "Αποτυχία αλλαγής κωδικού ίσως ο παλιός κωδικός να μην ήταν σωστός.",
"Recovery Key disabled" : "Κλειδί ανάκτησης απενεργοποιημένο",
"Recovery Key enabled" : "Κλειδί ανάκτησης ενεργοποιημένο",
"Could not enable the recovery key, please try again or contact your administrator" : "Αδυναμία ενεργοποίησης κλειδιού ανάκτησης, παρακαλούμε προσπαθήστε αργότερα ή επικοινωνήστε με το διαχειριστή σας",
"Could not update the private key password." : "Αποτυχία ενημέρωσης του προσωπικού κλειδιού πρόσβασης",
"The old password was not correct, please try again." : "Το παλαιό συνθηματικό δεν είναι σωστό, παρακαλώ δοκιμάστε ξανά.",
"The current log-in password was not correct, please try again." : "Το τρέχον συνθηματικό δεν είναι σωστό, παρακαλώ δοκιμάστε ξανά.",
"Private key password successfully updated." : "Το Προσωπικό κλειδί πρόσβασης ενημερώθηκε επιτυχώς",
"File recovery settings updated" : "Οι ρυθμίσεις επαναφοράς αρχείων ανανεώθηκαν",
"Could not update file recovery" : "Αποτυχία ενημέρωσης ανάκτησης αρχείων",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Η εφαρμογή κρυπτογράφησης δεν έχει εκκινήσει! Ίσως η εφαρμογή κρυπτογράφησης επανενεργοποιήθηκε κατά τη διάρκεια της τρέχουσας σύνδεσής σας. Παρακαλώ προσπαθήστε να αποσυνδεθείτε και να ξανασυνδεθείτε για να εκκινήσετε την εφαρμογή κρυπτογράφησης.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Το προσωπικό σας κλειδί δεν είναι έγκυρο! Πιθανόν ο κωδικός σας να άλλαξε έξω από το %s (π.χ. τη λίστα διευθύνσεων της εταιρείας σας). Μπορείτε να ενημερώσετε το προσωπικό σας κλειδί επαναφοράς κωδικού στις προσωπικές σας ρυθμίσεις για να επανακτήσετε πρόσβαση στα κρυπτογραφημένα σας αρχεία.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Δεν ήταν δυνατό να αποκρυπτογραφηθεί αυτό το αρχείο, πιθανόν πρόκειται για κοινόχρηστο αρχείο. Παρακαλώ ζητήστε από τον ιδιοκτήτη του αρχείου να το ξαναμοιραστεί μαζί σας.",
"Unknown error. Please check your system settings or contact your administrator" : "Άγνωστο σφάλμα. Παρακαλώ ελέγξτε τις ρυθμίσεις του συστήματό σας ή επικοινωνήστε με τον διαχειριστή συστημάτων σας",
"Initial encryption started... This can take some time. Please wait." : "Η αρχική κρυπτογράφηση άρχισε... Αυτό μπορεί να πάρει κάποια ώρα. Παρακαλώ περιμένετε.",
"Initial encryption running... Please try again later." : "Εκτέλεση αρχικής κρυπτογράφησης... Παρακαλώ προσπαθήστε αργότερα.",
"Missing requirements." : "Προαπαιτούμενα που απουσιάζουν.",
"Following users are not set up for encryption:" : "Οι κάτωθι χρήστες δεν έχουν ρυθμιστεί για κρυπογράφηση:",
"Go directly to your %spersonal settings%s." : "Πηγαίνετε κατ'ευθείαν στις %sπροσωπικές ρυθμίσεις%s σας.",
"You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Πρέπει να μεταφέρετε τα κλειδιά κρυπτογράφησής σας από την παλιά κρυπτογράφηση (ownCloud <= 8.0) στην καινούρια. Παρακαλούμε εκτελέστε την εντολή 'occ encryption:migrate' ή επικοινωνήστε με το διαχειριστή σας.",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Άκυρο προσωπικό κλειδί για την εφαρμογή κρυπτογράφησης. Παρακαλώ ενημερώστε τον κωδικό του προσωπικού κλειδίου σας στις προσωπικές ρυθμίσεις για να επανακτήσετε πρόσβαση στα κρυπτογραφημένα σας αρχεία.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Η εφαρμογή κρυπτογράφησης είναι ενεργοποιημένη αλλά τα κλειδιά σας δεν έχουν καταγραφεί, παρακαλώ αποσυνδεθείτε και επανασυνδεθείτε.",
"Enable recovery key (allow to recover users files in case of password loss):" : "Ενεργοποίηση κλειδιού ανάκτησης (επιτρέψτε την ανάκτηση αρχείων χρηστών σε περίπτωση απώλειας κωδικού):",
"Encryption App is enabled and ready" : "Η Εφαρμογή Κρυπτογράφησης είναι ενεργοποιημένη και έτοιμη.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Δεν ήταν δυνατό να αποκρυπτογραφηθεί αυτό το αρχείο, πιθανόν πρόκειται για κοινόχρηστο αρχείο. Παρακαλώ ζητήστε από τον ιδιοκτήτη του αρχείου να το ξαναμοιραστεί μαζί σας.",
"Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Αδυναμία ανάγνωσης αυτού του αρχείου, πιθανό να είναι διαμοιραζόμενο αρχείο. Παρακαλώ ρωτήστε τον κάτοχο του αρχείου να το διαμοιράσει ξανά μαζί σας.",
"Enable recovery key" : "Ενεργοποίηση κλειδιού ανάκτησης",
"Disable recovery key" : "Απενεργοποίηση κλειδιού ανάκτησης",
"The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Το κλειδί ανάκτησης είναι ένα επιπλέον κλειδί κρυπτογράφησης που χρησιμοποιείται για να κρυπτογραφήσει αρχεία. Επιτρέπει την ανάκτηση των αρχείων ενός χρήστη αν αυτός/αυτή ξεχάσει τον κωδικό πρόσβασης.",
"Recovery key password" : "Επαναφορά κωδικού κλειδιού",
"Repeat Recovery key password" : "Επαναλάβετε το κλειδί επαναφοράς κωδικού",
"Enabled" : "Ενεργοποιημένο",
"Disabled" : "Απενεργοποιημένο",
"Repeat recovery key password" : "Επαναλάβετε τον κωδικό του κλειδιού ανάκτησης",
"Change recovery key password:" : "Αλλαγή κλειδιού επαναφοράς κωδικού:",
"Old Recovery key password" : "Παλιό κλειδί επαναφοράς κωδικού",
"New Recovery key password" : "Νέο κλειδί επαναφοράς κωδικού",
"Repeat New Recovery key password" : "Επαναλάβετε νέο κλειδί επαναφοράς κωδικού",
"Old recovery key password" : "Παλιός κωδικός κλειδιού ανάκτησης",
"New recovery key password" : "Νέος κωδικός κλειδιού ανάκτησης",
"Repeat new recovery key password" : "Επαναλάβετε το νέο κωδικό κλειδιού ανάκτησης",
"Change Password" : "Αλλαγή Κωδικού Πρόσβασης",
"ownCloud basic encryption module" : "Βασική μονάδα κρυπτογράφησης του ",
"Your private key password no longer matches your log-in password." : "Ο κωδικός του ιδιωτικού κλειδιού σας δεν ταιριάζει πλέον με τον κωδικό σύνδεσής σας.",
"Set your old private key password to your current log-in password:" : "Ορίστε τον παλιό σας κωδικό ιδιωτικού κλειδιού στον τρέχοντα κωδικό σύνδεσης.",
" If you don't remember your old password you can ask your administrator to recover your files." : "Εάν δεν θυμάστε τον παλιό σας κωδικό μπορείτε να ζητήσετε από τον διαχειριστή σας να επανακτήσει τα αρχεία σας.",
@@ -45,6 +45,8 @@ OC.L10N.register(
"Current log-in password" : "Τρέχον συνθηματικό πρόσβασης",
"Update Private Key Password" : "Ενημέρωση Προσωπικού Κλειδού Πρόσβασης",
"Enable password recovery:" : "Ενεργοποιήστε την ανάκτηση κωδικού πρόσβασης",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Η ενεργοποίηση αυτής της επιλογής θα σας επιτρέψει να επανακτήσετε πρόσβαση στα κρυπτογραφημένα σας αρχεία σε περίπτωση απώλειας του κωδικού σας"
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Η ενεργοποίηση αυτής της επιλογής θα σας επιτρέψει να επανακτήσετε πρόσβαση στα κρυπτογραφημένα σας αρχεία σε περίπτωση απώλειας του κωδικού σας",
"Enabled" : "Ενεργοποιημένο",
"Disabled" : "Απενεργοποιημένο"
},
"nplurals=2; plural=(n != 1);");
@@ -1,41 +1,41 @@
{ "translations": {
"Unknown error" : "Άγνωστο σφάλμα",
"Missing recovery key password" : "Λείπει το κλειδί επαναφοράς κωδικού",
"Please repeat the recovery key password" : "Παρακαλώ επαναλάβετε το κλειδί επαναφοράς κωδικού",
"Repeated recovery key password does not match the provided recovery key password" : "Η επανάληψη του κλειδιού επαναφοράς κωδικού δεν ταιριάζει με το δοσμένο κλειδί επαναφοράς κωδικού",
"Recovery key successfully enabled" : "Επιτυχής ενεργοποίηση κλειδιού ανάκτησης",
"Could not disable recovery key. Please check your recovery key password!" : "Αποτυχία απενεργοποίησης κλειδιού ανάκτησης. Παρακαλώ ελέγξτε τον κωδικό του κλειδιού ανάκτησής σας!",
"Could not enable recovery key. Please check your recovery key password!" : "Αποτυχία ενεργοποίησης κλειδιού ανάκτησης. Παρακαλώ ελέγξτε τον κωδικό του κλειδιού ανάκτησής σας!",
"Recovery key successfully disabled" : "Επιτυχής απενεργοποίηση κλειδιού ανάκτησης",
"Could not disable recovery key. Please check your recovery key password!" : "Αποτυχία απενεργοποίησης κλειδιού ανάκτησης. Παρακαλώ ελέγξτε τον κωδικό του κλειδιού ανάκτησής σας!",
"Missing parameters" : "Ελλιπείς παράμετροι",
"Please provide the old recovery password" : "Παρακαλώ παρέχετε τον παλιό κωδικό επαναφοράς",
"Please provide a new recovery password" : "Παρακαλώ παρέχετε ένα νέο κωδικό επαναφοράς",
"Please repeat the new recovery password" : "Παρακαλώ επαναλάβετε το νέο κωδικό επαναφοράς",
"Password successfully changed." : "Ο κωδικός αλλάχτηκε επιτυχώς.",
"Could not change the password. Maybe the old password was not correct." : "Αποτυχία αλλαγής κωδικού ίσως ο παλιός κωδικός να μην ήταν σωστός.",
"Recovery Key disabled" : "Κλειδί ανάκτησης απενεργοποιημένο",
"Recovery Key enabled" : "Κλειδί ανάκτησης ενεργοποιημένο",
"Could not enable the recovery key, please try again or contact your administrator" : "Αδυναμία ενεργοποίησης κλειδιού ανάκτησης, παρακαλούμε προσπαθήστε αργότερα ή επικοινωνήστε με το διαχειριστή σας",
"Could not update the private key password." : "Αποτυχία ενημέρωσης του προσωπικού κλειδιού πρόσβασης",
"The old password was not correct, please try again." : "Το παλαιό συνθηματικό δεν είναι σωστό, παρακαλώ δοκιμάστε ξανά.",
"The current log-in password was not correct, please try again." : "Το τρέχον συνθηματικό δεν είναι σωστό, παρακαλώ δοκιμάστε ξανά.",
"Private key password successfully updated." : "Το Προσωπικό κλειδί πρόσβασης ενημερώθηκε επιτυχώς",
"File recovery settings updated" : "Οι ρυθμίσεις επαναφοράς αρχείων ανανεώθηκαν",
"Could not update file recovery" : "Αποτυχία ενημέρωσης ανάκτησης αρχείων",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Η εφαρμογή κρυπτογράφησης δεν έχει εκκινήσει! Ίσως η εφαρμογή κρυπτογράφησης επανενεργοποιήθηκε κατά τη διάρκεια της τρέχουσας σύνδεσής σας. Παρακαλώ προσπαθήστε να αποσυνδεθείτε και να ξανασυνδεθείτε για να εκκινήσετε την εφαρμογή κρυπτογράφησης.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Το προσωπικό σας κλειδί δεν είναι έγκυρο! Πιθανόν ο κωδικός σας να άλλαξε έξω από το %s (π.χ. τη λίστα διευθύνσεων της εταιρείας σας). Μπορείτε να ενημερώσετε το προσωπικό σας κλειδί επαναφοράς κωδικού στις προσωπικές σας ρυθμίσεις για να επανακτήσετε πρόσβαση στα κρυπτογραφημένα σας αρχεία.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Δεν ήταν δυνατό να αποκρυπτογραφηθεί αυτό το αρχείο, πιθανόν πρόκειται για κοινόχρηστο αρχείο. Παρακαλώ ζητήστε από τον ιδιοκτήτη του αρχείου να το ξαναμοιραστεί μαζί σας.",
"Unknown error. Please check your system settings or contact your administrator" : "Άγνωστο σφάλμα. Παρακαλώ ελέγξτε τις ρυθμίσεις του συστήματό σας ή επικοινωνήστε με τον διαχειριστή συστημάτων σας",
"Initial encryption started... This can take some time. Please wait." : "Η αρχική κρυπτογράφηση άρχισε... Αυτό μπορεί να πάρει κάποια ώρα. Παρακαλώ περιμένετε.",
"Initial encryption running... Please try again later." : "Εκτέλεση αρχικής κρυπτογράφησης... Παρακαλώ προσπαθήστε αργότερα.",
"Missing requirements." : "Προαπαιτούμενα που απουσιάζουν.",
"Following users are not set up for encryption:" : "Οι κάτωθι χρήστες δεν έχουν ρυθμιστεί για κρυπογράφηση:",
"Go directly to your %spersonal settings%s." : "Πηγαίνετε κατ'ευθείαν στις %sπροσωπικές ρυθμίσεις%s σας.",
"You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Πρέπει να μεταφέρετε τα κλειδιά κρυπτογράφησής σας από την παλιά κρυπτογράφηση (ownCloud <= 8.0) στην καινούρια. Παρακαλούμε εκτελέστε την εντολή 'occ encryption:migrate' ή επικοινωνήστε με το διαχειριστή σας.",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Άκυρο προσωπικό κλειδί για την εφαρμογή κρυπτογράφησης. Παρακαλώ ενημερώστε τον κωδικό του προσωπικού κλειδίου σας στις προσωπικές ρυθμίσεις για να επανακτήσετε πρόσβαση στα κρυπτογραφημένα σας αρχεία.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Η εφαρμογή κρυπτογράφησης είναι ενεργοποιημένη αλλά τα κλειδιά σας δεν έχουν καταγραφεί, παρακαλώ αποσυνδεθείτε και επανασυνδεθείτε.",
"Enable recovery key (allow to recover users files in case of password loss):" : "Ενεργοποίηση κλειδιού ανάκτησης (επιτρέψτε την ανάκτηση αρχείων χρηστών σε περίπτωση απώλειας κωδικού):",
"Encryption App is enabled and ready" : "Η Εφαρμογή Κρυπτογράφησης είναι ενεργοποιημένη και έτοιμη.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Δεν ήταν δυνατό να αποκρυπτογραφηθεί αυτό το αρχείο, πιθανόν πρόκειται για κοινόχρηστο αρχείο. Παρακαλώ ζητήστε από τον ιδιοκτήτη του αρχείου να το ξαναμοιραστεί μαζί σας.",
"Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Αδυναμία ανάγνωσης αυτού του αρχείου, πιθανό να είναι διαμοιραζόμενο αρχείο. Παρακαλώ ρωτήστε τον κάτοχο του αρχείου να το διαμοιράσει ξανά μαζί σας.",
"Enable recovery key" : "Ενεργοποίηση κλειδιού ανάκτησης",
"Disable recovery key" : "Απενεργοποίηση κλειδιού ανάκτησης",
"The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Το κλειδί ανάκτησης είναι ένα επιπλέον κλειδί κρυπτογράφησης που χρησιμοποιείται για να κρυπτογραφήσει αρχεία. Επιτρέπει την ανάκτηση των αρχείων ενός χρήστη αν αυτός/αυτή ξεχάσει τον κωδικό πρόσβασης.",
"Recovery key password" : "Επαναφορά κωδικού κλειδιού",
"Repeat Recovery key password" : "Επαναλάβετε το κλειδί επαναφοράς κωδικού",
"Enabled" : "Ενεργοποιημένο",
"Disabled" : "Απενεργοποιημένο",
"Repeat recovery key password" : "Επαναλάβετε τον κωδικό του κλειδιού ανάκτησης",
"Change recovery key password:" : "Αλλαγή κλειδιού επαναφοράς κωδικού:",
"Old Recovery key password" : "Παλιό κλειδί επαναφοράς κωδικού",
"New Recovery key password" : "Νέο κλειδί επαναφοράς κωδικού",
"Repeat New Recovery key password" : "Επαναλάβετε νέο κλειδί επαναφοράς κωδικού",
"Old recovery key password" : "Παλιός κωδικός κλειδιού ανάκτησης",
"New recovery key password" : "Νέος κωδικός κλειδιού ανάκτησης",
"Repeat new recovery key password" : "Επαναλάβετε το νέο κωδικό κλειδιού ανάκτησης",
"Change Password" : "Αλλαγή Κωδικού Πρόσβασης",
"ownCloud basic encryption module" : "Βασική μονάδα κρυπτογράφησης του ",
"Your private key password no longer matches your log-in password." : "Ο κωδικός του ιδιωτικού κλειδιού σας δεν ταιριάζει πλέον με τον κωδικό σύνδεσής σας.",
"Set your old private key password to your current log-in password:" : "Ορίστε τον παλιό σας κωδικό ιδιωτικού κλειδιού στον τρέχοντα κωδικό σύνδεσης.",
" If you don't remember your old password you can ask your administrator to recover your files." : "Εάν δεν θυμάστε τον παλιό σας κωδικό μπορείτε να ζητήσετε από τον διαχειριστή σας να επανακτήσει τα αρχεία σας.",
@@ -43,6 +43,8 @@
"Current log-in password" : "Τρέχον συνθηματικό πρόσβασης",
"Update Private Key Password" : "Ενημέρωση Προσωπικού Κλειδού Πρόσβασης",
"Enable password recovery:" : "Ενεργοποιήστε την ανάκτηση κωδικού πρόσβασης",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Η ενεργοποίηση αυτής της επιλογής θα σας επιτρέψει να επανακτήσετε πρόσβαση στα κρυπτογραφημένα σας αρχεία σε περίπτωση απώλειας του κωδικού σας"
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Η ενεργοποίηση αυτής της επιλογής θα σας επιτρέψει να επανακτήσετε πρόσβαση στα κρυπτογραφημένα σας αρχεία σε περίπτωση απώλειας του κωδικού σας",
"Enabled" : "Ενεργοποιημένο",
"Disabled" : "Απενεργοποιημένο"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
@@ -1,46 +1,43 @@
OC.L10N.register(
"files_encryption",
"encryption",
{
"Unknown error" : "Unknown error",
"Missing recovery key password" : "Missing recovery key password",
"Please repeat the recovery key password" : "Please repeat the recovery key password",
"Repeated recovery key password does not match the provided recovery key password" : "Repeated recovery key password does not match the provided recovery key password",
"Recovery key successfully enabled" : "Recovery key enabled successfully",
"Could not disable recovery key. Please check your recovery key password!" : "Could not disable recovery key. Please check your recovery key password!",
"Could not enable recovery key. Please check your recovery key password!" : "Could not enable recovery key. Please check your recovery key password!",
"Recovery key successfully disabled" : "Recovery key disabled successfully",
"Could not disable recovery key. Please check your recovery key password!" : "Could not disable recovery key. Please check your recovery key password!",
"Missing parameters" : "Missing parameters",
"Please provide the old recovery password" : "Please provide the old recovery password",
"Please provide a new recovery password" : "Please provide a new recovery password",
"Please repeat the new recovery password" : "Please repeat the new recovery password",
"Password successfully changed." : "Password changed successfully.",
"Could not change the password. Maybe the old password was not correct." : "Could not change the password. Maybe the old password was incorrect.",
"Recovery Key disabled" : "Recovery Key disabled",
"Recovery Key enabled" : "Recovery Key enabled",
"Could not enable the recovery key, please try again or contact your administrator" : "Could not enable the recovery key, please try again or contact your administrator",
"Could not update the private key password." : "Could not update the private key password.",
"The old password was not correct, please try again." : "The old password was not correct, please try again.",
"The current log-in password was not correct, please try again." : "The current log-in password was not correct, please try again.",
"Private key password successfully updated." : "Private key password updated successfully.",
"File recovery settings updated" : "File recovery settings updated",
"Could not update file recovery" : "Could not update file recovery",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Encryption app not initialised! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialise the encryption app.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Cannot decrypt this file, which is probably a shared file. Please ask the file owner to reshare the file with you.",
"Unknown error. Please check your system settings or contact your administrator" : "Unknown error. Please check your system settings or contact your administrator",
"Initial encryption started... This can take some time. Please wait." : "Initial encryption started... This can take some time. Please wait.",
"Initial encryption running... Please try again later." : "Initial encryption running... Please try again later.",
"Missing requirements." : "Missing requirements.",
"Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Please make sure that OpenSSL together with the PHP extension is enabled and properly configured. For now, the encryption app has been disabled.",
"Following users are not set up for encryption:" : "Following users are not set up for encryption:",
"Go directly to your %spersonal settings%s." : "Go directly to your %spersonal settings%s.",
"Server-side Encryption" : "Server-side Encryption",
"You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator",
"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.",
"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 initialised, please log-out and log-in again",
"Enable recovery key (allow to recover users files in case of password loss):" : "Enable recovery key (allow to recover users files in case of password loss):",
"Encryption App is enabled and ready" : "Encryption App is enabled and ready",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Cannot decrypt this file, which is probably a shared file. Please ask the file owner to reshare the file with you.",
"Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you.",
"Enable recovery key" : "Enable recovery key",
"Disable recovery key" : "Disable recovery key",
"The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password.",
"Recovery key password" : "Recovery key password",
"Repeat Recovery key password" : "Repeat recovery key password",
"Enabled" : "Enabled",
"Disabled" : "Disabled",
"Repeat recovery key password" : "Repeat recovery key password",
"Change recovery key password:" : "Change recovery key password:",
"Old Recovery key password" : "Old recovery key password",
"New Recovery key password" : "New recovery key password",
"Repeat New Recovery key password" : "Repeat new recovery key password",
"Old recovery key password" : "Old recovery key password",
"New recovery key password" : "New recovery key password",
"Repeat new recovery key password" : "Repeat new recovery key password",
"Change Password" : "Change Password",
"ownCloud basic encryption module" : "ownCloud basic encryption module",
"Your private key password no longer matches your log-in password." : "Your private key password no longer matches your log-in password.",
"Set your old private key password to your current log-in password:" : "Set your old private key password to your current log-in password:",
" If you don't remember your old password you can ask your administrator to recover your files." : " If you don't remember your old password you can ask your administrator to recover your files.",
@@ -48,6 +45,8 @@ OC.L10N.register(
"Current log-in password" : "Current login password",
"Update Private Key Password" : "Update Private Key Password",
"Enable password recovery:" : "Enable password recovery:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss"
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss",
"Enabled" : "Enabled",
"Disabled" : "Disabled"
},
"nplurals=2; plural=(n != 1);");
@@ -1,44 +1,41 @@
{ "translations": {
"Unknown error" : "Unknown error",
"Missing recovery key password" : "Missing recovery key password",
"Please repeat the recovery key password" : "Please repeat the recovery key password",
"Repeated recovery key password does not match the provided recovery key password" : "Repeated recovery key password does not match the provided recovery key password",
"Recovery key successfully enabled" : "Recovery key enabled successfully",
"Could not disable recovery key. Please check your recovery key password!" : "Could not disable recovery key. Please check your recovery key password!",
"Could not enable recovery key. Please check your recovery key password!" : "Could not enable recovery key. Please check your recovery key password!",
"Recovery key successfully disabled" : "Recovery key disabled successfully",
"Could not disable recovery key. Please check your recovery key password!" : "Could not disable recovery key. Please check your recovery key password!",
"Missing parameters" : "Missing parameters",
"Please provide the old recovery password" : "Please provide the old recovery password",
"Please provide a new recovery password" : "Please provide a new recovery password",
"Please repeat the new recovery password" : "Please repeat the new recovery password",
"Password successfully changed." : "Password changed successfully.",
"Could not change the password. Maybe the old password was not correct." : "Could not change the password. Maybe the old password was incorrect.",
"Recovery Key disabled" : "Recovery Key disabled",
"Recovery Key enabled" : "Recovery Key enabled",
"Could not enable the recovery key, please try again or contact your administrator" : "Could not enable the recovery key, please try again or contact your administrator",
"Could not update the private key password." : "Could not update the private key password.",
"The old password was not correct, please try again." : "The old password was not correct, please try again.",
"The current log-in password was not correct, please try again." : "The current log-in password was not correct, please try again.",
"Private key password successfully updated." : "Private key password updated successfully.",
"File recovery settings updated" : "File recovery settings updated",
"Could not update file recovery" : "Could not update file recovery",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Encryption app not initialised! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialise the encryption app.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Cannot decrypt this file, which is probably a shared file. Please ask the file owner to reshare the file with you.",
"Unknown error. Please check your system settings or contact your administrator" : "Unknown error. Please check your system settings or contact your administrator",
"Initial encryption started... This can take some time. Please wait." : "Initial encryption started... This can take some time. Please wait.",
"Initial encryption running... Please try again later." : "Initial encryption running... Please try again later.",
"Missing requirements." : "Missing requirements.",
"Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Please make sure that OpenSSL together with the PHP extension is enabled and properly configured. For now, the encryption app has been disabled.",
"Following users are not set up for encryption:" : "Following users are not set up for encryption:",
"Go directly to your %spersonal settings%s." : "Go directly to your %spersonal settings%s.",
"Server-side Encryption" : "Server-side Encryption",
"You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator",
"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.",
"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 initialised, please log-out and log-in again",
"Enable recovery key (allow to recover users files in case of password loss):" : "Enable recovery key (allow to recover users files in case of password loss):",
"Encryption App is enabled and ready" : "Encryption App is enabled and ready",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Cannot decrypt this file, which is probably a shared file. Please ask the file owner to reshare the file with you.",
"Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you.",
"Enable recovery key" : "Enable recovery key",
"Disable recovery key" : "Disable recovery key",
"The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password.",
"Recovery key password" : "Recovery key password",
"Repeat Recovery key password" : "Repeat recovery key password",
"Enabled" : "Enabled",
"Disabled" : "Disabled",
"Repeat recovery key password" : "Repeat recovery key password",
"Change recovery key password:" : "Change recovery key password:",
"Old Recovery key password" : "Old recovery key password",
"New Recovery key password" : "New recovery key password",
"Repeat New Recovery key password" : "Repeat new recovery key password",
"Old recovery key password" : "Old recovery key password",
"New recovery key password" : "New recovery key password",
"Repeat new recovery key password" : "Repeat new recovery key password",
"Change Password" : "Change Password",
"ownCloud basic encryption module" : "ownCloud basic encryption module",
"Your private key password no longer matches your log-in password." : "Your private key password no longer matches your log-in password.",
"Set your old private key password to your current log-in password:" : "Set your old private key password to your current log-in password:",
" If you don't remember your old password you can ask your administrator to recover your files." : " If you don't remember your old password you can ask your administrator to recover your files.",
@@ -46,6 +43,8 @@
"Current log-in password" : "Current login password",
"Update Private Key Password" : "Update Private Key Password",
"Enable password recovery:" : "Enable password recovery:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss"
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss",
"Enabled" : "Enabled",
"Disabled" : "Disabled"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+28
View File
@@ -0,0 +1,28 @@
OC.L10N.register(
"encryption",
{
"Missing parameters" : "Mankas parametroj",
"Password successfully changed." : "La pasvorto sukcese ŝanĝiĝis.",
"Could not change the password. Maybe the old password was not correct." : "Ne eblis ŝanĝi la pasvorton. Eble la malnova pasvorto malĝustis.",
"Recovery Key disabled" : "Restaŭroklavo malkapabliĝis",
"Recovery Key enabled" : "Restaŭroklavo kapabliĝis",
"Private key password successfully updated." : "La pasvorto de la malpublika klavo sukcese ĝisdatiĝis.",
"Encryption App is enabled and ready" : "Aplikaĵo Ĉifrado kapabligitas kaj pretas",
"Enable recovery key" : "Kapabligi restaŭroklavon",
"Disable recovery key" : "Malkapabligi restaŭroklavon",
"Recovery key password" : "Pasvorto de restaŭroklavo",
"Repeat recovery key password" : "Ripetu la pasvorton de restaŭroklavo",
"Change recovery key password:" : "Ŝanĝi la pasvorton de la restaŭroklavo:",
"Old recovery key password" : "Malnova pasvorto de restaŭroklavo",
"New recovery key password" : "Nova pasvorto de restaŭroklavo",
"Repeat new recovery key password" : "Ripetu la novan pasvorton de restaŭroklavo",
"Change Password" : "Ŝarĝi pasvorton",
"ownCloud basic encryption module" : "Baza ĉifrada modulo de ownCloud",
"Old log-in password" : "Malnova ensaluta pasvorto",
"Current log-in password" : "Nuna ensaluta pasvorto",
"Update Private Key Password" : "Ĝisdatigi la pasvorton de la malpublika klavo",
"Enable password recovery:" : "Kapabligi restaŭron de pasvorto:",
"Enabled" : "Kapabligita",
"Disabled" : "Malkapabligita"
},
"nplurals=2; plural=(n != 1);");
+26
View File
@@ -0,0 +1,26 @@
{ "translations": {
"Missing parameters" : "Mankas parametroj",
"Password successfully changed." : "La pasvorto sukcese ŝanĝiĝis.",
"Could not change the password. Maybe the old password was not correct." : "Ne eblis ŝanĝi la pasvorton. Eble la malnova pasvorto malĝustis.",
"Recovery Key disabled" : "Restaŭroklavo malkapabliĝis",
"Recovery Key enabled" : "Restaŭroklavo kapabliĝis",
"Private key password successfully updated." : "La pasvorto de la malpublika klavo sukcese ĝisdatiĝis.",
"Encryption App is enabled and ready" : "Aplikaĵo Ĉifrado kapabligitas kaj pretas",
"Enable recovery key" : "Kapabligi restaŭroklavon",
"Disable recovery key" : "Malkapabligi restaŭroklavon",
"Recovery key password" : "Pasvorto de restaŭroklavo",
"Repeat recovery key password" : "Ripetu la pasvorton de restaŭroklavo",
"Change recovery key password:" : "Ŝanĝi la pasvorton de la restaŭroklavo:",
"Old recovery key password" : "Malnova pasvorto de restaŭroklavo",
"New recovery key password" : "Nova pasvorto de restaŭroklavo",
"Repeat new recovery key password" : "Ripetu la novan pasvorton de restaŭroklavo",
"Change Password" : "Ŝarĝi pasvorton",
"ownCloud basic encryption module" : "Baza ĉifrada modulo de ownCloud",
"Old log-in password" : "Malnova ensaluta pasvorto",
"Current log-in password" : "Nuna ensaluta pasvorto",
"Update Private Key Password" : "Ĝisdatigi la pasvorton de la malpublika klavo",
"Enable password recovery:" : "Kapabligi restaŭron de pasvorto:",
"Enabled" : "Kapabligita",
"Disabled" : "Malkapabligita"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+52
View File
@@ -0,0 +1,52 @@
OC.L10N.register(
"encryption",
{
"Missing recovery key password" : "Falta contraseña de recuperación",
"Please repeat the recovery key password" : "Por favor, repita la contraseña de recuperación",
"Repeated recovery key password does not match the provided recovery key password" : "La contraseña de recuperación reintroducida no coincide con la contraseña de recuperación proporcionada",
"Recovery key successfully enabled" : "Se ha habilitado la recuperación de archivos",
"Could not enable recovery key. Please check your recovery key password!" : "No se pudo habilitar la contraseña de recuperación. Por favor, ¡compruebe su contraseña de recuperación!",
"Recovery key successfully disabled" : "Clave de recuperación deshabilitada",
"Could not disable recovery key. Please check your recovery key password!" : "No se pudo deshabilitar la clave de recuperación. Por favor, ¡compruebe su contraseña!",
"Missing parameters" : "Faltan parámetros",
"Please provide the old recovery password" : "Por favor, ingrese su antigua contraseña de recuperación",
"Please provide a new recovery password" : "Por favor, provea una nueva contraseña de recuperación",
"Please repeat the new recovery password" : "Por favor, repita su nueva contraseña de recuperación",
"Password successfully changed." : "Su contraseña ha sido cambiada",
"Could not change the password. Maybe the old password was not correct." : "No se pudo cambiar la contraseña. Compruebe que la contraseña actual sea correcta.",
"Recovery Key disabled" : "Desactivada la clave de recuperación",
"Recovery Key enabled" : "Recuperación de clave habilitada",
"Could not enable the recovery key, please try again or contact your administrator" : "No se pudo habilitar la clave de recuperación, por favor vuelva a intentarlo o póngase en contacto con su administrador",
"Could not update the private key password." : "No se pudo actualizar la contraseña de la clave privada.",
"The old password was not correct, please try again." : "La antigua contraseña no es correcta, por favor inténtelo de nuevo.",
"The current log-in password was not correct, please try again." : "La contraseña de inicio de sesión actual no es correcta, por favor inténtelo de nuevo.",
"Private key password successfully updated." : "Contraseña de clave privada actualizada con éxito.",
"You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Necesita migrar sus claves de cifrado desde el antiguo modelo de cifrado (ownCloud <= 8.0) al nuevo. Por favor ejecute 'occ encryption:migrate' o contáctese con su administrador.",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "La clave privada no es válida para la app de cifrado. Por favor, actualiza la contraseña de tu clave privada en tus ajustes personales para recuperar el acceso a tus archivos cifrados.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La app de cifrado está habilitada pero sus claves no se han inicializado, por favor, cierre la sesión y vuelva a iniciarla de nuevo.",
"Encryption App is enabled and ready" : "Cifrado App está habilitada y lista",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No fue posible descifrar este archivo, probablemente se trate de un archivo compartido. Solicite al propietario del mismo que vuelva a compartirlo con usted.",
"Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No se puede leer este archivo, probablemente sea un archivo compartido. Consulte con el propietario del mismo y que lo vuelva a compartir con usted.",
"Enable recovery key" : "Activa la clave de recuperación",
"Disable recovery key" : "Desactiva la clave de recuperación",
"The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "La clave de recuperación es una clave de cifrado extra que se usa para cifrar ficheros. Permite la recuperación de los ficheros de un usuario si él o ella olvida su contraseña.",
"Recovery key password" : "Contraseña de clave de recuperación",
"Repeat recovery key password" : "Repita la contraseña de recuperación",
"Change recovery key password:" : "Cambiar la contraseña de la clave de recuperación",
"Old recovery key password" : "Antigua contraseña de recuperación",
"New recovery key password" : "Nueva contraseña de recuperación",
"Repeat new recovery key password" : "Repita la nueva contraseña de recuperación",
"Change Password" : "Cambiar contraseña",
"ownCloud basic encryption module" : "Módulo básico de cifrado ownCloud",
"Your private key password no longer matches your log-in password." : "Su contraseña de clave privada ya no coincide con su contraseña de acceso.",
"Set your old private key password to your current log-in password:" : "Establezca la contraseña de clave privada antigua para su contraseña de inicio de sesión actual:",
" If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerda su antigua contraseña puede pedir a su administrador que le recupere sus ficheros.",
"Old log-in password" : "Contraseña de acceso antigua",
"Current log-in password" : "Contraseña de acceso actual",
"Update Private Key Password" : "Actualizar contraseña de clave privada",
"Enable password recovery:" : "Habilitar la recuperación de contraseña:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Habilitar esta opción le permitirá volver a tener acceso a sus ficheros cifrados en caso de pérdida de contraseña",
"Enabled" : "Habilitar",
"Disabled" : "Deshabilitado"
},
"nplurals=2; plural=(n != 1);");
+50
View File
@@ -0,0 +1,50 @@
{ "translations": {
"Missing recovery key password" : "Falta contraseña de recuperación",
"Please repeat the recovery key password" : "Por favor, repita la contraseña de recuperación",
"Repeated recovery key password does not match the provided recovery key password" : "La contraseña de recuperación reintroducida no coincide con la contraseña de recuperación proporcionada",
"Recovery key successfully enabled" : "Se ha habilitado la recuperación de archivos",
"Could not enable recovery key. Please check your recovery key password!" : "No se pudo habilitar la contraseña de recuperación. Por favor, ¡compruebe su contraseña de recuperación!",
"Recovery key successfully disabled" : "Clave de recuperación deshabilitada",
"Could not disable recovery key. Please check your recovery key password!" : "No se pudo deshabilitar la clave de recuperación. Por favor, ¡compruebe su contraseña!",
"Missing parameters" : "Faltan parámetros",
"Please provide the old recovery password" : "Por favor, ingrese su antigua contraseña de recuperación",
"Please provide a new recovery password" : "Por favor, provea una nueva contraseña de recuperación",
"Please repeat the new recovery password" : "Por favor, repita su nueva contraseña de recuperación",
"Password successfully changed." : "Su contraseña ha sido cambiada",
"Could not change the password. Maybe the old password was not correct." : "No se pudo cambiar la contraseña. Compruebe que la contraseña actual sea correcta.",
"Recovery Key disabled" : "Desactivada la clave de recuperación",
"Recovery Key enabled" : "Recuperación de clave habilitada",
"Could not enable the recovery key, please try again or contact your administrator" : "No se pudo habilitar la clave de recuperación, por favor vuelva a intentarlo o póngase en contacto con su administrador",
"Could not update the private key password." : "No se pudo actualizar la contraseña de la clave privada.",
"The old password was not correct, please try again." : "La antigua contraseña no es correcta, por favor inténtelo de nuevo.",
"The current log-in password was not correct, please try again." : "La contraseña de inicio de sesión actual no es correcta, por favor inténtelo de nuevo.",
"Private key password successfully updated." : "Contraseña de clave privada actualizada con éxito.",
"You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Necesita migrar sus claves de cifrado desde el antiguo modelo de cifrado (ownCloud <= 8.0) al nuevo. Por favor ejecute 'occ encryption:migrate' o contáctese con su administrador.",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "La clave privada no es válida para la app de cifrado. Por favor, actualiza la contraseña de tu clave privada en tus ajustes personales para recuperar el acceso a tus archivos cifrados.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La app de cifrado está habilitada pero sus claves no se han inicializado, por favor, cierre la sesión y vuelva a iniciarla de nuevo.",
"Encryption App is enabled and ready" : "Cifrado App está habilitada y lista",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No fue posible descifrar este archivo, probablemente se trate de un archivo compartido. Solicite al propietario del mismo que vuelva a compartirlo con usted.",
"Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No se puede leer este archivo, probablemente sea un archivo compartido. Consulte con el propietario del mismo y que lo vuelva a compartir con usted.",
"Enable recovery key" : "Activa la clave de recuperación",
"Disable recovery key" : "Desactiva la clave de recuperación",
"The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "La clave de recuperación es una clave de cifrado extra que se usa para cifrar ficheros. Permite la recuperación de los ficheros de un usuario si él o ella olvida su contraseña.",
"Recovery key password" : "Contraseña de clave de recuperación",
"Repeat recovery key password" : "Repita la contraseña de recuperación",
"Change recovery key password:" : "Cambiar la contraseña de la clave de recuperación",
"Old recovery key password" : "Antigua contraseña de recuperación",
"New recovery key password" : "Nueva contraseña de recuperación",
"Repeat new recovery key password" : "Repita la nueva contraseña de recuperación",
"Change Password" : "Cambiar contraseña",
"ownCloud basic encryption module" : "Módulo básico de cifrado ownCloud",
"Your private key password no longer matches your log-in password." : "Su contraseña de clave privada ya no coincide con su contraseña de acceso.",
"Set your old private key password to your current log-in password:" : "Establezca la contraseña de clave privada antigua para su contraseña de inicio de sesión actual:",
" If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerda su antigua contraseña puede pedir a su administrador que le recupere sus ficheros.",
"Old log-in password" : "Contraseña de acceso antigua",
"Current log-in password" : "Contraseña de acceso actual",
"Update Private Key Password" : "Actualizar contraseña de clave privada",
"Enable password recovery:" : "Habilitar la recuperación de contraseña:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Habilitar esta opción le permitirá volver a tener acceso a sus ficheros cifrados en caso de pérdida de contraseña",
"Enabled" : "Habilitar",
"Disabled" : "Deshabilitado"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+26
View File
@@ -0,0 +1,26 @@
OC.L10N.register(
"encryption",
{
"Recovery key successfully enabled" : "Se habilitó la recuperación de archivos",
"Could not enable recovery key. Please check your recovery key password!" : "No se pudo habilitar la clave de recuperación. Por favor, comprobá tu contraseña.",
"Recovery key successfully disabled" : "Clave de recuperación deshabilitada",
"Could not disable recovery key. Please check your recovery key password!" : "No fue posible deshabilitar la clave de recuperación. Por favor, comprobá tu contraseña.",
"Password successfully changed." : "Tu contraseña fue cambiada",
"Could not change the password. Maybe the old password was not correct." : "No se pudo cambiar la contraseña. Comprobá que la contraseña actual sea correcta.",
"Private key password successfully updated." : "Contraseña de clave privada actualizada con éxito.",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Llave privada inválida para la aplicación de encriptación. Por favor actualice la clave de la llave privada en las configuraciones personales para recobrar el acceso a sus archivos encriptados.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encriptación está habilitada pero las llaves no fueron inicializadas, por favor termine y vuelva a iniciar la sesión",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No se puede descibrar este archivo, probablemente sea un archivo compartido. Por favor pídele al dueño que recomparta el archivo contigo.",
"Recovery key password" : "Contraseña de recuperación de clave",
"Change recovery key password:" : "Cambiar contraseña para recuperar la clave:",
"Change Password" : "Cambiar contraseña",
" If you don't remember your old password you can ask your administrator to recover your files." : "Si no te acordás de tu contraseña antigua, pedile al administrador que recupere tus archivos",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar contraseña de la clave privada",
"Enable password recovery:" : "Habilitar recuperación de contraseña:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Habilitando esta opción, vas a tener acceso a tus archivos encriptados, incluso si perdés la contraseña",
"Enabled" : "Habilitado",
"Disabled" : "Deshabilitado"
},
"nplurals=2; plural=(n != 1);");
+24
View File
@@ -0,0 +1,24 @@
{ "translations": {
"Recovery key successfully enabled" : "Se habilitó la recuperación de archivos",
"Could not enable recovery key. Please check your recovery key password!" : "No se pudo habilitar la clave de recuperación. Por favor, comprobá tu contraseña.",
"Recovery key successfully disabled" : "Clave de recuperación deshabilitada",
"Could not disable recovery key. Please check your recovery key password!" : "No fue posible deshabilitar la clave de recuperación. Por favor, comprobá tu contraseña.",
"Password successfully changed." : "Tu contraseña fue cambiada",
"Could not change the password. Maybe the old password was not correct." : "No se pudo cambiar la contraseña. Comprobá que la contraseña actual sea correcta.",
"Private key password successfully updated." : "Contraseña de clave privada actualizada con éxito.",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Llave privada inválida para la aplicación de encriptación. Por favor actualice la clave de la llave privada en las configuraciones personales para recobrar el acceso a sus archivos encriptados.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encriptación está habilitada pero las llaves no fueron inicializadas, por favor termine y vuelva a iniciar la sesión",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No se puede descibrar este archivo, probablemente sea un archivo compartido. Por favor pídele al dueño que recomparta el archivo contigo.",
"Recovery key password" : "Contraseña de recuperación de clave",
"Change recovery key password:" : "Cambiar contraseña para recuperar la clave:",
"Change Password" : "Cambiar contraseña",
" If you don't remember your old password you can ask your administrator to recover your files." : "Si no te acordás de tu contraseña antigua, pedile al administrador que recupere tus archivos",
"Old log-in password" : "Contraseña anterior",
"Current log-in password" : "Contraseña actual",
"Update Private Key Password" : "Actualizar contraseña de la clave privada",
"Enable password recovery:" : "Habilitar recuperación de contraseña:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Habilitando esta opción, vas a tener acceso a tus archivos encriptados, incluso si perdés la contraseña",
"Enabled" : "Habilitado",
"Disabled" : "Deshabilitado"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
@@ -1,37 +1,26 @@
OC.L10N.register(
"files_encryption",
"encryption",
{
"Unknown error" : "Error desconocido",
"Recovery key successfully enabled" : "Se ha habilitado la recuperación de archivos",
"Could not disable recovery key. Please check your recovery key password!" : "No se pudo deshabilitar la clave de recuperación. Por favor compruebe su contraseña!",
"Could not enable recovery key. Please check your recovery key password!" : "No se pudo habilitar la clave de recuperación. Por favor compruebe su contraseña.",
"Recovery key successfully disabled" : "Clave de recuperación deshabilitada",
"Could not disable recovery key. Please check your recovery key password!" : "No se pudo deshabilitar la clave de recuperación. Por favor compruebe su contraseña!",
"Password successfully changed." : "Su contraseña ha sido cambiada",
"Could not change the password. Maybe the old password was not correct." : "No se pudo cambiar la contraseña. Compruebe que la contraseña actual sea correcta.",
"Private key password successfully updated." : "Contraseña de clave privada actualizada con éxito.",
"File recovery settings updated" : "Opciones de recuperación de archivos actualizada",
"Could not update file recovery" : "No se pudo actualizar la recuperación de archivos",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "¡La aplicación de cifrado no ha sido inicializada! Quizá fue restablecida durante tu sesión. Por favor intenta cerrar la sesión y volver a iniciarla para inicializar la aplicación de cifrado.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "¡Su clave privada no es válida! Tal vez su contraseña ha sido cambiada desde fuera. de %s (Ej:Su directorio corporativo). Puede actualizar la contraseña de su clave privada en sus opciones personales para recuperar el acceso a sus archivos.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No fue posible descifrar este archivo, probablemente se trate de un archivo compartido. Solicite al propietario del mismo que vuelva a compartirlo con usted.",
"Initial encryption started... This can take some time. Please wait." : "Encriptación iniciada... Esto puede tomar un tiempo. Por favor espere.",
"Missing requirements." : "Requisitos incompletos.",
"Following users are not set up for encryption:" : "Los siguientes usuarios no han sido configurados para el cifrado:",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "La clave privada no es válida para la aplicación de cifrado. Por favor, actualiza la contraseña de tu clave privada en tus ajustes personales para recuperar el acceso a tus archivos cifrados.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de crifrado está habilitada pero tus claves no han sido inicializadas, por favor, cierra la sesión y vuelva a iniciarla de nuevo.",
"Enable recovery key (allow to recover users files in case of password loss):" : "Habilitar la clave de recuperación (permite recuperar los archivos del usuario en caso de pérdida de la contraseña);",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No fue posible descifrar este archivo, probablemente se trate de un archivo compartido. Solicite al propietario del mismo que vuelva a compartirlo con usted.",
"Recovery key password" : "Contraseña de clave de recuperación",
"Repeat Recovery key password" : "Repite la contraseña de clave de recuperación",
"Enabled" : "Habilitar",
"Disabled" : "Deshabilitado",
"Change recovery key password:" : "Cambiar la contraseña de la clave de recuperación",
"Old Recovery key password" : "Antigua clave de recuperación",
"New Recovery key password" : "Nueva clave de recuperación",
"Repeat New Recovery key password" : "Repetir la nueva clave de recuperación",
"Change Password" : "Cambiar contraseña",
" If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerda su antigua contraseña puede pedir a su administrador que le recupere sus archivos.",
"Old log-in password" : "Contraseña de acceso antigua",
"Current log-in password" : "Contraseña de acceso actual",
"Update Private Key Password" : "Actualizar Contraseña de Clave Privada",
"Enable password recovery:" : "Habilitar la recuperación de contraseña:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Habilitar esta opción le permitirá volver a tener acceso a sus archivos cifrados en caso de pérdida de contraseña"
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Habilitar esta opción le permitirá volver a tener acceso a sus archivos cifrados en caso de pérdida de contraseña",
"Enabled" : "Habilitar",
"Disabled" : "Deshabilitado"
},
"nplurals=2; plural=(n != 1);");
@@ -1,35 +1,24 @@
{ "translations": {
"Unknown error" : "Error desconocido",
"Recovery key successfully enabled" : "Se ha habilitado la recuperación de archivos",
"Could not disable recovery key. Please check your recovery key password!" : "No se pudo deshabilitar la clave de recuperación. Por favor compruebe su contraseña!",
"Could not enable recovery key. Please check your recovery key password!" : "No se pudo habilitar la clave de recuperación. Por favor compruebe su contraseña.",
"Recovery key successfully disabled" : "Clave de recuperación deshabilitada",
"Could not disable recovery key. Please check your recovery key password!" : "No se pudo deshabilitar la clave de recuperación. Por favor compruebe su contraseña!",
"Password successfully changed." : "Su contraseña ha sido cambiada",
"Could not change the password. Maybe the old password was not correct." : "No se pudo cambiar la contraseña. Compruebe que la contraseña actual sea correcta.",
"Private key password successfully updated." : "Contraseña de clave privada actualizada con éxito.",
"File recovery settings updated" : "Opciones de recuperación de archivos actualizada",
"Could not update file recovery" : "No se pudo actualizar la recuperación de archivos",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "¡La aplicación de cifrado no ha sido inicializada! Quizá fue restablecida durante tu sesión. Por favor intenta cerrar la sesión y volver a iniciarla para inicializar la aplicación de cifrado.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "¡Su clave privada no es válida! Tal vez su contraseña ha sido cambiada desde fuera. de %s (Ej:Su directorio corporativo). Puede actualizar la contraseña de su clave privada en sus opciones personales para recuperar el acceso a sus archivos.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No fue posible descifrar este archivo, probablemente se trate de un archivo compartido. Solicite al propietario del mismo que vuelva a compartirlo con usted.",
"Initial encryption started... This can take some time. Please wait." : "Encriptación iniciada... Esto puede tomar un tiempo. Por favor espere.",
"Missing requirements." : "Requisitos incompletos.",
"Following users are not set up for encryption:" : "Los siguientes usuarios no han sido configurados para el cifrado:",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "La clave privada no es válida para la aplicación de cifrado. Por favor, actualiza la contraseña de tu clave privada en tus ajustes personales para recuperar el acceso a tus archivos cifrados.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de crifrado está habilitada pero tus claves no han sido inicializadas, por favor, cierra la sesión y vuelva a iniciarla de nuevo.",
"Enable recovery key (allow to recover users files in case of password loss):" : "Habilitar la clave de recuperación (permite recuperar los archivos del usuario en caso de pérdida de la contraseña);",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No fue posible descifrar este archivo, probablemente se trate de un archivo compartido. Solicite al propietario del mismo que vuelva a compartirlo con usted.",
"Recovery key password" : "Contraseña de clave de recuperación",
"Repeat Recovery key password" : "Repite la contraseña de clave de recuperación",
"Enabled" : "Habilitar",
"Disabled" : "Deshabilitado",
"Change recovery key password:" : "Cambiar la contraseña de la clave de recuperación",
"Old Recovery key password" : "Antigua clave de recuperación",
"New Recovery key password" : "Nueva clave de recuperación",
"Repeat New Recovery key password" : "Repetir la nueva clave de recuperación",
"Change Password" : "Cambiar contraseña",
" If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerda su antigua contraseña puede pedir a su administrador que le recupere sus archivos.",
"Old log-in password" : "Contraseña de acceso antigua",
"Current log-in password" : "Contraseña de acceso actual",
"Update Private Key Password" : "Actualizar Contraseña de Clave Privada",
"Enable password recovery:" : "Habilitar la recuperación de contraseña:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Habilitar esta opción le permitirá volver a tener acceso a sus archivos cifrados en caso de pérdida de contraseña"
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Habilitar esta opción le permitirá volver a tener acceso a sus archivos cifrados en caso de pérdida de contraseña",
"Enabled" : "Habilitar",
"Disabled" : "Deshabilitado"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
@@ -1,13 +1,14 @@
OC.L10N.register(
"files_encryption",
"encryption",
{
"Unknown error" : "Tundmatu viga",
"Missing recovery key password" : "Muuda taastevõtme parool",
"Please repeat the recovery key password" : "Palun korda uut taastevõtme parooli",
"Repeated recovery key password does not match the provided recovery key password" : "Lahtritesse sisestatud taastevõtme paroolid ei kattu",
"Recovery key successfully enabled" : "Taastevõtme lubamine õnnestus",
"Could not disable recovery key. Please check your recovery key password!" : "Ei suuda keelata taastevõtit. Palun kontrolli oma taastevõtme parooli!",
"Could not enable recovery key. Please check your recovery key password!" : "Ei suutnud lubada taastevõtit. Palun kontrolli oma taastevõtme parooli!",
"Recovery key successfully disabled" : "Taastevõtme keelamine õnnestus",
"Could not disable recovery key. Please check your recovery key password!" : "Ei suuda keelata taastevõtit. Palun kontrolli oma taastevõtme parooli!",
"Missing parameters" : "Paramttrid puuduvad",
"Please provide the old recovery password" : "Palun sisesta vana taastevõtme parool",
"Please provide a new recovery password" : "Palun sisesta uus taastevõtme parool",
"Please repeat the new recovery password" : "Palun korda uut taastevõtme parooli",
@@ -17,27 +18,11 @@ OC.L10N.register(
"The old password was not correct, please try again." : "Vana parool polnud õige, palun proovi uuesti.",
"The current log-in password was not correct, please try again." : "Praeguse sisselogimise parool polnud õige, palun proovi uuesti.",
"Private key password successfully updated." : "Privaatse võtme parool edukalt uuendatud.",
"File recovery settings updated" : "Faili taaste seaded uuendatud",
"Could not update file recovery" : "Ei suuda uuendada taastefaili",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Krüpteerimise rakend pole käivitatud. Võib-olla krüpteerimise rakend taaskäivitati sinu sessiooni kestel. Palun proovi logida välja ning uuesti sisse käivitamaks krüpteerimise rakendit.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Sinu provaatne võti pole kehtiv! Tõenäoliselt mudueti parooli väljaspool kausta %s (nt. sinu ettevõtte kaust). Sa saad uuendada oma privaatse võtme parooli oma isiklikes seadetes, et taastada ligipääs sinu krüpteeritud failidele.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Sa ei saa seda faili dekrüpteerida, see on tõenäoliselt jagatud fail. Palun lase omanikul seda faili sinuga uuesti jagada.",
"Unknown error. Please check your system settings or contact your administrator" : "Tundmatu viga. Palun võta ühendust oma administraatoriga.",
"Initial encryption started... This can take some time. Please wait." : "Algne krüpteerimine käivitati... See võib võtta natuke aega. Palun oota.",
"Initial encryption running... Please try again later." : "Toimub esmane krüpteerimine... Palun proovi hiljem uuesti.",
"Missing requirements." : "Nõutavad on puudu.",
"Following users are not set up for encryption:" : "Järgmised kasutajad pole seadistatud krüpteeringuks:",
"Go directly to your %spersonal settings%s." : "Liigi otse oma %s isiklike seadete %s juurde.",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Vigane Krüpteerimisrakendi privaatvõti . Palun uuenda oma privaatse võtme parool oma personaasete seadete all taastamaks ligipääsu oma krüpteeritud failidele.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krüpteerimisrakend on lubatud, kuid võtmeid pole lähtestatud. Palun logi välja ning uuesti sisse.",
"Enable recovery key (allow to recover users files in case of password loss):" : "Luba taastevõti (võimalda kasutaja failide taastamine parooli kaotuse puhul):",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Sa ei saa seda faili dekrüpteerida, see on tõenäoliselt jagatud fail. Palun lase omanikul seda faili sinuga uuesti jagada.",
"Recovery key password" : "Taastevõtme parool",
"Repeat Recovery key password" : "Korda taastevõtme parooli",
"Enabled" : "Sisse lülitatud",
"Disabled" : "Väljalülitatud",
"Change recovery key password:" : "Muuda taastevõtme parooli:",
"Old Recovery key password" : "Vana taastevõtme parool",
"New Recovery key password" : "Uus taastevõtme parool",
"Repeat New Recovery key password" : "Korda uut taastevõtme parooli",
"Change Password" : "Muuda parooli",
"Your private key password no longer matches your log-in password." : "Sinu provaatvõtme parool ei kattu enam sinu sisselogimise parooliga.",
"Set your old private key password to your current log-in password:" : "Pane oma vana privaatvõtme parooliks oma praegune sisselogimise parool.",
@@ -46,6 +31,8 @@ OC.L10N.register(
"Current log-in password" : "Praegune sisselogimise parool",
"Update Private Key Password" : "Uuenda privaatse võtme parooli",
"Enable password recovery:" : "Luba parooli taaste:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Valiku lubamine võimaldab taastada ligipääsu krüpteeritud failidele kui parooli kaotuse puhul"
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Valiku lubamine võimaldab taastada ligipääsu krüpteeritud failidele kui parooli kaotuse puhul",
"Enabled" : "Sisse lülitatud",
"Disabled" : "Väljalülitatud"
},
"nplurals=2; plural=(n != 1);");
@@ -1,11 +1,12 @@
{ "translations": {
"Unknown error" : "Tundmatu viga",
"Missing recovery key password" : "Muuda taastevõtme parool",
"Please repeat the recovery key password" : "Palun korda uut taastevõtme parooli",
"Repeated recovery key password does not match the provided recovery key password" : "Lahtritesse sisestatud taastevõtme paroolid ei kattu",
"Recovery key successfully enabled" : "Taastevõtme lubamine õnnestus",
"Could not disable recovery key. Please check your recovery key password!" : "Ei suuda keelata taastevõtit. Palun kontrolli oma taastevõtme parooli!",
"Could not enable recovery key. Please check your recovery key password!" : "Ei suutnud lubada taastevõtit. Palun kontrolli oma taastevõtme parooli!",
"Recovery key successfully disabled" : "Taastevõtme keelamine õnnestus",
"Could not disable recovery key. Please check your recovery key password!" : "Ei suuda keelata taastevõtit. Palun kontrolli oma taastevõtme parooli!",
"Missing parameters" : "Paramttrid puuduvad",
"Please provide the old recovery password" : "Palun sisesta vana taastevõtme parool",
"Please provide a new recovery password" : "Palun sisesta uus taastevõtme parool",
"Please repeat the new recovery password" : "Palun korda uut taastevõtme parooli",
@@ -15,27 +16,11 @@
"The old password was not correct, please try again." : "Vana parool polnud õige, palun proovi uuesti.",
"The current log-in password was not correct, please try again." : "Praeguse sisselogimise parool polnud õige, palun proovi uuesti.",
"Private key password successfully updated." : "Privaatse võtme parool edukalt uuendatud.",
"File recovery settings updated" : "Faili taaste seaded uuendatud",
"Could not update file recovery" : "Ei suuda uuendada taastefaili",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Krüpteerimise rakend pole käivitatud. Võib-olla krüpteerimise rakend taaskäivitati sinu sessiooni kestel. Palun proovi logida välja ning uuesti sisse käivitamaks krüpteerimise rakendit.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Sinu provaatne võti pole kehtiv! Tõenäoliselt mudueti parooli väljaspool kausta %s (nt. sinu ettevõtte kaust). Sa saad uuendada oma privaatse võtme parooli oma isiklikes seadetes, et taastada ligipääs sinu krüpteeritud failidele.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Sa ei saa seda faili dekrüpteerida, see on tõenäoliselt jagatud fail. Palun lase omanikul seda faili sinuga uuesti jagada.",
"Unknown error. Please check your system settings or contact your administrator" : "Tundmatu viga. Palun võta ühendust oma administraatoriga.",
"Initial encryption started... This can take some time. Please wait." : "Algne krüpteerimine käivitati... See võib võtta natuke aega. Palun oota.",
"Initial encryption running... Please try again later." : "Toimub esmane krüpteerimine... Palun proovi hiljem uuesti.",
"Missing requirements." : "Nõutavad on puudu.",
"Following users are not set up for encryption:" : "Järgmised kasutajad pole seadistatud krüpteeringuks:",
"Go directly to your %spersonal settings%s." : "Liigi otse oma %s isiklike seadete %s juurde.",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Vigane Krüpteerimisrakendi privaatvõti . Palun uuenda oma privaatse võtme parool oma personaasete seadete all taastamaks ligipääsu oma krüpteeritud failidele.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krüpteerimisrakend on lubatud, kuid võtmeid pole lähtestatud. Palun logi välja ning uuesti sisse.",
"Enable recovery key (allow to recover users files in case of password loss):" : "Luba taastevõti (võimalda kasutaja failide taastamine parooli kaotuse puhul):",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Sa ei saa seda faili dekrüpteerida, see on tõenäoliselt jagatud fail. Palun lase omanikul seda faili sinuga uuesti jagada.",
"Recovery key password" : "Taastevõtme parool",
"Repeat Recovery key password" : "Korda taastevõtme parooli",
"Enabled" : "Sisse lülitatud",
"Disabled" : "Väljalülitatud",
"Change recovery key password:" : "Muuda taastevõtme parooli:",
"Old Recovery key password" : "Vana taastevõtme parool",
"New Recovery key password" : "Uus taastevõtme parool",
"Repeat New Recovery key password" : "Korda uut taastevõtme parooli",
"Change Password" : "Muuda parooli",
"Your private key password no longer matches your log-in password." : "Sinu provaatvõtme parool ei kattu enam sinu sisselogimise parooliga.",
"Set your old private key password to your current log-in password:" : "Pane oma vana privaatvõtme parooliks oma praegune sisselogimise parool.",
@@ -44,6 +29,8 @@
"Current log-in password" : "Praegune sisselogimise parool",
"Update Private Key Password" : "Uuenda privaatse võtme parooli",
"Enable password recovery:" : "Luba parooli taaste:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Valiku lubamine võimaldab taastada ligipääsu krüpteeritud failidele kui parooli kaotuse puhul"
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Valiku lubamine võimaldab taastada ligipääsu krüpteeritud failidele kui parooli kaotuse puhul",
"Enabled" : "Sisse lülitatud",
"Disabled" : "Väljalülitatud"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
@@ -1,13 +1,13 @@
OC.L10N.register(
"files_encryption",
"encryption",
{
"Unknown error" : "Errore ezezaguna",
"Missing recovery key password" : "Berreskurapen gakoaren pasahitza falta da",
"Please repeat the recovery key password" : "Mesedez errepikatu berreskuratze gakoaren pasahitza",
"Repeated recovery key password does not match the provided recovery key password" : "Errepikatutako berreskuratze gakoaren pasahitza ez dator bat berreskuratze gakoaren pasahitzarekin",
"Recovery key successfully enabled" : "Berreskuratze gakoa behar bezala gaitua",
"Could not disable recovery key. Please check your recovery key password!" : "Ezin da berreskuratze gako desgaitu. Egiaztatu berreskuratze gako pasahitza!",
"Could not enable recovery key. Please check your recovery key password!" : "Ezin da berreskuratze gako gaitu. Egiaztatu berreskuratze gako pasahitza!",
"Recovery key successfully disabled" : "Berreskuratze gakoa behar bezala desgaitu da",
"Could not disable recovery key. Please check your recovery key password!" : "Ezin da berreskuratze gako desgaitu. Egiaztatu berreskuratze gako pasahitza!",
"Please provide the old recovery password" : "Mesedez sartu berreskuratze pasahitz zaharra",
"Please provide a new recovery password" : "Mesedez sartu berreskuratze pasahitz berria",
"Please repeat the new recovery password" : "Mesedez errepikatu berreskuratze pasahitz berria",
@@ -17,29 +17,11 @@ OC.L10N.register(
"The old password was not correct, please try again." : "Pasahitz zaharra ez da egokia. Mesedez, saiatu berriro.",
"The current log-in password was not correct, please try again." : "Oraingo pasahitza ez da egokia. Mesedez, saiatu berriro.",
"Private key password successfully updated." : "Gako pasahitz pribatu behar bezala eguneratu da.",
"File recovery settings updated" : "Fitxategi berreskuratze ezarpenak eguneratuak",
"Could not update file recovery" : "Ezin da fitxategi berreskuratzea eguneratu",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Enkriptazio aplikazioa ez dago hasieratuta! Agian aplikazioa birgaitu egin da zure saioa bitartean. Mesdez atear eta sartu berriz enkriptazio aplikazioa hasierarazteko.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Zure gako pribatua ez da egokia! Seguruaski zure pasahitza %s-tik kanpo aldatu da (adb. zure direktorio korporatiboa). Zure gako pribatuaren pasahitza eguneratu dezakezu zure ezarpen pertsonaletan zure enkriptatutako fitxategiak berreskuratzeko.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Ezin izan da fitxategi hau deszifratu, ziurrenik elkarbanatutako fitxategi bat da. Mesdez, eskatu fitxategiaren jabeari fitxategia zurekin berriz elkarbana dezan.",
"Unknown error. Please check your system settings or contact your administrator" : "Errore ezezaguna. Mesedez, egiaztatu zure sistemaren ezarpenak edo jarri zure administrariarekin kontaktuan.",
"Initial encryption started... This can take some time. Please wait." : "Hasierako enkriptazioa hasi da... Honek denbora har dezake. Mesedez itxaron.",
"Initial encryption running... Please try again later." : "Hasierako enkriptaketa abian... mesedez, saiatu beranduago.",
"Missing requirements." : "Eskakizun batzuk ez dira betetzen.",
"Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Mesedez ziurtatu OpenSSL eta PHP hedapena instaltuta eta ongi konfiguratuta daudela. Oraingoz enkriptazio aplikazioa desgaitua izan da.",
"Following users are not set up for encryption:" : "Hurrengo erabiltzaileak ez daude enktriptatzeko konfiguratutak:",
"Go directly to your %spersonal settings%s." : "Joan zuzenean zure %sezarpen pertsonaletara%s.",
"Server-side Encryption" : "Zerbitzari aldeko enkriptazioa",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Enkriptazio aplikaziorako gako pribatu okerra. Mesedez eguneratu zure gako pribatuaren pasahitza zure ezarpen pertsonaletan zure enkriptatuko fitxategietarako sarrera berreskuratzeko.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Enkriptazio aplikazioa gaituta dago baina zure gakoak ez daude konfiguratuta, mesedez saioa bukatu eta berriro hasi",
"Enable recovery key (allow to recover users files in case of password loss):" : "Gaitu berreskurapen gakoa (erabiltzaileen fitxategiak berreskuratzea ahalbidetzen du pasahitza galtzen badute ere):",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Ezin izan da fitxategi hau deszifratu, ziurrenik elkarbanatutako fitxategi bat da. Mesdez, eskatu fitxategiaren jabeari fitxategia zurekin berriz elkarbana dezan.",
"Recovery key password" : "Berreskuratze gako pasahitza",
"Repeat Recovery key password" : "Errepikatu berreskuratze gakoaren pasahitza",
"Enabled" : "Gaitua",
"Disabled" : "Ez-gaitua",
"Change recovery key password:" : "Aldatu berreskuratze gako pasahitza:",
"Old Recovery key password" : "Berreskuratze gako pasahitz zaharra",
"New Recovery key password" : "Berreskuratze gako pasahitz berria",
"Repeat New Recovery key password" : "Errepikatu berreskuratze gako berriaren pasahitza",
"Change Password" : "Aldatu Pasahitza",
"Your private key password no longer matches your log-in password." : "Zure gako pasahitza pribatua ez da dagoeneko bat etortzen zure sartzeko pasahitzarekin.",
"Set your old private key password to your current log-in password:" : "Ezarri zure gako pasahitz zaharra orain duzun sartzeko pasahitzan:",
@@ -48,6 +30,8 @@ OC.L10N.register(
"Current log-in password" : "Sartzeko oraingo pasahitza",
"Update Private Key Password" : "Eguneratu gako pasahitza pribatua",
"Enable password recovery:" : "Gaitu pasahitzaren berreskuratzea:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Aukera hau gaituz zure enkriptatutako fitxategiak berreskuratu ahal izango dituzu pasahitza galtzekotan"
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Aukera hau gaituz zure enkriptatutako fitxategiak berreskuratu ahal izango dituzu pasahitza galtzekotan",
"Enabled" : "Gaitua",
"Disabled" : "Ez-gaitua"
},
"nplurals=2; plural=(n != 1);");
@@ -1,11 +1,11 @@
{ "translations": {
"Unknown error" : "Errore ezezaguna",
"Missing recovery key password" : "Berreskurapen gakoaren pasahitza falta da",
"Please repeat the recovery key password" : "Mesedez errepikatu berreskuratze gakoaren pasahitza",
"Repeated recovery key password does not match the provided recovery key password" : "Errepikatutako berreskuratze gakoaren pasahitza ez dator bat berreskuratze gakoaren pasahitzarekin",
"Recovery key successfully enabled" : "Berreskuratze gakoa behar bezala gaitua",
"Could not disable recovery key. Please check your recovery key password!" : "Ezin da berreskuratze gako desgaitu. Egiaztatu berreskuratze gako pasahitza!",
"Could not enable recovery key. Please check your recovery key password!" : "Ezin da berreskuratze gako gaitu. Egiaztatu berreskuratze gako pasahitza!",
"Recovery key successfully disabled" : "Berreskuratze gakoa behar bezala desgaitu da",
"Could not disable recovery key. Please check your recovery key password!" : "Ezin da berreskuratze gako desgaitu. Egiaztatu berreskuratze gako pasahitza!",
"Please provide the old recovery password" : "Mesedez sartu berreskuratze pasahitz zaharra",
"Please provide a new recovery password" : "Mesedez sartu berreskuratze pasahitz berria",
"Please repeat the new recovery password" : "Mesedez errepikatu berreskuratze pasahitz berria",
@@ -15,29 +15,11 @@
"The old password was not correct, please try again." : "Pasahitz zaharra ez da egokia. Mesedez, saiatu berriro.",
"The current log-in password was not correct, please try again." : "Oraingo pasahitza ez da egokia. Mesedez, saiatu berriro.",
"Private key password successfully updated." : "Gako pasahitz pribatu behar bezala eguneratu da.",
"File recovery settings updated" : "Fitxategi berreskuratze ezarpenak eguneratuak",
"Could not update file recovery" : "Ezin da fitxategi berreskuratzea eguneratu",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Enkriptazio aplikazioa ez dago hasieratuta! Agian aplikazioa birgaitu egin da zure saioa bitartean. Mesdez atear eta sartu berriz enkriptazio aplikazioa hasierarazteko.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Zure gako pribatua ez da egokia! Seguruaski zure pasahitza %s-tik kanpo aldatu da (adb. zure direktorio korporatiboa). Zure gako pribatuaren pasahitza eguneratu dezakezu zure ezarpen pertsonaletan zure enkriptatutako fitxategiak berreskuratzeko.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Ezin izan da fitxategi hau deszifratu, ziurrenik elkarbanatutako fitxategi bat da. Mesdez, eskatu fitxategiaren jabeari fitxategia zurekin berriz elkarbana dezan.",
"Unknown error. Please check your system settings or contact your administrator" : "Errore ezezaguna. Mesedez, egiaztatu zure sistemaren ezarpenak edo jarri zure administrariarekin kontaktuan.",
"Initial encryption started... This can take some time. Please wait." : "Hasierako enkriptazioa hasi da... Honek denbora har dezake. Mesedez itxaron.",
"Initial encryption running... Please try again later." : "Hasierako enkriptaketa abian... mesedez, saiatu beranduago.",
"Missing requirements." : "Eskakizun batzuk ez dira betetzen.",
"Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Mesedez ziurtatu OpenSSL eta PHP hedapena instaltuta eta ongi konfiguratuta daudela. Oraingoz enkriptazio aplikazioa desgaitua izan da.",
"Following users are not set up for encryption:" : "Hurrengo erabiltzaileak ez daude enktriptatzeko konfiguratutak:",
"Go directly to your %spersonal settings%s." : "Joan zuzenean zure %sezarpen pertsonaletara%s.",
"Server-side Encryption" : "Zerbitzari aldeko enkriptazioa",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Enkriptazio aplikaziorako gako pribatu okerra. Mesedez eguneratu zure gako pribatuaren pasahitza zure ezarpen pertsonaletan zure enkriptatuko fitxategietarako sarrera berreskuratzeko.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Enkriptazio aplikazioa gaituta dago baina zure gakoak ez daude konfiguratuta, mesedez saioa bukatu eta berriro hasi",
"Enable recovery key (allow to recover users files in case of password loss):" : "Gaitu berreskurapen gakoa (erabiltzaileen fitxategiak berreskuratzea ahalbidetzen du pasahitza galtzen badute ere):",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Ezin izan da fitxategi hau deszifratu, ziurrenik elkarbanatutako fitxategi bat da. Mesdez, eskatu fitxategiaren jabeari fitxategia zurekin berriz elkarbana dezan.",
"Recovery key password" : "Berreskuratze gako pasahitza",
"Repeat Recovery key password" : "Errepikatu berreskuratze gakoaren pasahitza",
"Enabled" : "Gaitua",
"Disabled" : "Ez-gaitua",
"Change recovery key password:" : "Aldatu berreskuratze gako pasahitza:",
"Old Recovery key password" : "Berreskuratze gako pasahitz zaharra",
"New Recovery key password" : "Berreskuratze gako pasahitz berria",
"Repeat New Recovery key password" : "Errepikatu berreskuratze gako berriaren pasahitza",
"Change Password" : "Aldatu Pasahitza",
"Your private key password no longer matches your log-in password." : "Zure gako pasahitza pribatua ez da dagoeneko bat etortzen zure sartzeko pasahitzarekin.",
"Set your old private key password to your current log-in password:" : "Ezarri zure gako pasahitz zaharra orain duzun sartzeko pasahitzan:",
@@ -46,6 +28,8 @@
"Current log-in password" : "Sartzeko oraingo pasahitza",
"Update Private Key Password" : "Eguneratu gako pasahitza pribatua",
"Enable password recovery:" : "Gaitu pasahitzaren berreskuratzea:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Aukera hau gaituz zure enkriptatutako fitxategiak berreskuratu ahal izango dituzu pasahitza galtzekotan"
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Aukera hau gaituz zure enkriptatutako fitxategiak berreskuratu ahal izango dituzu pasahitza galtzekotan",
"Enabled" : "Gaitua",
"Disabled" : "Ez-gaitua"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
@@ -1,30 +1,23 @@
OC.L10N.register(
"files_encryption",
"encryption",
{
"Unknown error" : "خطای نامشخص",
"Recovery key successfully enabled" : "کلید بازیابی با موفقیت فعال شده است.",
"Could not disable recovery key. Please check your recovery key password!" : "کلید بازیابی را نمی تواند غیرفعال نماید. لطفا رمزعبور کلید بازیابی خود را بررسی کنید!",
"Could not enable recovery key. Please check your recovery key password!" : "کلید بازیابی نمی تواند فعال شود. لطفا رمزعبور کلید بازیابی خود را بررسی نمایید!",
"Recovery key successfully disabled" : "کلید بازیابی با موفقیت غیر فعال شده است.",
"Could not disable recovery key. Please check your recovery key password!" : "کلید بازیابی را نمی تواند غیرفعال نماید. لطفا رمزعبور کلید بازیابی خود را بررسی کنید!",
"Password successfully changed." : "رمزعبور با موفقیت تغییر یافت.",
"Could not change the password. Maybe the old password was not correct." : "رمزعبور را نمیتواند تغییر دهد. شاید رمزعبورقدیمی صحیح نمی باشد.",
"Private key password successfully updated." : "رمزعبور کلید خصوصی با موفقیت به روز شد.",
"File recovery settings updated" : "تنظیمات بازیابی فایل به روز شده است.",
"Could not update file recovery" : "به روز رسانی بازیابی فایل را نمی تواند انجام دهد.",
"Missing requirements." : "نیازمندی های گمشده",
"Following users are not set up for encryption:" : "کاربران زیر برای رمزنگاری تنظیم نشده اند",
"Enable recovery key (allow to recover users files in case of password loss):" : "فعال کردن کلید بازیابی(اجازه بازیابی فایل های کاربران در صورت از دست دادن رمزعبور):",
"Recovery key password" : "رمزعبور کلید بازیابی",
"Enabled" : "فعال شده",
"Disabled" : "غیرفعال شده",
"Change recovery key password:" : "تغییر رمزعبور کلید بازیابی:",
"Old Recovery key password" : "رمزعبور قدیمی کلید بازیابی ",
"New Recovery key password" : "رمزعبور جدید کلید بازیابی",
"Change Password" : "تغییر رمزعبور",
" If you don't remember your old password you can ask your administrator to recover your files." : "اگر رمزعبور قدیمی را فراموش کرده اید میتوانید از مدیر خود برای بازیابی فایل هایتان درخواست نمایید.",
"Old log-in password" : "رمزعبور قدیمی",
"Current log-in password" : "رمزعبور فعلی",
"Update Private Key Password" : "به روز رسانی رمزعبور کلید خصوصی",
"Enable password recovery:" : "فعال سازی بازیابی رمزعبور:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "فعال کردن این گزینه به شما اجازه خواهد داد در صورت از دست دادن رمزعبور به فایل های رمزگذاری شده خود دسترسی داشته باشید."
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "فعال کردن این گزینه به شما اجازه خواهد داد در صورت از دست دادن رمزعبور به فایل های رمزگذاری شده خود دسترسی داشته باشید.",
"Enabled" : "فعال شده",
"Disabled" : "غیرفعال شده"
},
"nplurals=1; plural=0;");
@@ -1,28 +1,21 @@
{ "translations": {
"Unknown error" : "خطای نامشخص",
"Recovery key successfully enabled" : "کلید بازیابی با موفقیت فعال شده است.",
"Could not disable recovery key. Please check your recovery key password!" : "کلید بازیابی را نمی تواند غیرفعال نماید. لطفا رمزعبور کلید بازیابی خود را بررسی کنید!",
"Could not enable recovery key. Please check your recovery key password!" : "کلید بازیابی نمی تواند فعال شود. لطفا رمزعبور کلید بازیابی خود را بررسی نمایید!",
"Recovery key successfully disabled" : "کلید بازیابی با موفقیت غیر فعال شده است.",
"Could not disable recovery key. Please check your recovery key password!" : "کلید بازیابی را نمی تواند غیرفعال نماید. لطفا رمزعبور کلید بازیابی خود را بررسی کنید!",
"Password successfully changed." : "رمزعبور با موفقیت تغییر یافت.",
"Could not change the password. Maybe the old password was not correct." : "رمزعبور را نمیتواند تغییر دهد. شاید رمزعبورقدیمی صحیح نمی باشد.",
"Private key password successfully updated." : "رمزعبور کلید خصوصی با موفقیت به روز شد.",
"File recovery settings updated" : "تنظیمات بازیابی فایل به روز شده است.",
"Could not update file recovery" : "به روز رسانی بازیابی فایل را نمی تواند انجام دهد.",
"Missing requirements." : "نیازمندی های گمشده",
"Following users are not set up for encryption:" : "کاربران زیر برای رمزنگاری تنظیم نشده اند",
"Enable recovery key (allow to recover users files in case of password loss):" : "فعال کردن کلید بازیابی(اجازه بازیابی فایل های کاربران در صورت از دست دادن رمزعبور):",
"Recovery key password" : "رمزعبور کلید بازیابی",
"Enabled" : "فعال شده",
"Disabled" : "غیرفعال شده",
"Change recovery key password:" : "تغییر رمزعبور کلید بازیابی:",
"Old Recovery key password" : "رمزعبور قدیمی کلید بازیابی ",
"New Recovery key password" : "رمزعبور جدید کلید بازیابی",
"Change Password" : "تغییر رمزعبور",
" If you don't remember your old password you can ask your administrator to recover your files." : "اگر رمزعبور قدیمی را فراموش کرده اید میتوانید از مدیر خود برای بازیابی فایل هایتان درخواست نمایید.",
"Old log-in password" : "رمزعبور قدیمی",
"Current log-in password" : "رمزعبور فعلی",
"Update Private Key Password" : "به روز رسانی رمزعبور کلید خصوصی",
"Enable password recovery:" : "فعال سازی بازیابی رمزعبور:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "فعال کردن این گزینه به شما اجازه خواهد داد در صورت از دست دادن رمزعبور به فایل های رمزگذاری شده خود دسترسی داشته باشید."
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "فعال کردن این گزینه به شما اجازه خواهد داد در صورت از دست دادن رمزعبور به فایل های رمزگذاری شده خود دسترسی داشته باشید.",
"Enabled" : "فعال شده",
"Disabled" : "غیرفعال شده"
},"pluralForm" :"nplurals=1; plural=0;"
}
@@ -1,44 +1,43 @@
OC.L10N.register(
"files_encryption",
"encryption",
{
"Unknown error" : "Tuntematon virhe",
"Missing recovery key password" : "Palautusavaimen salasana puuttuu",
"Please repeat the recovery key password" : "Toista palautusavaimen salasana",
"Repeated recovery key password does not match the provided recovery key password" : "Toistamiseen annettu palautusavaimen salasana ei täsmää annettua palautusavaimen salasanaa",
"Recovery key successfully enabled" : "Palautusavain kytketty päälle onnistuneesti",
"Could not disable recovery key. Please check your recovery key password!" : "Palautusavaimen poistaminen käytöstä ei onnistunut. Tarkista palautusavaimesi salasana!",
"Could not enable recovery key. Please check your recovery key password!" : "Palautusavaimen käyttöönotto epäonnistui. Tarkista palautusavaimesi salasana!",
"Recovery key successfully disabled" : "Palautusavain poistettu onnistuneesti käytöstä",
"Could not disable recovery key. Please check your recovery key password!" : "Palautusavaimen poistaminen käytöstä ei onnistunut. Tarkista palautusavaimesi salasana!",
"Missing parameters" : "Puuttuvat parametrit",
"Please provide the old recovery password" : "Anna vanha palautussalasana",
"Please provide a new recovery password" : "Anna uusi palautussalasana",
"Please repeat the new recovery password" : "Toista uusi palautussalasana",
"Password successfully changed." : "Salasana vaihdettiin onnistuneesti.",
"Could not change the password. Maybe the old password was not correct." : "Salasanan vaihto epäonnistui. Kenties vanha salasana oli väärin.",
"Recovery Key disabled" : "Palautusavain poistettu käytöstä",
"Recovery Key enabled" : "Palautusavain käytössä",
"Could not enable the recovery key, please try again or contact your administrator" : "Palautusavaimen käyttöönotto epäonnistui, yritä myöhemmin uudelleen tai ota yhteys ylläpitäjään",
"Could not update the private key password." : "Yksityisen avaimen salasanaa ei voitu päivittää.",
"The old password was not correct, please try again." : "Vanha salasana oli väärin, yritä uudelleen.",
"The current log-in password was not correct, please try again." : "Nykyinen kirjautumissalasana ei ollut oikein, yritä uudelleen.",
"Private key password successfully updated." : "Yksityisen avaimen salasana päivitetty onnistuneesti.",
"File recovery settings updated" : "Tiedostopalautuksen asetukset päivitetty",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Salaussovellusta ei ole käynnissä! Kenties salaussovellus otettiin uudelleen käyttöön nykyisen istuntosi aikana. Kirjaudu ulos ja takaisin sisään saadaksesi salaussovelluksen käyttöön.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tämän tiedoston salauksen purkaminen ei onnistu. Kyseessä on luultavasti jaettu tiedosto. Pyydä tiedoston omistajaa jakamaan tiedosto kanssasi uudelleen.",
"Unknown error. Please check your system settings or contact your administrator" : "Tuntematon virhe. Tarkista järjestelmän asetukset tai ole yhteydessä ylläpitäjään.",
"Initial encryption started... This can take some time. Please wait." : "Ensimmäinen salauskerta käynnistetty... Tämä saattaa kestää hetken.",
"Initial encryption running... Please try again later." : "Ensimmäinen salauskerta on meneillään... Yritä myöhemmin uudelleen.",
"Missing requirements." : "Puuttuvat vaatimukset.",
"Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Varmista, että OpenSSL ja PHP-laajennus ovat käytössä ja niiden asetukset ovat oikein. Salaussovellus on poistettu toistaiseksi käytöstä.",
"Following users are not set up for encryption:" : "Seuraavat käyttäjät eivät ole määrittäneet salausta:",
"Go directly to your %spersonal settings%s." : "Siirry suoraan %shenkilökohtaisiin asetuksiisi%s.",
"Server-side Encryption" : "Palvelinpuolen salaus",
"The current log-in password was not correct, please try again." : "Nykyinen kirjautumiseen käytettävä salasana oli väärin, yritä uudelleen.",
"Private key password successfully updated." : "Yksityisen avaimen salasana päivitettiin onnistuneesti.",
"You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Salausavaimet tulee siirtää vanhasta salaustavasta (ownCloud <= 8.0) uuteen salaustapaan. Suorita 'occ encryption:migrate' tai ota yhteys ylläpitoon",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Salaussovelluksen salausavain on virheellinen. Ole hyvä ja päivitä salausavain henkilökohtaisissa asetuksissasi jotta voit taas avata salatuskirjoitetut tiedostosi.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Salaussovellus on käytössä, mutta salausavaimia ei ole alustettu. Ole hyvä ja kirjaudu sisään uudelleen.",
"Enable recovery key (allow to recover users files in case of password loss):" : "Käytä palautusavainta (salli käyttäjien tiedostojen palauttaminen, jos heidän salasana unohtuu):",
"Encryption App is enabled and ready" : "Salaussovellus on käytössä ja valmis",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tämän tiedoston salauksen purkaminen ei onnistu. Kyseessä on luultavasti jaettu tiedosto. Pyydä tiedoston omistajaa jakamaan tiedosto kanssasi uudelleen.",
"Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tiedostoa ei voi lukea, se on luultavasti jaettu tiedosto. Pyydä tiedoston omistajaa jakamaan tiedosto uudelleen kanssasi.",
"Enable recovery key" : "Ota palautusavain käyttöön",
"Disable recovery key" : "Poista palautusavain käytöstä",
"The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Palautusavain on ylimääräinen salausavain, jota käytetään tiedostojen salaamiseen. Sen avulla on mahdollista palauttaa käyttäjien tiedostot, vaikka käyttäjä unohtaisi oman salasanansa.",
"Recovery key password" : "Palautusavaimen salasana",
"Repeat Recovery key password" : "Toista palautusavaimen salasana",
"Enabled" : "Käytössä",
"Disabled" : "Ei käytössä",
"Repeat recovery key password" : "Toista salausavaimen salasana",
"Change recovery key password:" : "Vaihda palautusavaimen salasana:",
"Old Recovery key password" : "Vanha palautusavaimen salasana",
"New Recovery key password" : "Uusi palautusavaimen salasana",
"Repeat New Recovery key password" : "Toista uusi palautusavaimen salasana",
"Old recovery key password" : "Vanha salausavaimen salasana",
"New recovery key password" : "Uusi salausavaimen salasana",
"Repeat new recovery key password" : "Toista uusi salausavaimen salasana",
"Change Password" : "Vaihda salasana",
"ownCloud basic encryption module" : "ownCloudin perussalausmoduuli",
"Your private key password no longer matches your log-in password." : "Salaisen avaimesi salasana ei enää vastaa kirjautumissalasanaasi.",
"Set your old private key password to your current log-in password:" : "Aseta yksityisen avaimen vanha salasana vastaamaan nykyistä kirjautumissalasanaasi:",
" If you don't remember your old password you can ask your administrator to recover your files." : "Jos et muista vanhaa salasanaasi, voit pyytää ylläpitäjää palauttamaan tiedostosi.",
@@ -46,6 +45,8 @@ OC.L10N.register(
"Current log-in password" : "Nykyinen kirjautumissalasana",
"Update Private Key Password" : "Päivitä yksityisen avaimen salasana",
"Enable password recovery:" : "Ota salasanan palautus käyttöön:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Tämän valinnan käyttäminen mahdollistaa pääsyn salattuihin tiedostoihisi, jos salasana unohtuu"
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Tämän valinnan käyttäminen mahdollistaa pääsyn salattuihin tiedostoihisi, jos salasana unohtuu",
"Enabled" : "Käytössä",
"Disabled" : "Ei käytössä"
},
"nplurals=2; plural=(n != 1);");
@@ -1,42 +1,41 @@
{ "translations": {
"Unknown error" : "Tuntematon virhe",
"Missing recovery key password" : "Palautusavaimen salasana puuttuu",
"Please repeat the recovery key password" : "Toista palautusavaimen salasana",
"Repeated recovery key password does not match the provided recovery key password" : "Toistamiseen annettu palautusavaimen salasana ei täsmää annettua palautusavaimen salasanaa",
"Recovery key successfully enabled" : "Palautusavain kytketty päälle onnistuneesti",
"Could not disable recovery key. Please check your recovery key password!" : "Palautusavaimen poistaminen käytöstä ei onnistunut. Tarkista palautusavaimesi salasana!",
"Could not enable recovery key. Please check your recovery key password!" : "Palautusavaimen käyttöönotto epäonnistui. Tarkista palautusavaimesi salasana!",
"Recovery key successfully disabled" : "Palautusavain poistettu onnistuneesti käytöstä",
"Could not disable recovery key. Please check your recovery key password!" : "Palautusavaimen poistaminen käytöstä ei onnistunut. Tarkista palautusavaimesi salasana!",
"Missing parameters" : "Puuttuvat parametrit",
"Please provide the old recovery password" : "Anna vanha palautussalasana",
"Please provide a new recovery password" : "Anna uusi palautussalasana",
"Please repeat the new recovery password" : "Toista uusi palautussalasana",
"Password successfully changed." : "Salasana vaihdettiin onnistuneesti.",
"Could not change the password. Maybe the old password was not correct." : "Salasanan vaihto epäonnistui. Kenties vanha salasana oli väärin.",
"Recovery Key disabled" : "Palautusavain poistettu käytöstä",
"Recovery Key enabled" : "Palautusavain käytössä",
"Could not enable the recovery key, please try again or contact your administrator" : "Palautusavaimen käyttöönotto epäonnistui, yritä myöhemmin uudelleen tai ota yhteys ylläpitäjään",
"Could not update the private key password." : "Yksityisen avaimen salasanaa ei voitu päivittää.",
"The old password was not correct, please try again." : "Vanha salasana oli väärin, yritä uudelleen.",
"The current log-in password was not correct, please try again." : "Nykyinen kirjautumissalasana ei ollut oikein, yritä uudelleen.",
"Private key password successfully updated." : "Yksityisen avaimen salasana päivitetty onnistuneesti.",
"File recovery settings updated" : "Tiedostopalautuksen asetukset päivitetty",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Salaussovellusta ei ole käynnissä! Kenties salaussovellus otettiin uudelleen käyttöön nykyisen istuntosi aikana. Kirjaudu ulos ja takaisin sisään saadaksesi salaussovelluksen käyttöön.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tämän tiedoston salauksen purkaminen ei onnistu. Kyseessä on luultavasti jaettu tiedosto. Pyydä tiedoston omistajaa jakamaan tiedosto kanssasi uudelleen.",
"Unknown error. Please check your system settings or contact your administrator" : "Tuntematon virhe. Tarkista järjestelmän asetukset tai ole yhteydessä ylläpitäjään.",
"Initial encryption started... This can take some time. Please wait." : "Ensimmäinen salauskerta käynnistetty... Tämä saattaa kestää hetken.",
"Initial encryption running... Please try again later." : "Ensimmäinen salauskerta on meneillään... Yritä myöhemmin uudelleen.",
"Missing requirements." : "Puuttuvat vaatimukset.",
"Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Varmista, että OpenSSL ja PHP-laajennus ovat käytössä ja niiden asetukset ovat oikein. Salaussovellus on poistettu toistaiseksi käytöstä.",
"Following users are not set up for encryption:" : "Seuraavat käyttäjät eivät ole määrittäneet salausta:",
"Go directly to your %spersonal settings%s." : "Siirry suoraan %shenkilökohtaisiin asetuksiisi%s.",
"Server-side Encryption" : "Palvelinpuolen salaus",
"The current log-in password was not correct, please try again." : "Nykyinen kirjautumiseen käytettävä salasana oli väärin, yritä uudelleen.",
"Private key password successfully updated." : "Yksityisen avaimen salasana päivitettiin onnistuneesti.",
"You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Salausavaimet tulee siirtää vanhasta salaustavasta (ownCloud <= 8.0) uuteen salaustapaan. Suorita 'occ encryption:migrate' tai ota yhteys ylläpitoon",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Salaussovelluksen salausavain on virheellinen. Ole hyvä ja päivitä salausavain henkilökohtaisissa asetuksissasi jotta voit taas avata salatuskirjoitetut tiedostosi.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Salaussovellus on käytössä, mutta salausavaimia ei ole alustettu. Ole hyvä ja kirjaudu sisään uudelleen.",
"Enable recovery key (allow to recover users files in case of password loss):" : "Käytä palautusavainta (salli käyttäjien tiedostojen palauttaminen, jos heidän salasana unohtuu):",
"Encryption App is enabled and ready" : "Salaussovellus on käytössä ja valmis",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tämän tiedoston salauksen purkaminen ei onnistu. Kyseessä on luultavasti jaettu tiedosto. Pyydä tiedoston omistajaa jakamaan tiedosto kanssasi uudelleen.",
"Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tiedostoa ei voi lukea, se on luultavasti jaettu tiedosto. Pyydä tiedoston omistajaa jakamaan tiedosto uudelleen kanssasi.",
"Enable recovery key" : "Ota palautusavain käyttöön",
"Disable recovery key" : "Poista palautusavain käytöstä",
"The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Palautusavain on ylimääräinen salausavain, jota käytetään tiedostojen salaamiseen. Sen avulla on mahdollista palauttaa käyttäjien tiedostot, vaikka käyttäjä unohtaisi oman salasanansa.",
"Recovery key password" : "Palautusavaimen salasana",
"Repeat Recovery key password" : "Toista palautusavaimen salasana",
"Enabled" : "Käytössä",
"Disabled" : "Ei käytössä",
"Repeat recovery key password" : "Toista salausavaimen salasana",
"Change recovery key password:" : "Vaihda palautusavaimen salasana:",
"Old Recovery key password" : "Vanha palautusavaimen salasana",
"New Recovery key password" : "Uusi palautusavaimen salasana",
"Repeat New Recovery key password" : "Toista uusi palautusavaimen salasana",
"Old recovery key password" : "Vanha salausavaimen salasana",
"New recovery key password" : "Uusi salausavaimen salasana",
"Repeat new recovery key password" : "Toista uusi salausavaimen salasana",
"Change Password" : "Vaihda salasana",
"ownCloud basic encryption module" : "ownCloudin perussalausmoduuli",
"Your private key password no longer matches your log-in password." : "Salaisen avaimesi salasana ei enää vastaa kirjautumissalasanaasi.",
"Set your old private key password to your current log-in password:" : "Aseta yksityisen avaimen vanha salasana vastaamaan nykyistä kirjautumissalasanaasi:",
" If you don't remember your old password you can ask your administrator to recover your files." : "Jos et muista vanhaa salasanaasi, voit pyytää ylläpitäjää palauttamaan tiedostosi.",
@@ -44,6 +43,8 @@
"Current log-in password" : "Nykyinen kirjautumissalasana",
"Update Private Key Password" : "Päivitä yksityisen avaimen salasana",
"Enable password recovery:" : "Ota salasanan palautus käyttöön:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Tämän valinnan käyttäminen mahdollistaa pääsyn salattuihin tiedostoihisi, jos salasana unohtuu"
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Tämän valinnan käyttäminen mahdollistaa pääsyn salattuihin tiedostoihisi, jos salasana unohtuu",
"Enabled" : "Käytössä",
"Disabled" : "Ei käytössä"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
@@ -1,46 +1,43 @@
OC.L10N.register(
"files_encryption",
"encryption",
{
"Unknown error" : "Erreur Inconnue ",
"Missing recovery key password" : "Mot de passe de la clef de récupération manquant",
"Please repeat the recovery key password" : "Répétez le mot de passe de la clef de récupération",
"Repeated recovery key password does not match the provided recovery key password" : "Le mot de passe de la clef de récupération et sa répétition ne sont pas identiques.",
"Recovery key successfully enabled" : "Clef de récupération activée avec succès",
"Could not disable recovery key. Please check your recovery key password!" : "Impossible de désactiver la clef de récupération. Veuillez vérifier le mot de passe de votre clef de récupération !",
"Could not enable recovery key. Please check your recovery key password!" : "Impossible d'activer la clef de récupération. Veuillez vérifier le mot de passe de votre clé de récupération !",
"Recovery key successfully disabled" : "Clef de récupération désactivée avec succès",
"Could not disable recovery key. Please check your recovery key password!" : "Impossible de désactiver la clef de récupération. Veuillez vérifier le mot de passe de votre clef de récupération !",
"Missing parameters" : "Paramètres manquants",
"Please provide the old recovery password" : "Veuillez entrer l'ancien mot de passe de récupération",
"Please provide a new recovery password" : "Veuillez entrer un nouveau mot de passe de récupération",
"Please repeat the new recovery password" : "Veuillez répéter le nouveau mot de passe de récupération",
"Password successfully changed." : "Mot de passe changé avec succès.",
"Could not change the password. Maybe the old password was not correct." : "Erreur lors du changement de mot de passe. L'ancien mot de passe est peut-être incorrect.",
"Recovery Key disabled" : "Clé de récupération désactivée",
"Recovery Key enabled" : "Clef de récupération activée",
"Could not enable the recovery key, please try again or contact your administrator" : "Impossible d'activer la clef de récupération. Veuillez essayer à nouveau ou contacter votre administrateur",
"Could not update the private key password." : "Impossible de mettre à jour le mot de passe de la clef privée.",
"The old password was not correct, please try again." : "L'ancien mot de passe est incorrect. Veuillez réessayer.",
"The current log-in password was not correct, please try again." : "Le mot de passe actuel n'est pas correct, veuillez réessayer.",
"The current log-in password was not correct, please try again." : "Le mot de passe de connexion actuel n'est pas correct, veuillez réessayer.",
"Private key password successfully updated." : "Mot de passe de la clef privée mis à jour avec succès.",
"File recovery settings updated" : "Paramètres de récupération de fichiers mis à jour",
"Could not update file recovery" : "Impossible de mettre à jour les fichiers de récupération",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "L'application de chiffrement n'est pas initialisée ! Peut-être que cette application a été réactivée pendant votre session. Veuillez essayer de vous déconnecter et ensuite de vous reconnecter pour initialiser l'application de chiffrement.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Votre clef privée n'est pas valide ! Votre mot de passe a probablement été modifié hors de %s (ex. votre annuaire d'entreprise). Vous pouvez mettre à jour le mot de passe de votre clef privée dans les paramètres personnels pour pouvoir récupérer l'accès à vos fichiers chiffrés.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de déchiffrer ce fichier, il s'agit probablement d'un fichier partagé. Veuillez demander au propriétaire de ce fichier de le repartager avec vous.",
"Unknown error. Please check your system settings or contact your administrator" : "Erreur inconnue. Veuillez vérifier vos paramètres système ou contacter un administrateur.",
"Initial encryption started... This can take some time. Please wait." : "Chiffrement initial démarré... Cela peut prendre un certain temps. Veuillez patienter.",
"Initial encryption running... Please try again later." : "Chiffrement initial en cours... Veuillez ré-essayer ultérieurement.",
"Missing requirements." : "Dépendances manquantes.",
"Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Merci de vous assurer que OpenSSL et son extension PHP sont activés et configurés correctement. Pour l'instant, l'application de chiffrement a été désactivée.",
"Following users are not set up for encryption:" : "Les utilisateurs suivants ne sont pas configurés pour le chiffrement :",
"Go directly to your %spersonal settings%s." : "Aller à %svos paramètres personnels%s.",
"Server-side Encryption" : "Chiffrement côté serveur",
"You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Vous devez migrer vos clés de chiffrement de l'ancienne version (ownCloud <= 8.0) vers la nouvelle. Veuillez exécuter 'occ encryption:migrate' ou contacter votre administrateur",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Votre clef privée de chiffrement n'est pas valide ! Veuillez mettre à jour le mot de passe de la clef privée dans vos paramètres personnels pour récupérer l'accès à vos fichiers chiffrés.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'application de chiffrement est activée mais vos clefs ne sont pas initialisées. Veuillez vous déconnecter et ensuite vous reconnecter.",
"Enable recovery key (allow to recover users files in case of password loss):" : "Activer la clef de récupération (permet de récupérer les fichiers des utilisateurs en cas de perte de mot de passe).",
"Encryption App is enabled and ready" : "L'application de chiffrement est activée et prête",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de déchiffrer ce fichier : il s'agit probablement d'un fichier partagé. Veuillez demander au propriétaire du fichier de le partager à nouveau avec vous.",
"Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de lire ce fichier, il s'agit probablement d'un fichier partagé. Veuillez demander au propriétaire du fichier de le repartager avec vous. ",
"Enable recovery key" : "Activer la clé de récupération",
"Disable recovery key" : "Désactiver la clé de récupération",
"The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "La clé de récupération est une clé supplémentaire utilisée pour chiffrer les fichiers. Elle permet de récupérer les fichiers des utilisateurs s'ils oublient leur mot de passe.",
"Recovery key password" : "Mot de passe de la clef de récupération",
"Repeat Recovery key password" : "Répétez le mot de passe de la clef de récupération",
"Enabled" : "Activé",
"Disabled" : "Désactivé",
"Repeat recovery key password" : "Répétez le mot de passe de la clé de récupération",
"Change recovery key password:" : "Modifier le mot de passe de la clef de récupération :",
"Old Recovery key password" : "Ancien mot de passe de la clef de récupération",
"New Recovery key password" : "Nouveau mot de passe de la clef de récupération",
"Repeat New Recovery key password" : "Répétez le nouveau mot de passe de la clef de récupération",
"Old recovery key password" : "Ancien mot de passe de la clé de récupération",
"New recovery key password" : "Nouveau mot de passe de la clé de récupération",
"Repeat new recovery key password" : "Répétez le nouveau mot de passe de la clé de récupération",
"Change Password" : "Changer de mot de passe",
"ownCloud basic encryption module" : "Module de chiffrement de base d'ownCloud",
"Your private key password no longer matches your log-in password." : "Le mot de passe de votre clef privée ne correspond plus à votre mot de passe de connexion.",
"Set your old private key password to your current log-in password:" : "Faites de votre mot de passe de connexion le mot de passe de votre clef privée :",
" If you don't remember your old password you can ask your administrator to recover your files." : "Si vous ne vous souvenez plus de votre ancien mot de passe, vous pouvez demander à votre administrateur de récupérer vos fichiers.",
@@ -48,6 +45,8 @@ OC.L10N.register(
"Current log-in password" : "Actuel mot de passe de connexion",
"Update Private Key Password" : "Mettre à jour le mot de passe de votre clef privée",
"Enable password recovery:" : "Activer la récupération du mot de passe :",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Activer cette option vous permettra d'obtenir à nouveau l'accès à vos fichiers chiffrés en cas de perte de mot de passe"
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Activer cette option vous permettra d'obtenir à nouveau l'accès à vos fichiers chiffrés en cas de perte de mot de passe",
"Enabled" : "Activé",
"Disabled" : "Désactivé"
},
"nplurals=2; plural=(n > 1);");
@@ -1,44 +1,41 @@
{ "translations": {
"Unknown error" : "Erreur Inconnue ",
"Missing recovery key password" : "Mot de passe de la clef de récupération manquant",
"Please repeat the recovery key password" : "Répétez le mot de passe de la clef de récupération",
"Repeated recovery key password does not match the provided recovery key password" : "Le mot de passe de la clef de récupération et sa répétition ne sont pas identiques.",
"Recovery key successfully enabled" : "Clef de récupération activée avec succès",
"Could not disable recovery key. Please check your recovery key password!" : "Impossible de désactiver la clef de récupération. Veuillez vérifier le mot de passe de votre clef de récupération !",
"Could not enable recovery key. Please check your recovery key password!" : "Impossible d'activer la clef de récupération. Veuillez vérifier le mot de passe de votre clé de récupération !",
"Recovery key successfully disabled" : "Clef de récupération désactivée avec succès",
"Could not disable recovery key. Please check your recovery key password!" : "Impossible de désactiver la clef de récupération. Veuillez vérifier le mot de passe de votre clef de récupération !",
"Missing parameters" : "Paramètres manquants",
"Please provide the old recovery password" : "Veuillez entrer l'ancien mot de passe de récupération",
"Please provide a new recovery password" : "Veuillez entrer un nouveau mot de passe de récupération",
"Please repeat the new recovery password" : "Veuillez répéter le nouveau mot de passe de récupération",
"Password successfully changed." : "Mot de passe changé avec succès.",
"Could not change the password. Maybe the old password was not correct." : "Erreur lors du changement de mot de passe. L'ancien mot de passe est peut-être incorrect.",
"Recovery Key disabled" : "Clé de récupération désactivée",
"Recovery Key enabled" : "Clef de récupération activée",
"Could not enable the recovery key, please try again or contact your administrator" : "Impossible d'activer la clef de récupération. Veuillez essayer à nouveau ou contacter votre administrateur",
"Could not update the private key password." : "Impossible de mettre à jour le mot de passe de la clef privée.",
"The old password was not correct, please try again." : "L'ancien mot de passe est incorrect. Veuillez réessayer.",
"The current log-in password was not correct, please try again." : "Le mot de passe actuel n'est pas correct, veuillez réessayer.",
"The current log-in password was not correct, please try again." : "Le mot de passe de connexion actuel n'est pas correct, veuillez réessayer.",
"Private key password successfully updated." : "Mot de passe de la clef privée mis à jour avec succès.",
"File recovery settings updated" : "Paramètres de récupération de fichiers mis à jour",
"Could not update file recovery" : "Impossible de mettre à jour les fichiers de récupération",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "L'application de chiffrement n'est pas initialisée ! Peut-être que cette application a été réactivée pendant votre session. Veuillez essayer de vous déconnecter et ensuite de vous reconnecter pour initialiser l'application de chiffrement.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Votre clef privée n'est pas valide ! Votre mot de passe a probablement été modifié hors de %s (ex. votre annuaire d'entreprise). Vous pouvez mettre à jour le mot de passe de votre clef privée dans les paramètres personnels pour pouvoir récupérer l'accès à vos fichiers chiffrés.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de déchiffrer ce fichier, il s'agit probablement d'un fichier partagé. Veuillez demander au propriétaire de ce fichier de le repartager avec vous.",
"Unknown error. Please check your system settings or contact your administrator" : "Erreur inconnue. Veuillez vérifier vos paramètres système ou contacter un administrateur.",
"Initial encryption started... This can take some time. Please wait." : "Chiffrement initial démarré... Cela peut prendre un certain temps. Veuillez patienter.",
"Initial encryption running... Please try again later." : "Chiffrement initial en cours... Veuillez ré-essayer ultérieurement.",
"Missing requirements." : "Dépendances manquantes.",
"Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Merci de vous assurer que OpenSSL et son extension PHP sont activés et configurés correctement. Pour l'instant, l'application de chiffrement a été désactivée.",
"Following users are not set up for encryption:" : "Les utilisateurs suivants ne sont pas configurés pour le chiffrement :",
"Go directly to your %spersonal settings%s." : "Aller à %svos paramètres personnels%s.",
"Server-side Encryption" : "Chiffrement côté serveur",
"You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Vous devez migrer vos clés de chiffrement de l'ancienne version (ownCloud <= 8.0) vers la nouvelle. Veuillez exécuter 'occ encryption:migrate' ou contacter votre administrateur",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Votre clef privée de chiffrement n'est pas valide ! Veuillez mettre à jour le mot de passe de la clef privée dans vos paramètres personnels pour récupérer l'accès à vos fichiers chiffrés.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'application de chiffrement est activée mais vos clefs ne sont pas initialisées. Veuillez vous déconnecter et ensuite vous reconnecter.",
"Enable recovery key (allow to recover users files in case of password loss):" : "Activer la clef de récupération (permet de récupérer les fichiers des utilisateurs en cas de perte de mot de passe).",
"Encryption App is enabled and ready" : "L'application de chiffrement est activée et prête",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de déchiffrer ce fichier : il s'agit probablement d'un fichier partagé. Veuillez demander au propriétaire du fichier de le partager à nouveau avec vous.",
"Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de lire ce fichier, il s'agit probablement d'un fichier partagé. Veuillez demander au propriétaire du fichier de le repartager avec vous. ",
"Enable recovery key" : "Activer la clé de récupération",
"Disable recovery key" : "Désactiver la clé de récupération",
"The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "La clé de récupération est une clé supplémentaire utilisée pour chiffrer les fichiers. Elle permet de récupérer les fichiers des utilisateurs s'ils oublient leur mot de passe.",
"Recovery key password" : "Mot de passe de la clef de récupération",
"Repeat Recovery key password" : "Répétez le mot de passe de la clef de récupération",
"Enabled" : "Activé",
"Disabled" : "Désactivé",
"Repeat recovery key password" : "Répétez le mot de passe de la clé de récupération",
"Change recovery key password:" : "Modifier le mot de passe de la clef de récupération :",
"Old Recovery key password" : "Ancien mot de passe de la clef de récupération",
"New Recovery key password" : "Nouveau mot de passe de la clef de récupération",
"Repeat New Recovery key password" : "Répétez le nouveau mot de passe de la clef de récupération",
"Old recovery key password" : "Ancien mot de passe de la clé de récupération",
"New recovery key password" : "Nouveau mot de passe de la clé de récupération",
"Repeat new recovery key password" : "Répétez le nouveau mot de passe de la clé de récupération",
"Change Password" : "Changer de mot de passe",
"ownCloud basic encryption module" : "Module de chiffrement de base d'ownCloud",
"Your private key password no longer matches your log-in password." : "Le mot de passe de votre clef privée ne correspond plus à votre mot de passe de connexion.",
"Set your old private key password to your current log-in password:" : "Faites de votre mot de passe de connexion le mot de passe de votre clef privée :",
" If you don't remember your old password you can ask your administrator to recover your files." : "Si vous ne vous souvenez plus de votre ancien mot de passe, vous pouvez demander à votre administrateur de récupérer vos fichiers.",
@@ -46,6 +43,8 @@
"Current log-in password" : "Actuel mot de passe de connexion",
"Update Private Key Password" : "Mettre à jour le mot de passe de votre clef privée",
"Enable password recovery:" : "Activer la récupération du mot de passe :",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Activer cette option vous permettra d'obtenir à nouveau l'accès à vos fichiers chiffrés en cas de perte de mot de passe"
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Activer cette option vous permettra d'obtenir à nouveau l'accès à vos fichiers chiffrés en cas de perte de mot de passe",
"Enabled" : "Activé",
"Disabled" : "Désactivé"
},"pluralForm" :"nplurals=2; plural=(n > 1);"
}
+52
View File
@@ -0,0 +1,52 @@
OC.L10N.register(
"encryption",
{
"Missing recovery key password" : "Falta o contrasinal da chave de recuperación",
"Please repeat the recovery key password" : "Repita o contrasinal da chave de recuperación",
"Repeated recovery key password does not match the provided recovery key password" : "A repetición do contrasinal da chave de recuperación non coincide co contrasinal da chave de recuperación fornecido",
"Recovery key successfully enabled" : "Activada satisfactoriamente a chave de recuperación",
"Could not enable recovery key. Please check your recovery key password!" : "Non foi posíbel activar a chave de recuperación. Comprobe o contrasinal da chave de recuperación!",
"Recovery key successfully disabled" : "Desactivada satisfactoriamente a chave de recuperación",
"Could not disable recovery key. Please check your recovery key password!" : "Non foi posíbel desactivar a chave de recuperación. Comprobe o contrasinal da chave de recuperación!",
"Missing parameters" : "Faltan os parámetros",
"Please provide the old recovery password" : "Introduza o antigo contrasinal de recuperación",
"Please provide a new recovery password" : "Introduza a nova chave de recuperación",
"Please repeat the new recovery password" : "Repita o novo contrasinal de recuperación",
"Password successfully changed." : "O contrasinal foi cambiado satisfactoriamente",
"Could not change the password. Maybe the old password was not correct." : "Non foi posíbel cambiar o contrasinal. Probabelmente o contrasinal antigo non é o correcto.",
"Recovery Key disabled" : "Desactivada a chave de recuperación",
"Recovery Key enabled" : "Activada a chave de recuperación",
"Could not enable the recovery key, please try again or contact your administrator" : "Non foi posíbel activar a chave de recuperación, ténteo de novo ou póñase en contacto co administrador.",
"Could not update the private key password." : "Non foi posíbel actualizar o contrasinal da chave privada.",
"The old password was not correct, please try again." : "O contrasinal antigo non é correcto, ténteo de novo.",
"The current log-in password was not correct, please try again." : "O actual contrasinal de acceso non é correcto, ténteo de novo.",
"Private key password successfully updated." : "A chave privada foi actualizada correctamente.",
"You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "É necesario migrar as súas chaves de cifrado do antigo cifrado (ownCloud <= 8,0) cara ao novo. Execute «occ encryption:migrate» ou contacte co administrador",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "A chave privada para a aplicación de cifrado non é correcta. Actualice o contrasinal da súa chave privada nos seus axustes persoais para recuperar o acceso aos seus ficheiros cifrados.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "A aplicación de cifrado está activada, mais as chaves non foron preparadas, saia da sesión e volva a acceder de novo",
"Encryption App is enabled and ready" : " A aplicación de cifrado está activada e lista",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Non foi posíbel descifrar o ficheiro, probabelmente tratase dun ficheiro compartido. Pídalle ao propietario do ficheiro que volva compartir o ficheiro con vostede.",
"Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Non foi posíbel ler o ficheiro, probabelmente tratase dun ficheiro compartido. Pídalle ao propietario do ficheiro que volva compartir o ficheiro con vostede.",
"Enable recovery key" : "Activar a chave de recuperación",
"Disable recovery key" : "Desactivar a chave de recuperación",
"The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "A chave de recuperación é unha chave de cifrado adicional que se utiliza para cifrar ficheiros. Permite a recuperación de ficheiros dun usuario se o usuario esquece o seu contrasinal.",
"Recovery key password" : "Contrasinal da chave de recuperación",
"Repeat recovery key password" : "Repita o contrasinal da chave de recuperación",
"Change recovery key password:" : "Cambiar o contrasinal da chave de la recuperación:",
"Old recovery key password" : "Contrasinal antigo da chave de recuperación",
"New recovery key password" : "Novo contrasinal da chave de recuperación",
"Repeat new recovery key password" : "Repita o novo contrasinal da chave de recuperación",
"Change Password" : "Cambiar o contrasinal",
"ownCloud basic encryption module" : "Módulo básico de cifrado de ownCloud",
"Your private key password no longer matches your log-in password." : "O seu contrasinal da chave privada non coincide co seu contrasinal de acceso.",
"Set your old private key password to your current log-in password:" : "Estabeleza o seu contrasinal antigo da chave de recuperación ao seu contrasinal de acceso actual:",
" If you don't remember your old password you can ask your administrator to recover your files." : "Se non lembra o seu antigo contrasinal pode pedírllelo ao seu administrador para recuperar os seus ficheiros.",
"Old log-in password" : "Contrasinal antigo de acceso",
"Current log-in password" : "Contrasinal actual de acceso",
"Update Private Key Password" : "Actualizar o contrasinal da chave privada",
"Enable password recovery:" : "Activar o contrasinal de recuperación:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Ao activar esta opción permitiráselle volver a obter acceso aos ficheiros cifrados no caso de perda do contrasinal",
"Enabled" : "Activado",
"Disabled" : "Desactivado"
},
"nplurals=2; plural=(n != 1);");
+50
View File
@@ -0,0 +1,50 @@
{ "translations": {
"Missing recovery key password" : "Falta o contrasinal da chave de recuperación",
"Please repeat the recovery key password" : "Repita o contrasinal da chave de recuperación",
"Repeated recovery key password does not match the provided recovery key password" : "A repetición do contrasinal da chave de recuperación non coincide co contrasinal da chave de recuperación fornecido",
"Recovery key successfully enabled" : "Activada satisfactoriamente a chave de recuperación",
"Could not enable recovery key. Please check your recovery key password!" : "Non foi posíbel activar a chave de recuperación. Comprobe o contrasinal da chave de recuperación!",
"Recovery key successfully disabled" : "Desactivada satisfactoriamente a chave de recuperación",
"Could not disable recovery key. Please check your recovery key password!" : "Non foi posíbel desactivar a chave de recuperación. Comprobe o contrasinal da chave de recuperación!",
"Missing parameters" : "Faltan os parámetros",
"Please provide the old recovery password" : "Introduza o antigo contrasinal de recuperación",
"Please provide a new recovery password" : "Introduza a nova chave de recuperación",
"Please repeat the new recovery password" : "Repita o novo contrasinal de recuperación",
"Password successfully changed." : "O contrasinal foi cambiado satisfactoriamente",
"Could not change the password. Maybe the old password was not correct." : "Non foi posíbel cambiar o contrasinal. Probabelmente o contrasinal antigo non é o correcto.",
"Recovery Key disabled" : "Desactivada a chave de recuperación",
"Recovery Key enabled" : "Activada a chave de recuperación",
"Could not enable the recovery key, please try again or contact your administrator" : "Non foi posíbel activar a chave de recuperación, ténteo de novo ou póñase en contacto co administrador.",
"Could not update the private key password." : "Non foi posíbel actualizar o contrasinal da chave privada.",
"The old password was not correct, please try again." : "O contrasinal antigo non é correcto, ténteo de novo.",
"The current log-in password was not correct, please try again." : "O actual contrasinal de acceso non é correcto, ténteo de novo.",
"Private key password successfully updated." : "A chave privada foi actualizada correctamente.",
"You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "É necesario migrar as súas chaves de cifrado do antigo cifrado (ownCloud <= 8,0) cara ao novo. Execute «occ encryption:migrate» ou contacte co administrador",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "A chave privada para a aplicación de cifrado non é correcta. Actualice o contrasinal da súa chave privada nos seus axustes persoais para recuperar o acceso aos seus ficheiros cifrados.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "A aplicación de cifrado está activada, mais as chaves non foron preparadas, saia da sesión e volva a acceder de novo",
"Encryption App is enabled and ready" : " A aplicación de cifrado está activada e lista",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Non foi posíbel descifrar o ficheiro, probabelmente tratase dun ficheiro compartido. Pídalle ao propietario do ficheiro que volva compartir o ficheiro con vostede.",
"Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Non foi posíbel ler o ficheiro, probabelmente tratase dun ficheiro compartido. Pídalle ao propietario do ficheiro que volva compartir o ficheiro con vostede.",
"Enable recovery key" : "Activar a chave de recuperación",
"Disable recovery key" : "Desactivar a chave de recuperación",
"The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "A chave de recuperación é unha chave de cifrado adicional que se utiliza para cifrar ficheiros. Permite a recuperación de ficheiros dun usuario se o usuario esquece o seu contrasinal.",
"Recovery key password" : "Contrasinal da chave de recuperación",
"Repeat recovery key password" : "Repita o contrasinal da chave de recuperación",
"Change recovery key password:" : "Cambiar o contrasinal da chave de la recuperación:",
"Old recovery key password" : "Contrasinal antigo da chave de recuperación",
"New recovery key password" : "Novo contrasinal da chave de recuperación",
"Repeat new recovery key password" : "Repita o novo contrasinal da chave de recuperación",
"Change Password" : "Cambiar o contrasinal",
"ownCloud basic encryption module" : "Módulo básico de cifrado de ownCloud",
"Your private key password no longer matches your log-in password." : "O seu contrasinal da chave privada non coincide co seu contrasinal de acceso.",
"Set your old private key password to your current log-in password:" : "Estabeleza o seu contrasinal antigo da chave de recuperación ao seu contrasinal de acceso actual:",
" If you don't remember your old password you can ask your administrator to recover your files." : "Se non lembra o seu antigo contrasinal pode pedírllelo ao seu administrador para recuperar os seus ficheiros.",
"Old log-in password" : "Contrasinal antigo de acceso",
"Current log-in password" : "Contrasinal actual de acceso",
"Update Private Key Password" : "Actualizar o contrasinal da chave privada",
"Enable password recovery:" : "Activar o contrasinal de recuperación:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Ao activar esta opción permitiráselle volver a obter acceso aos ficheiros cifrados no caso de perda do contrasinal",
"Enabled" : "Activado",
"Disabled" : "Desactivado"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
@@ -1,34 +1,18 @@
OC.L10N.register(
"files_encryption",
"encryption",
{
"Unknown error" : "Nepoznata pogreška",
"Recovery key successfully enabled" : "Ključ za oporavak uspješno aktiviran",
"Could not disable recovery key. Please check your recovery key password!" : "Ključ za oporavak nije moguće deaktivirati. Molimo provjerite svoju lozinku ključa za oporavak!",
"Could not enable recovery key. Please check your recovery key password!" : "Ključ za oporavak nije moguće aktivirati. Molimo provjerite svoju lozinku ključa za oporavak!",
"Recovery key successfully disabled" : "Ključ za ooravak uspješno deaktiviran",
"Could not disable recovery key. Please check your recovery key password!" : "Ključ za oporavak nije moguće deaktivirati. Molimo provjerite svoju lozinku ključa za oporavak!",
"Password successfully changed." : "Lozinka uspješno promijenjena.",
"Could not change the password. Maybe the old password was not correct." : "Lozinku nije moguće promijeniti. Možda je stara lozinka bila neispravna.",
"Private key password successfully updated." : "Lozinka privatnog ključa uspješno ažurirana.",
"File recovery settings updated" : "Ažurirane postavke za oporavak datoteke",
"Could not update file recovery" : "Oporavak datoteke nije moguće ažurirati",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Aplikacija šifriranja nije inicijalizirana! Možda je aplikacija šifriranja bila reaktivirana tijekom vaše sesije.Da biste inicijalizirali aplikaciju šifriranja, molimo, pokušajte se odjaviti i ponovno prijaviti.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Vaš privatni ključ nije ispravan! Vjerojatno je vaša lozinka promijenjena izvan %s(npr. vašega korporativnog direktorija). Lozinku svoga privatnog ključa možete ažuriratiu svojim osobnim postavkama da biste obnovili pristup svojim šifriranim datotekama.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Ovu datoteku nije moguće dešifrirati, vjerojatno je riječ o zajedničkoj datoteci. Molimopitajte vlasnika datoteke da je ponovo podijeli s vama.",
"Unknown error. Please check your system settings or contact your administrator" : "Pogreška nepoznata. Molimo provjerite svoje sistemske postavke ili kontaktirajte svog administratora.",
"Initial encryption started... This can take some time. Please wait." : "Počelo inicijalno šifriranje... To može potrajati neko vrijeme. Molimo, pričekajte.",
"Initial encryption running... Please try again later." : "Inicijalno šifriranje u tijeku... Molimo, pokušajte ponovno kasnije.",
"Missing requirements." : "Nedostaju preduvjeti.",
"Following users are not set up for encryption:" : "Sljedeći korisnici nisu određeni za šifriranje:",
"Go directly to your %spersonal settings%s." : "Idite izravno na svoje %sosobne postavke%s.",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Neispravan privatni ključ za šifriranje. Molimo ažurirajte lozinku svoga privatnog ključa u svojim osobnimpostavkama da biste obnovili pristup svojim šifriranim datotekama.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija šifriranja je aktivirana ali vaši ključevi nisu inicijalizirani, molimo odjavite se iponovno prijavite.",
"Enable recovery key (allow to recover users files in case of password loss):" : "Aktivirajte ključ za oporavak (u slučaju gubitka lozinke dozvolite oporavak korisničkih datoteka):",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Ovu datoteku nije moguće dešifrirati, vjerojatno je riječ o zajedničkoj datoteci. Molimopitajte vlasnika datoteke da je ponovo podijeli s vama.",
"Recovery key password" : "Lozinka ključa za oporavak",
"Repeat Recovery key password" : "Ponovite lozinku ključa za oporavak",
"Enabled" : "Aktivirano",
"Disabled" : "Onemogućeno",
"Change recovery key password:" : "Promijenite lozinku ključa za oporavak",
"Old Recovery key password" : "Stara lozinka ključa za oporavak",
"New Recovery key password" : "Nova lozinka ključa za oporavak",
"Repeat New Recovery key password" : "Ponovite novu lozinku ključa za oporavak",
"Change Password" : "Promijenite lozinku",
"Your private key password no longer matches your log-in password." : "Lozinka vašeg privatnog ključa više se ne slaže s vašom lozinkom za prijavu.",
"Set your old private key password to your current log-in password:" : "Postavite svoju staru lozinku privatnog ključa u svoju postojeću lozinku za prijavu.",
@@ -37,6 +21,8 @@ OC.L10N.register(
"Current log-in password" : "Aktualna lozinka za prijavu",
"Update Private Key Password" : "Ažurirajte lozinku privatnog ključa",
"Enable password recovery:" : "Omogućite oporavak lozinke:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "U slučaju gubitka lozinke, aktiviranje ove opcije ponovno će vam pribaviti pristup vašim šifriranim datotekama"
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "U slučaju gubitka lozinke, aktiviranje ove opcije ponovno će vam pribaviti pristup vašim šifriranim datotekama",
"Enabled" : "Aktivirano",
"Disabled" : "Onemogućeno"
},
"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;");
@@ -1,32 +1,16 @@
{ "translations": {
"Unknown error" : "Nepoznata pogreška",
"Recovery key successfully enabled" : "Ključ za oporavak uspješno aktiviran",
"Could not disable recovery key. Please check your recovery key password!" : "Ključ za oporavak nije moguće deaktivirati. Molimo provjerite svoju lozinku ključa za oporavak!",
"Could not enable recovery key. Please check your recovery key password!" : "Ključ za oporavak nije moguće aktivirati. Molimo provjerite svoju lozinku ključa za oporavak!",
"Recovery key successfully disabled" : "Ključ za ooravak uspješno deaktiviran",
"Could not disable recovery key. Please check your recovery key password!" : "Ključ za oporavak nije moguće deaktivirati. Molimo provjerite svoju lozinku ključa za oporavak!",
"Password successfully changed." : "Lozinka uspješno promijenjena.",
"Could not change the password. Maybe the old password was not correct." : "Lozinku nije moguće promijeniti. Možda je stara lozinka bila neispravna.",
"Private key password successfully updated." : "Lozinka privatnog ključa uspješno ažurirana.",
"File recovery settings updated" : "Ažurirane postavke za oporavak datoteke",
"Could not update file recovery" : "Oporavak datoteke nije moguće ažurirati",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Aplikacija šifriranja nije inicijalizirana! Možda je aplikacija šifriranja bila reaktivirana tijekom vaše sesije.Da biste inicijalizirali aplikaciju šifriranja, molimo, pokušajte se odjaviti i ponovno prijaviti.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Vaš privatni ključ nije ispravan! Vjerojatno je vaša lozinka promijenjena izvan %s(npr. vašega korporativnog direktorija). Lozinku svoga privatnog ključa možete ažuriratiu svojim osobnim postavkama da biste obnovili pristup svojim šifriranim datotekama.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Ovu datoteku nije moguće dešifrirati, vjerojatno je riječ o zajedničkoj datoteci. Molimopitajte vlasnika datoteke da je ponovo podijeli s vama.",
"Unknown error. Please check your system settings or contact your administrator" : "Pogreška nepoznata. Molimo provjerite svoje sistemske postavke ili kontaktirajte svog administratora.",
"Initial encryption started... This can take some time. Please wait." : "Počelo inicijalno šifriranje... To može potrajati neko vrijeme. Molimo, pričekajte.",
"Initial encryption running... Please try again later." : "Inicijalno šifriranje u tijeku... Molimo, pokušajte ponovno kasnije.",
"Missing requirements." : "Nedostaju preduvjeti.",
"Following users are not set up for encryption:" : "Sljedeći korisnici nisu određeni za šifriranje:",
"Go directly to your %spersonal settings%s." : "Idite izravno na svoje %sosobne postavke%s.",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Neispravan privatni ključ za šifriranje. Molimo ažurirajte lozinku svoga privatnog ključa u svojim osobnimpostavkama da biste obnovili pristup svojim šifriranim datotekama.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija šifriranja je aktivirana ali vaši ključevi nisu inicijalizirani, molimo odjavite se iponovno prijavite.",
"Enable recovery key (allow to recover users files in case of password loss):" : "Aktivirajte ključ za oporavak (u slučaju gubitka lozinke dozvolite oporavak korisničkih datoteka):",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Ovu datoteku nije moguće dešifrirati, vjerojatno je riječ o zajedničkoj datoteci. Molimopitajte vlasnika datoteke da je ponovo podijeli s vama.",
"Recovery key password" : "Lozinka ključa za oporavak",
"Repeat Recovery key password" : "Ponovite lozinku ključa za oporavak",
"Enabled" : "Aktivirano",
"Disabled" : "Onemogućeno",
"Change recovery key password:" : "Promijenite lozinku ključa za oporavak",
"Old Recovery key password" : "Stara lozinka ključa za oporavak",
"New Recovery key password" : "Nova lozinka ključa za oporavak",
"Repeat New Recovery key password" : "Ponovite novu lozinku ključa za oporavak",
"Change Password" : "Promijenite lozinku",
"Your private key password no longer matches your log-in password." : "Lozinka vašeg privatnog ključa više se ne slaže s vašom lozinkom za prijavu.",
"Set your old private key password to your current log-in password:" : "Postavite svoju staru lozinku privatnog ključa u svoju postojeću lozinku za prijavu.",
@@ -35,6 +19,8 @@
"Current log-in password" : "Aktualna lozinka za prijavu",
"Update Private Key Password" : "Ažurirajte lozinku privatnog ključa",
"Enable password recovery:" : "Omogućite oporavak lozinke:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "U slučaju gubitka lozinke, aktiviranje ove opcije ponovno će vam pribaviti pristup vašim šifriranim datotekama"
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "U slučaju gubitka lozinke, aktiviranje ove opcije ponovno će vam pribaviti pristup vašim šifriranim datotekama",
"Enabled" : "Aktivirano",
"Disabled" : "Onemogućeno"
},"pluralForm" :"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;"
}
@@ -1,38 +1,26 @@
OC.L10N.register(
"files_encryption",
"encryption",
{
"Unknown error" : "Ismeretlen hiba",
"Recovery key successfully enabled" : "A helyreállítási kulcs sikeresen bekapcsolva",
"Could not disable recovery key. Please check your recovery key password!" : "A helyreállítási kulcsot nem lehetett kikapcsolni. Ellenőrizze a helyreállítási kulcsa jelszavát!",
"Could not enable recovery key. Please check your recovery key password!" : "A helyreállítási kulcsot nem lehetett engedélyezni. Ellenőrizze a helyreállítási kulcsa jelszavát!",
"Recovery key successfully disabled" : "A helyreállítási kulcs sikeresen kikapcsolva",
"Could not disable recovery key. Please check your recovery key password!" : "A helyreállítási kulcsot nem lehetett kikapcsolni. Ellenőrizze a helyreállítási kulcsa jelszavát!",
"Password successfully changed." : "A jelszót sikeresen megváltoztattuk.",
"Could not change the password. Maybe the old password was not correct." : "A jelszót nem lehet megváltoztatni! Lehet, hogy hibás volt a régi jelszó.",
"Private key password successfully updated." : "A személyes kulcsának jelszava frissítésre került.",
"File recovery settings updated" : "A fájlhelyreállítási beállítások frissültek",
"Could not update file recovery" : "A fájlhelyreállítás nem frissíthető",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "A titkosítási modul nincs elindítva! Talán a munkafolyamat közben került engedélyezésre. Kérjük jelentkezzen ki majd ismét jelentkezzen be, hogy a titkosítási modul megfelelően elinduljon!",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Az állományok titkosításához használt titkos kulcsa érvénytelen. Valószínűleg a %s rendszeren kívül változtatta meg a jelszavát (pl. a munkahelyi címtárban). A személyes beállításoknál frissítheti a titkos kulcsát, hogy ismét elérhesse a titkosított állományait.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Az állományt nem sikerült dekódolni, valószínűleg ez egy megosztott fájl. Kérje meg az állomány tulajdonosát, hogy újra ossza meg Önnel ezt az állományt!",
"Initial encryption started... This can take some time. Please wait." : "A titkosítási folyamat megkezdődött... Ez hosszabb ideig is eltarthat. Kérem várjon.",
"Initial encryption running... Please try again later." : "Kezedeti titkosítás fut... Próbálja később.",
"Missing requirements." : "Hiányzó követelmények.",
"Following users are not set up for encryption:" : "A következő felhasználók nem állították be a titkosítást:",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Az állományok titkosításához használt titkos kulcsa érvénytelen. Kérjük frissítse a titkos kulcs jelszót a személyes beállításokban, hogy ismét hozzáférjen a titkosított állományaihoz!",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Az állományok titkosítása engedélyezve van, de az Ön titkos kulcsai nincsenek beállítva. Ezért kérjük, hogy jelentkezzen ki, és lépjen be újra!",
"Enable recovery key (allow to recover users files in case of password loss):" : "A helyreállítási kulcs beállítása (lehetővé teszi a felhasználók állományainak visszaállítását, ha elfelejtik a jelszavukat):",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Az állományt nem sikerült dekódolni, valószínűleg ez egy megosztott fájl. Kérje meg az állomány tulajdonosát, hogy újra ossza meg Önnel ezt az állományt!",
"Recovery key password" : "A helyreállítási kulcs jelszava",
"Repeat Recovery key password" : "Ismételje meg a helyreállítási kulcs jelszavát",
"Enabled" : "Bekapcsolva",
"Disabled" : "Kikapcsolva",
"Change recovery key password:" : "A helyreállítási kulcs jelszavának módosítása:",
"Old Recovery key password" : "Régi Helyreállítási Kulcs Jelszava",
"New Recovery key password" : "Új Helyreállítási kulcs jelszava",
"Repeat New Recovery key password" : "Ismételje meg az új helyreállítási kulcs jelszavát",
"Change Password" : "Jelszó megváltoztatása",
" If you don't remember your old password you can ask your administrator to recover your files." : "Ha nem emlékszik a régi jelszavára akkor megkérheti a rendszergazdát, hogy állítsa vissza az állományait.",
"Old log-in password" : "Régi bejelentkezési jelszó",
"Current log-in password" : "Jelenlegi bejelentkezési jelszó",
"Update Private Key Password" : "A személyest kulcs jelszó frissítése",
"Enable password recovery:" : "Jelszó-visszaállítás bekapcsolása",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Ez az opció lehetővé teszi, hogy a titkosított állományok tartalmát visszanyerjük abban az esetben, ha elfelejti a jelszavát"
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Ez az opció lehetővé teszi, hogy a titkosított állományok tartalmát visszanyerjük abban az esetben, ha elfelejti a jelszavát",
"Enabled" : "Bekapcsolva",
"Disabled" : "Kikapcsolva"
},
"nplurals=2; plural=(n != 1);");
@@ -1,36 +1,24 @@
{ "translations": {
"Unknown error" : "Ismeretlen hiba",
"Recovery key successfully enabled" : "A helyreállítási kulcs sikeresen bekapcsolva",
"Could not disable recovery key. Please check your recovery key password!" : "A helyreállítási kulcsot nem lehetett kikapcsolni. Ellenőrizze a helyreállítási kulcsa jelszavát!",
"Could not enable recovery key. Please check your recovery key password!" : "A helyreállítási kulcsot nem lehetett engedélyezni. Ellenőrizze a helyreállítási kulcsa jelszavát!",
"Recovery key successfully disabled" : "A helyreállítási kulcs sikeresen kikapcsolva",
"Could not disable recovery key. Please check your recovery key password!" : "A helyreállítási kulcsot nem lehetett kikapcsolni. Ellenőrizze a helyreállítási kulcsa jelszavát!",
"Password successfully changed." : "A jelszót sikeresen megváltoztattuk.",
"Could not change the password. Maybe the old password was not correct." : "A jelszót nem lehet megváltoztatni! Lehet, hogy hibás volt a régi jelszó.",
"Private key password successfully updated." : "A személyes kulcsának jelszava frissítésre került.",
"File recovery settings updated" : "A fájlhelyreállítási beállítások frissültek",
"Could not update file recovery" : "A fájlhelyreállítás nem frissíthető",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "A titkosítási modul nincs elindítva! Talán a munkafolyamat közben került engedélyezésre. Kérjük jelentkezzen ki majd ismét jelentkezzen be, hogy a titkosítási modul megfelelően elinduljon!",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Az állományok titkosításához használt titkos kulcsa érvénytelen. Valószínűleg a %s rendszeren kívül változtatta meg a jelszavát (pl. a munkahelyi címtárban). A személyes beállításoknál frissítheti a titkos kulcsát, hogy ismét elérhesse a titkosított állományait.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Az állományt nem sikerült dekódolni, valószínűleg ez egy megosztott fájl. Kérje meg az állomány tulajdonosát, hogy újra ossza meg Önnel ezt az állományt!",
"Initial encryption started... This can take some time. Please wait." : "A titkosítási folyamat megkezdődött... Ez hosszabb ideig is eltarthat. Kérem várjon.",
"Initial encryption running... Please try again later." : "Kezedeti titkosítás fut... Próbálja később.",
"Missing requirements." : "Hiányzó követelmények.",
"Following users are not set up for encryption:" : "A következő felhasználók nem állították be a titkosítást:",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Az állományok titkosításához használt titkos kulcsa érvénytelen. Kérjük frissítse a titkos kulcs jelszót a személyes beállításokban, hogy ismét hozzáférjen a titkosított állományaihoz!",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Az állományok titkosítása engedélyezve van, de az Ön titkos kulcsai nincsenek beállítva. Ezért kérjük, hogy jelentkezzen ki, és lépjen be újra!",
"Enable recovery key (allow to recover users files in case of password loss):" : "A helyreállítási kulcs beállítása (lehetővé teszi a felhasználók állományainak visszaállítását, ha elfelejtik a jelszavukat):",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Az állományt nem sikerült dekódolni, valószínűleg ez egy megosztott fájl. Kérje meg az állomány tulajdonosát, hogy újra ossza meg Önnel ezt az állományt!",
"Recovery key password" : "A helyreállítási kulcs jelszava",
"Repeat Recovery key password" : "Ismételje meg a helyreállítási kulcs jelszavát",
"Enabled" : "Bekapcsolva",
"Disabled" : "Kikapcsolva",
"Change recovery key password:" : "A helyreállítási kulcs jelszavának módosítása:",
"Old Recovery key password" : "Régi Helyreállítási Kulcs Jelszava",
"New Recovery key password" : "Új Helyreállítási kulcs jelszava",
"Repeat New Recovery key password" : "Ismételje meg az új helyreállítási kulcs jelszavát",
"Change Password" : "Jelszó megváltoztatása",
" If you don't remember your old password you can ask your administrator to recover your files." : "Ha nem emlékszik a régi jelszavára akkor megkérheti a rendszergazdát, hogy állítsa vissza az állományait.",
"Old log-in password" : "Régi bejelentkezési jelszó",
"Current log-in password" : "Jelenlegi bejelentkezési jelszó",
"Update Private Key Password" : "A személyest kulcs jelszó frissítése",
"Enable password recovery:" : "Jelszó-visszaállítás bekapcsolása",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Ez az opció lehetővé teszi, hogy a titkosított állományok tartalmát visszanyerjük abban az esetben, ha elfelejti a jelszavát"
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Ez az opció lehetővé teszi, hogy a titkosított állományok tartalmát visszanyerjük abban az esetben, ha elfelejti a jelszavát",
"Enabled" : "Bekapcsolva",
"Disabled" : "Kikapcsolva"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
@@ -1,48 +1,49 @@
OC.L10N.register(
"files_encryption",
"encryption",
{
"Unknown error" : "Kesalahan tidak diketahui",
"Missing recovery key password" : "Sandi kunci pemuliahan hilang",
"Please repeat the recovery key password" : "Silakan ulangi sandi kunci pemulihan",
"Repeated recovery key password does not match the provided recovery key password" : "Sandi kunci pemulihan yang diulangi tidak cocok dengan sandi kunci pemulihan yang diberikan",
"Recovery key successfully enabled" : "Kunci pemulihan berhasil diaktifkan",
"Could not disable recovery key. Please check your recovery key password!" : "Tidak dapat menonaktifkan kunci pemulihan. Silakan periksa sandi kunci pemulihan Anda!",
"Could not enable recovery key. Please check your recovery key password!" : "Tidak dapat mengaktifkan kunci pemulihan. Silakan periksa sandi kunci pemulihan Anda!",
"Recovery key successfully disabled" : "Kunci pemulihan berhasil dinonaktifkan",
"Could not disable recovery key. Please check your recovery key password!" : "Tidak dapat menonaktifkan kunci pemulihan. Silakan periksa sandi kunci pemulihan Anda!",
"Missing parameters" : "Parameter salah",
"Please provide the old recovery password" : "Mohon berikan sandi pemulihan lama",
"Please provide a new recovery password" : "Mohon berikan sandi pemulihan baru",
"Please repeat the new recovery password" : "Silakan ulangi sandi pemulihan baru",
"Password successfully changed." : "Sandi berhasil diubah",
"Could not change the password. Maybe the old password was not correct." : "Tidak dapat mengubah sandi. Kemungkinan sandi lama yang dimasukkan salah.",
"Recovery Key disabled" : "Kunci Pemulihan dinonaktifkan",
"Recovery Key enabled" : "Kunci Pemulihan diaktifkan",
"Could not enable the recovery key, please try again or contact your administrator" : "Tidak dapat mengaktifkan kunci pemulihan, silakan coba lagi atau hubungi administrator Anda",
"Could not update the private key password." : "Tidak dapat memperbarui sandi kunci private.",
"The old password was not correct, please try again." : "Sandi lama salah, mohon coba lagi.",
"The current log-in password was not correct, please try again." : "Sandi masuk saat ini salah, mohon coba lagi.",
"Private key password successfully updated." : "Sandi kunci privat berhasil diperbarui.",
"File recovery settings updated" : "Pengaturan pemulihan berkas diperbarui",
"Could not update file recovery" : "Tidak dapat memperbarui pemulihan berkas",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Aplikasi enkripsi tidak dimulai! Kemungkinan aplikasi enkripsi telah diaktifkan ulang saat sesi Anda. Silakan coba untuk keluar dan kembali lagi untuk memulai aplikasi enkripsi.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Kunci private Anda tidak sah! Nampaknya sandi Anda telah diubah diluar %s (misal direktori perusahaan Anda). Anda dapat memperbarui sandi kunci private untuk memulihakan akses ke berkas terenkripsi Anda.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tidak dapat mendekripsi berkas ini, mungkin ini adalah berkas bersama. Silakan meminta pemilik berkas ini untuk membagikan kembali dengan Anda.",
"Unknown error. Please check your system settings or contact your administrator" : "Kesalahan tidak diketahui. Silakan periksa pengaturan sistem Anda atau hubungi administrator",
"Initial encryption started... This can take some time. Please wait." : "Enskripsi awal dijalankan... Ini dapat memakan waktu. Silakan tunggu.",
"Initial encryption running... Please try again later." : "Enkripsi awal sedang berjalan... Sialakn coba lagi nanti.",
"Missing requirements." : "Persyaratan tidak terpenuhi.",
"Following users are not set up for encryption:" : "Pengguna berikut belum diatur untuk enkripsi:",
"Go directly to your %spersonal settings%s." : "Langsung ke %spengaturan pribadi%s Anda.",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Kunci privat tidak sah untuk Aplikasi Enskripsi. Silakan perbarui sandi kunci privat anda pada pengaturan pribadi untuk memulihkan akses ke berkas anda yang dienskripsi.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikasi Enskripsi telah diaktifkan tetapi kunci tidak diinisialisasi, silakan log-out dan log-in lagi",
"Enable recovery key (allow to recover users files in case of password loss):" : "Aktifkan kunci pemulihan (memungkinkan pengguna untuk memulihkan berkas dalam kasus kehilangan sandi):",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tidak dapat mendekripsi berkas ini, mungkin ini adalah berkas bersama. Silakan meminta pemilik berkas ini untuk membagikan kembali dengan Anda.",
"Enable recovery key" : "Aktifkan kunci pemulihan",
"Disable recovery key" : "Nonaktifkan kunci pemulihan",
"The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Kunci pemulihan adalah kunci enkripsi tambahan yang digunakan untuk mengenkripsi berkas. Kunci pemulihan memungkinkan untuk memulihkan berkas-berkas pengguna ketika pengguna tersebut melupakan sandi mereka.",
"Recovery key password" : "Sandi kunci pemulihan",
"Repeat Recovery key password" : "Ulangi sandi kunci Pemulihan",
"Enabled" : "Diaktifkan",
"Disabled" : "Dinonaktifkan",
"Repeat recovery key password" : "Ulangi sandi kunci pemulihan",
"Change recovery key password:" : "Ubah sandi kunci pemulihan:",
"Old Recovery key password" : "Sandi kunci Pemulihan Lama",
"New Recovery key password" : "Sandi kunci Pemulihan Baru",
"Repeat New Recovery key password" : "Ulangi sandi kunci Pemulihan baru",
"Change Password" : "Ubah sandi",
"Old recovery key password" : "Sandi kunci pemulihan lama",
"New recovery key password" : "Sandi kunci pemulihan baru",
"Repeat new recovery key password" : "Ulangi sandi kunci pemulihan baru",
"Change Password" : "Ubah Sandi",
"ownCloud basic encryption module" : "Modul enkripsi dasar ownCloud",
"Your private key password no longer matches your log-in password." : "Sandi kunci private Anda tidak lagi cocok dengan sandi masuk Anda.",
"Set your old private key password to your current log-in password:" : "Setel sandi kunci private Anda untuk sandi masuk Anda saat ini:",
" If you don't remember your old password you can ask your administrator to recover your files." : "Jika Anda tidak ingat sandi lama, Anda dapat meminta administrator Anda untuk memulihkan berkas.",
"Old log-in password" : "Sandi masuk yang lama",
"Current log-in password" : "Sandi masuk saat ini",
"Update Private Key Password" : "Perbarui Sandi Kunci Privat",
"Update Private Key Password" : "Perbarui Sandi Kunci Private",
"Enable password recovery:" : "Aktifkan sandi pemulihan:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Mengaktifkan opsi ini memungkinkan Anda untuk mendapatkan kembali akses ke berkas terenkripsi Anda dalam kasus kehilangan sandi"
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Mengaktifkan opsi ini memungkinkan Anda untuk mendapatkan kembali akses ke berkas terenkripsi Anda dalam kasus kehilangan sandi",
"Enabled" : "Diaktifkan",
"Disabled" : "Dinonaktifkan"
},
"nplurals=1; plural=0;");
@@ -1,46 +1,47 @@
{ "translations": {
"Unknown error" : "Kesalahan tidak diketahui",
"Missing recovery key password" : "Sandi kunci pemuliahan hilang",
"Please repeat the recovery key password" : "Silakan ulangi sandi kunci pemulihan",
"Repeated recovery key password does not match the provided recovery key password" : "Sandi kunci pemulihan yang diulangi tidak cocok dengan sandi kunci pemulihan yang diberikan",
"Recovery key successfully enabled" : "Kunci pemulihan berhasil diaktifkan",
"Could not disable recovery key. Please check your recovery key password!" : "Tidak dapat menonaktifkan kunci pemulihan. Silakan periksa sandi kunci pemulihan Anda!",
"Could not enable recovery key. Please check your recovery key password!" : "Tidak dapat mengaktifkan kunci pemulihan. Silakan periksa sandi kunci pemulihan Anda!",
"Recovery key successfully disabled" : "Kunci pemulihan berhasil dinonaktifkan",
"Could not disable recovery key. Please check your recovery key password!" : "Tidak dapat menonaktifkan kunci pemulihan. Silakan periksa sandi kunci pemulihan Anda!",
"Missing parameters" : "Parameter salah",
"Please provide the old recovery password" : "Mohon berikan sandi pemulihan lama",
"Please provide a new recovery password" : "Mohon berikan sandi pemulihan baru",
"Please repeat the new recovery password" : "Silakan ulangi sandi pemulihan baru",
"Password successfully changed." : "Sandi berhasil diubah",
"Could not change the password. Maybe the old password was not correct." : "Tidak dapat mengubah sandi. Kemungkinan sandi lama yang dimasukkan salah.",
"Recovery Key disabled" : "Kunci Pemulihan dinonaktifkan",
"Recovery Key enabled" : "Kunci Pemulihan diaktifkan",
"Could not enable the recovery key, please try again or contact your administrator" : "Tidak dapat mengaktifkan kunci pemulihan, silakan coba lagi atau hubungi administrator Anda",
"Could not update the private key password." : "Tidak dapat memperbarui sandi kunci private.",
"The old password was not correct, please try again." : "Sandi lama salah, mohon coba lagi.",
"The current log-in password was not correct, please try again." : "Sandi masuk saat ini salah, mohon coba lagi.",
"Private key password successfully updated." : "Sandi kunci privat berhasil diperbarui.",
"File recovery settings updated" : "Pengaturan pemulihan berkas diperbarui",
"Could not update file recovery" : "Tidak dapat memperbarui pemulihan berkas",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Aplikasi enkripsi tidak dimulai! Kemungkinan aplikasi enkripsi telah diaktifkan ulang saat sesi Anda. Silakan coba untuk keluar dan kembali lagi untuk memulai aplikasi enkripsi.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Kunci private Anda tidak sah! Nampaknya sandi Anda telah diubah diluar %s (misal direktori perusahaan Anda). Anda dapat memperbarui sandi kunci private untuk memulihakan akses ke berkas terenkripsi Anda.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tidak dapat mendekripsi berkas ini, mungkin ini adalah berkas bersama. Silakan meminta pemilik berkas ini untuk membagikan kembali dengan Anda.",
"Unknown error. Please check your system settings or contact your administrator" : "Kesalahan tidak diketahui. Silakan periksa pengaturan sistem Anda atau hubungi administrator",
"Initial encryption started... This can take some time. Please wait." : "Enskripsi awal dijalankan... Ini dapat memakan waktu. Silakan tunggu.",
"Initial encryption running... Please try again later." : "Enkripsi awal sedang berjalan... Sialakn coba lagi nanti.",
"Missing requirements." : "Persyaratan tidak terpenuhi.",
"Following users are not set up for encryption:" : "Pengguna berikut belum diatur untuk enkripsi:",
"Go directly to your %spersonal settings%s." : "Langsung ke %spengaturan pribadi%s Anda.",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Kunci privat tidak sah untuk Aplikasi Enskripsi. Silakan perbarui sandi kunci privat anda pada pengaturan pribadi untuk memulihkan akses ke berkas anda yang dienskripsi.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikasi Enskripsi telah diaktifkan tetapi kunci tidak diinisialisasi, silakan log-out dan log-in lagi",
"Enable recovery key (allow to recover users files in case of password loss):" : "Aktifkan kunci pemulihan (memungkinkan pengguna untuk memulihkan berkas dalam kasus kehilangan sandi):",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tidak dapat mendekripsi berkas ini, mungkin ini adalah berkas bersama. Silakan meminta pemilik berkas ini untuk membagikan kembali dengan Anda.",
"Enable recovery key" : "Aktifkan kunci pemulihan",
"Disable recovery key" : "Nonaktifkan kunci pemulihan",
"The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Kunci pemulihan adalah kunci enkripsi tambahan yang digunakan untuk mengenkripsi berkas. Kunci pemulihan memungkinkan untuk memulihkan berkas-berkas pengguna ketika pengguna tersebut melupakan sandi mereka.",
"Recovery key password" : "Sandi kunci pemulihan",
"Repeat Recovery key password" : "Ulangi sandi kunci Pemulihan",
"Enabled" : "Diaktifkan",
"Disabled" : "Dinonaktifkan",
"Repeat recovery key password" : "Ulangi sandi kunci pemulihan",
"Change recovery key password:" : "Ubah sandi kunci pemulihan:",
"Old Recovery key password" : "Sandi kunci Pemulihan Lama",
"New Recovery key password" : "Sandi kunci Pemulihan Baru",
"Repeat New Recovery key password" : "Ulangi sandi kunci Pemulihan baru",
"Change Password" : "Ubah sandi",
"Old recovery key password" : "Sandi kunci pemulihan lama",
"New recovery key password" : "Sandi kunci pemulihan baru",
"Repeat new recovery key password" : "Ulangi sandi kunci pemulihan baru",
"Change Password" : "Ubah Sandi",
"ownCloud basic encryption module" : "Modul enkripsi dasar ownCloud",
"Your private key password no longer matches your log-in password." : "Sandi kunci private Anda tidak lagi cocok dengan sandi masuk Anda.",
"Set your old private key password to your current log-in password:" : "Setel sandi kunci private Anda untuk sandi masuk Anda saat ini:",
" If you don't remember your old password you can ask your administrator to recover your files." : "Jika Anda tidak ingat sandi lama, Anda dapat meminta administrator Anda untuk memulihkan berkas.",
"Old log-in password" : "Sandi masuk yang lama",
"Current log-in password" : "Sandi masuk saat ini",
"Update Private Key Password" : "Perbarui Sandi Kunci Privat",
"Update Private Key Password" : "Perbarui Sandi Kunci Private",
"Enable password recovery:" : "Aktifkan sandi pemulihan:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Mengaktifkan opsi ini memungkinkan Anda untuk mendapatkan kembali akses ke berkas terenkripsi Anda dalam kasus kehilangan sandi"
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Mengaktifkan opsi ini memungkinkan Anda untuk mendapatkan kembali akses ke berkas terenkripsi Anda dalam kasus kehilangan sandi",
"Enabled" : "Diaktifkan",
"Disabled" : "Dinonaktifkan"
},"pluralForm" :"nplurals=1; plural=0;"
}
@@ -1,46 +1,43 @@
OC.L10N.register(
"files_encryption",
"encryption",
{
"Unknown error" : "Errore sconosciuto",
"Missing recovery key password" : "Manca la password della chiave di recupero",
"Please repeat the recovery key password" : "Ripeti la password della chiave di recupero",
"Repeated recovery key password does not match the provided recovery key password" : "La password della chiave di recupero ripetuta non corrisponde alla password della chiave di recupero fornita",
"Recovery key successfully enabled" : "Chiave di recupero abilitata correttamente",
"Could not disable recovery key. Please check your recovery key password!" : "Impossibile disabilitare la chiave di recupero. Verifica la password della chiave di recupero.",
"Could not enable recovery key. Please check your recovery key password!" : "Impossibile abilitare la chiave di ripristino. Verifica la password della chiave di ripristino.",
"Recovery key successfully disabled" : "Chiave di recupero disabilitata correttamente",
"Could not disable recovery key. Please check your recovery key password!" : "Impossibile disabilitare la chiave di recupero. Verifica la password della chiave di recupero.",
"Missing parameters" : "Parametri mancanti",
"Please provide the old recovery password" : "Fornisci la vecchia password di recupero",
"Please provide a new recovery password" : "Fornisci una nuova password di recupero",
"Please repeat the new recovery password" : "Ripeti la nuova password di recupero",
"Password successfully changed." : "Password modificata correttamente.",
"Could not change the password. Maybe the old password was not correct." : "Impossibile cambiare la password. Forse la vecchia password non era corretta.",
"Recovery Key disabled" : "Chiave di ripristino disabilitata",
"Recovery Key enabled" : "Chiave di ripristino abilitata",
"Could not enable the recovery key, please try again or contact your administrator" : "Impossibile abilitare la chiave di ripristino, prova ancora o contatta il tuo amministratore",
"Could not update the private key password." : "Impossibile aggiornare la password della chiave privata.",
"The old password was not correct, please try again." : "La vecchia password non era corretta, prova di nuovo.",
"The current log-in password was not correct, please try again." : "La password di accesso attuale non era corretta, prova ancora.",
"Private key password successfully updated." : "Password della chiave privata aggiornata correttamente.",
"File recovery settings updated" : "Impostazioni di ripristino dei file aggiornate",
"Could not update file recovery" : "Impossibile aggiornare il ripristino dei file",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Applicazione di cifratura non inizializzata. Forse l'applicazione è stata riabilitata durante la tua sessione. Prova a disconnetterti e ad effettuare nuovamente l'accesso per inizializzarla.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "La tua chiave privata non è valida! Forse la password è stata cambiata al di fuori di %s (ad es. la directory aziendale). Puoi aggiornare la password della chiave privata nelle impostazioni personali per ottenere nuovamente l'accesso ai file cifrati.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossibile decifrare questo file, probabilmente è un file condiviso. Chiedi al proprietario del file di condividere nuovamente il file con te.",
"Unknown error. Please check your system settings or contact your administrator" : "Errore sconosciuto. Controlla le impostazioni di sistema o contatta il tuo amministratore",
"Initial encryption started... This can take some time. Please wait." : "Cifratura iniziale avviata... Potrebbe richiedere del tempo. Attendi.",
"Initial encryption running... Please try again later." : "Cifratura iniziale in esecuzione... Riprova più tardi.",
"Missing requirements." : "Requisiti mancanti.",
"Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Assicurati che OpenSSL e l'estensione PHP sia abilitatati e configurati correttamente. Per ora, l'applicazione di cifratura è disabilitata.",
"Following users are not set up for encryption:" : "I seguenti utenti non sono configurati per la cifratura:",
"Go directly to your %spersonal settings%s." : "Vai direttamente alle tue %simpostazioni personali%s.",
"Server-side Encryption" : "Cifratura lato server",
"You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Devi migrare le tue chiavi di cifratura dalla vecchia cifratura (ownCloud <= 8.0) alla nuova. Esegui 'occ encryption:migrate' o contatta il tuo amministratore",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chiave privata non valida per l'applicazione di cifratura. Aggiorna la password della chiave privata nelle impostazioni personali per ripristinare l'accesso ai tuoi file cifrati.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'applicazione di cifratura è abilitata, ma le chiavi non sono state inizializzate, disconnettiti ed effettua nuovamente l'accesso",
"Enable recovery key (allow to recover users files in case of password loss):" : "Abilita la chiave di recupero (permette di recuperare i file utenti in caso di perdita della password):",
"Encryption App is enabled and ready" : "L'applicazione Cifratura è abilitata e pronta",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossibile decifrare questo file, probabilmente è un file condiviso. Chiedi al proprietario del file di condividere nuovamente il file con te.",
"Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossibile leggere questo file, probabilmente è un file condiviso. Chiedi al proprietario del file di condividere nuovamente il file con te.",
"Enable recovery key" : "Abilita chiave di ripristino",
"Disable recovery key" : "Disabilita chiave di ripristino",
"The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "La chiave di ripristino è una chiave di cifratura aggiuntiva utilizzata per cifrare i file. Consente di ripristinare i file di un utente se l'utente dimentica la propria password.",
"Recovery key password" : "Password della chiave di recupero",
"Repeat Recovery key password" : "Ripeti la password della chiave di recupero",
"Enabled" : "Abilitata",
"Disabled" : "Disabilitata",
"Repeat recovery key password" : "Ripeti la password della chiave di ripristino",
"Change recovery key password:" : "Cambia la password della chiave di recupero:",
"Old Recovery key password" : "Vecchia password della chiave di recupero",
"New Recovery key password" : "Nuova password della chiave di recupero",
"Repeat New Recovery key password" : "Ripeti la nuova password della chiave di recupero",
"Old recovery key password" : "Vecchia password della chiave di ripristino",
"New recovery key password" : "Nuova password della chiave di ripristino",
"Repeat new recovery key password" : "Ripeti la nuova password della chiave di ripristino",
"Change Password" : "Modifica password",
"ownCloud basic encryption module" : "Modulo di cifratura di base di ownCloud",
"Your private key password no longer matches your log-in password." : "La password della chiave privata non corrisponde più alla password di accesso.",
"Set your old private key password to your current log-in password:" : "Imposta la vecchia password della chiave privata sull'attuale password di accesso:",
" If you don't remember your old password you can ask your administrator to recover your files." : "Se non ricordi la vecchia password puoi chiedere al tuo amministratore di recuperare i file.",
@@ -48,6 +45,8 @@ OC.L10N.register(
"Current log-in password" : "Password di accesso attuale",
"Update Private Key Password" : "Aggiorna la password della chiave privata",
"Enable password recovery:" : "Abilita il ripristino della password:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "L'abilitazione di questa opzione ti consentirà di accedere nuovamente ai file cifrati in caso di perdita della password"
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "L'abilitazione di questa opzione ti consentirà di accedere nuovamente ai file cifrati in caso di perdita della password",
"Enabled" : "Abilitata",
"Disabled" : "Disabilitata"
},
"nplurals=2; plural=(n != 1);");
@@ -1,44 +1,41 @@
{ "translations": {
"Unknown error" : "Errore sconosciuto",
"Missing recovery key password" : "Manca la password della chiave di recupero",
"Please repeat the recovery key password" : "Ripeti la password della chiave di recupero",
"Repeated recovery key password does not match the provided recovery key password" : "La password della chiave di recupero ripetuta non corrisponde alla password della chiave di recupero fornita",
"Recovery key successfully enabled" : "Chiave di recupero abilitata correttamente",
"Could not disable recovery key. Please check your recovery key password!" : "Impossibile disabilitare la chiave di recupero. Verifica la password della chiave di recupero.",
"Could not enable recovery key. Please check your recovery key password!" : "Impossibile abilitare la chiave di ripristino. Verifica la password della chiave di ripristino.",
"Recovery key successfully disabled" : "Chiave di recupero disabilitata correttamente",
"Could not disable recovery key. Please check your recovery key password!" : "Impossibile disabilitare la chiave di recupero. Verifica la password della chiave di recupero.",
"Missing parameters" : "Parametri mancanti",
"Please provide the old recovery password" : "Fornisci la vecchia password di recupero",
"Please provide a new recovery password" : "Fornisci una nuova password di recupero",
"Please repeat the new recovery password" : "Ripeti la nuova password di recupero",
"Password successfully changed." : "Password modificata correttamente.",
"Could not change the password. Maybe the old password was not correct." : "Impossibile cambiare la password. Forse la vecchia password non era corretta.",
"Recovery Key disabled" : "Chiave di ripristino disabilitata",
"Recovery Key enabled" : "Chiave di ripristino abilitata",
"Could not enable the recovery key, please try again or contact your administrator" : "Impossibile abilitare la chiave di ripristino, prova ancora o contatta il tuo amministratore",
"Could not update the private key password." : "Impossibile aggiornare la password della chiave privata.",
"The old password was not correct, please try again." : "La vecchia password non era corretta, prova di nuovo.",
"The current log-in password was not correct, please try again." : "La password di accesso attuale non era corretta, prova ancora.",
"Private key password successfully updated." : "Password della chiave privata aggiornata correttamente.",
"File recovery settings updated" : "Impostazioni di ripristino dei file aggiornate",
"Could not update file recovery" : "Impossibile aggiornare il ripristino dei file",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Applicazione di cifratura non inizializzata. Forse l'applicazione è stata riabilitata durante la tua sessione. Prova a disconnetterti e ad effettuare nuovamente l'accesso per inizializzarla.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "La tua chiave privata non è valida! Forse la password è stata cambiata al di fuori di %s (ad es. la directory aziendale). Puoi aggiornare la password della chiave privata nelle impostazioni personali per ottenere nuovamente l'accesso ai file cifrati.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossibile decifrare questo file, probabilmente è un file condiviso. Chiedi al proprietario del file di condividere nuovamente il file con te.",
"Unknown error. Please check your system settings or contact your administrator" : "Errore sconosciuto. Controlla le impostazioni di sistema o contatta il tuo amministratore",
"Initial encryption started... This can take some time. Please wait." : "Cifratura iniziale avviata... Potrebbe richiedere del tempo. Attendi.",
"Initial encryption running... Please try again later." : "Cifratura iniziale in esecuzione... Riprova più tardi.",
"Missing requirements." : "Requisiti mancanti.",
"Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Assicurati che OpenSSL e l'estensione PHP sia abilitatati e configurati correttamente. Per ora, l'applicazione di cifratura è disabilitata.",
"Following users are not set up for encryption:" : "I seguenti utenti non sono configurati per la cifratura:",
"Go directly to your %spersonal settings%s." : "Vai direttamente alle tue %simpostazioni personali%s.",
"Server-side Encryption" : "Cifratura lato server",
"You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Devi migrare le tue chiavi di cifratura dalla vecchia cifratura (ownCloud <= 8.0) alla nuova. Esegui 'occ encryption:migrate' o contatta il tuo amministratore",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chiave privata non valida per l'applicazione di cifratura. Aggiorna la password della chiave privata nelle impostazioni personali per ripristinare l'accesso ai tuoi file cifrati.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'applicazione di cifratura è abilitata, ma le chiavi non sono state inizializzate, disconnettiti ed effettua nuovamente l'accesso",
"Enable recovery key (allow to recover users files in case of password loss):" : "Abilita la chiave di recupero (permette di recuperare i file utenti in caso di perdita della password):",
"Encryption App is enabled and ready" : "L'applicazione Cifratura è abilitata e pronta",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossibile decifrare questo file, probabilmente è un file condiviso. Chiedi al proprietario del file di condividere nuovamente il file con te.",
"Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossibile leggere questo file, probabilmente è un file condiviso. Chiedi al proprietario del file di condividere nuovamente il file con te.",
"Enable recovery key" : "Abilita chiave di ripristino",
"Disable recovery key" : "Disabilita chiave di ripristino",
"The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "La chiave di ripristino è una chiave di cifratura aggiuntiva utilizzata per cifrare i file. Consente di ripristinare i file di un utente se l'utente dimentica la propria password.",
"Recovery key password" : "Password della chiave di recupero",
"Repeat Recovery key password" : "Ripeti la password della chiave di recupero",
"Enabled" : "Abilitata",
"Disabled" : "Disabilitata",
"Repeat recovery key password" : "Ripeti la password della chiave di ripristino",
"Change recovery key password:" : "Cambia la password della chiave di recupero:",
"Old Recovery key password" : "Vecchia password della chiave di recupero",
"New Recovery key password" : "Nuova password della chiave di recupero",
"Repeat New Recovery key password" : "Ripeti la nuova password della chiave di recupero",
"Old recovery key password" : "Vecchia password della chiave di ripristino",
"New recovery key password" : "Nuova password della chiave di ripristino",
"Repeat new recovery key password" : "Ripeti la nuova password della chiave di ripristino",
"Change Password" : "Modifica password",
"ownCloud basic encryption module" : "Modulo di cifratura di base di ownCloud",
"Your private key password no longer matches your log-in password." : "La password della chiave privata non corrisponde più alla password di accesso.",
"Set your old private key password to your current log-in password:" : "Imposta la vecchia password della chiave privata sull'attuale password di accesso:",
" If you don't remember your old password you can ask your administrator to recover your files." : "Se non ricordi la vecchia password puoi chiedere al tuo amministratore di recuperare i file.",
@@ -46,6 +43,8 @@
"Current log-in password" : "Password di accesso attuale",
"Update Private Key Password" : "Aggiorna la password della chiave privata",
"Enable password recovery:" : "Abilita il ripristino della password:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "L'abilitazione di questa opzione ti consentirà di accedere nuovamente ai file cifrati in caso di perdita della password"
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "L'abilitazione di questa opzione ti consentirà di accedere nuovamente ai file cifrati in caso di perdita della password",
"Enabled" : "Abilitata",
"Disabled" : "Disabilitata"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
+52
View File
@@ -0,0 +1,52 @@
OC.L10N.register(
"encryption",
{
"Missing recovery key password" : "復旧キーのパスワードがありません",
"Please repeat the recovery key password" : "復旧キーのパスワードをもう一度入力",
"Repeated recovery key password does not match the provided recovery key password" : "入力された復旧キーのパスワードが一致しません。",
"Recovery key successfully enabled" : "復旧キーを正常に有効化しました",
"Could not enable recovery key. Please check your recovery key password!" : "復旧キーを有効にできませんでした。リカバリ用のキーのパスワードを確認してください!",
"Recovery key successfully disabled" : "復旧キーを正常に無効化しました",
"Could not disable recovery key. Please check your recovery key password!" : "復旧キーを無効化できませんでした。リカバリ用のキーのパスワードを確認してください!",
"Missing parameters" : "パラメータが不足しています",
"Please provide the old recovery password" : "古い復旧キーのパスワードを入力",
"Please provide a new recovery password" : "新しい復旧キーのパスワードを入力",
"Please repeat the new recovery password" : "新しい復旧キーのパスワードをもう一度入力",
"Password successfully changed." : "パスワードを変更できました。",
"Could not change the password. Maybe the old password was not correct." : "パスワードを変更できませんでした。古いパスワードが間違っているかもしれません。",
"Recovery Key disabled" : "復旧キーが無効になりました。",
"Recovery Key enabled" : "復旧キーが有効になりました。",
"Could not enable the recovery key, please try again or contact your administrator" : "復旧キーを有効化できませんでした。もう一度試してみるか、管理者に連絡してください。",
"Could not update the private key password." : "秘密鍵のパスワードを更新できませんでした。",
"The old password was not correct, please try again." : "古いパスワードが一致しませんでした。もう一度入力してください。",
"The current log-in password was not correct, please try again." : "ログインパスワードが一致しませんでした。もう一度入力してください。",
"Private key password successfully updated." : "秘密鍵のパスワードが正常に更新されました。",
"You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "古い暗号化(ownCloud 8.0以前)から新しい方へ、暗号化キーを移行する必要があります。'occ encryption:migrate'を実行するか、管理者に問い合わせてください。",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "暗号化アプリの無効なプライベートキーです。あなたの暗号化されたファイルへアクセスするために、個人設定からプライベートキーのパスワードを更新してください。",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "暗号化アプリは有効ですが、あなたの暗号化キーは初期化されていません。ログアウトした後に、再度ログインしてください",
"Encryption App is enabled and ready" : "暗号化アプリは有効になっており、準備が整いました",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "このファイルを復号化できません、共有ファイルの可能性があります。ファイルの所有者にお願いして、ファイルを共有しなおしてもらってください。",
"Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "このファイルを読み取ることができません、共有ファイルの可能性があります。ファイルの所有者にお願いして、ファイルを共有しなおしてもらってください。",
"Enable recovery key" : "復旧キーを有効にする",
"Disable recovery key" : "復旧キーを無効にする",
"The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "復旧キーは、ファイルの暗号化に使う特別な暗号化キーです。ユーザがパスワードを忘れてしまった場合には、リカバリキーを使ってユーザのファイルを復元することができます。",
"Recovery key password" : "復旧キーのパスワード",
"Repeat recovery key password" : "復旧キーのパスワードをもう一度入力",
"Change recovery key password:" : "復旧キーのパスワードを変更:",
"Old recovery key password" : "古い復旧キーのパスワード",
"New recovery key password" : "新しい復旧キーのパスワード",
"Repeat new recovery key password" : "新しい復旧キーのパスワードをもう一度入力",
"Change Password" : "パスワードを変更",
"ownCloud basic encryption module" : "ownCloud 基本暗号化モジュール",
"Your private key password no longer matches your log-in password." : "もはや秘密鍵はログインパスワードと一致しません。",
"Set your old private key password to your current log-in password:" : "古い秘密鍵のパスワードを現在のログインパスワードに設定:",
" If you don't remember your old password you can ask your administrator to recover your files." : "古いパスワードを覚えていない場合、管理者に尋ねてファイルを回復することができます。",
"Old log-in password" : "古いログインパスワード",
"Current log-in password" : "現在のログインパスワード",
"Update Private Key Password" : "秘密鍵のパスワードを更新",
"Enable password recovery:" : "パスワードリカバリを有効に:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "このオプションを有効にすると、パスワードを紛失した場合も、暗号化されたファイルに再度アクセスすることができるようになります。",
"Enabled" : "有効",
"Disabled" : "無効"
},
"nplurals=1; plural=0;");
+50
View File
@@ -0,0 +1,50 @@
{ "translations": {
"Missing recovery key password" : "復旧キーのパスワードがありません",
"Please repeat the recovery key password" : "復旧キーのパスワードをもう一度入力",
"Repeated recovery key password does not match the provided recovery key password" : "入力された復旧キーのパスワードが一致しません。",
"Recovery key successfully enabled" : "復旧キーを正常に有効化しました",
"Could not enable recovery key. Please check your recovery key password!" : "復旧キーを有効にできませんでした。リカバリ用のキーのパスワードを確認してください!",
"Recovery key successfully disabled" : "復旧キーを正常に無効化しました",
"Could not disable recovery key. Please check your recovery key password!" : "復旧キーを無効化できませんでした。リカバリ用のキーのパスワードを確認してください!",
"Missing parameters" : "パラメータが不足しています",
"Please provide the old recovery password" : "古い復旧キーのパスワードを入力",
"Please provide a new recovery password" : "新しい復旧キーのパスワードを入力",
"Please repeat the new recovery password" : "新しい復旧キーのパスワードをもう一度入力",
"Password successfully changed." : "パスワードを変更できました。",
"Could not change the password. Maybe the old password was not correct." : "パスワードを変更できませんでした。古いパスワードが間違っているかもしれません。",
"Recovery Key disabled" : "復旧キーが無効になりました。",
"Recovery Key enabled" : "復旧キーが有効になりました。",
"Could not enable the recovery key, please try again or contact your administrator" : "復旧キーを有効化できませんでした。もう一度試してみるか、管理者に連絡してください。",
"Could not update the private key password." : "秘密鍵のパスワードを更新できませんでした。",
"The old password was not correct, please try again." : "古いパスワードが一致しませんでした。もう一度入力してください。",
"The current log-in password was not correct, please try again." : "ログインパスワードが一致しませんでした。もう一度入力してください。",
"Private key password successfully updated." : "秘密鍵のパスワードが正常に更新されました。",
"You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "古い暗号化(ownCloud 8.0以前)から新しい方へ、暗号化キーを移行する必要があります。'occ encryption:migrate'を実行するか、管理者に問い合わせてください。",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "暗号化アプリの無効なプライベートキーです。あなたの暗号化されたファイルへアクセスするために、個人設定からプライベートキーのパスワードを更新してください。",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "暗号化アプリは有効ですが、あなたの暗号化キーは初期化されていません。ログアウトした後に、再度ログインしてください",
"Encryption App is enabled and ready" : "暗号化アプリは有効になっており、準備が整いました",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "このファイルを復号化できません、共有ファイルの可能性があります。ファイルの所有者にお願いして、ファイルを共有しなおしてもらってください。",
"Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "このファイルを読み取ることができません、共有ファイルの可能性があります。ファイルの所有者にお願いして、ファイルを共有しなおしてもらってください。",
"Enable recovery key" : "復旧キーを有効にする",
"Disable recovery key" : "復旧キーを無効にする",
"The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "復旧キーは、ファイルの暗号化に使う特別な暗号化キーです。ユーザがパスワードを忘れてしまった場合には、リカバリキーを使ってユーザのファイルを復元することができます。",
"Recovery key password" : "復旧キーのパスワード",
"Repeat recovery key password" : "復旧キーのパスワードをもう一度入力",
"Change recovery key password:" : "復旧キーのパスワードを変更:",
"Old recovery key password" : "古い復旧キーのパスワード",
"New recovery key password" : "新しい復旧キーのパスワード",
"Repeat new recovery key password" : "新しい復旧キーのパスワードをもう一度入力",
"Change Password" : "パスワードを変更",
"ownCloud basic encryption module" : "ownCloud 基本暗号化モジュール",
"Your private key password no longer matches your log-in password." : "もはや秘密鍵はログインパスワードと一致しません。",
"Set your old private key password to your current log-in password:" : "古い秘密鍵のパスワードを現在のログインパスワードに設定:",
" If you don't remember your old password you can ask your administrator to recover your files." : "古いパスワードを覚えていない場合、管理者に尋ねてファイルを回復することができます。",
"Old log-in password" : "古いログインパスワード",
"Current log-in password" : "現在のログインパスワード",
"Update Private Key Password" : "秘密鍵のパスワードを更新",
"Enable password recovery:" : "パスワードリカバリを有効に:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "このオプションを有効にすると、パスワードを紛失した場合も、暗号化されたファイルに再度アクセスすることができるようになります。",
"Enabled" : "有効",
"Disabled" : "無効"
},"pluralForm" :"nplurals=1; plural=0;"
}
@@ -1,11 +1,10 @@
OC.L10N.register(
"files_encryption",
"encryption",
{
"Unknown error" : "មិន​ស្គាល់​កំហុស",
"Password successfully changed." : "បាន​ប្ដូរ​ពាក្យ​សម្ងាត់​ដោយ​ជោគជ័យ។",
"Could not change the password. Maybe the old password was not correct." : "មិន​អាច​ប្ដូរ​ពាក្យ​សម្ងាត់​បាន​ទេ។ ប្រហែល​ពាក្យ​សម្ងាត់​ចាស់​មិន​ត្រឹម​ត្រូវ។",
"Change Password" : "ប្ដូរ​ពាក្យ​សម្ងាត់",
"Enabled" : "បាន​បើក",
"Disabled" : "បាន​បិទ",
"Change Password" : "ប្ដូរ​ពាក្យ​សម្ងាត់"
"Disabled" : "បាន​បិទ"
},
"nplurals=1; plural=0;");
@@ -1,9 +1,8 @@
{ "translations": {
"Unknown error" : "មិន​ស្គាល់​កំហុស",
"Password successfully changed." : "បាន​ប្ដូរ​ពាក្យ​សម្ងាត់​ដោយ​ជោគជ័យ។",
"Could not change the password. Maybe the old password was not correct." : "មិន​អាច​ប្ដូរ​ពាក្យ​សម្ងាត់​បាន​ទេ។ ប្រហែល​ពាក្យ​សម្ងាត់​ចាស់​មិន​ត្រឹម​ត្រូវ។",
"Change Password" : "ប្ដូរ​ពាក្យ​សម្ងាត់",
"Enabled" : "បាន​បើក",
"Disabled" : "បាន​បិទ",
"Change Password" : "ប្ដូរ​ពាក្យ​សម្ងាត់"
"Disabled" : "បាន​បិទ"
},"pluralForm" :"nplurals=1; plural=0;"
}
@@ -1,7 +1,6 @@
OC.L10N.register(
"files_encryption",
"encryption",
{
"Unknown error" : "ಗೊತ್ತಿಲ್ಲದ ದೋಷ",
"Enabled" : "ಸಕ್ರಿಯಗೊಳಿಸಿದೆ",
"Disabled" : "ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"
},
@@ -1,5 +1,4 @@
{ "translations": {
"Unknown error" : "ಗೊತ್ತಿಲ್ಲದ ದೋಷ",
"Enabled" : "ಸಕ್ರಿಯಗೊಳಿಸಿದೆ",
"Disabled" : "ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"
},"pluralForm" :"nplurals=1; plural=0;"
@@ -1,46 +1,40 @@
OC.L10N.register(
"files_encryption",
"encryption",
{
"Unknown error" : "알 수 없는 오류",
"Missing recovery key password" : "잊어버린 복구 키 암호 복구",
"Please repeat the recovery key password" : "복구 키 암호를 다시 입력하십시오",
"Repeated recovery key password does not match the provided recovery key password" : "입력한 복구 키 암호가 서로 다릅니다",
"Recovery key successfully enabled" : "복구 키가 성공적으로 활성화되었습니다",
"Could not disable recovery key. Please check your recovery key password!" : "복구 키를 활성화 할 수 없습니다. 복구 키의 암호를 확인해 주십시오!",
"Could not enable recovery key. Please check your recovery key password!" : "복구 키를 활성화 할 수 없습니다. 복구 키의 암호를 확인해 주십시오!",
"Recovery key successfully disabled" : "복구 키가 성공적으로 비활성화 되었습니다",
"Could not disable recovery key. Please check your recovery key password!" : "복구 키를 비활성화 할 수 없습니다. 복구 키의 암호를 확인해 주십시오!",
"Missing parameters" : "인자 부족함",
"Please provide the old recovery password" : "이전 복구 암호를 입력하십시오",
"Please provide a new recovery password" : "새 복구 암호를 입력하십시오",
"Please repeat the new recovery password" : "새 복구 암호를 다시 입력하십시오",
"Password successfully changed." : "암호가 성공적으로 변경되었습니다",
"Could not change the password. Maybe the old password was not correct." : "암호를 변경할 수 없습니다. 예전 암호가 정확하지 않은 것 같습니다.",
"Recovery Key disabled" : "복구 키가 비활성화됨",
"Recovery Key enabled" : "복구 키가 활성화됨",
"Could not enable the recovery key, please try again or contact your administrator" : "복구 키를 활성화할 수 없습니다. 다시 시도하거나 관리자에게 연락하십시오",
"Could not update the private key password." : "개인 키 암호를 업데이트할 수 없습니다",
"The old password was not correct, please try again." : "이전 암호가 잘못되었습니다. 다시 시도하십시오.",
"The current log-in password was not correct, please try again." : "현재 로그인 암호가 잘못되었습니다. 다시 시도하십시오.",
"Private key password successfully updated." : "개인 키 암호가 성공적으로 업데이트 되었습니다.",
"File recovery settings updated" : "파일 복구 설정 업데이트됨",
"Could not update file recovery" : "파일 복구를 업데이트할 수 없습니다",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "암호화 앱이 초기화되지 않았습니다! 암호화 앱이 다시 활성화된 것 같습니다. 암호화 앱을 초기화하려면 로그아웃했다 다시 로그인하십시오.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "개인 키가 올바르지 않습니다! 암호가 %s 외부에서(예: 회사 디렉터리) 변경된 것 같습니다. 암호화된 파일에 다시 접근하려면 개인 설정에서 개인 키 암호를 수정하십시오.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "이 파일을 복호화할 수 없습니다. 공유된 파일일 수도 있습니다. 파일 소유자에게 공유를 다시 요청하십시오.",
"Unknown error. Please check your system settings or contact your administrator" : "알 수 없는 오류입니다. 시스템 설정을 확인하거나 관리자에게 문의하십시오",
"Initial encryption started... This can take some time. Please wait." : "초기 암호화가 시작되었습니다... 시간이 걸릴 수도 있으니 기다려 주십시오.",
"Initial encryption running... Please try again later." : "초기 암호화가 진행 중입니다... 나중에 다시 시도하십시오.",
"Missing requirements." : "요구 사항이 부족합니다.",
"Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "OpenSSL 및 PHP OpenSSL 확장이 활성화되어 있고 올바르게 설정되어 있는지 확인하십시오. 현재 암호화 앱이 비활성화되었습니다.",
"Following users are not set up for encryption:" : "다음 사용자는 암호화를 사용할 수 없습니다:",
"Go directly to your %spersonal settings%s." : "%s개인 설정%s으로 직접 이동하십시오.",
"Server-side Encryption" : "서버 측 암호화",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "암호화 앱의 개인 키가 잘못되었습니다. 암호화된 파일에 다시 접근하려면 개인 설정에서 개인 키 암호를 업데이트해야 합니다.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "암호화 앱이 활성화되어 있지만 키가 초기화되지 않았습니다. 로그아웃한 후 다시 로그인하십시오",
"Enable recovery key (allow to recover users files in case of password loss):" : "복구 키 사용 (암호를 잊었을 때 파일을 복구할 수 있도록 함):",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "이 파일을 복호화할 수 없습니다. 공유된 파일일습니다. 파일 소유자에게 공유를 다시 요청하십시오.",
"Enable recovery key" : "복구 키 활성화",
"Disable recovery key" : "복구 키 비활성화",
"The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "복구 키는 파일을 암호화하는 추가 키입니다. 사용자가 암호를 잊었을 때 복구할 수 있도록 해 줍니다.",
"Recovery key password" : "복구 키 암호",
"Repeat Recovery key password" : "복구 키 암호 재입력",
"Enabled" : "활성화",
"Disabled" : "비활성화",
"Repeat recovery key password" : "복구 키 암호 확인",
"Change recovery key password:" : "복구 키 암호 변경:",
"Old Recovery key password" : "이전 복구 키 암호",
"New Recovery key password" : "새 복구 키 암호",
"Repeat New Recovery key password" : "새 복구 키 암호 재입력",
"Old recovery key password" : "이전 복구 키 암호",
"New recovery key password" : "새 복구 키 암호",
"Repeat new recovery key password" : "새 복구 키 암호 확인",
"Change Password" : "암호 변경",
"ownCloud basic encryption module" : "ownCloud 기본 암호화 모듈",
"Your private key password no longer matches your log-in password." : "개인 키 암호와 로그인 암호가 일치하지 않습니다.",
"Set your old private key password to your current log-in password:" : "기존 개인 키 암호를 로그인 암호와 동일하게 설정하십시오:",
" If you don't remember your old password you can ask your administrator to recover your files." : " 이전 암호가 기억나지 않으면 시스템 관리자에게 파일 복구를 요청하십시오.",
@@ -48,6 +42,8 @@ OC.L10N.register(
"Current log-in password" : "현재 로그인 암호",
"Update Private Key Password" : "개인 키 암호 업데이트",
"Enable password recovery:" : "암호 복구 사용:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "이 옵션을 사용하면 암호를 잊었을 때 암호화된 파일에 다시 접근할 수 있습니다"
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "이 옵션을 사용하면 암호를 잊었을 때 암호화된 파일에 다시 접근할 수 있습니다",
"Enabled" : "활성화",
"Disabled" : "비활성화"
},
"nplurals=1; plural=0;");
@@ -1,44 +1,38 @@
{ "translations": {
"Unknown error" : "알 수 없는 오류",
"Missing recovery key password" : "잊어버린 복구 키 암호 복구",
"Please repeat the recovery key password" : "복구 키 암호를 다시 입력하십시오",
"Repeated recovery key password does not match the provided recovery key password" : "입력한 복구 키 암호가 서로 다릅니다",
"Recovery key successfully enabled" : "복구 키가 성공적으로 활성화되었습니다",
"Could not disable recovery key. Please check your recovery key password!" : "복구 키를 활성화 할 수 없습니다. 복구 키의 암호를 확인해 주십시오!",
"Could not enable recovery key. Please check your recovery key password!" : "복구 키를 활성화 할 수 없습니다. 복구 키의 암호를 확인해 주십시오!",
"Recovery key successfully disabled" : "복구 키가 성공적으로 비활성화 되었습니다",
"Could not disable recovery key. Please check your recovery key password!" : "복구 키를 비활성화 할 수 없습니다. 복구 키의 암호를 확인해 주십시오!",
"Missing parameters" : "인자 부족함",
"Please provide the old recovery password" : "이전 복구 암호를 입력하십시오",
"Please provide a new recovery password" : "새 복구 암호를 입력하십시오",
"Please repeat the new recovery password" : "새 복구 암호를 다시 입력하십시오",
"Password successfully changed." : "암호가 성공적으로 변경되었습니다",
"Could not change the password. Maybe the old password was not correct." : "암호를 변경할 수 없습니다. 예전 암호가 정확하지 않은 것 같습니다.",
"Recovery Key disabled" : "복구 키가 비활성화됨",
"Recovery Key enabled" : "복구 키가 활성화됨",
"Could not enable the recovery key, please try again or contact your administrator" : "복구 키를 활성화할 수 없습니다. 다시 시도하거나 관리자에게 연락하십시오",
"Could not update the private key password." : "개인 키 암호를 업데이트할 수 없습니다",
"The old password was not correct, please try again." : "이전 암호가 잘못되었습니다. 다시 시도하십시오.",
"The current log-in password was not correct, please try again." : "현재 로그인 암호가 잘못되었습니다. 다시 시도하십시오.",
"Private key password successfully updated." : "개인 키 암호가 성공적으로 업데이트 되었습니다.",
"File recovery settings updated" : "파일 복구 설정 업데이트됨",
"Could not update file recovery" : "파일 복구를 업데이트할 수 없습니다",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "암호화 앱이 초기화되지 않았습니다! 암호화 앱이 다시 활성화된 것 같습니다. 암호화 앱을 초기화하려면 로그아웃했다 다시 로그인하십시오.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "개인 키가 올바르지 않습니다! 암호가 %s 외부에서(예: 회사 디렉터리) 변경된 것 같습니다. 암호화된 파일에 다시 접근하려면 개인 설정에서 개인 키 암호를 수정하십시오.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "이 파일을 복호화할 수 없습니다. 공유된 파일일 수도 있습니다. 파일 소유자에게 공유를 다시 요청하십시오.",
"Unknown error. Please check your system settings or contact your administrator" : "알 수 없는 오류입니다. 시스템 설정을 확인하거나 관리자에게 문의하십시오",
"Initial encryption started... This can take some time. Please wait." : "초기 암호화가 시작되었습니다... 시간이 걸릴 수도 있으니 기다려 주십시오.",
"Initial encryption running... Please try again later." : "초기 암호화가 진행 중입니다... 나중에 다시 시도하십시오.",
"Missing requirements." : "요구 사항이 부족합니다.",
"Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "OpenSSL 및 PHP OpenSSL 확장이 활성화되어 있고 올바르게 설정되어 있는지 확인하십시오. 현재 암호화 앱이 비활성화되었습니다.",
"Following users are not set up for encryption:" : "다음 사용자는 암호화를 사용할 수 없습니다:",
"Go directly to your %spersonal settings%s." : "%s개인 설정%s으로 직접 이동하십시오.",
"Server-side Encryption" : "서버 측 암호화",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "암호화 앱의 개인 키가 잘못되었습니다. 암호화된 파일에 다시 접근하려면 개인 설정에서 개인 키 암호를 업데이트해야 합니다.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "암호화 앱이 활성화되어 있지만 키가 초기화되지 않았습니다. 로그아웃한 후 다시 로그인하십시오",
"Enable recovery key (allow to recover users files in case of password loss):" : "복구 키 사용 (암호를 잊었을 때 파일을 복구할 수 있도록 함):",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "이 파일을 복호화할 수 없습니다. 공유된 파일일습니다. 파일 소유자에게 공유를 다시 요청하십시오.",
"Enable recovery key" : "복구 키 활성화",
"Disable recovery key" : "복구 키 비활성화",
"The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "복구 키는 파일을 암호화하는 추가 키입니다. 사용자가 암호를 잊었을 때 복구할 수 있도록 해 줍니다.",
"Recovery key password" : "복구 키 암호",
"Repeat Recovery key password" : "복구 키 암호 재입력",
"Enabled" : "활성화",
"Disabled" : "비활성화",
"Repeat recovery key password" : "복구 키 암호 확인",
"Change recovery key password:" : "복구 키 암호 변경:",
"Old Recovery key password" : "이전 복구 키 암호",
"New Recovery key password" : "새 복구 키 암호",
"Repeat New Recovery key password" : "새 복구 키 암호 재입력",
"Old recovery key password" : "이전 복구 키 암호",
"New recovery key password" : "새 복구 키 암호",
"Repeat new recovery key password" : "새 복구 키 암호 확인",
"Change Password" : "암호 변경",
"ownCloud basic encryption module" : "ownCloud 기본 암호화 모듈",
"Your private key password no longer matches your log-in password." : "개인 키 암호와 로그인 암호가 일치하지 않습니다.",
"Set your old private key password to your current log-in password:" : "기존 개인 키 암호를 로그인 암호와 동일하게 설정하십시오:",
" If you don't remember your old password you can ask your administrator to recover your files." : " 이전 암호가 기억나지 않으면 시스템 관리자에게 파일 복구를 요청하십시오.",
@@ -46,6 +40,8 @@
"Current log-in password" : "현재 로그인 암호",
"Update Private Key Password" : "개인 키 암호 업데이트",
"Enable password recovery:" : "암호 복구 사용:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "이 옵션을 사용하면 암호를 잊었을 때 암호화된 파일에 다시 접근할 수 있습니다"
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "이 옵션을 사용하면 암호를 잊었을 때 암호화된 파일에 다시 접근할 수 있습니다",
"Enabled" : "활성화",
"Disabled" : "비활성화"
},"pluralForm" :"nplurals=1; plural=0;"
}
+8
View File
@@ -0,0 +1,8 @@
OC.L10N.register(
"encryption",
{
"Change Password" : "Passwuert änneren",
"Enabled" : "Aktivéiert",
"Disabled" : "Deaktivéiert"
},
"nplurals=2; plural=(n != 1);");
+6
View File
@@ -0,0 +1,6 @@
{ "translations": {
"Change Password" : "Passwuert änneren",
"Enabled" : "Aktivéiert",
"Disabled" : "Deaktivéiert"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}
@@ -1,37 +1,26 @@
OC.L10N.register(
"files_encryption",
"encryption",
{
"Unknown error" : "Neatpažinta klaida",
"Recovery key successfully enabled" : "Atkūrimo raktas sėkmingai įjungtas",
"Could not disable recovery key. Please check your recovery key password!" : "Neišėjo jungti jūsų atkūrimo rakto. Prašome jį patikrinti!",
"Could not enable recovery key. Please check your recovery key password!" : "Neišėjo įjungti jūsų atkūrimo rakto. Prašome jį patikrinti!",
"Recovery key successfully disabled" : "Atkūrimo raktas sėkmingai išjungtas",
"Could not disable recovery key. Please check your recovery key password!" : "Neišėjo išjungti jūsų atkūrimo rakto. Prašome jį patikrinti!",
"Password successfully changed." : "Slaptažodis sėkmingai pakeistas",
"Could not change the password. Maybe the old password was not correct." : "Slaptažodis nebuvo pakeistas. Gali būti, kad buvo neteisingai suvestas senasis.",
"Private key password successfully updated." : "Privataus rakto slaptažodis buvo sėkmingai atnaujintas.",
"File recovery settings updated" : "Failų atkūrimo nustatymai pakeisti",
"Could not update file recovery" : "Neišėjo atnaujinti failų atkūrimo",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Šifravimo programa nepaleista! Galbūt šifravimo programa buvo įjungta dar kartą Jūsų sesijos metu. Prašome atsijungti ir vėl prisijungti, kad paleisti šifravimo programą.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Jūsų privatus raktas yra netinkamas! Panašu, kad Jūsų slaptažodis buvo pakeistas už %s (pvz. Jūsų organizacijos kataloge). Galite atnaujinti savo privataus rakto slaptažodį savo asmeniniuose nustatymuose, kad atkurti prieigą prie savo šifruotų failų.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Failo iššifruoti nepavyko, gali būti jog jis yra pasidalintas su jumis. Paprašykite failo savininko, kad jums iš naujo pateiktų šį failą.",
"Initial encryption started... This can take some time. Please wait." : "Pradėtas pirminis šifravimas... Tai gali užtrukti. Prašome palaukti.",
"Missing requirements." : "Trūkstami laukai.",
"Following users are not set up for encryption:" : "Sekantys naudotojai nenustatyti šifravimui:",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Netinkamas privatus raktas Šifravimo programai. Prašome atnaujinti savo privataus rakto slaptažodį asmeniniuose nustatymuose, kad atkurti prieigą prie šifruotų failų.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Šifravimo programa įjungta, bet Jūsų raktai nėra pritaikyti. Prašome atsijungti ir vėl prisijungti",
"Enable recovery key (allow to recover users files in case of password loss):" : "Įjunkite atkūrimo raktą, (leisti atkurti naudotojų failus praradus slaptažodį):",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Failo iššifruoti nepavyko, gali būti jog jis yra pasidalintas su jumis. Paprašykite failo savininko, kad jums iš naujo pateiktų šį failą.",
"Recovery key password" : "Atkūrimo rakto slaptažodis",
"Repeat Recovery key password" : "Pakartokite atkūrimo rakto slaptažodį",
"Enabled" : "Įjungta",
"Disabled" : "Išjungta",
"Change recovery key password:" : "Pakeisti atkūrimo rakto slaptažodį:",
"Old Recovery key password" : "Senas atkūrimo rakto slaptažodis",
"New Recovery key password" : "Naujas atkūrimo rakto slaptažodis",
"Repeat New Recovery key password" : "Pakartokite naują atkūrimo rakto slaptažodį",
"Change Password" : "Pakeisti slaptažodį",
" If you don't remember your old password you can ask your administrator to recover your files." : "Jei nepamenate savo seno slaptažodžio, galite paprašyti administratoriaus atkurti Jūsų failus.",
"Old log-in password" : "Senas prisijungimo slaptažodis",
"Current log-in password" : "Dabartinis prisijungimo slaptažodis",
"Update Private Key Password" : "Atnaujinti privataus rakto slaptažodį",
"Enable password recovery:" : "Įjungti slaptažodžio atkūrimą:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Įjungus šią funkciją jums bus suteiktas pakartotinis priėjimas prie Jūsų šifruotų failų pamiršus slaptažodį."
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Įjungus šią funkciją jums bus suteiktas pakartotinis priėjimas prie Jūsų šifruotų failų pamiršus slaptažodį.",
"Enabled" : "Įjungta",
"Disabled" : "Išjungta"
},
"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);");
@@ -1,35 +1,24 @@
{ "translations": {
"Unknown error" : "Neatpažinta klaida",
"Recovery key successfully enabled" : "Atkūrimo raktas sėkmingai įjungtas",
"Could not disable recovery key. Please check your recovery key password!" : "Neišėjo jungti jūsų atkūrimo rakto. Prašome jį patikrinti!",
"Could not enable recovery key. Please check your recovery key password!" : "Neišėjo įjungti jūsų atkūrimo rakto. Prašome jį patikrinti!",
"Recovery key successfully disabled" : "Atkūrimo raktas sėkmingai išjungtas",
"Could not disable recovery key. Please check your recovery key password!" : "Neišėjo išjungti jūsų atkūrimo rakto. Prašome jį patikrinti!",
"Password successfully changed." : "Slaptažodis sėkmingai pakeistas",
"Could not change the password. Maybe the old password was not correct." : "Slaptažodis nebuvo pakeistas. Gali būti, kad buvo neteisingai suvestas senasis.",
"Private key password successfully updated." : "Privataus rakto slaptažodis buvo sėkmingai atnaujintas.",
"File recovery settings updated" : "Failų atkūrimo nustatymai pakeisti",
"Could not update file recovery" : "Neišėjo atnaujinti failų atkūrimo",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Šifravimo programa nepaleista! Galbūt šifravimo programa buvo įjungta dar kartą Jūsų sesijos metu. Prašome atsijungti ir vėl prisijungti, kad paleisti šifravimo programą.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Jūsų privatus raktas yra netinkamas! Panašu, kad Jūsų slaptažodis buvo pakeistas už %s (pvz. Jūsų organizacijos kataloge). Galite atnaujinti savo privataus rakto slaptažodį savo asmeniniuose nustatymuose, kad atkurti prieigą prie savo šifruotų failų.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Failo iššifruoti nepavyko, gali būti jog jis yra pasidalintas su jumis. Paprašykite failo savininko, kad jums iš naujo pateiktų šį failą.",
"Initial encryption started... This can take some time. Please wait." : "Pradėtas pirminis šifravimas... Tai gali užtrukti. Prašome palaukti.",
"Missing requirements." : "Trūkstami laukai.",
"Following users are not set up for encryption:" : "Sekantys naudotojai nenustatyti šifravimui:",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Netinkamas privatus raktas Šifravimo programai. Prašome atnaujinti savo privataus rakto slaptažodį asmeniniuose nustatymuose, kad atkurti prieigą prie šifruotų failų.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Šifravimo programa įjungta, bet Jūsų raktai nėra pritaikyti. Prašome atsijungti ir vėl prisijungti",
"Enable recovery key (allow to recover users files in case of password loss):" : "Įjunkite atkūrimo raktą, (leisti atkurti naudotojų failus praradus slaptažodį):",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Failo iššifruoti nepavyko, gali būti jog jis yra pasidalintas su jumis. Paprašykite failo savininko, kad jums iš naujo pateiktų šį failą.",
"Recovery key password" : "Atkūrimo rakto slaptažodis",
"Repeat Recovery key password" : "Pakartokite atkūrimo rakto slaptažodį",
"Enabled" : "Įjungta",
"Disabled" : "Išjungta",
"Change recovery key password:" : "Pakeisti atkūrimo rakto slaptažodį:",
"Old Recovery key password" : "Senas atkūrimo rakto slaptažodis",
"New Recovery key password" : "Naujas atkūrimo rakto slaptažodis",
"Repeat New Recovery key password" : "Pakartokite naują atkūrimo rakto slaptažodį",
"Change Password" : "Pakeisti slaptažodį",
" If you don't remember your old password you can ask your administrator to recover your files." : "Jei nepamenate savo seno slaptažodžio, galite paprašyti administratoriaus atkurti Jūsų failus.",
"Old log-in password" : "Senas prisijungimo slaptažodis",
"Current log-in password" : "Dabartinis prisijungimo slaptažodis",
"Update Private Key Password" : "Atnaujinti privataus rakto slaptažodį",
"Enable password recovery:" : "Įjungti slaptažodžio atkūrimą:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Įjungus šią funkciją jums bus suteiktas pakartotinis priėjimas prie Jūsų šifruotų failų pamiršus slaptažodį."
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Įjungus šią funkciją jums bus suteiktas pakartotinis priėjimas prie Jūsų šifruotų failų pamiršus slaptažodį.",
"Enabled" : "Įjungta",
"Disabled" : "Išjungta"
},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);"
}
@@ -1,7 +1,7 @@
OC.L10N.register(
"files_encryption",
"encryption",
{
"Unknown error" : "Nezināma kļūda",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Šifrēšanas lietotnei nepareiza privātā atslēga. Lūdzu atjaunojiet savu privāto atslēgu personīgo uzstādījumu sadaļā, lai atjaunot pieeju šifrētajiem failiem.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Šifrēšanas lietotnes ir pieslēgta, bet šifrēšanas atslēgas nav uzstādītas. Lūdzu izejiet no sistēmas un ieejiet sistēmā atpakaļ.",
"Enabled" : "Pievienots"
},
@@ -1,5 +1,5 @@
{ "translations": {
"Unknown error" : "Nezināma kļūda",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Šifrēšanas lietotnei nepareiza privātā atslēga. Lūdzu atjaunojiet savu privāto atslēgu personīgo uzstādījumu sadaļā, lai atjaunot pieeju šifrētajiem failiem.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Šifrēšanas lietotnes ir pieslēgta, bet šifrēšanas atslēgas nav uzstādītas. Lūdzu izejiet no sistēmas un ieejiet sistēmā atpakaļ.",
"Enabled" : "Pievienots"
},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);"
@@ -1,18 +1,13 @@
OC.L10N.register(
"files_encryption",
"encryption",
{
"Unknown error" : "Непозната грешка",
"Password successfully changed." : "Лозинката е успешно променета.",
"Could not change the password. Maybe the old password was not correct." : "Лозинката не можеше да се промени. Можеби старата лозинка не беше исправна.",
"Missing requirements." : "Барања кои недостасуваат.",
"Repeat Recovery key password" : "Повтори ја лозинката за клучот на обновување",
"Enabled" : "Овозможен",
"Disabled" : "Оневозможен",
"Old Recovery key password" : "Старата лозинка за клучот на обновување ",
"Repeat New Recovery key password" : "Повтори ја лозинката за клучот на обновувањето",
"Change Password" : "Смени лозинка",
"Old log-in password" : "Старата лозинка за најавување",
"Current log-in password" : "Тековната лозинка за најавување",
"Enable password recovery:" : "Овозможи го обновувањето на лозинката:"
"Enable password recovery:" : "Овозможи го обновувањето на лозинката:",
"Enabled" : "Овозможен",
"Disabled" : "Оневозможен"
},
"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;");
@@ -1,16 +1,11 @@
{ "translations": {
"Unknown error" : "Непозната грешка",
"Password successfully changed." : "Лозинката е успешно променета.",
"Could not change the password. Maybe the old password was not correct." : "Лозинката не можеше да се промени. Можеби старата лозинка не беше исправна.",
"Missing requirements." : "Барања кои недостасуваат.",
"Repeat Recovery key password" : "Повтори ја лозинката за клучот на обновување",
"Enabled" : "Овозможен",
"Disabled" : "Оневозможен",
"Old Recovery key password" : "Старата лозинка за клучот на обновување ",
"Repeat New Recovery key password" : "Повтори ја лозинката за клучот на обновувањето",
"Change Password" : "Смени лозинка",
"Old log-in password" : "Старата лозинка за најавување",
"Current log-in password" : "Тековната лозинка за најавување",
"Enable password recovery:" : "Овозможи го обновувањето на лозинката:"
"Enable password recovery:" : "Овозможи го обновувањето на лозинката:",
"Enabled" : "Овозможен",
"Disabled" : "Оневозможен"
},"pluralForm" :"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;"
}
@@ -1,46 +1,43 @@
OC.L10N.register(
"files_encryption",
"encryption",
{
"Unknown error" : "Ukjent feil",
"Missing recovery key password" : "Passord for gjenopprettingsnøkkel mangler",
"Please repeat the recovery key password" : "Gjenta passord for gjenopprettingsnøkkel",
"Repeated recovery key password does not match the provided recovery key password" : "Gjentatt passord for gjenopprettingsnøkkel stemmer ikke med oppgitt passord for gjenopprettingsnøkkel",
"Recovery key successfully enabled" : "Gjenopprettingsnøkkel aktivert",
"Could not disable recovery key. Please check your recovery key password!" : "Klarte ikke å deaktivere gjenopprettingsnøkkel. Sjekk passordet for gjenopprettingsnøkkelen.",
"Could not enable recovery key. Please check your recovery key password!" : "Klarte ikke å aktivere gjenopprettingsnøkkel. Sjekk passordet for gjenopprettingsnøkkelen.",
"Recovery key successfully disabled" : "Gjenopprettingsnøkkel ble deaktivert",
"Could not disable recovery key. Please check your recovery key password!" : "Klarte ikke å deaktivere gjenopprettingsnøkkel. Sjekk passordet for gjenopprettingsnøkkelen.",
"Missing parameters" : "Manglende parametre",
"Please provide the old recovery password" : "Oppgi det gamle gjenopprettingspassordet",
"Please provide a new recovery password" : "Oppgi et nytt gjenopprettingspassord",
"Please repeat the new recovery password" : "Gjenta det nye gjenopprettingspassordet",
"Password successfully changed." : "Passordet ble endret.",
"Could not change the password. Maybe the old password was not correct." : "Klarte ikke å endre passordet. Kanskje gammelt passord ikke var korrekt.",
"Recovery Key disabled" : "Gjenopprettingsnøkkel deaktivert",
"Recovery Key enabled" : "Gjenopprettingsnøkkel aktivert",
"Could not enable the recovery key, please try again or contact your administrator" : "Klarte ikke å aktivere gjenopprettingsnøkkelen. Prøv igjen eller kontakt administratoren.",
"Could not update the private key password." : "Klarte ikke å oppdatere privatnøkkelpassordet.",
"The old password was not correct, please try again." : "Det gamle passordet var feil. Prøv igjen.",
"The current log-in password was not correct, please try again." : "Det nåværende innloggingspassordet var feil. Prøv igjen.",
"Private key password successfully updated." : "Passord for privat nøkkel ble oppdatert.",
"File recovery settings updated" : "Innstillinger for gjenoppretting av filer ble oppdatert",
"Could not update file recovery" : "Klarte ikke å oppdatere gjenoppretting av filer",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Krypterings-app ikke initialisert! Kanskje krypterings-appen ble aktivert på nytt i løpet av økten din. Prøv å logge ut og logge inn igjen for å initialisere krypterings-appen.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Din private nøkkel er ikke gyldig! Sannsynligvis ble passordet ditt endret utenfor %s. (f.eks. din bedriftskatalog). Du kan oppdatere passordet for din private nøkkel i dine personlige innstillinger for å gjenvinne tilgang til de krypterte filene dine.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke dekryptere denne filen. Dette er sannsynligvis en delt fil. Spør eieren av filen om å dele den med deg på nytt.",
"Unknown error. Please check your system settings or contact your administrator" : "Ukjent feil. Sjekk systeminnstillingene eller kontakt administratoren.",
"Initial encryption started... This can take some time. Please wait." : "Førstegangs kryptering startet... Dette kan ta litt tid. Vennligst vent.",
"Initial encryption running... Please try again later." : "Førstegangs kryptering kjører... Prøv igjen senere.",
"Missing requirements." : "Manglende krav.",
"Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Vennligst se til at OpenSSL sammen med PHP-utvidelsen er aktivert og riktig konfigurert. Krypterings-appen er foreløpig deaktivert.",
"Following users are not set up for encryption:" : "Følgende brukere er ikke satt opp for kryptering:",
"Go directly to your %spersonal settings%s." : "Gå direkte til dine %spersonlige innstillinger%s.",
"Server-side Encryption" : "Serverkryptering",
"You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Du må migrere krypteringsnøklene din fra den gamle krypteringen (ownCloud <= 8.0) til den nye. Vennligst kjør 'occ encryption:migrate' eller kontakt en administrator",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ugyldig privat nøkkel for Krypterings-app. Oppdater passordet for din private nøkkel i dine personlige innstillinger for å gjenopprette tilgang til de krypterte filene dine.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "App for kryptering er aktivert men nøklene dine er ikke satt opp. Logg ut og logg inn igjen.",
"Enable recovery key (allow to recover users files in case of password loss):" : "Aktiver gjenopprettingsnøkkel (tillat å gjenopprette brukerfiler i tilfelle tap av passord):",
"Encryption App is enabled and ready" : "Krypterings-appen er aktivert og klar",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke dekryptere denne filen. Dette er sannsynligvis en delt fil. Spør eieren av filen om å dele den med deg på nytt.",
"Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke lese denne filen, som sannsynligvis er en delt fil. Be eieren av filen om å dele den med deg på nytt.",
"Enable recovery key" : "Aktiver gjenopprettingsnøkkel",
"Disable recovery key" : "Deaktiver gjenopprettingsnøkkel",
"The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Gjenopprettingsnøkkelen er en ekstra krypteringsnøkkel som brukes til å kryptere filer. Den tillater gjenoppretting av en brukers filer i tilfelle brukeren glemmer passordet sitt.",
"Recovery key password" : "Passord for gjenopprettingsnøkkel",
"Repeat Recovery key password" : "Gjenta passord for gjenopprettingsnøkkel",
"Enabled" : "Aktiv",
"Disabled" : "Inaktiv",
"Repeat recovery key password" : "Gjenta passord for gjenopprettingsnøkkel",
"Change recovery key password:" : "Endre passord for gjenopprettingsnøkkel:",
"Old Recovery key password" : "Gammelt passord for gjenopprettingsnøkkel",
"New Recovery key password" : "Nytt passord for gjenopprettingsnøkkel",
"Repeat New Recovery key password" : "Gjenta nytt passord for gjenopprettingsnøkkel",
"Old recovery key password" : "Gammelt passord for gjenopprettingsnøkkel",
"New recovery key password" : "Nytt passord for gjenopprettingsnøkkel",
"Repeat new recovery key password" : "Gjenta nytt passord for gjenopprettingsnøkkel",
"Change Password" : "Endre passord",
"ownCloud basic encryption module" : "ownCloud grunnleggende krypteringsmodul",
"Your private key password no longer matches your log-in password." : "Passordet for din private nøkkel stemmer ikke lenger med påloggingspassordet ditt.",
"Set your old private key password to your current log-in password:" : "Sett ditt gamle passord for privat nøkkel til ditt nåværende påloggingspassord:",
" If you don't remember your old password you can ask your administrator to recover your files." : "Hvis du ikke husker det gamle passordet ditt kan du spørre administratoren om å gjenopprette filene dine.",
@@ -48,6 +45,8 @@ OC.L10N.register(
"Current log-in password" : "Nåværende påloggingspassord",
"Update Private Key Password" : "Oppdater passord for privat nøkkel",
"Enable password recovery:" : "Aktiver gjenoppretting av passord:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Aktivering av dette valget tillater deg å gjenerobre tilgang til dine krypterte filer i tilfelle du mister passordet ditt."
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Aktivering av dette valget tillater deg å gjenerobre tilgang til dine krypterte filer i tilfelle du mister passordet ditt.",
"Enabled" : "Aktiv",
"Disabled" : "Inaktiv"
},
"nplurals=2; plural=(n != 1);");
@@ -1,44 +1,41 @@
{ "translations": {
"Unknown error" : "Ukjent feil",
"Missing recovery key password" : "Passord for gjenopprettingsnøkkel mangler",
"Please repeat the recovery key password" : "Gjenta passord for gjenopprettingsnøkkel",
"Repeated recovery key password does not match the provided recovery key password" : "Gjentatt passord for gjenopprettingsnøkkel stemmer ikke med oppgitt passord for gjenopprettingsnøkkel",
"Recovery key successfully enabled" : "Gjenopprettingsnøkkel aktivert",
"Could not disable recovery key. Please check your recovery key password!" : "Klarte ikke å deaktivere gjenopprettingsnøkkel. Sjekk passordet for gjenopprettingsnøkkelen.",
"Could not enable recovery key. Please check your recovery key password!" : "Klarte ikke å aktivere gjenopprettingsnøkkel. Sjekk passordet for gjenopprettingsnøkkelen.",
"Recovery key successfully disabled" : "Gjenopprettingsnøkkel ble deaktivert",
"Could not disable recovery key. Please check your recovery key password!" : "Klarte ikke å deaktivere gjenopprettingsnøkkel. Sjekk passordet for gjenopprettingsnøkkelen.",
"Missing parameters" : "Manglende parametre",
"Please provide the old recovery password" : "Oppgi det gamle gjenopprettingspassordet",
"Please provide a new recovery password" : "Oppgi et nytt gjenopprettingspassord",
"Please repeat the new recovery password" : "Gjenta det nye gjenopprettingspassordet",
"Password successfully changed." : "Passordet ble endret.",
"Could not change the password. Maybe the old password was not correct." : "Klarte ikke å endre passordet. Kanskje gammelt passord ikke var korrekt.",
"Recovery Key disabled" : "Gjenopprettingsnøkkel deaktivert",
"Recovery Key enabled" : "Gjenopprettingsnøkkel aktivert",
"Could not enable the recovery key, please try again or contact your administrator" : "Klarte ikke å aktivere gjenopprettingsnøkkelen. Prøv igjen eller kontakt administratoren.",
"Could not update the private key password." : "Klarte ikke å oppdatere privatnøkkelpassordet.",
"The old password was not correct, please try again." : "Det gamle passordet var feil. Prøv igjen.",
"The current log-in password was not correct, please try again." : "Det nåværende innloggingspassordet var feil. Prøv igjen.",
"Private key password successfully updated." : "Passord for privat nøkkel ble oppdatert.",
"File recovery settings updated" : "Innstillinger for gjenoppretting av filer ble oppdatert",
"Could not update file recovery" : "Klarte ikke å oppdatere gjenoppretting av filer",
"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Krypterings-app ikke initialisert! Kanskje krypterings-appen ble aktivert på nytt i løpet av økten din. Prøv å logge ut og logge inn igjen for å initialisere krypterings-appen.",
"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Din private nøkkel er ikke gyldig! Sannsynligvis ble passordet ditt endret utenfor %s. (f.eks. din bedriftskatalog). Du kan oppdatere passordet for din private nøkkel i dine personlige innstillinger for å gjenvinne tilgang til de krypterte filene dine.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke dekryptere denne filen. Dette er sannsynligvis en delt fil. Spør eieren av filen om å dele den med deg på nytt.",
"Unknown error. Please check your system settings or contact your administrator" : "Ukjent feil. Sjekk systeminnstillingene eller kontakt administratoren.",
"Initial encryption started... This can take some time. Please wait." : "Førstegangs kryptering startet... Dette kan ta litt tid. Vennligst vent.",
"Initial encryption running... Please try again later." : "Førstegangs kryptering kjører... Prøv igjen senere.",
"Missing requirements." : "Manglende krav.",
"Please make sure that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Vennligst se til at OpenSSL sammen med PHP-utvidelsen er aktivert og riktig konfigurert. Krypterings-appen er foreløpig deaktivert.",
"Following users are not set up for encryption:" : "Følgende brukere er ikke satt opp for kryptering:",
"Go directly to your %spersonal settings%s." : "Gå direkte til dine %spersonlige innstillinger%s.",
"Server-side Encryption" : "Serverkryptering",
"You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Du må migrere krypteringsnøklene din fra den gamle krypteringen (ownCloud <= 8.0) til den nye. Vennligst kjør 'occ encryption:migrate' eller kontakt en administrator",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ugyldig privat nøkkel for Krypterings-app. Oppdater passordet for din private nøkkel i dine personlige innstillinger for å gjenopprette tilgang til de krypterte filene dine.",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "App for kryptering er aktivert men nøklene dine er ikke satt opp. Logg ut og logg inn igjen.",
"Enable recovery key (allow to recover users files in case of password loss):" : "Aktiver gjenopprettingsnøkkel (tillat å gjenopprette brukerfiler i tilfelle tap av passord):",
"Encryption App is enabled and ready" : "Krypterings-appen er aktivert og klar",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke dekryptere denne filen. Dette er sannsynligvis en delt fil. Spør eieren av filen om å dele den med deg på nytt.",
"Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke lese denne filen, som sannsynligvis er en delt fil. Be eieren av filen om å dele den med deg på nytt.",
"Enable recovery key" : "Aktiver gjenopprettingsnøkkel",
"Disable recovery key" : "Deaktiver gjenopprettingsnøkkel",
"The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Gjenopprettingsnøkkelen er en ekstra krypteringsnøkkel som brukes til å kryptere filer. Den tillater gjenoppretting av en brukers filer i tilfelle brukeren glemmer passordet sitt.",
"Recovery key password" : "Passord for gjenopprettingsnøkkel",
"Repeat Recovery key password" : "Gjenta passord for gjenopprettingsnøkkel",
"Enabled" : "Aktiv",
"Disabled" : "Inaktiv",
"Repeat recovery key password" : "Gjenta passord for gjenopprettingsnøkkel",
"Change recovery key password:" : "Endre passord for gjenopprettingsnøkkel:",
"Old Recovery key password" : "Gammelt passord for gjenopprettingsnøkkel",
"New Recovery key password" : "Nytt passord for gjenopprettingsnøkkel",
"Repeat New Recovery key password" : "Gjenta nytt passord for gjenopprettingsnøkkel",
"Old recovery key password" : "Gammelt passord for gjenopprettingsnøkkel",
"New recovery key password" : "Nytt passord for gjenopprettingsnøkkel",
"Repeat new recovery key password" : "Gjenta nytt passord for gjenopprettingsnøkkel",
"Change Password" : "Endre passord",
"ownCloud basic encryption module" : "ownCloud grunnleggende krypteringsmodul",
"Your private key password no longer matches your log-in password." : "Passordet for din private nøkkel stemmer ikke lenger med påloggingspassordet ditt.",
"Set your old private key password to your current log-in password:" : "Sett ditt gamle passord for privat nøkkel til ditt nåværende påloggingspassord:",
" If you don't remember your old password you can ask your administrator to recover your files." : "Hvis du ikke husker det gamle passordet ditt kan du spørre administratoren om å gjenopprette filene dine.",
@@ -46,6 +43,8 @@
"Current log-in password" : "Nåværende påloggingspassord",
"Update Private Key Password" : "Oppdater passord for privat nøkkel",
"Enable password recovery:" : "Aktiver gjenoppretting av passord:",
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Aktivering av dette valget tillater deg å gjenerobre tilgang til dine krypterte filer i tilfelle du mister passordet ditt."
"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Aktivering av dette valget tillater deg å gjenerobre tilgang til dine krypterte filer i tilfelle du mister passordet ditt.",
"Enabled" : "Aktiv",
"Disabled" : "Inaktiv"
},"pluralForm" :"nplurals=2; plural=(n != 1);"
}

Some files were not shown because too many files have changed in this diff Show More