Compare commits

..

5006 Commits

Author SHA1 Message Date
C Montero-Luque 35746e68ce 7.0.14 RC2 2016-05-02 04:20:40 -04:00
C Montero-Luque fe03f46a39 7.0.14 RC1 2016-04-26 21:28:52 -04:00
Thomas Müller 6518d6d0e8 Merge pull request #24167 from owncloud/stable7-certificate
[stable7] Ignore certificate file if it starts with file://
2016-04-22 09:34:44 +02:00
Lukas Reschke 9d5005c795 [stable7] Ignore certificate file if it starts with file:// 2016-04-21 18:47:17 +02:00
C Montero-Luque 84b831b0fe 7.0.13 2016-03-08 09:05:31 -05:00
C Montero-Luque 392696998b 7.0.13 RC2 2016-03-04 18:17:59 -05:00
C Montero-Luque a1fecc1d09 7.0.13 RC1 2016-03-01 21:27:10 -05:00
C. Montero Luque 40f3404d71 Merge pull request #22763 from owncloud/stable7-phpmailer
[stable7] Backport PHPMailer validation
2016-03-01 15:26:58 -05:00
Lukas Reschke 9ae57d55f0 [stable7] Backport PHPMailer validation
For https://github.com/owncloud/3rdparty/pull/252
2016-03-01 21:25:00 +01:00
C Montero-Luque 5557f6835d 7.0.12 2015-12-21 07:25:49 -05:00
C Montero-Luque a76d0cdc3d 7.0.12 RC2 2015-12-18 17:35:20 -05:00
C Montero-Luque f0032bd7b5 7.0.12 RC1 2015-12-15 16:13:05 -05:00
Lukas Reschke 5436575564 Merge pull request #21191 from owncloud/preview-non-existing-7
[7.0] Handle non existing files in version previews
2015-12-14 16:34:14 +01:00
Robin Appelman f746100e13 Handle non existing files in version previews 2015-12-14 15:59:36 +01:00
Lukas Reschke 85e068a723 Use XMLWriter to generate response
Gets rid of manual XML generation.
2015-12-14 09:37:16 +01:00
C Montero-Luque 119cd08c93 7.0.11 2015-10-30 12:47:18 -04:00
C Montero-Luque 912e346229 7.0.11 RC2 2015-10-28 10:39:53 -04:00
Thomas Müller 65ba58d2a4 Merge pull request #20062 from owncloud/stable7-add-warning-for-php7
[stable7] Stop processing if PHP 7 is used
2015-10-26 22:03:45 +01:00
Lukas Reschke 48a2e343e0 Stop processing if PHP 7 is used
PHP 7 is only compatible with ownCloud 8.2.0
2015-10-26 17:40:26 +01:00
C Montero-Luque df9b8cdd7f 7.0.11 RC1 2015-10-21 17:43:21 -04:00
Morris Jobke cdcb6c3dc7 Merge pull request #18858 from owncloud/memcached-fix-stable7
[stable7] Fallback to complete Memcached flush if getAllKeys fails
2015-10-09 13:18:54 +02:00
Thomas Müller 89b0a6796d Merge pull request #19626 from owncloud/stable7-backport-13771
[stable7] generate valid human readable text for 0 - fixed #9342
2015-10-08 17:23:02 +02:00
Thomas Müller 75d4dac8ed generate valid human readable text for 0 - fixed #9342 2015-10-07 15:51:30 +02:00
Morris Jobke 7b6602e0db Merge pull request #19448 from owncloud/stable7-backport-19441
[stable7][upgrade] switch to debug logging on upgrade
2015-10-02 12:39:26 +02:00
Thomas Müller fd8ddf6d27 Merge pull request #19493 from owncloud/stable7-fix-php5.3
PHP 5.3 compliance
2015-10-01 11:56:41 +02:00
Thomas Müller 754d4f68a7 Fix #19492 2015-10-01 10:51:44 +02:00
Morris Jobke f4c7b3051d [upgrade] switch to debug logging on upgrade
* resets afterwards
* adds output about the previous log level
2015-09-29 16:36:55 +02:00
Morris Jobke 9d270bcc46 Merge pull request #17954 from owncloud/backport-17464-stable7
fix uncaught exception on not permitted file types when setting avata…
2015-09-28 11:52:23 +02:00
Morris Jobke 0f2ea52861 Merge pull request #18705 from owncloud/stable7-dav-copy-fix
[stable7] Check for file existence before doing a DAV copy
2015-09-28 11:51:06 +02:00
C Montero-Luque 4b6474edf1 7.0.10 2015-09-10 10:23:53 -04:00
Morris Jobke a2658515b3 Merge pull request #18898 from owncloud/revert-18385-stable7-fix-repair-emit
Revert "[stable7] forward repair events to updater"
2015-09-08 14:28:37 +02:00
Lukas Reschke bc5368f9be Revert "[stable7] forward repair events to updater" 2015-09-08 14:20:32 +02:00
Morris Jobke cde3efb63c Merge pull request #18845 from owncloud/app-upgrade-routenotfound-stable7
[stable7] Always add to $loadedApps
2015-09-07 00:24:32 +02:00
Robin McCorkell 3bc4c92d76 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 20:42:23 +01:00
Robin McCorkell 0f4c90acbc Always add to $loadedApps 2015-09-05 11:45:33 +01:00
Thomas Müller 7438c463d4 Merge pull request #18793 from owncloud/LukasReschke-patch-1
[stable7] Use PHP 5.3 syntax
2015-09-03 09:13:57 +02:00
Lukas Reschke c50a378c3b [stable7] Use PHP 5.3 syntax 2015-09-03 08:49:23 +02:00
C Montero-Luque 30303822e3 7.0.9 2015-09-02 10:52:28 +02:00
Vincent Petry 5849a2de8c Check for file existence before doing a DAV copy
Partial backport of f39fcbc250 from 8.1
2015-08-31 15:18:14 +02:00
Morris Jobke 0f89d4f9ef Merge pull request #18602 from owncloud/stable7-backport-17083
[stable7] take share target into account when updating recipient etags
2015-08-29 12:48:54 +02:00
Vincent Petry f7e0370f32 Unit test for etag update on custom share folder 2015-08-27 14:50:26 +02:00
Robin Appelman 9c60922311 take share target into account when updating recipient etags 2015-08-27 14:50:18 +02:00
C Montero-Luque c67435189e 7.0.9 RC1 2015-08-27 11:35:00 +02:00
Morris Jobke 6bcffdc889 Merge pull request #18561 from owncloud/ext-objectstore-stable7
[stable7] Prevent objectstore being set from client side
2015-08-25 18:33:42 +02:00
Robin McCorkell b05e178bbf Prevent objectstore being set from client side 2015-08-25 16:29:12 +01:00
Thomas Müller 3b3ce91d46 Merge pull request #18385 from owncloud/stable7-fix-repair-emit
[stable7] forward repair events to updater
2015-08-19 09:31:19 +02:00
Morris Jobke 2ce22eeefb forward repair events to updater
* fixes #17313
* already in stable8+: 22bc37cb82 - #13513
2015-08-18 13:15:27 +02:00
Morris Jobke b1f8c5cfac Merge pull request #18180 from owncloud/backport-18159-stable7
Backport 18159 stable7
2015-08-16 14:40:41 +02:00
michag86 164865e813 Update installer.php 2015-08-10 18:43:28 +02:00
michag86 f0e62145d3 Check if archive contains a directory named like appid 2015-08-10 18:43:24 +02:00
Frank Karlitschek ebe5c05764 7.0.8 2015-08-07 20:18:58 -04:00
C Montero-Luque 1287036801 7.0.8 RC1 2015-08-03 08:55:49 -04:00
Arthur Schiwon d44a6563a7 fix uncaught exception on not permitted file types when setting avatar, fixes #17232 2015-07-29 13:15:53 +02:00
C Montero-Luque e8cc365310 7.0.8 beta 1 2015-07-22 22:28:57 -04:00
Morris Jobke 3feccc9562 Merge pull request #17765 from owncloud/backport-17723-stable7
Backport of #17723 to stable7
2015-07-21 00:05:22 +02:00
Morris Jobke 6dfb2afa29 Merge pull request #17368 from owncloud/fix_16740_7.0
[stable7] owner is stored as 'uid_owner', not as 'owner' in the oc_share table
2015-07-20 23:14:46 +02:00
Arthur Schiwon a1815cf275 Backport of #17723 to stable7
fix runtime caching in ldap's user manager, fixes #17631
2015-07-20 23:09:47 +02:00
Joas Schilling 5c4e6b1c3e Merge pull request #17406 from owncloud/stable7-backport-17095
[stable7] Proper error handling
2015-07-16 11:56:10 +02:00
Thomas Müller 374dd3cbcb Merge pull request #17630 from owncloud/stable7-rescanversionsonlyonce
[stable7] Only rescan versions once in trashbin
2015-07-14 14:04:26 +02:00
Vincent Petry 895285ab59 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-07-14 06:39:06 +02:00
Morris Jobke f4aa78c75f Merge pull request #17416 from owncloud/issue-17260-NaN-when-creating-new-user-and-group
Return correct user count when the group has none
2015-07-09 22:47:47 +02:00
Joas Schilling 0dfc47c02d Return correct user count when the group has none 2015-07-06 13:32:11 +02:00
Morris Jobke fba6ac5050 [updater] mark failure in red 2015-07-06 10:58:22 +02:00
Morris Jobke 917002f3ec [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-07-06 10:58:12 +02:00
Morris Jobke 8df392738c Added error message on initMountpoints exception 2015-07-06 10:53:25 +02:00
C Montero-Luque 4df15bf573 7.0.7 2015-07-03 06:17:54 -04:00
Bjoern Schiessle 5fadc7e3c6 owner is stored as 'uid_owner', not as 'owner' in the oc_share table 2015-07-03 10:43:16 +02:00
C. Montero Luque 84b1253def Merge pull request #17208 from owncloud/stable7-fix-16812
[Stable7] Oracle workaround for adding a column with not-null default value
2015-07-02 15:26:00 -04:00
Morris Jobke 065bcf4790 Merge pull request #17319 from owncloud/stable7-clean-ocsid
[stable7] Delete OCS ID from DB if none is specified
2015-07-02 14:39:43 +02:00
Morris Jobke d8f88aa413 Merge pull request #17314 from owncloud/stable7-remove-ocs-ids
[stable7] Remove OCS IDs
2015-07-02 14:39:35 +02:00
Lukas Reschke a1da45a172 Bump versions 2015-07-02 09:27:36 +02:00
Lukas Reschke 6170aa5cc3 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:26:37 +02:00
Lukas Reschke 552bcf1dcf [stable7] 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:54:57 +02:00
C Montero-Luque f29af9c23b 7.0.7RC1 2015-06-30 18:49:26 -04:00
Morris Jobke 4448c06f14 Merge pull request #17234 from owncloud/oc-version-to-app-store-stable7
Add oc version to app store requests in stable7
2015-06-29 16:35:24 +02:00
Joas Schilling f5f92447e5 Add oc version to app store requests in stable7 2015-06-29 16:01:57 +02:00
Victor Dubiniuk ed1565e18c Oracle-specific workaround for adding a column with not-null default value 2015-06-27 00:03:27 +03:00
Frank Karlitschek c1bed643a0 Merge pull request #17180 from owncloud/stable7-backport-17026
[stable7] [config.sample.php] set correct default value for skeletondirectory
2015-06-25 14:56:25 -04:00
Morris Jobke 3c02cbe5dd [config.sample.php] set correct default value for skeletondirectory 2015-06-25 17:08:55 +02:00
Morris Jobke e2a9c7a911 Merge pull request #17116 from owncloud/stable7-17115
[stable7] [sharing] handle shares of users that aren't available anymore
2015-06-24 17:38:47 +02:00
Morris Jobke 81ceb00632 [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:18:26 +02:00
C Montero-Luque e5237a2cfe version 7.0.7 beta 2015-06-23 11:56:31 -04:00
Morris Jobke e2b486eab6 Merge pull request #17034 from owncloud/backport-16890-stable7
Backport of #16890 to stable7
2015-06-23 16:32:21 +02:00
Joas Schilling b1fc1b2e4c Merge pull request #17096 from owncloud/stable7-fix-deleted-users
[Stable7] fix deleted users during upgrade migration
2015-06-23 14:51:31 +02:00
Lukas Reschke 063b8ea31d Merge pull request #16581 from owncloud/stable7-cors-no-cookie-auth
Disallow cookie auth for cors requests stable7
2015-06-23 13:37:50 +02:00
Thomas Müller 6fdd1d094f Merge pull request #17020 from owncloud/stable7-proper-repair-step-info
Proper repair step info during upgrade on cli
2015-06-23 13:37:38 +02:00
Morris Jobke e6bf1ca7b3 skip users that are not available anymore during sharing upgrade 2015-06-23 11:34:30 +02:00
Morris Jobke 6ee4fe56db Merge pull request #17073 from owncloud/appframework-type-cast-stable7
[stable7] Allow multiple whitespace in type hints in AppFramework
2015-06-22 15:46:51 +02:00
Robin McCorkell 28ea652e19 AppFramework annotation whitespace unit test 2015-06-22 12:18:03 +01:00
Robin McCorkell 8592c0efb7 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-22 12:18:02 +01:00
Thomas Müller 1e0febe467 Merge pull request #17021 from owncloud/stable7-verify-path
[stable7] Verify if path exists
2015-06-19 15:47:12 +02:00
Arthur Schiwon 0766a679b4 Backport of #16890 to stable7
the user is gone, userExists will not bring him back. But the user's folder needs to be deleted anyway

delete user test to take getHome into account to ensure it is also deleted subsequently

Conflicts:
	apps/user_ldap/tests/user_ldap.php
2015-06-18 22:14:59 +02:00
Lukas Reschke ff2de8439a 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 17:28:09 +02:00
Morris Jobke d48ab2b051 Proper repair step info during upgrade on cli 2015-06-18 16:49:20 +02:00
Morris Jobke f2b7eb85c8 Merge pull request #16991 from owncloud/stable7-verify-if-path-exists
[stable7] Verify if path exists
2015-06-17 16:59:24 +02:00
Lukas Reschke 1fc8afef1e Throw nicer error message instead 500 2015-06-17 15:41:21 +02:00
Lukas Reschke f4bc29a1e7 Verify if path exists
We need to verify if the specified path exists to gracefully prevent errors.
2015-06-17 15:08:39 +02:00
Morris Jobke 448ee4e7a9 Merge pull request #16969 from owncloud/stable7-backport-15549
[Stable7] don't update identical values
2015-06-17 10:22:44 +02:00
Jens-Christian Fischer 07ef143fde clarify the duplication of the $params array 2015-06-16 16:30:24 +02:00
Jens-Christian Fischer 4eb90cf3dc 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-06-16 16:30:19 +02:00
Thomas Müller 99d03daf65 Merge pull request #16864 from owncloud/backport-concatenation-7
[stable7] Don't use command concatenation
2015-06-11 09:42:49 +02:00
Morris Jobke 532a919a0c Merge pull request #16863 from owncloud/stable7-backport-16840
[stable7] Disable video preview if previews are disabled
2015-06-10 15:53:18 +02:00
Lukas Reschke b0314907c0 Don't use command concatenation
Possibly fixes https://github.com/owncloud/core/issues/16853
2015-06-10 15:19:18 +02:00
Morris Jobke 7ca01a65dd Disable video preview if previews are disabled 2015-06-10 15:00:30 +02:00
Morris Jobke 429fb87386 Merge pull request #16759 from owncloud/backport-16748-stable7
Backport stable7: port detection needs to take care of now thrown exceptions when LDAP …
2015-06-10 09:14:17 +02:00
Morris Jobke e5ff9f0b6b Merge pull request #16682 from owncloud/stable7-check-for-arry
Check if array
2015-06-10 07:36:31 +02:00
Morris Jobke fe92dd7381 Merge pull request #16707 from owncloud/stable7-fix-ie8-ie9
[stable7] Add min-height to login page for IE8 and IE9
2015-06-10 07:35:47 +02:00
blizzz 02bffbe670 Merge pull request #16773 from owncloud/fix-16582
return name instead of false, as it is on oc8 and master, so groups a…
2015-06-09 23:52:25 +02:00
Arthur Schiwon fda8d66697 return name instead of false, as it is on oc8 and master, so groups are displayed in files_external 2015-06-05 22:06:50 +02:00
Arthur Schiwon ef16f4ba57 port detection needs to take care of now thrown exceptions when LDAP server is not available 2015-06-05 13:20:46 +02:00
Frank Karlitschek 59b3c2fde3 7.0.6 2015-06-03 20:41:01 -04:00
Morris Jobke c72de30ccb Add min-height to login page for IE8 and IE9 2015-06-03 10:48:15 +02:00
Lukas Reschke a88df5c6ec Check if array
The great library that we use apparently uses mixed types for everything because 🙈

Fixes https://github.com/owncloud/core/issues/16679
2015-06-02 12:39:01 +02:00
Frank Karlitschek 54642984b1 7.0.6RC2 2015-06-01 18:54:41 -04:00
Thomas Müller 1c19fd15e0 Merge pull request #16666 from owncloud/fix-code
Fix compatibility with 5.3 again
2015-06-01 17:50:07 +02:00
Lukas Reschke 9b05d22b0c Fix compatibility with 5.4 again
Fixes https://github.com/owncloud/core/issues/16665
2015-06-01 17:24:58 +02:00
Lukas Reschke 200e9d9497 Disallow semicolons in passed commands 2015-06-01 17:06:21 +02:00
Lukas Reschke 5fa749cd96 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-06-01 17:06:16 +02:00
Lukas Reschke a15710afad Clean application identifier before processing 2015-06-01 17:06:10 +02:00
Lukas Reschke 7071cf15c2 Revert custom patch that can cause problems 2015-06-01 17:06:05 +02:00
Morris Jobke 97dbd04e0a Merge pull request #16635 from owncloud/stable7-fix-themes-readme
[stable7] Fix themes README
2015-05-30 13:05:51 +02:00
Morris Jobke ba93c3d18b Fix themes README
Fixes #16617
2015-05-30 12:12:02 +02:00
Frank Karlitschek 927cae7efc 7.0.6 RC1 2015-05-29 13:58:39 -04:00
Vincent Petry b04d510053 Merge pull request #16608 from owncloud/fix_14588
[stable7] make sure to get the right list of users with access to the file when deleting a shared file
2015-05-28 16:53:55 +02:00
Bjoern Schiessle b4741cfa96 make sure to get the right list of users with access to the file, including the owner 2015-05-28 16:13:05 +02:00
Bernhard Posselt 6b4f1706b9 backport #16532 to stable7 2015-05-27 14:32:37 +02:00
Thomas Müller 55a122a9fe Merge pull request #13742 from owncloud/fix-12190-2-stable7
[backport #13740] backport #13740 to stable7
2015-05-26 16:06:21 +02:00
Morris Jobke 5014d2c60c Merge pull request #15402 from owncloud/response-setContentLengthHeader-stable7
[stable7] Add OC_Response::setContentLengthHeader() for Apache PHP SAPI workaround.
2015-05-20 10:15:58 +02:00
Morris Jobke 8a39256092 Merge pull request #15077 from owncloud/fix-smb-oc-admin-stable7
[stable7] Support constructing an SMB_OC without saved session credentials
2015-05-20 10:03:18 +02:00
Arthur Schiwon ae850d76ea add primary group users to resultset before caching 2015-05-14 01:09:57 +02:00
Morris Jobke 765526ec4c Merge pull request #15271 from owncloud/stable7-fix-ext-owncloud
[stable7] Fix bugs in ownCloud external storage
2015-05-13 09:40:20 +02:00
Thomas Müller 87052be76f Merge pull request #16291 from RealRancor/asset_pipe_note
Add note for asset pipeline and third-party apps on stable7
2015-05-13 00:52:20 +02:00
RealRancor 02ef384064 Add note for asset pipeline and third-party apps on stable7 2015-05-12 18:59:57 +02:00
Morris Jobke cf05d50654 Merge pull request #15863 from owncloud/public-reshare-webdav-stable7
[stable7] Fix webdav access for public reshare
2015-05-08 13:56:07 +02:00
Lukas Reschke f5a597b259 Merge pull request #16114 from owncloud/stable7-backport-15510-and-15465
[stable7] block cron.php and OCS API when in single user mode or maintenance mode
2015-05-08 12:13:24 +02:00
Thomas Müller 2c656b0e4c Fix singe user mode on public.php - take two 2015-05-06 12:14:34 +02:00
Thomas Müller 9c44e7bfb8 Fix single user check in case no user is logged in 2015-05-06 12:12:40 +02:00
Robin Appelman 0418b330d5 block ocs in single user mode 2015-05-06 12:10:02 +02:00
Robin Appelman 780530ec83 block webdav in single user mode 2015-05-06 12:08:58 +02:00
Robin Appelman 67c862c286 block cron when in single user mode 2015-05-06 11:51:14 +02:00
Joas Schilling 88006222a9 Disable OCS api when in maintenance mode 2015-05-06 11:50:08 +02:00
Lukas Reschke d01bfe3587 Merge pull request #15833 from owncloud/backport-files-external-fixes
Backport files external fixes
2015-05-05 12:22:35 +02:00
Robin Appelman 38644cffd4 fix subfolder reshares over webdav 2015-04-24 14:19:52 +02:00
Robin Appelman 2c10e31c8f resolve reshares in public webdav 2015-04-24 14:19:52 +02:00
Jörn Friedrich Dreyer e37f9c8351 use displayname lookup route in files_external settings 2015-04-23 14:23:17 +02:00
Jörn Friedrich Dreyer 79187fcb10 add lookup route for displaynames 2015-04-23 14:23:03 +02:00
Morris Jobke e72cd711ad Merge pull request #15332 from owncloud/dont_hide_exceptions
do not hide exception when ldap server has a hiccup
2015-04-22 22:48:29 +02:00
Arthur Schiwon 598f798c04 throw exception when LDAP Connection was lost 2015-04-22 15:22:11 +02:00
Jörn Friedrich Dreyer 919241cdda fix filesystem and encryption tests 2015-04-22 11:34:17 +02:00
Jörn Friedrich Dreyer f7db588e62 throw exception when backends don't provide a user instead of creating legacy local storages 2015-04-22 11:34:17 +02:00
Morris Jobke a2cc658f37 throw exception if setup is incomplete 2015-04-22 11:34:14 +02:00
Morris Jobke f830150acc more robust share dialog 2015-04-22 11:33:05 +02:00
Jörn Friedrich Dreyer 77a601c3fe fix_tests 2015-04-22 11:33:05 +02:00
Jörn Friedrich Dreyer 24037218dd do not disclose information, show generic error on login page 2015-04-22 11:33:05 +02:00
Jörn Friedrich Dreyer caae0e6f47 do not hide exception when ldap server has a hiccup 2015-04-22 11:32:58 +02:00
Arthur Schiwon 07988cf77c Fixes returns of group memberships and counting if all members have the specific groups as primary set. 2015-04-14 14:56:36 +02:00
Arthur Schiwon f3bd266787 Backport of #13740
inlcude AD primary group in user filter, if a group is selected. fixes #12190

fix counting of users in primary group

💄

adept to OC 7

and escape the search term

Conflicts:
	apps/user_ldap/lib/connection.php
2015-04-14 14:56:01 +02:00
Morris Jobke 03c9657607 Merge pull request #15559 from owncloud/backport-15541-stable7
[stable7] Add "Reply-To" support for sharing notifications
2015-04-13 08:50:22 +02:00
Lukas Reschke e6c2382a19 Add "Reply-To" support for sharing notifications
Very hacky backport of https://github.com/owncloud/core/pull/15541 - I changed the code path to use OC_Mail instead the OCP pendant since I didn't want to modify the public API. (OCP\Util::sendMail() is anyways deprecated with 8.1)
2015-04-12 23:03:32 +02:00
Morris Jobke 43b2f3c2dc Merge pull request #15435 from owncloud/dont_return_empty_groups
don't return null for not existing group id's
2015-04-10 14:23:38 +02:00
Jörn Friedrich Dreyer 1ae73f0e99 don't return null for not existing group id's 2015-04-07 13:47:10 +02:00
Andreas Fischer 3f23ae4a16 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-04-04 11:53:32 +02:00
Thomas Müller a4c0f259a5 Merge pull request #15370 from owncloud/stable7-backport-15353
Cron has to be executed with the correct user - fixes 13912 and others
2015-04-02 09:22:01 +02:00
Thomas Müller 6ebe04f8d4 Cron has to be executed with the correct user - fixes 13912 and others 2015-04-01 18:30:20 +02:00
Robin McCorkell 1c5a86a115 Fix bugs in ownCloud external storage 2015-03-27 12:31:20 +00:00
Morris Jobke 57d6c49a62 Merge pull request #15251 from owncloud/use_default_share_folder_oc7
always fall back to default share folder
2015-03-27 09:56:46 +01:00
Lukas Reschke 423311c7e8 Merge pull request #14498 from owncloud/kill-substr-mssql-stable7
[stable7] Remove hacky Substring support for MSSQL
2015-03-26 23:00:33 +01:00
Bjoern Schiessle 0cdeeec82b always fall back to default share folder 2015-03-26 22:46:43 +01:00
Morris Jobke 32bd2d15e3 Merge pull request #15072 from owncloud/fix_group_share
also call generateTarget for group shares
2015-03-26 22:24:42 +01:00
Morris Jobke ef1ddfc5db Merge pull request #14861 from owncloud/stable7-fix-sizepropagationwithshare
[stable7] Fix size propagation over shared storage boundary
2015-03-26 20:14:00 +01:00
Thomas Müller 529d45c5b2 Merge pull request #15161 from owncloud/stable7-fixcronconfig
[stable7] Fix config API usage in cron.php
2015-03-24 20:22:30 +01:00
Morris Jobke 0c72c99f04 Merge pull request #14889 from owncloud/backport-14849-stable7
[stable7] support paged results against 389ds.
2015-03-24 20:11:34 +01:00
Vincent Petry 2bb6a920e3 Fix config API usage in cron.php 2015-03-24 18:19:43 +01:00
Morris Jobke 1325649b4b Merge pull request #15141 from owncloud/backport-15123-stable7
[backport] [stable7] offset needs to be considered in computed limit
2015-03-24 11:12:16 +01:00
Arthur Schiwon bf7e2c756f offset needs to be considered in computed limit 2015-03-24 10:22:49 +01:00
Robin McCorkell 467da3c519 Support constructing an SMB_OC without saved session credentials
Conflicts:
	apps/files_external/lib/smb_oc.php
2015-03-20 16:07:19 +00:00
Bjoern Schiessle df2f85ee01 also call generateTarget for group share to add the correct prefix if share_folder is defined in config.php 2015-03-20 15:51:25 +01:00
Thomas Müller 9e52b174b1 Merge pull request #14902 from owncloud/tempmanager-fix-backport
Check directory handle before we use it
2015-03-16 09:44:52 +01:00
Robin McCorkell 03ca380815 Check directory handle before we use it 2015-03-15 18:28:01 +00:00
Arthur Schiwon db763760f1 support paged results against 389ds. 2015-03-13 23:03:47 +01:00
Robin Appelman 0ca1500330 also clear statcache in mapped local 2015-03-13 11:53:50 +01:00
Robin Appelman 92cbeefa34 Clear statcache before getting the mtime from local storage backends 2015-03-13 11:53:21 +01:00
Vincent Petry b62d20f2ee Uglify unit test to make them work on stable7 2015-03-13 11:36:31 +01:00
Vincent Petry 4f9c750a0a Add unit test for size propagation across share boundaries 2015-03-13 11:09:41 +01:00
Vincent Petry a529b2bf86 Fix size propagation over shared storage boundary 2015-03-13 11:09:36 +01:00
Thomas Müller 27ec925132 Merge pull request #14846 from owncloud/fix-14843-stable7
cron shall not operate in case we are in maintenance mode - fixes #14843
2015-03-13 09:25:18 +01:00
Thomas Müller c716776a90 cron shall not operate in case we are in maintenance mode - fixes #14843 2015-03-12 21:08:00 +01:00
Morris Jobke b588692ef4 Merge pull request #14637 from owncloud/backport-13341
[Stable7] Read version and product name from update template
2015-03-11 20:16:01 +01:00
Morris Jobke 5544509283 Merge pull request #14182 from RealRancor/update_office_preview
[stable7] Fix libre/openoffice preview on multi-user instances
2015-03-11 17:55:00 +01:00
Morris Jobke 39492eb020 Merge pull request #14707 from owncloud/ldap-reset-paged-search-on-null-limit-stable7
LDAP: reset paged search on null limit [stable7]
2015-03-09 08:15:18 +01:00
Arthur Schiwon 24eb2bcab5 set up paged search when limit is 0 2015-03-05 13:22:52 +01:00
Frank Karlitschek 8b83580af7 bump release 2015-03-02 22:45:17 +01:00
Frank Karlitschek 02757ad08e Merge pull request #14688 from owncloud/stable7-trashbin-selected-delete
[stable7] Fix deleting selected files in the trashbin
2015-03-04 08:54:56 -05:00
Robin Appelman 3bf505b566 Fix deleting selected files in the trashbin 2015-03-04 12:48:52 +01:00
Morris Jobke 1dea188fea Merge pull request #14642 from owncloud/issue/13751-only-variables-passed-by-reference
[Stable7] Fix "Only variables should be passed by reference" in stable7 template
2015-03-02 16:10:49 +01:00
Joas Schilling 86e4177914 Fix "Only variables should be passed by reference" in stable7 template 2015-03-02 14:31:38 +01:00
Vincent Petry ec71e0b4e6 Read version and product name from update template
During upgrade, the config settings aren't always available due to
base.php changes. This fix makes the update info page read the product
name and version from the update template, which already had them.
2015-03-02 11:39:23 +01:00
Lukas Reschke 51017e43a0 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:08:44 +01:00
Thomas Müller eb778eb2b0 Merge pull request #14425 from owncloud/backport-12313
[stable7] The class name is Movie NOT Movies
2015-02-23 15:12:57 +01:00
Olivier Paroz 45ad072c62 The class name is Movie NOT Movies
Conflicts:
	config/config.sample.php
	lib/private/preview.php
2015-02-23 11:02:46 +01:00
Frank Karlitschek 3ac33c865b 7.0.5 2015-02-16 04:56:33 +01:00
Lukas Reschke 431638742c Merge pull request #14040 from owncloud/stable7-app-upgrade-order
[Stable7] app upgrade order fix
2015-02-17 14:48:09 +01:00
Thomas Müller 7b432cbbf7 Merge pull request #12327 from owncloud/stable7l10nbport
backport some strings to stable7
2015-02-17 14:08:45 +01:00
Thomas Müller 01cede4511 Merge pull request #14254 from owncloud/console-execution-time-stable7
[backport-14243-stable7] console commands shall not be limited with respect to execution time
2015-02-16 19:44:07 +01:00
Thomas Müller 73954c44c6 console commands shall not be limited with respect to execution time - fixes #14156 2015-02-16 16:22:16 +01:00
Lukas Reschke e345ae7b53 Merge pull request #13988 from owncloud/group-share-collition-wrong-type-in-post-hook-stable7
[stable7] Do not overwrite the shareType so the post hook is still correct
2015-02-16 14:41:52 +01:00
RealRancor 9fd53ef84f Removed anchor in config.sample.php 2015-02-13 15:28:35 +01:00
RealRancor 6a46ede8b7 Fix libre/openoffice preview on multi-user instances 2015-02-12 23:20:54 +01:00
Jörn Friedrich Dreyer 3e5a1ad76b Merge pull request #14147 from owncloud/no-whitespace-from-themes-stable7
catch any whitespaces which might get written to the output buffer while...
2015-02-12 17:07:34 +01:00
Thomas Müller a45c606b96 catch any whitespaces which might get written to the output buffer while loading a theme 2015-02-12 11:28:59 +01:00
Thomas Müller fcad7252bd Merge pull request #14078 from owncloud/stable7-preview-hint
Add hint for troubleshooting MS Word previews
2015-02-11 21:17:59 +01:00
RealRancor c11edb9138 Add hint for troubleshooting MS Word previews 2015-02-11 01:14:58 +01:00
Vincent Petry 61852536fe Fix "other" app update stack 2015-02-10 11:58:25 +01:00
Arthur Schiwon d9d7774cc1 on ownCloud upgrade: upgrade all apps in order, load important ones 2015-02-10 11:58:23 +01:00
Joas Schilling 63e5282c41 Add a test for the post_shared hook shareType
Conflicts:
	tests/lib/share/share.php
2015-02-09 16:27:44 +01:00
Joas Schilling 0c3204c7a6 Do not overwrite the shareType so the post hook is still correct
Conflicts:
	lib/private/share/share.php
2015-02-09 16:26:29 +01:00
RealRancor c2a72ce6b0 external user app: Add note to enable it first 2015-02-07 20:12:15 +01:00
Lukas Reschke cbf8dd439c Normalize before processing 2015-02-06 15:09:31 +01:00
Frank Karlitschek c658ec658a 7.0.5 RC1 2015-02-06 02:46:00 +01:00
Morris Jobke 9db5323a92 Merge pull request #13927 from owncloud/fix_ghost_directories
fix creation of ghost directories
2015-02-06 00:07:43 +01:00
Bjoern Schiessle c58501ee87 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:11:27 +01:00
Thomas Müller 3e9d8cce10 Merge pull request #13759 from owncloud/fix-12035
fix LDAP update routine to OC 7
2015-02-05 17:05:32 +01:00
Morris Jobke 6897be7a93 Merge pull request #13888 from owncloud/upload_to_root_of_mountpoint_stable7
detect root of mountpoint also if the trailing slash is missed
2015-02-04 16:21:34 +01:00
Björn Schießle f0b0e462ea Merge pull request #13796 from owncloud/issue/13490-stable7-backport
[stable7] use uid provided by setupfs hook to mount server2server shares
2015-02-04 14:59:44 +01:00
Bjoern Schiessle 2b83afdd7e detect root of mountpoint also if the trailing slash is missed 2015-02-04 14:53:17 +01:00
Morris Jobke a81b4c54d8 Merge pull request #13880 from owncloud/backport-10398-stable7
[backport #10398] Give a better error message for external shares with self-signed ssl cer...
2015-02-04 14:09:25 +01:00
Robin Appelman 7975b74816 Give a better error message for external shares with self-signed ssl certificates 2015-02-04 12:19:08 +01:00
Thomas Müller 361b70e4d7 Merge pull request #13803 from owncloud/revert-close-cursor-stable7
Revert "Close cursor early in calculateFolderSize" for now
2015-01-30 23:23:44 +01:00
Morris Jobke 8305ae6b09 Merge pull request #13798 from owncloud/update-sabre-dav-stable7
Update sabre dav to 1.8.12 on stable7
2015-01-30 16:10:34 +01:00
Joas Schilling 91fc933432 Revert "Close cursor early in calculateFolderSize"
This reverts commit 234f33e01e.
2015-01-30 15:35:54 +01:00
Joas Schilling ed60bdeac9 Update sabre dav to 1.8.12 on stable7 2015-01-30 14:43:41 +01:00
Joas Schilling bd14af5806 use uid provided by setupfs hook to mount server2server shares
otherwise mount will fail for public link shares

backport of 66f0db30b2
2015-01-30 12:57:03 +01:00
Vincent Petry 234f33e01e Close cursor early in calculateFolderSize
This method triggers additional queries in $this->update() so to avoid
potential database locks or delays, we close the cursor as soon as it is not needed any more
2015-01-29 14:53:44 +01:00
Arthur Schiwon 441f807bce fix update routine 2015-01-29 12:51:12 +01:00
Morris Jobke 80560e70b7 Merge pull request #13470 from owncloud/stable7-share-fixfindshareforuserwithmultiplegroups
[stable7] Fix getItemSharedWithUser for groups
2015-01-23 12:59:39 +01:00
Georg Ehrke 56c51d481c add config-option for an image's maximum filesize when generating previews 2015-01-22 23:23:36 +01:00
Georg Ehrke 2d2e024cfa remove insane debug-log from OC_Image 2015-01-22 23:21:40 +01:00
Morris Jobke 491c714f54 Fix undefined offset 1 for wrong user mail address
* fixes Undefined offset: 1 at lib/private/mail.php#143
2015-01-22 17:26:13 +01:00
Robin Appelman 8459b9f6fb Add unit test 2015-01-22 16:18:36 +01:00
Robin Appelman 153ff1b766 Remove duplicated slashes from the requested url 2015-01-22 16:18:32 +01:00
Morris Jobke 11efe732f9 Merge pull request #13555 from owncloud/issue/13482-stable7
Stable7 Backport Set the debugoutput channel to error_log instead of echoing it
2015-01-21 16:31:04 +01:00
Joas Schilling f03a1868ab Set the debugoutput channel to error_log instead of echoing it 2015-01-21 15:34:58 +01:00
Arthur Schiwon 1c000b799b this must be larger then (>), since buggy behaviour occurs when the parameter is a small number 2015-01-21 14:38:47 +01:00
Vincent Petry 18d46dfdeb Fix getItemSharedWithUser for groups
Fixed SQL query for whenever a user has more than one group.
Added missing $owner where clause for group lookup.
Added unit tests for the group cases.

Backport of 40931a8b0d from master
2015-01-20 22:07:21 +01:00
Thomas Müller 9d761fcaee Merge pull request #13422 from owncloud/user-mgnt-init-fix
Increase initial user count to 50
2015-01-19 15:08:16 +01:00
Carla Schroder 5f70ed188b Note in config.sample.php that certain previews are not available in ms windows 2015-01-17 09:27:27 +01:00
Morris Jobke 616fd4b54a Increase initial user count to 50
* fix initial user count if you have a big screen (or a portrait screen)
2015-01-16 18:04:29 +01:00
Thomas Müller 6d87922cea Merge pull request #13384 from owncloud/stable7-fix-13317-backport
Fix backport of #13317
2015-01-15 17:27:09 +01:00
Robin Appelman 0753514e5b Fix test 2015-01-15 14:24:54 +01:00
Robin Appelman 7ef006e1c9 php <5.4 style array 2015-01-15 14:02:36 +01:00
Robin Appelman 5a58d142e5 Proper constant for stable7 2015-01-15 14:02:11 +01:00
Robin Appelman db51d9aacb Add View::getMount() for stable7 2015-01-15 14:01:52 +01:00
Vincent Petry d534f262aa Use source storage permissions when scanning shared storage 2015-01-15 11:15:39 +01:00
Robin Appelman 0f04bfc319 Return valid fileinfo objects for part files 2015-01-15 00:22:38 +01:00
Morris Jobke 4d42485bf5 drop useless "!!! No reuse of etag" - fixes #13187
Backport of 9b49b52fc6 from master
2015-01-13 13:47:09 +01:00
Arthur Schiwon 713f2b3a52 fix retrieval of user groups
Conflicts:
	apps/user_ldap/lib/connection.php
2015-01-13 10:19:50 +01:00
Morris Jobke 0d39a63b05 Merge pull request #13186 from owncloud/no-session-for-formfactor-stable7
no need to store the form factor in the session - it's computation is ra...
2015-01-09 18:19:26 +01:00
Jan-Christoph Borchardt bd1bf9e9ac replace outdated 'shared' people icon with regular share icon as fallback 2015-01-09 17:58:45 +01:00
Thomas Müller 6552fec113 no need to store the form factor in the session - it's computation is rather cheep
Conflicts:
	lib/private/template.php
2015-01-09 10:19:28 +01:00
Morris Jobke d5190b5481 Merge pull request #12735 from owncloud/temp-handling-stable7
[stable7] Cleanup handling of temporary files
2015-01-08 18:35:00 +01:00
Robin Appelman 06bc987bd9 Use the TempManager to handle temporary files
Conflicts:
	lib/private/helper.php
2015-01-08 16:22:14 +01:00
Robin Appelman 344606b2c8 Add \OC\TempManager to handle creating and cleaning temporary files
Conflicts:
	lib/private/server.php
	lib/public/iservercontainer.php
2015-01-08 16:22:14 +01:00
Vincent Petry a5574e885c Fix source path when share is a mount point
Whenever an external storage mount point is shared directly, its path is
empty which causes a leading slash to appear in the source path.

This fix removes the bogus leading slash in such situation.

Backport of 01c83158bb from master
2015-01-08 16:07:44 +01:00
Robin Appelman bf1f9df590 Prevent leaking db connection info in the stacktrace 2015-01-07 09:48:25 +01:00
Morris Jobke 2fd2b182e7 Check for version before mounting a public link
* ownCloud 7.0.0 is needed - version of merge of server <-> server
  sharing - https://github.com/owncloud/core/pull/8399
* adjust error message
2015-01-05 13:23:53 +01:00
Byron Marohn 8778af681c Added error check to lib/private/image.php
This checks that imagecreatetruecolor actually creates an image, rather than returning FALSE.
Without this check, subsequent loop might create billions of ERROR-level log messages.

Signed-off-by: Byron Marohn <combustible@live.com>
2015-01-02 08:48:59 +01:00
blizzz fb63e75743 Merge pull request #12643 from owncloud/ldap-user-cleanup-stable7
LDAP User Cleanup - stable7
2014-12-19 19:04:50 +01:00
Morris Jobke 4c0af1b2a2 Merge pull request #12332 from owncloud/langbport2
more strings to backport
2014-12-19 14:14:03 +01:00
Morris Jobke 9c38baac9e show spinner on file upload in IE8, 9 2014-12-19 02:04:35 +01:00
Arthur Schiwon dd18f963d4 and don't forget to adjust tests 2014-12-18 12:22:34 +01:00
Arthur Schiwon 5d46dfd2b4 PHPdoc fixes, no code change 2014-12-17 16:08:01 +01:00
Arthur Schiwon 1d54735d5d forgotten file 2014-12-17 13:52:09 +01:00
Arthur Schiwon cb5f9d2164 add ldap:check-user to check user existance on the fly 2014-12-17 13:37:53 +01:00
Jan-Christoph Borchardt a26ddb33a2 Merge pull request #12798 from cyberb/stable7
fixes #12434 (stable7)
2014-12-16 14:35:11 +01:00
Arthur Schiwon dd8ba68e07 LDAP User Cleanup
background job for user clean up

adjust user backend for clean up

register background job

remove dead code

dependency injection

make Helper non-static for proper testing

check whether it is OK to run clean up job. Do not forget to pass arguments.

use correct method to get the config from server

methods can be private, proper indirect testing is given

no automatic user deletion

make limit readable for test purposes

make method less complex

add first tests

let preferences accept limit and offset for getUsersForValue

DI via constructor does not work for background jobs

after detecting, now we have retrieving deleted users and their details

we need this method to be public for now

finalize export method, add missing getter

clean up namespaces and get rid of unnecessary files

helper is not static anymore

cleanup according to scrutinizer

add cli tool to show deleted users

uses are necessary after recent namespace change

also remove user from mappings table on deletion

add occ command to delete users

fix use statement

improve output

big fixes / improvements

PHP doc

return true in userExists early for cleaning up deleted users

bump version

control state and interval with one config.php setting, now ldapUserCleanupInterval. 0 will disable it. enabled by default.

improve doc

rename cli method to be consistent with  others

introduce ldapUserCleanupInterval in sample config

don't show last login as unix epoche start when no  login happend

less log output

consistent namespace for OfflineUser

rename GarbageCollector to DeletedUsersIndex and move it to user subdir

fix unit tests

add tests for deleteUser

more test adjustements
2014-12-15 12:56:16 +01:00
Morris Jobke bfe4ee6e47 Merge pull request #12825 from d1saster/stable7-fixpcre
make regex in controllermethodreflector.php compatible with PCRE 6.x
2014-12-14 10:51:56 +01:00
Morris Jobke a429fa74d9 Merge pull request #12655 from owncloud/fix-appstore-link
fix broken link on app management page for apps without ocsid
2014-12-13 11:54:30 +01:00
Morris Jobke f0a0e44d2e fix broken link on app management page for apps without ocsid - fix #9574, fix #10461 2014-12-13 08:39:38 +01:00
Philipp Knechtges 533e8e14b6 make regex in controllermethodreflector.php compatible with PCRE 6.x
The syntax ?<...> seems to be only supported from PCRE 7.0 on. For
backwards-compability ?P<...> is used.
2014-12-13 02:16:37 +01:00
Vincent Petry 60099b91c4 Merge pull request #12624 from nazar-pc/stable7
Backport of #11524 into stable7
2014-12-12 11:34:40 +01:00
Georg Ehrke 5fd1d54607 remove ugly hack and don't use OC\Preview\Image for tiffs and svgs 2014-12-12 08:30:17 +01:00
Vincent Petry 0eb3496ab6 Return real mime type on PROPFIND
Return the real (insecure) mime type on PROPFIND
2014-12-12 08:29:44 +01:00
Robin Appelman bd06b4cf42 Ensure user mountpoints are setup when using getUserFolder 2014-12-12 08:29:15 +01:00
Vincent Petry 72c0cc2267 Do not remove dir entry if it has the same name as the parent
This fixes an issue when a subdir has the same name as its parent, it
would get exluded from the list.
2014-12-11 23:57:17 +01:00
Boris Rybalkin 43b6676d0e fixes #12434 2014-12-11 18:44:50 +00:00
Morris Jobke 36e7d3b7da Merge pull request #12663 from zinks-/l10n-fr-backport
Patched french translation (backported from master)
2014-12-10 08:59:11 +01:00
Morris Jobke 7a60651037 Merge pull request #12656 from owncloud/stable7-fix-12164
Wipe cache if there is no response from feed
2014-12-10 08:26:02 +01:00
Robin Appelman 50705cfaf8 Add js unit test 2014-12-10 08:24:35 +01:00
Robin Appelman 3720ba9318 Dont show the delete button for selected files if one of the selected files is not deletable 2014-12-10 08:24:31 +01:00
Robin Appelman a05fc9dc73 Check if files are deletable before trying to delete them 2014-12-10 08:24:27 +01:00
Morris Jobke cf0a12f999 fix placeholder fake in IE8 & 9 that brokes group listing in user management - fixes #12525 2014-12-10 08:23:26 +01:00
Volkan Gezer 5fcc3401e2 translated saved message in files external 2014-12-10 08:23:03 +01:00
Victor Dubiniuk 60b2dd6ab4 Skip headers that can not be split 2014-12-10 08:22:06 +01:00
Morris Jobke ed96f8c628 remove duplicate loaded personal.js - fixes #12674 2014-12-10 08:21:40 +01:00
Frank Karlitschek 77bcc5b2f3 7.0.4 2014-12-08 19:27:21 +01:00
Arthur Schiwon 1b1951a64f add doc 2014-12-08 19:18:28 +01:00
Arthur Schiwon a33dcd359a preserve an asterisk at the start when escaping a search term 2014-12-08 19:18:24 +01:00
Lukas Reschke 55ebf024a7 Create config if it does not exists
The codepath that is executed when executing ownCloud via CLI is different than via browser. Specifically, the config is created by the user session already in `OC_Util::getInstanceId()` by a call to `setValue`. That said, this seems to be quite a bad side-effect, but for the sake of "not breaking whatever might break if we touch this" let's keep it that way for now.

When executing the autoconfig via `php -f index.php` the said session was not setup and thus no `config/config.php` file was created resulting in an installation error.

To reproduce this try to setup ownCloud via `php -f index.php` with and without that patch. (ensure to delete all existing configs before and don't access ownCloud with a browser in the meantime)

Fixes itself.
2014-12-07 22:34:55 +01:00
Victor Dubiniuk 21f467dd36 Wipe cache if there is no response from feed 2014-12-06 15:19:34 +03:00
Thomas Imbreckx 26e504e096 Patched french translation (backported from master) 2014-12-05 19:14:08 +01:00
Lukas Reschke 5d56eba398 Add test for IPv6 without port 2014-12-05 11:29:04 +01:00
Lukas Reschke 0b80c5e18e Add workaround for older instances
To be removed with oCAdd workaround for older instances

To be removed with oC99
2014-12-05 11:29:00 +01:00
Lukas Reschke be26cccd8a Trim port from domain
Depending on the used environment the port might be appended to the host header resulting in an inaccessible instance when initially setting up on a system with a different HTTP or HTTPS port. (for example test:500)

To test this setup ownCloud under a different port with and without this patch. (heads-up: localhost is always white-listed, so use a different domain)
2014-12-05 11:28:56 +01:00
Frank Karlitschek 71bd33da98 7.0.4 RC2 2014-12-05 04:24:13 +01:00
Björn Schießle 3c673717b0 Merge pull request #12623 from owncloud/fix-s2s-oc7
password column needs to allow null (oc7 backport)
2014-12-04 22:24:57 +01:00
blizzz 01a176f2a3 Merge pull request #12309 from owncloud/ldap-cache-user-count
LDAP: cache total  user count
2014-12-04 19:08:20 +01:00
blizzz af1c47d1e8 Merge pull request #12493 from owncloud/ldap_search_perf
LDAP search behaviour modifications
2014-12-04 18:58:18 +01:00
Vincent Petry 913ad8634f Merge pull request #11524 from nazar-pc/patch-1
Page size calculation based on real page height
2014-12-04 17:07:41 +01:00
Bjoern Schiessle 79711c32b7 password column needs to allow null otherwise Oracle will break for empty passwords 2014-12-04 16:18:16 +01:00
Arthur Schiwon ddd832c2dc trim search string before passing it on 2014-12-04 15:29:16 +01:00
Thomas Müller d30059d76c Merge pull request #12528 from owncloud/backport-12419
Allow read-only configuration
2014-12-03 17:48:25 +01:00
Morris Jobke 5fe7781452 add proper description what database is supported by CE and EE 2014-12-03 13:14:58 +01:00
Frank Karlitschek 8fc4f67f14 7.0.4 RC1 2014-12-01 21:42:19 +01:00
Lukas Reschke f5d9513957 Allow read-only configuration
Workaround required for IIS setups running ownCloud to prevent dataloss.

Long-term solution would be to move some configuration settings to the database

Conflicts:
	lib/base.php
	settings/admin.php
2014-12-01 17:26:21 +01:00
Vincent Petry 3917383cef Merge pull request #11747 from owncloud/storeCredentialsOnlyInSessionIfRequired
Store credentials only in session if required
2014-12-01 11:07:57 +01:00
Thomas Müller 46a4af1dc2 Merge pull request #12496 from owncloud/check-xml-writer-for-7
Check for XMLWriter class
2014-12-01 10:53:50 +01:00
Lukas Reschke 2954169512 Adjust sample config 2014-11-28 19:20:11 +01:00
Lukas Reschke b122b285c9 Disable MSSQL for new CE installations
Since automatic schema migrations are not yet possible let's disable this for now.

Conflicts:
	lib/private/setup.php
2014-11-28 19:19:48 +01:00
Lukas Reschke 85b7ee349b Check for XMLWriter class
Backport of https://github.com/owncloud/core/pull/12321
2014-11-28 15:43:08 +01:00
Arthur Schiwon 7484c2f0d8 LDAP search filter creation changes:
1. do not prepend * wildcard to search terms. Will result in faster search, but
you don't find "foobar"  when looking for "bar"
2. advanced behaviour when search string contains a space and multiple search
attributes are present. The search string is split into single words. The
resulting filter requires that each word at least appears once in any search
attribute. This is supposed to return better results in big LDAPs.
2014-11-28 13:31:57 +01:00
Arthur Schiwon 2944f952dc add ldap-search command to occ 2014-11-28 12:32:38 +01:00
Carla Schroder 9b414d81d8 Markup corrections 2014-11-28 10:20:12 +01:00
Carla Schroder 5ac96c0a87 Add notes that SQLite is CE only 2014-11-28 10:20:08 +01:00
Georg Ehrke a60e113fa8 delete old previews 2014-11-27 12:09:56 +01:00
Carla Schroder 392e36d4e4 added comment that App Store is disabled for EE 2014-11-26 17:56:51 +01:00
Lukas Reschke 8b3728ed9b Don't show favicon to prevent iteration through subfolders
The codepath for generating the favicons iterates through subnodes and if one of those nodes is unavailable is throwing a 503 exception. Since these favicons don't have any use except of "making a tool for developers looking nicer" I consider it feasible to remove them.
2014-11-26 17:07:24 +01:00
Miguel Prokop b96b601017 Consolidate if statement, and update unit test 2014-11-26 13:04:20 +01:00
Miguel Prokop cdf37a061b fix calculation of expiration date if there is a default expiration date set (but not forced) and the user does not want the link to expire. 2014-11-26 13:03:45 +01:00
Morris Jobke b1f838814d Merge pull request #12397 from owncloud/fix-undefined-appitem
[stable7] fixes undefined appitem - fixes #12396
2014-11-26 11:18:15 +01:00
Morris Jobke 161e58b1a2 Merge pull request #12415 from owncloud/port-12262
Backport #12262
2014-11-25 15:45:27 +01:00
Lukas Reschke d815638f7b Try to read the file only instead of trying to touch
The permissions are already catched properly on the installation so we just have to check whether the file is readable to prevent fatal errors from happening.

Fixes https://github.com/owncloud/core/issues/12135

Conflicts:
	lib/private/config.php
2014-11-25 14:40:52 +01:00
Bjoern Schiessle 384d1892aa use login name to verify password 2014-11-25 14:09:22 +01:00
Lukas Reschke 32a90911b0 The "dir" key is used within the public sharing template to indicate in which directory the user currently is when sharing a directory with subdirectories. This is needed by the JS scripts.
However, when not accessing a directory then "dir" was set to the relative path of the file (from the user's home directory), meaning that for every public shared file the sharee can see the path.
(For example if you share the file "foo.txt" from "finances/topsecret/" the sharee would still see the path "finances/topsecret/" from the shared HTML template)

This is not the excpected behaviour and can be considered a privacy problem, this patch addresses this by setting "dir" to an empty key.

Port of https://github.com/owncloud/core/pull/12262, approved with https://github.com/owncloud/core/pull/12262#issuecomment-64394040
2014-11-25 13:52:44 +01:00
Morris Jobke 6967512c5f fixes undefined appitem - fixes #12396 2014-11-25 09:06:49 +01:00
Morris Jobke 8ea0187ecd Merge pull request #12373 from owncloud/backport_preview_fixes_stable7
Backport preview fixes stable7
2014-11-24 13:28:00 +01:00
Lukas Reschke abc7f143da Use / as redirect location if webroot is set to an empty value
If the webroot has been set to an empty value or ownCloud has been installed at the root location (`/``) there is a fair chance that the redirect for password resets does not work at all.

This means that while the password is getting resetted the user is not redirected to the login page.

I'm aware that it might be better to just set the webroot to `/` in those cases but this patch is better in the regard that it cannot break stuff.

Thanks to @PVince81 for helping me debugging this. (I'm a moron and assumed it couldn't be THAT easy)

Reported by @cdamken
2014-11-24 11:12:01 +01:00
Georg Ehrke d7779f9209 delete all children's previews when deleting a folder
add phpdoc

Conflicts:
	lib/private/preview.php
2014-11-23 21:45:01 +01:00
Georg Ehrke 4c5aa43079 add y to with-aspect naming schema 2014-11-23 21:43:21 +01:00
Volkan Gezer 11ca5588ea more strings to backport 2014-11-20 16:51:10 +01:00
Vincent Petry 3ff1f879e0 Merge pull request #12131 from owncloud/stable7-enc-recoverykeywithextstoragefix
[stable7] Fix file upload to ext storage when recovery key is enabled
2014-11-20 16:43:20 +01:00
Lukas Reschke 74b68e10e4 Only store user credentials when SMB_OC storage is enabled 2014-11-20 16:05:42 +01:00
Lukas Reschke ec853da5ad Backport \OC\Security\Crypto to ownCloud 7
Conflicts:
	lib/repair/repairconfig.php
2014-11-20 16:05:42 +01:00
Volkan Gezer c494887d98 backport some strings to stable7 2014-11-20 15:13:37 +01:00
Vincent Petry f64c6c9c9c Show warning when invalid user was passed
Sometimes there are bugs that cause setupFS() to be called for
non-existing users. Instead of failing hard and breaking the instance,
this fix simply logs a warning.

Backport c941c3fa51 from master
2014-11-20 13:46:19 +01:00
Arthur Schiwon 56fabf8adf cache total user count 2014-11-19 20:27:20 +01:00
Craig Morrissey 42ada6cb15 adjust autocomplete behavior for sharing menu 2014-11-19 17:01:13 +01:00
Joas Schilling 54607a2142 Merge pull request #12288 from owncloud/backport-mapper-fixes
Backport mapper fixes
2014-11-19 16:29:30 +01:00
Joas Schilling 6a6b645b83 Merge pull request #12291 from owncloud/issue/10991-stable7-backport
Issue/10991 stable7 backport
2014-11-19 16:19:06 +01:00
Clark Tomlinson 2f1270278d fixing cache routes
Conflicts:
	tests/lib/cache/file.php
	tests/lib/cache/usercache.php
2014-11-19 11:07:55 +01:00
Lukas Reschke f235e8b803 Fix mapping of relative paths 2014-11-19 10:21:14 +01:00
Joas Schilling baf8d8433f Use md5() of the original name instead of uniqid() for slugifying
Previously we used uniqid() here.
However this means that the behaviour is not reproducable, so
when uploading files into a "empty" folder, the folders name is
different.

If there would be a md5() hash collition, the deduplicate check
will spot this and append an index later, so this should not be
a problem.

Fix #6722
2014-11-19 10:17:36 +01:00
Joas Schilling f5bd8e4947 Fix code layout before fixing the function 2014-11-19 10:17:30 +01:00
Bjoern Schiessle d49e3d0ceb use the new base class for share/share.php tests 2014-11-19 10:07:03 +01:00
Joas Schilling bc76998cd2 Simple fix for the wrong Mapper reset 2014-11-19 10:06:15 +01:00
Joas Schilling f371f14fc2 Back to OC_Util::generateRandomBytes() 2014-11-19 10:06:14 +01:00
Joas Schilling 4e1799759c Correctly restore previous root mount point after testing
Conflicts:
	tests/lib/cache/file.php
	tests/lib/cache/usercache.php
2014-11-19 10:06:13 +01:00
Joas Schilling 122f3ff594 Correctly refresh the apps list after removing the mock 2014-11-19 10:06:12 +01:00
Joas Schilling a19fd8880d Fix Files\Storage\Home::testRoot() 2014-11-19 10:06:11 +01:00
Joas Schilling e3a9a19d95 Make it possible to cleanPath() absolute Windows paths 2014-11-19 10:06:10 +01:00
Joas Schilling 75e8d2ad6e Fix single run of encryption tests and usages of uniqid() and fopen()
Conflicts:
	apps/files_encryption/tests/crypt.php
	apps/files_encryption/tests/helper.php
	apps/files_encryption/tests/hooks.php
	apps/files_encryption/tests/keymanager.php
	apps/files_encryption/tests/proxy.php
	apps/files_encryption/tests/share.php
	apps/files_encryption/tests/stream.php
	apps/files_encryption/tests/trashbin.php
	apps/files_encryption/tests/webdav.php
2014-11-19 10:06:09 +01:00
Joas Schilling 2dc688dcdf Skip some more tests on Windows which just can not work at all
Conflicts:
	tests/lib/archive/tar.php
	tests/lib/files/storage/local.php
	tests/lib/files/view.php
2014-11-19 10:06:08 +01:00
Joas Schilling ce79974888 Windows does not support CHMOD, therefor we can not test not writable folders
Conflicts:
	tests/lib/tempmanager.php
2014-11-19 10:06:07 +01:00
Joas Schilling 060a40ad43 Test LargeFileHelperGetFileSize also with ascii only characters
And skip the UTF8 names on Windows as they are not supported
2014-11-19 10:06:06 +01:00
Joas Schilling ce3e5a8538 Do not use uniqid in Group and User tests as it is not unique on windows 2014-11-19 10:06:05 +01:00
Joas Schilling 9384fa65b5 Testcase base class 2014-11-19 10:06:04 +01:00
Bjoern Schiessle e6e0573756 only users can have a display name different from the id 2014-11-18 17:29:00 +01:00
Bjoern Schiessle fcde4c70a2 make sure that we only find the shares from the correct share type if users and groups with the same ID exists 2014-11-18 17:27:10 +01:00
Bjoern Schiessle b7cf8fac34 make sure that we don't find the wrong shares if a user and a group have the same ID 2014-11-18 17:26:55 +01:00
Morris Jobke 0271e7539d Merge pull request #12154 from owncloud/ignore-port-for-trusted-domain
Ignore port for trusted domains
2014-11-18 10:53:22 +01:00
Morris Jobke 3acd98f331 add newline 2014-11-18 10:48:38 +01:00
Lukas Reschke 74a625155d Merge pull request #12223 from owncloud/fix-unit-tests-s7
Backport #12181
2014-11-17 13:48:56 +01:00
Michael Roitzsch 643835e2b3 file size on non-(Linux/BSD/Windows)-installations
Determining the file size using the exec() method is implemented for Linux, BSD, and Windows. However, on systems matching neither platform name (like SunOS), the fall-through path will return a file size result constituting a zero size instead of an invalid null return value.
2014-11-17 13:42:23 +01:00
Lukas Reschke a843129a06 Backport #12181
This should fix the stable7 unit tests again since the last CI update.
2014-11-17 12:48:13 +01:00
Vincent Petry 0ab77083c6 Fix file upload to ext storage when recovery key is enabled
Fixes an issue when uploading files to external storage when recovery
keys are enabled

The Util class only works with real users, so instantiating it with the
virtual recovery key user or public key user can cause issues.
2014-11-17 11:38:40 +01:00
Lukas Reschke 32401b42f1 Check if app is enabled for user
Fixes https://github.com/owncloud/core/issues/12188 for AppFramework apps
2014-11-15 14:40:48 +01:00
Clark Tomlinson 4fbd6023f0 Hiding add to your own cloud if server2server sharing is not enabled 2014-11-13 22:45:00 +01:00
michag86 b35a5b5a85 cleanup group admin(s) on deleteGroup 2014-11-13 22:40:12 +01:00
michag86 135479cae2 removal of wrong/double implemented check
Check already implemented in core/settings/ajax/changedisplayname.php
2014-11-13 18:32:13 +01:00
michag86 29fd95967b fix for issue #10880 2014-11-13 18:30:16 +01:00
Lukas Reschke c8a48272c5 Add repair steps for legacy config files
Remove all ports from the trusted domains
2014-11-13 13:34:11 +01:00
Lukas Reschke 2b3b4272f8 Merge pull request #12109 from owncloud/add-preupdate-before-upgrade
Run preupdate before an update
2014-11-13 12:07:10 +01:00
Lukas Reschke 786007c78c Ignore port for trusted domains
This lead to a lot of confusion in the past and did not really offer any value. Let's remove the port check therefore. (it's anyways not really a part of the domain)

Fixes https://github.com/owncloud/core/issues/12150 and https://github.com/owncloud/core/issues/12123 and also a problem reported by @DeepDiver1975.
2014-11-13 11:15:47 +01:00
Andreas Fischer 1e5a39ea6c user_ldap: Reimplement convertSID2Str() without BCMath dependency.
Also explicitly format sub-id integers as unsigned, which is required for
32-bit systems.
2014-11-12 19:47:44 +01:00
Vincent Petry d859d1b6c7 Fix root path handling for WebDAV ext storage
Added missing cleanPath() call that converts "/" to "" when calling
SabreDAV. This is needed because SabreDAV will discard its base URL when
passing "/".
2014-11-12 12:09:15 +01:00
Lukas Reschke 778efcb054 Run preupdate before an update
The update routine tries to test the database migration before actually performing the update.

However, this will fail hard if the schema has changed (for example an unique key has been added). App developers can convert the DB in preupdate.php, however it is not called before and therefore the update fails.

This actually breaks ownCloud updates from ownCloud 6 to ownCloud 7 when the files_antivirus app is enabled.
2014-11-11 20:22:23 +01:00
Morris Jobke f52662ab26 Fix infinite loop if count and limit is 0
* otherwise it will always think it hits the limit and need another round to fetch additional results
2014-11-11 13:39:48 +01:00
Arthur Schiwon fea444b941 dont fail with 500 if configured display name attribute is not set 2014-11-11 13:28:48 +01:00
Frank Karlitschek 27c29c0c58 updating 7.0.3 2014-11-10 17:09:50 +01:00
Thomas Müller afc4224aff Merge pull request #12083 from owncloud/fix-occ-upgrade
Ensure there is a connection object within \OC_DB::enableCaching()
2014-11-10 17:01:53 +01:00
Thomas Müller 042bfabf64 Ensure there is a connection object within \OC_DB::enableCaching() 2014-11-10 16:17:08 +01:00
Morris Jobke e9ebbcb47e Login Name -> Username in user management 2014-11-10 11:17:18 +01:00
Lukas Reschke 35a71cc9a5 Use proper array key
Fixes https://github.com/owncloud/core/issues/12047
2014-11-08 15:47:40 +01:00
Frank Karlitschek ddccbb9530 7.0.3 2014-11-07 20:26:18 +01:00
Craig Morrissey 5ef6c4e03d logging changes 2014-11-07 12:44:18 -05:00
Vincent Petry b6c868ec88 Merge pull request #11994 from owncloud/stable7-sabre-convertstoragenotavailableexception
[stable7] Convert StorageNotAvailableException to SabreDAV exception
2014-11-07 16:25:27 +01:00
Morris Jobke 32625aff30 JS unit tests fix - use toBeUndefined() instead of toEqual(null) 2014-11-07 14:31:39 +01:00
Frank Karlitschek 2fb1ed84f2 7.0.3 RC3 2014-11-06 14:45:41 +01:00
Bjoern Schiessle 9255da9856 check if the provided password is really the current log-in password 2014-11-06 14:35:48 +01:00
Vincent Petry 2db69a5328 Convert StorageNotAvailableException to SabreDAV exception
Convert \OCP\Files\StorageNotAvailableException to
\Sabre\DAV\Exception\ServiceUnavailable for every file/directory
operation happening inside of SabreDAV.

This is necessary to avoid having the exception bubble up to remote.php
which would return an exception page instead of an appropriate response.

Conflicts:
	lib/private/connector/sabre/directory.php
	lib/private/connector/sabre/file.php
2014-11-06 11:23:20 +01:00
Morris Jobke 4c46a2f162 Merge pull request #11964 from canepan/patch-1
Fixed a typo in translation
2014-11-06 09:49:30 +01:00
Bernhard Posselt 6d7a5bf943 fix typo in content type 2014-11-05 14:35:11 +01:00
Lukas Reschke 8d87a2c4a6 Support HTML in logo claim 2014-11-05 13:55:15 +01:00
Thomas Müller 42197e2ce3 Merge pull request #11944 from owncloud/stable7backportl10n
backport some strings to stable7
2014-11-05 13:50:19 +01:00
Thomas Müller 61c802935b adjust strings - fixed #11930 2014-11-05 13:44:30 +01:00
canepan b6334a2da5 Fixed a typo in translation 2014-11-05 11:51:37 +01:00
Vincent Petry acc547c5ff Merge pull request #11950 from owncloud/stable7-s2s-fixcertcheckwhennocertfile
[stable7] Check for cert bundle existence before using it
2014-11-04 20:52:41 +01:00
Vincent Petry b509fdb30f Store curl error message directly 2014-11-04 20:06:17 +01:00
Vincent Petry 3f35822e24 Check for cert bundle existence before using it 2014-11-04 16:49:25 +01:00
Volkan Gezer d5316623dc backport some strings to stable7 2014-11-04 14:36:44 +01:00
Vincent Petry 8339aeab9a Only rescan trash folder when checking deleted versions
This fix prevents the file scanner to rescan the WHOLE storage and reset
the etags by mistake.

Backport of 97a51c46ed from master
2014-11-04 14:17:32 +01:00
Morris Jobke f718e88aa1 fix config.sample.php linebreak 2014-11-04 09:23:56 +01:00
Vincent Petry 38783b1ca3 Capitalize Checks in admin page 2014-11-03 15:46:40 +01:00
Jörn Friedrich Dreyer 56fade9a04 add driver options to config samples 2014-11-03 14:22:57 +01:00
Jörn Friedrich Dreyer 70e68280b8 allow passing driver options, fixes #11718 2014-11-03 14:22:27 +01:00
Bjoern Schiessle 840f5487aa don't move versions if only the mount point was renamed 2014-11-03 13:32:19 +01:00
Lukas Reschke 920e991c82 Fix typo 2014-11-03 13:31:58 +01:00
Bjoern Schiessle 67c3ab92cf get the source path and owner in a pre hook and the target path and owner in a
post hook
2014-11-03 13:31:45 +01:00
Lukas Reschke 3bc748d43f Merge pull request #11614 from owncloud/fix_files_external_s3_storage_id_migration
fix files_external storage id migration
2014-10-31 10:22:20 +01:00
Arthur Schiwon aeb9e172a9 on xp'ed mode and switching configurations: save raw mode instead of toggling filter mode in tabs since their status is unknown and dealt with by the Wizard. Fixes #11848
Backport of 8a48b088ed from master
2014-10-31 08:39:36 +01:00
Lukas Reschke 1025c30885 Fix stupid copy paste fail
...
2014-10-30 16:09:52 +01:00
Morris Jobke 4aae60a375 update 3rdparty to match it's stable7 branch 2014-10-30 13:44:43 +01:00
Morris Jobke 05a15a9669 Merge pull request #11865 from owncloud/stable7-fix-enc-sharingtests
Properly register sharing hooks and proxies
2014-10-30 13:39:45 +01:00
Vincent Petry 43e01439d6 Properly register sharing hooks and proxies
This will fix failing tests when shares weren't cleant up on delete due
to missing hooks.

Added login for user1 in setUp().
2014-10-30 12:17:02 +01:00
Morris Jobke 2261db62f5 fix style of generated documentation 2014-10-29 20:39:18 +01:00
Jörn Friedrich Dreyer 496b62f2eb test files external amazon s3 storage id migration 2014-10-27 13:01:48 +01:00
Jörn Friedrich Dreyer b5ab3d7fc0 fix files_external storage id migration 2014-10-27 13:01:36 +01:00
Frank Karlitschek 321a631d92 7.0.3RC1 2014-10-23 21:26:04 +02:00
Vincent Petry a1ded6e9d7 Added encryption test when moving file as non-owner 2014-10-29 16:11:15 +01:00
Vincent Petry 68dd41a4c9 Fix warning with unset extension check 2014-10-29 16:11:11 +01:00
Vincent Petry 0d02aa7910 Fix moving share keys as non-owner to subdir
This fix gathers the share keys BEFORE a file is moved to make sure that
findShareKeys() is able to find all relevant keys when the file still
exists.

After the move/copy operation the keys are moved/copied to the target
dir.

Also: refactored preRename and preCopy into a single function to avoid
duplicate code.
2014-10-29 16:11:06 +01:00
Lukas Reschke 77a533a29d Close session for search
Make search non-blocking.
2014-10-29 15:29:35 +01:00
Lukas Reschke 84e942f121 Close session for avatar get
This somehow blocked the "Users" UI for me when having a lot of users. - Shouldn't hurt here.
2014-10-29 15:08:01 +01:00
Lukas Reschke 96c092ce14 Show login again instead of JSON if CSRF check fails
Previously a JSON error page was shown to the user in-case the CSRF token was not valid. This was confusing and prevented people from login.

With this at least the login page is shown again and not a JSON error message. I consider this as sufficient since adding a new error page just for this sake would uneededly make lib/base.php even more cluttered and this is a edge-case which optimally should anyways not happen that often.

This can be tested by opening the login page, then clearing the cookies, and trying to login.
2014-10-29 14:38:24 +01:00
Lukas Reschke ec3f92e102 Merge pull request #11802 from owncloud/backport-10958
Backport #10958
2014-10-28 14:23:58 +01:00
Thomas Müller 15e357fa94 Merge pull request #11800 from owncloud/backport-MakeSupportedDBsConfigurable
Make supported DBs configurable within config.php
2014-10-28 10:05:32 +01:00
Vincent Petry 3ba1441c2d Properly catch 503 storage not available in getQuotaInfo
When doing a PROPFIND on the root and one of the mount points is not
available, the returned quota attributes will now be zero.

This fix prevents the expected exception to make the whole call fail.

Backport of 21d825ed6c from master
2014-10-28 09:53:24 +01:00
Robin Appelman 9c24dbbac7 Introduce cross-db ILIKE
adding ILIKE to AdapterSQLSrv

add test case for ILIKE with wildcard

Make sqlite LIKE case sensitive on default

Implement ILIKE for sqlite

Use ILIKE in cache search

Fix ILIKE without wildcards for oracle
2014-10-27 23:00:49 +01:00
Lukas Reschke 9b908c3d05 Make supported DBs configurable within config.php
This commit will make the supported DBs for installation configurable within config.php. By default the following databases are tested: "sqlite", "mysql", "pgsql". The reason behind this is that there might be instances where we want to prevent SQLite to be used by mistake.

To test this play around with the new configuration parameter "supportedDatabases".

Conflicts:
	lib/private/util.php
2014-10-27 22:27:57 +01:00
Lukas Reschke dbfe5ef28a Make files non executable
There is not much sense in having these files marked executable, we should avoid that.
2014-10-24 14:16:37 +02:00
Vincent Petry a3c33585e1 Merge pull request #11719 from owncloud/stable7-fix-s3-regression
[stable7] Fix S3 connection regression
2014-10-23 12:36:35 +02:00
Vincent Petry 6a8c41754f Fix S3 connection 2014-10-22 21:48:22 +02:00
Arthur Schiwon 3399930355 Backport of #11702
set up FS by username, not login name\!

better variable name
2014-10-22 17:58:09 +02:00
Vincent Petry 09d80ac9fc Lazy initialize external storages
Backport of 075e8d8e86 from master
2014-10-22 14:50:22 +02:00
Jörn Friedrich Dreyer 6995b96589 guess mimetype on touch
Conflicts:
	apps/files_external/lib/amazons3.php
2014-10-22 12:35:59 +02:00
Vincent Petry 5624968d1e Merge pull request #11691 from owncloud/fix_pub_link_creation
fix target creation for public links
2014-10-22 11:06:12 +02:00
Bjoern Schiessle a5d6e6eb28 if it is not a folder share the path already points to the correct file 2014-10-21 16:20:28 +02:00
Bjoern Schiessle 098b4e9e81 always use the correct share type 2014-10-21 16:19:54 +02:00
Lukas Reschke d0b3fe2414 Merge pull request #11673 from owncloud/backport-11593
Backport #11593
2014-10-20 20:09:27 +02:00
Vincent Petry 3e02e79154 Add proper setup and teardown
Properly restore REQUEST_URI and SCRIPT_NAME after test runs
2014-10-20 19:15:50 +02:00
Lukas Reschke 841998bdcb Add "$_SERVER['REQUEST_URI']" to fix the unit tests
Let's hope that works
2014-10-20 19:15:45 +02:00
Lukas Reschke ff93c5859b Refer to relative path instead of absolute path
There is no need to refer to the absolute path here if we can use the relative one.

Conflicts:
	lib/private/templatelayout.php

Conflicts:
	lib/private/templatelayout.php
2014-10-20 19:15:23 +02:00
Lukas Reschke 7ffe80cf25 Add unit tests for convertToRelativePath 2014-10-20 19:09:47 +02:00
Arthur Schiwon 86daab2800 backport of #11494
fix retrievel of group members and cache group members

fix changed variable name

with several backends, more than limit can be returned

make performance less bad. Still far from good, but at least it works

add one simple cache test

adjust group manager tests
2014-10-18 00:17:43 +02:00
macjohnny 174ab07a4b backport of #9104
Update manager.php

add caching to getUserGroupIds

Update manager.php

added description and blank lines in getUserGroupIds

Update manager.php

defined $uid in getUserGroupIds

Update manager.php

Update manager.php

Update manager.php

clean up function getUserGroupIds

clean up of function getUserGroupIds and improved caching mechanism of cachedUserGroupIds

modified caching mechanism in getUserGroupIds

removed cachedUserGroupIds, instead changed indexing in getUserGroups to groupId

adapted tests for a groupId indexed group array
2014-10-17 21:14:01 +02:00
Vincent Petry 9998861402 Encapsulate require_once to avoid name space bleedind
The script required by require_once might use variable names like $app
which will conflict with the code that follows.

This fix encapsulates require_once into its own function to avoid such
issues.
2014-10-17 15:03:53 +02:00
Thomas Müller 5b6ba39734 fixing usage of EncryptionException 2014-10-17 14:18:46 +02:00
Thomas Müller fb9c2b5362 Merge pull request #11610 from owncloud/fix-svg-s7
Fix SVG icons
2014-10-17 12:02:03 +02:00
Bjoern Schiessle a93e424738 set password field placeholder back if passward was disabled 2014-10-17 11:34:26 +02:00
Morris Jobke d27db8cc61 fix the RST syntax of config.sample.php 2014-10-17 10:13:37 +02:00
Jörn Friedrich Dreyer 0c6a58a883 Merge pull request #11550 from owncloud/fix_flickering_users
fix flickering users in files external
2014-10-17 09:50:06 +02:00
Morris Jobke d2b766ddee read config.sample.php options and whitespace fixes 2014-10-17 00:37:02 +02:00
Carla Schroder da10518278 commented out instanceid and passwordsalt 2014-10-17 00:36:53 +02:00
Carla Schroder 9ed35a377f some small tweaks 2014-10-17 00:36:49 +02:00
Carla Schroder c8c182b36e small corrections to config.sample.php 2014-10-17 00:36:38 +02:00
Lukas Reschke f2dadc7104 Add a try catch block
This function might also be called before ownCloud is setup which results in a PHP fatal error. We therefore should gracefully catch errors in there.
2014-10-16 22:28:12 +02:00
Arthur Schiwon ada93bab0c backport of #11478
add checkbox for experienced users to server tab

must be empty not auto

sets user filters to raw mode when marking user as experienced

Objectlasses, Groups and Attributes are now loaded only in assisted mode and only once

user and group counts are only upated on demand in experienced mode

confirmation before switching to assisted mode when admin is experienced

rename internal var name to avoid collision

more beautiful white spaces

smaller corrections to make scruitinizer happier, no effective changes

bump version

fix triggering of group update counts. improves the basic code which is also responsible for user counts. i did not find regressions, please doublecheck

remove debug output

coding style, no effective code changes

always abort running ajax request when the method is fired up again

show a spinner next to test filter button when the test is running

show Spinner when stuff is being saved

show busy cursor and lock tabs on save

instead of dis/enabling tabs on save, cancel tab change. avoids noisy ui

remove debug output

rephrase xp'ed user mode label

left-align checkbox on server tab
2014-10-16 16:24:04 +02:00
Jörn Friedrich Dreyer b3acb2a1e7 Merge pull request #10732 from owncloud/make_skeleton_compatible_with_objectstore_minimal_stable7
make skeleton compatible with objectstore
2014-10-16 16:05:56 +02:00
Thomas Müller af72528570 include the apps' versions hash to invalidate the cached assets 2014-10-16 15:55:33 +02:00
Lukas Reschke 5f69b2095a Add app version to JS and CSS
This leads to the regeneration of the hash in case a single application is updated.

Fixes https://github.com/owncloud/core/issues/11374
2014-10-16 15:55:27 +02:00
Bjoern Schiessle 6e3a7ea140 strip whitespace from the beginning and end of the display name to avoid empty display names 2014-10-16 14:55:07 +02:00
Lukas Reschke 38c817c7dd Merge pull request #11613 from owncloud/external-share-self-signed-stable7
[stable7] Use certificate bundle from files_external for external shares
2014-10-16 14:33:32 +02:00
Jörn Friedrich Dreyer 61873e4e21 throw exception in writeBack, the returned boolean is checked nowhere 2014-10-16 14:10:28 +02:00
Jörn Friedrich Dreyer 6d4d5400d7 make tests compatible with hook based skeleton generation 2014-10-16 14:10:28 +02:00
Jörn Friedrich Dreyer 92d069ab6c make skeleton compatible with objectstore
suspend encryption proxy when copying skeleton
2014-10-16 14:10:15 +02:00
Robin Appelman d0101668ce Use certificate bundle from files_external for external shares 2014-10-16 13:42:42 +02:00
Lukas Reschke 73a5e3810f Remove insane comment 2014-10-16 12:40:09 +02:00
Lukas Reschke 6d81789a66 Fix SVG icons
FIXME: Ugly hack to prevent SVG of being returned if the SVG
provider is not enabled.
This is required because the preview system is designed in a
bad way and relies on opt-in with asterisks (i.e. image/*)
which will lead to the fact that a SVG will also match the image
provider.

Conflicts:
	lib/private/preview.php
2014-10-16 12:31:40 +02:00
Frank Karlitschek e1e501b17f 7.0.3 RC1 2014-10-16 08:26:55 +02:00
Lukas Reschke f53ecea372 Add darwin to if block
Otherwise it would fall into the 'win' else block because strpos($os, 'win') does also match 'darwin' what is the `php_uname` for OS X.
2014-10-15 22:26:03 +02:00
Lukas Reschke 15b39a6566 Merge pull request #11520 from owncloud/make-trash-objectstore-compatible
make trashbin compatible with objectstore
2014-10-15 22:24:59 +02:00
Lukas Reschke 508ef23486 Use rawurlencode since this seems to be expected by cURL
Fixes https://github.com/owncloud/core/pull/11501#issuecomment-58794405

Conflicts:
	tests/lib/largefilehelpergetfilesize.php
2014-10-15 20:00:51 +02:00
Robin Appelman ff8d755702 Merge pull request #11567 from owncloud/cache-updater-refactor-stable7
[stable7] Refactor cache updater to work outside of the users home
2014-10-15 17:00:01 +02:00
Clark Tomlinson 9159598d32 Adding test helper to test private methods 2014-10-15 14:43:09 +02:00
Vincent Petry 361d6892c9 Allow specifying protocol in ext storage OC config
Allow specifying a protocol in the host field when mounting another
ownCloud instance. Note that this was already possible with the WebDAV
config but this bug made it inconsistent.
2014-10-15 14:17:49 +02:00
Vincent Petry 149b55f8ae Use body element when animating scroll in public page
In the public page the scroll container is the window instead of a div.
The $(window) object doesn't support animating the scroll property, so
the $('body') element is used instead.

Backport of 704ffaa6a3 from master
2014-10-15 10:53:25 +02:00
Thomas Müller e7a46ed9e7 Merge pull request #11408 from owncloud/refactor-mailsettings-controller
Refactor MailSettings controller
2014-10-14 15:34:13 +02:00
Robin Appelman ad06cd4b1f Remove explicit propagate calls 2014-10-14 14:38:31 +02:00
Robin Appelman f03142f3d6 remove unstable test 2014-10-14 14:38:25 +02:00
Robin Appelman 0497136d29 Update cache before post hooks 2014-10-14 14:38:11 +02:00
Robin Appelman c7f26fa969 Fix warning in homecache 2014-10-14 14:37:37 +02:00
Robin Appelman ad6e281586 Fix unit test 2014-10-14 14:37:31 +02:00
Robin Appelman 595d43ab35 Improve unit tests for Cache\Updater 2014-10-14 14:37:22 +02:00
Robin Appelman 45738b6b7a Refactor Cache\Updater to work outside of the users home 2014-10-14 14:37:10 +02:00
Joas Schilling ba33fd6a07 Set overwritemailurl* configs on setup
Correctly use overwritemailurl value when generating absolute urls in CLI

Fix #11500

Rename the config to *cli

Add overwrite.cli.url to the sample config

Revert separator fix, fixes unit test

Backport of 0407bc0978 from master
2014-10-14 09:20:23 +02:00
Thomas Müller 19585f9c3b fixing typos 2014-10-14 04:49:29 +02:00
Lukas Reschke da150afcc5 Close session when loading apps
Otherwise the session is blocked while all remote apps are loaded. This can be very annoying especially when apps.owncloud.com is down or not reachable.
2014-10-13 18:00:38 +02:00
Jörn Friedrich Dreyer 496b68e2ad fix flickering users 2014-10-13 17:51:38 +02:00
Vincent Petry d6a380613f Retrieve storage numeric id earlier when still available
The numeric id is only available before the storage entry is deleted, so
get it at that time.

Backport of d485c0098d from master
2014-10-13 17:37:33 +02:00
Vincent Petry c38454a5b2 Revert "Set overwrite.cli.url configs on setup"
This reverts commit 48a1e69f5e.

This was backported too quickly.
2014-10-13 17:30:53 +02:00
Bjoern Schiessle e4fa642e54 improved unit tests 2014-10-13 17:27:02 +02:00
Bjoern Schiessle 697f461ded always take unencrypted size 2014-10-13 17:26:38 +02:00
Joas Schilling 48a1e69f5e Set overwrite.cli.url configs on setup
Correctly use overwrite.cli.url value when generating absolute urls in CLI

Fix #11500

Backport and squash of the following from master, in order:
- f0fcaff9b957f1e6c04f9bfd9b8e0eb84f78bbf8
- 923de0afd9a7e717a5e1d25747caf4840633db25
- a487ce76e86940c94801da6157bcf70ed4005c1f
- bd3ebdbd135b30946fdf55b41b5e96497d0c3e4a
2014-10-13 17:21:33 +02:00
Bjoern Schiessle d71fae51f8 distinguish between file dependent shares and other shares 2014-10-13 17:01:19 +02:00
Vincent Petry 372676ee17 Fixed array detection on public download
When downloading a folder called "0001" PHP should fallback to parsing
it as string and properly detect that it is not a JSON array.

Backport of 6cbabdf217 from master
2014-10-13 16:56:37 +02:00
Lukas Reschke 686a43ccf3 force loading of encryption app 2014-10-13 11:52:16 +02:00
Jörn Friedrich Dreyer 3ce828b4b7 make trashbin compatible with objectstore, replace glob with search in cache, make unknown free space work like unlimited free space 2014-10-10 18:26:43 +02:00
Vincent Petry b297ddf349 Log warning when no uid was found for user
In some incomplete setups (like mine) it can happen that the uid
attribute of users is missing.

To be able to find out that something is wrong, a debug message is now
logged when it has not been found.

Backport of 59f9107dd9 from master
2014-10-10 17:59:05 +02:00
Bjoern Schiessle ecc7161611 make sure that we always delete oldest first 2014-10-10 17:31:27 +02:00
Bjoern Schiessle f4c91f0e82 try to get path from filesystem 2014-10-10 15:58:13 +02:00
Bjoern Schiessle 5a37703b3f fix performance issues 2014-10-10 15:58:00 +02:00
Vincent Petry 088879c4ec Prevent button click when enter key is pressed in LDAP wizard
Pressing enter in the LDAP wizard will trigger a click on the first
button. In the main page it would trigger the delete dialog, which is
quite inconvenient.

Added a type attribute to suppress this behavior.

Backport of bb424802c8 from master
2014-10-10 14:58:06 +02:00
Lukas Reschke 7097201eab Merge pull request #11503 from owncloud/stable7-9753
Stable7 9753
2014-10-10 13:02:28 +02:00
Lukas Reschke b089b85753 Refactor MailSettings controller
- Do not store the password (fixes https://github.com/owncloud/core/issues/11385)
- Refactor to AppFramework
- Add unit tests
2014-10-10 12:34:43 +02:00
Tony Zelenoff 34c1760e9f Urlencode file name before passing it to cURL
Large file helper use cURL to determine file sizes. Thus filenames must be
urlencoded in case special symbols like '#' can cause BadRequest errors.

Signed-off-by: Tony Zelenoff <antonz@parallels.com>

Backport of 2d03019c91 from master
2014-10-10 10:58:26 +02:00
Vincent Petry 140f3a7aa9 Merge pull request #11505 from owncloud/stable7-ext-updateetagmount
Stable7 ext updateetagmount
2014-10-10 09:54:33 +02:00
Morris Jobke f1a99ebb6d Additional changes to config.sample.php and typo fixes 2014-10-10 01:51:57 +02:00
Morris Jobke bd205c58c7 apply @carlaschroder's changes from owncloud/documentation#594 2014-10-10 01:50:56 +02:00
Vincent Petry a036cc56c4 Added PHP docs for etag propagator 2014-10-09 18:20:25 +02:00
Robin Appelman 1203580848 More phpdoc 2014-10-09 18:20:20 +02:00
Robin Appelman f534574b30 Hookup the etag propagator 2014-10-09 18:20:15 +02:00
Robin Appelman a11a75faba Add EtagPropagator to handle etag changes when external storages are changed 2014-10-09 18:20:11 +02:00
Robin Appelman 0d8d5cb3e6 Fix add/remove mountpoint hooks 2014-10-09 18:20:07 +02:00
Robin Appelman 4858b5e94a Expose getAppKeys trough \OCP\IConfig 2014-10-09 18:19:59 +02:00
Vincent Petry 3d68d172af Added failing unit tests for mount config hooks 2014-10-09 18:18:50 +02:00
Vincent Petry fe652258be Added filesystem hooks for mount/unmount ext storage 2014-10-09 18:18:46 +02:00
Vincent Petry 24dbdd2b8e Clear enabled apps cache after loading authentication app
Since getEnabledApps() depends on an authentication app to be loaded,
especially in the case of LDAP, the cache from getEnabledApps() is now
cleared to make sure that subsequent calls will properly return apps
that were enabled for groups.
This is because getEnabledApps() uses the inGroups() function from the
group manager provided by LDAP or any other authentication app.

Backport of 36d22825e0 from master
2014-10-09 17:19:34 +02:00
Lukas Reschke f8675f60e8 Add beforeeach and aftereach 2014-10-09 18:04:56 +03:00
Lukas Reschke d6ee378564 Add support for keys in the info.xml
This allows to have links to different doc base URLs
2014-10-09 17:00:06 +02:00
Lukas Reschke 335ad56ff8 Add unittest for filePath 2014-10-09 17:59:58 +03:00
Robin Appelman 7479a6ebf9 Remove special case for css in OC.filePath 2014-10-09 17:59:35 +03:00
Arthur Schiwon f0c4347330 Backport of #10527
properly cancel a Paginated Results operation in order to avoid protocol errors, fixes #10526

abandon ongoing paged search before starting a new one

abandond paged search only if PHP supports them

init a new paged search on read operations to satisfy OpenLDAP

make scrutinizer happy, very minor changes
2014-10-09 14:29:00 +02:00
Bjoern Schiessle d222d2b73f check if I can create a file at the location 2014-10-09 13:30:11 +02:00
MTRichards 5b6f866756 Updated info.xml app description
Made description consistent with other apps
2014-10-08 22:34:10 -04:00
MTRichards cdeb7cb9b3 Updated info.xml app description
Updated description
2014-10-08 22:33:02 -04:00
MTRichards a7398bcfa8 Updated info.xml app description
Updated app description
2014-10-08 22:28:11 -04:00
MTRichards f4e1e5f414 Updated info.xml app description
Backported to stable 7
2014-10-08 22:15:33 -04:00
MTRichards c9875e3959 Updated info.xml app description
Updated documentation. Removed doc links as this has two packages, need to not hard link.
2014-10-08 22:14:07 -04:00
MTRichards a3c6b7a662 Updated info.xml app description
Backporting to stable 7. Removed doc links as this is packaged in 2 different setups, links are different.
2014-10-08 22:10:32 -04:00
Morris Jobke 063d2032a7 style fixes in config.sample.php 2014-10-08 23:27:57 +02:00
Morris Jobke 47c05e048f Fixes in config.sample.php
* owncloud -> ownCloud
* add default value
* proper comment style
* fix line wrapping and minor typo
* remove duplication
* add Vincents proposals
* drop master config switches while backporting
2014-10-08 23:24:34 +02:00
Morris Jobke c83a17e6c8 re-arrange the config options and sort them in a semantical way
Conflicts:
	config/config.sample.php
2014-10-08 23:21:58 +02:00
Morris Jobke 3e7bc72281 unify style of config.sample.php
* use ' instead of " for config option
* place default parameters where useful into sample
* use proper comment block
* limit line size to 80 characters
2014-10-08 23:20:31 +02:00
brumsoel 251e4d78b8 Fix file size comparator return value 2014-10-08 23:09:01 +02:00
Vincent Petry 6b89f4b44d Merge pull request #11375 from owncloud/fix_files_external_amazon_s3_stat_call
Fix files external amazon s3
2014-10-08 18:49:41 +02:00
Bjoern Schiessle a766f5b633 improved visual feedback if user enabled recovery key 2014-10-08 16:20:21 +02:00
Bjoern Schiessle 7ee3ad411c improved visual feedback if recovery key password gets changed 2014-10-08 16:19:28 +02:00
Bjoern Schiessle bdfd3ca2bf improved visual feedback if recovery key gets enabled/disabled 2014-10-08 16:18:59 +02:00
Bjoern Schiessle 4dcd1ed34f make sure that the notification gets shown again after a second try 2014-10-08 16:13:35 +02:00
michag86 a045f8cd3a restrict $div to local scope 2014-10-07 16:30:21 +02:00
michag86 4e74983676 variable for found avatar div 2014-10-07 16:30:21 +02:00
michag86 aedd64b5a6 fix for issue #10483 2014-10-07 16:30:21 +02:00
Vincent Petry b6e81b517f Merge pull request #11457 from owncloud/stable7-fix-rename-position
fix position of rename field, fix #10867
2014-10-07 16:00:41 +02:00
Jan-Christoph Borchardt 77b5e2e661 fix position of rename field, fix #10867 2014-10-07 14:58:01 +02:00
Jan-Christoph Borchardt 9411a6ea53 reduce bottom padding in filelist, fix perceived glitching, fix #11213 2014-10-07 14:52:22 +02:00
Victor Dubiniuk e0d1fa554f Add CssImportFilter. More elegant fix for documents#348 2014-10-07 14:33:42 +02:00
Jan-Christoph Borchardt 532f65116a fix position and style of sort indicator 2014-10-07 14:23:27 +02:00
Bjoern Schiessle 30398370b8 we also encrypt/decrypt files in the versions folder for previews and if encryption is enabled/disabled 2014-10-06 13:11:09 +02:00
Jörn Friedrich Dreyer 413bd5406c extract batchDelete(), better comments 2014-10-06 11:08:21 +02:00
André Gaul 056b97834d files_extern: remove empty Body and ContentLength in Amazon S3 mount
fixes #10501

Conflicts:
	apps/files_external/lib/amazons3.php
2014-10-02 12:00:50 +02:00
Lukas Reschke 1f5f278501 Merge pull request #11299 from owncloud/barkport-10934
[stable7] Don't complain about non-writable datadirs before we're installed
2014-10-02 10:38:15 +02:00
Jörn Friedrich Dreyer 2b91e628f5 fix amazon s3 issues
folder size and mtime is always unknown in s3

more s3 fixes

make rescanDelay of root dir configurable, add on the fly update of legacy storage ids, !isset -> empty when checking strings

reduce number of http calls on remove and rmdir

fix typo
2014-10-01 14:38:50 +02:00
Jörn Friedrich Dreyer c8dab5829c make some storage tests explain what went wrong 2014-10-01 14:38:50 +02:00
Jörn Friedrich Dreyer 8089e0f9b8 strict comparison 2014-10-01 14:38:50 +02:00
Jörn Friedrich Dreyer 7fd925e96d log exceptions when listing files 2014-10-01 13:17:28 +02:00
Robin Appelman 3a4ac2caa1 Skip test for unsuported feature for amazon s3 2014-10-01 13:15:20 +02:00
Robin Appelman 67b9edeeb7 Fix copy overwrite for amazon s3 2014-10-01 13:15:13 +02:00
Robin Appelman 25d003a52d Fix amazon s3 rename overwrite 2014-10-01 13:15:06 +02:00
Robin Appelman a47f965b87 Fix AmazonS3 rmdir on the root 2014-10-01 13:14:56 +02:00
Lukas Reschke 0484939fe0 Redirect only to absolute URL
We do not want to redirect to other domains using the "?redirect_url=" feature. Please notice, that the ownCloud project does not consider open redirectors as security issue.
2014-10-01 12:49:54 +02:00
Lukas Reschke 69296befa6 Use SVG previews for public sharing
Fixes https://github.com/owncloud/core/pull/11367#issuecomment-57306037 and https://github.com/owncloud/core/issues/9218
2014-10-01 11:16:10 +02:00
Lukas Reschke bc5c608e4e Add flock to config
This adds a file lock to the config in hope that this prevents race conditions as reported in https://github.com/owncloud/core/issues/11070

Testplan:

- [ ] Delete config.php and make it read-only => Error is thrown that it is not writeable
- [ ] Installation still works
- [ ] Changing config settings works (i.e. using the SMTP config switches in the administration menu)
- [ ] Your PC didn't blow up
- [ ] Installing the news app and the "Disable AppCode checker" app did not destroy your installation

Only skip the main config

Otherwise read only additional configs might not be processed

Test on tmpdir
2014-10-01 11:14:15 +02:00
Bjoern Schiessle 02374e595a don't clean up the test environment if a data provider was finished 2014-09-30 12:50:21 +02:00
Lukas Reschke f788dffce8 Try to create datadirectory to test whether the .htaccess works
Fixes https://github.com/owncloud/core/pull/11299#issuecomment-56968588 and also https://github.com/owncloud/core/issues/10628 together with https://github.com/owncloud/core/pull/11299#issuecomment-56968588 when backported.
2014-09-30 10:24:52 +02:00
Robin Appelman d102cb4ffa Don't test for htaccess if we cant write into the datadir anyway 2014-09-30 10:24:52 +02:00
Robin Appelman 83a06950f4 Check for writable datadir during setup 2014-09-30 10:24:52 +02:00
Robin Appelman 6c09c0e082 Don't complain about non-writable datadirs before we're installed
Conflicts:
	lib/private/util.php
2014-09-30 10:24:52 +02:00
Robin Appelman 2376d69115 Inject config into checkserver and cleanup tests
Conflicts:
	lib/private/util.php
2014-09-30 10:24:52 +02:00
Lukas Reschke 7eb0d6866c Close the session for preview generation
Without closing the session every preview image generation is locking the session which makes the webinterface unresponsive.
2014-09-29 22:03:58 +02:00
Arthur Schiwon 5ddacaed7f dn needs to be fetched to be able to detect memberOf support 2014-09-29 15:17:34 +02:00
Dan Bartram bd74ab2886 Clear up confusion of log_rotate_size config value
Remove the second comment which could be confused with suggesting an invalid value: `// 100 MiB`.

To keep the easily readable example value, it has been moved into the comment header for the config item.
2014-09-29 09:39:55 +02:00
Frank Karlitschek 424cc31fd6 increase version 2014-09-28 13:19:53 +02:00
Björn Schießle d388ef5c0a Merge pull request #11363 from owncloud/sharing_group_shares_stable7
Sharing group shares stable7
2014-10-01 23:35:33 +02:00
Thomas Müller 7d389b26f9 catch and log exception in OC_Helper::cleanTmp() 2014-10-01 15:57:30 +02:00
Bjoern Schiessle 9254073786 some small fixed, suggested by scrutinizer 2014-10-01 15:13:48 +02:00
Bjoern Schiessle bb703006da throw a exception if we can't handle the provided path 2014-10-01 15:13:48 +02:00
Bjoern Schiessle 1371fecf26 on unshare only unshare childrens if there is no other parent available 2014-10-01 15:13:48 +02:00
Bjoern Schiessle 1e5c786392 only create a new share entry, if the user needs a different target name than the group share 2014-10-01 15:13:48 +02:00
Bjoern Schiessle 6d85cf2a0b for group shares we don't need a extra db entry of groupTarget equals itemTarget 2014-10-01 15:13:48 +02:00
Bjoern Schiessle 3b1715c3fc for group shares only the parent has the up-to-date permission. Make sure that we always use this permission, except if the user permission is '0' because in this case the user unshared the group share from self 2014-10-01 15:13:48 +02:00
Bjoern Schiessle 6d747e9721 call \OCP\Share::getItemsSharedWithUser() to get exclude list, this way all checks are executed, e.g. to check if the share is really visible 2014-10-01 15:13:48 +02:00
Bjoern Schiessle c5db1ef3cc always select permissions, used in getItems() 2014-10-01 15:13:48 +02:00
Bjoern Schiessle 27a630b0bc some small fixes 2014-10-01 15:13:48 +02:00
Bjoern Schiessle e25593db4e clear share table after each test run 2014-10-01 15:13:47 +02:00
Bjoern Schiessle 7edf912ef8 only add a new row if it isn't a unique share, otherwise update the existing row 2014-10-01 15:13:47 +02:00
Bjoern Schiessle aab44694ad fix unit tests 2014-10-01 15:13:47 +02:00
Bjoern Schiessle 98268078c0 mark exclude list as deprecated. It neither used by the files app nor by the
calendar or contacts app. It doesn't make sense to build a exclude list by the
share API, the apps knows best which are valid targets.
2014-10-01 15:13:47 +02:00
Bjoern Schiessle df97d8299a fix add user to group to work with grouped shares 2014-10-01 15:13:47 +02:00
Bjoern Schiessle 97dba2e022 generateTarget() will always find a unique target 2014-10-01 15:13:47 +02:00
Bjoern Schiessle b52154b306 unit tests for grouping of shares pointing to the same source 2014-10-01 15:13:47 +02:00
Bjoern Schiessle 64a9315b4a group shares and combine permissions 2014-10-01 15:13:47 +02:00
Lukas Reschke 3fb55d9d2e Merge pull request #11364 from owncloud/fix_unit_test_oc7
make sure that the users file system is initialized before we emit the post hook
2014-10-01 15:07:16 +02:00
Bjoern Schiessle 094f5bcc78 make sure that we re-load the file system after the quota was set 2014-10-01 09:42:50 +02:00
Bjoern Schiessle 79f5346105 make sure that the users file system is initialized before we emit the post hook 2014-09-30 13:14:04 +02:00
Vincent Petry 5c0139fdff Prevent monkey clicking on labels
Clicking on labels while the spinner is there will not trigger the
hidden checkbox any more.
2014-09-27 10:42:00 +02:00
Lukas Reschke c1c70b306e Add ID to markup to have the checkboxes in the right position 2014-09-27 10:41:51 +02:00
Vincent Petry 4d261d9e15 Added spinners in share dropdown
Added spinners for the following actions:
- adding user
- removing user
- changing password
- toggling allowing upload
- setting a password
2014-09-27 10:41:45 +02:00
Jan-Christoph Borchardt 257dbe61e2 for whitelabeled edition, show branding name (e.g. 'ownCloud') instead of appname in header bar 2014-09-27 10:29:20 +02:00
Robin Appelman d660aab116 Fix dav permissions for folders without create permissions 2014-09-26 09:24:24 +02:00
Robin Appelman e37f44e56a Expose creatable permissions trough fileinfo 2014-09-26 09:24:23 +02:00
Robin Appelman bdc26c6749 Don't keep the full info of all children in memory 2014-09-25 20:04:02 +02:00
Lukas Reschke 6d8fdcd7d2 Clarify possible preview providers for type Office
a

Conflicts:
	lib/private/preview.php
2014-09-25 00:00:40 +02:00
Morris Jobke 0044c3bb6b Merge pull request #11245 from owncloud/backport-11211
Add a configuration switch for enabled preview mimetypes
2014-09-24 23:57:23 +02:00
Robin Appelman 1ec756d125 Show a proper error message when trying to scan the filesystem for a non existing user 2014-09-24 23:21:26 +02:00
Thomas Müller c31990e936 Updating 3rdparty - contains updated tar archive and getid3 2014-09-24 14:30:00 +02:00
Jan-Christoph Borchardt 4e850128e6 fix filepicker home icon being partly hidden, fix #10169 2014-09-24 02:14:20 +02:00
Lukas Reschke 00bb0e122f Check for blacklisted characters
Fixes https://github.com/owncloud/core/issues/11264

(This should in future get moved to the mountpoint class - but that is something for @icewind1991 ;-))
2014-09-24 00:38:18 +02:00
Vincent Petry 2013404e0a Moved WebDAV and internet checks to client side JS
- Added setup checks in JavaScript
- Moved isWebDAVWorking to JS using SetupChecks
- Moved internet connection checks to an ajax call that goes through the
  server

Backport of e65ceb08fc from master
2014-09-23 16:58:19 +02:00
Lukas Reschke 734112a5c1 Merge branch 'stable7' into backport-11211
Conflicts:
	config/config.sample.php
2014-09-23 14:48:16 +02:00
Remco Brenninkmeijer fbcd80ac08 Previous commit was not based on master, retry. Removed broken tar cutter, double extensions are not possible in temp files. Added tar support. Fixed extension switch. 2014-09-23 14:45:56 +02:00
Thomas Müller 435b9c3028 using flush() here is pointless as we render the layout into a memory buffer and actually transmit the data later 2014-09-23 13:41:45 +02:00
Thomas Müller 838c849a5a remove post setup check
Backport of 21412559df from master
2014-09-23 13:00:55 +02:00
Vincent Petry 85d7492398 Fix share key finding algorithm in various cases
Instead of inaccurate pattern matching, use the list of users who we
know have access to the file to build the list of share keys.

This covers the following cases:

- Move/copy files into a subfolder within a share
- Unsharing from a user
- Deleting files directlry / moving share keys to trashbin

Backport of 1e631754d7 from master
2014-09-23 12:54:07 +02:00
Victor Dubiniuk a6eb638380 Use non-empty defaults 2014-09-23 12:53:11 +02:00
Lukas Reschke cb3bc5ad31 Do only follow HTTP and HTTPS redirects
We do not want to follow redirects to other protocols since they might allow an adversary to bypass network restrictions. (i.e. a redirect to ftp:// might be used to access files of a FTP server which might be in a secure zone and not be reachable from the net but from the ownCloud server)

Get final redirect manually using get_headers()

Migrate to HTTPHelper class and add unit tests

Conflicts:
	apps/files/ajax/newfile.php
	lib/private/files/storage/dav.php
	lib/private/server.php
	lib/private/util.php
	lib/public/iservercontainer.php
2014-09-23 11:51:18 +02:00
Lukas Reschke d9384cd959 Append port to trusted domain in case it's not 80 or 443
Ref https://github.com/owncloud/core/pull/10584#issuecomment-54677059

Backport of 2590a4dc85 from master
2014-09-23 11:20:52 +02:00
Bjoern Schiessle bd7f6c9e18 first check if a private key exists, if not it is always a recovery szenario 2014-09-23 10:42:56 +02:00
Lukas Reschke bb69eebde4 Add a configuration switch for enabled preview mimetypes
Backport of https://github.com/owncloud/core/pull/11211 to stable7
2014-09-23 10:42:45 +02:00
Vincent Petry cb39c55073 WebDAV now throws 403 when deletion did not work
Assume a permission issue whenever a file could not be deleted.

This is because some storages are not able to return permissions, so a
permission denied situation can only be triggered during direct
deletion.
2014-09-23 00:50:28 +02:00
Morris Jobke 33737f9526 Merge pull request #11230 from owncloud/fix-failing-mountconfig-tests-stable7
Load apps in test situations
2014-09-23 00:45:35 +02:00
Victor Dubiniuk b3ddd39438 Log unsuccessful temp file creation and return false 2014-09-22 18:57:03 +03:00
Vincent Petry 2b297567b5 Added extra check to avoid deleting key folders
Whenever a delete operation is called twice in a row, it could happen
that the first call already deleted the file.

The second call would return an empty $ownerPath because the file does
not exist. That empty $ownerPath would run the key deletion operation on
the wrong path.

This fix adds checks in many places to make sure we don't use $ownerPath
when it's empty or null.

Backport of 8aca127e52 from master
2014-09-22 17:06:46 +02:00
Thomas Müller d6276beac0 date printed in the admin section regarding last execution time is already displayed in the users timezone - no need to append UTC 2014-09-22 16:58:17 +02:00
Vincent Petry 03bb3d2bdc Reenable file proxy when renaming between mount points
When moving a folder into another mount point, $renamedFiles is empty
because that goes over a different mechanism.

In such case, this fix makes sure that the file proxy is reenable to
avoid breaking the subsequent files that are being moved.
2014-09-22 16:30:37 +02:00
Jörn Friedrich Dreyer 44c7562c7b in quota wrapper use === instead of ! for better readability and as in other wrappers 2014-09-22 16:26:20 +02:00
Jörn Friedrich Dreyer e556698db7 return boolean in Ciose::stream_seek 2014-09-22 16:26:14 +02:00
Jörn Friedrich Dreyer 2bdf5a8b1a return boolean in OC::stream_seek 2014-09-22 16:26:01 +02:00
Jörn Friedrich Dreyer dfc6bfe131 add seek and tell to streamwrapper test 2014-09-22 16:25:50 +02:00
Robin McCorkell c0d1b6bfb2 Load apps in test situations 2014-09-22 15:39:16 +02:00
Vincent Petry 387638e317 Use afterBind to send fileId header for files and directories
afterBind is called for both files and directories and is now used to
send the OC-FileId headers.
2014-09-22 14:12:52 +02:00
Morris Jobke 2d3ea08e19 update 3rdparty submodule to its stable7 commit 2014-09-22 13:05:36 +02:00
voxsim 3ebd0b8983 Backport of #9225
fix in displayNamesInGroup: when specified limit N, we did complex search only in the first N users

change logic in displayNamesInGroup and add some unit tests

add more logic in displayNamesInGroup for big user bases

1. remove sizeof($filteredUsers) > 0 as condition
2. use count instead of sizeof. Latter is an alias to first one, practically we stick to count everywhere. Having it consistent helps with readability.
3. move whitespace so we have $groupUsers[] = $filteredUser; instead of $groupUsers []= $filteredUser;
2014-09-22 12:21:34 +02:00
Robin Appelman 984b6a28ac Also setup the filesystem when matching routes 2014-09-22 10:34:40 +02:00
Robin Appelman 744b20bc0d Remove unneeded file initialization in encryption, already handled in a hook 2014-09-22 10:34:37 +02:00
Robin Appelman 8905e77d60 Don't automatically setup the filesystem the moment we load OC\Files\FileSystem 2014-09-22 10:34:32 +02:00
Vincent Petry c16c680e32 Add select2 cache for complete group list
To avoid making a server request every time the dropdown opens, the
whole list of groups are cached (from the last request):

Whenever the user types in a search term it will still send server
requests.
2014-09-22 10:14:25 +02:00
Jan-Christoph Borchardt 13cee302f7 fit select2 to ownCloud input style 2014-09-22 10:14:22 +02:00
Vincent Petry 2aaad09062 Fixed select2 for admin and apps page
Added explicit escaping.
Now internally using a pipe symbol as separator for select2, to make it
possible to use group names containing commas.
2014-09-22 10:14:18 +02:00
Vincent Petry 996c68aa2e Added select2 on the apps page
Moved setupGroupsSelect() from admin.js to a common settings.js
as OC.Settings.setupGoupsSelect().

Now using select2 as well on the apps page.
2014-09-22 10:14:15 +02:00
Vincent Petry 7f030eedde Remove excludegroup.php
The ajax call is now using ajax/appconfig.php instead
2014-09-22 10:14:11 +02:00
Vincent Petry 2e93300313 Load select2 on admin page 2014-09-22 10:14:08 +02:00
Vincent Petry a385a367b0 Now using select2 for the groups excluded from sharing 2014-09-22 10:14:05 +02:00
Vincent Petry 97b83b9098 Move select2 from files_external to core
Backport of 412da87e65 from master
2014-09-22 10:13:46 +02:00
Bjoern Schiessle ce69e83b33 make sure that we really catch the files folder only 2014-09-22 10:00:47 +02:00
Bjoern Schiessle a2e9056832 create backup from all keys before recovery 2014-09-22 10:00:37 +02:00
Thomas Müller 260229b027 Merge pull request #11202 from owncloud/stable_l10n_backport
backport server2server strings
2014-09-22 09:16:34 +02:00
Thomas Müller 0c014409e6 Merge pull request #11201 from owncloud/fix-button-text
fix button text l10n
2014-09-22 09:16:00 +02:00
Georg Ehrke 2068eaf16b make sure preview prop is instanceof OC_Image before using it in showPreview 2014-09-22 00:48:01 +02:00
Georg Ehrke 645e7a0c9e delete old previews 2014-09-21 22:49:22 +02:00
Volkan Gezer 0afd79a22c backport server2server strings 2014-09-21 17:34:39 +02:00
Volkan Gezer 6946962609 fix button text l10n 2014-09-21 17:32:37 +02:00
Morris Jobke f8ecef2917 Merge pull request #11195 from owncloud/stable_l10n_backport
backport stable translations
2014-09-21 11:16:08 +02:00
Thomas Müller 6c544b95e8 adding 'smallint unsigned' to type mapping for sqlite 2014-09-21 11:14:14 +02:00
Volkan Gezer 5637a581d2 backport stable translations 2014-09-20 18:50:17 +02:00
Robin McCorkell 83b9a89569 Merge pull request #11190 from owncloud/fix-unit-test-sort-order-stable7
Don't rely on the sorting the database gives us for tests
2014-09-20 12:09:50 +01:00
Robin Appelman 8580e2a697 Don't rely on the sorting the database gives us for tests 2014-09-20 09:17:18 +02:00
Lukas Reschke 7f45226b8e Prevent updates between multiple major versions
Ref https://github.com/owncloud/core/issues/11078
2014-09-19 17:00:50 +02:00
Lukas Reschke 37632e428d Move BasicAuth check to "isLoggedIn()"
Ensures that Basic Auth works properly for APIs and removes the need for some even uglier lines of code.
2014-09-19 13:41:55 +02:00
Volkan Gezer 7930440b31 update encryption doc link
I don't know how we missed to update this :/

update ldap doc link
2014-09-18 18:20:20 +02:00
Lukas Reschke 749c519759 Move basic auth check
At the previous point not all apps were initialized. Now the basic auth check happens together at the same location as all others.

Fixes https://github.com/owncloud/core/issues/11129
2014-09-18 14:41:43 +02:00
Vincent Petry 35cb14c95f Add timeout to user and group deletion notification
Added timeout in DeleteHandler to auto-delete after a delay.

Fixed issue where OC.Notification.hide() was called twice in a row when
deleting multiple entries, causing the second notification to disappear.
Fixed issue where "undo" click event handler was registered multiple
times when calling setNotifications() twice.
Added JS unit tests for the DeleteHandler class.

Refix undo users, groups feature

Timeout is now cleared in cancel().

Fixed click handler name for "undo" to be able to work with multiple
DeleteHandler instances (in our case one for users and one for groups)
so that there is no conflict.

Backport of 0d9f24a0ef from master
2014-09-18 10:22:10 +02:00
Lukas Reschke 28f462095d Make 404 page easier to understand
Fixes https://github.com/owncloud/core/issues/11133
2014-09-18 09:10:56 +02:00
Frank Karlitschek 19a7aa081e version bump 2014-09-13 22:56:07 +02:00
Thomas Müller 82ccb04182 adding unit test to truncate the table 2014-09-17 14:28:31 +02:00
Andreas Fischer ebbd40385a Use Doctrine Platform to generate SQL query for table truncation. 2014-09-17 14:28:31 +02:00
Vincent Petry 03f9b14a23 Merge pull request #11053 from owncloud/baskport-11041-stable7
content size checks are not valid for LOCK
2014-09-16 16:46:47 +02:00
Lukas Reschke 8ed1762dfb Reword the description
The old one was just horrible wrong.
2014-09-16 16:01:35 +02:00
Thomas Müller 76ff7ab007 Disable database migrations for MSSQL - scripts have to be applied manually 2014-09-16 14:03:24 +02:00
Bjoern Schiessle 9bf1a18512 also expire file if timestamp = limit, happens if trashbin_retention_obligation is set to zero 2014-09-16 13:58:56 +02:00
kondou 86400ea4c8 Preserve transparency when loading from a file
Fix #7148 - again :)
2014-09-16 08:34:18 +02:00
Lukas Reschke ff6deb809a Use secure mimetype for content delivery
Adds some hardening against potential CSP bypassed.
2014-09-15 12:50:35 +02:00
Vincent Petry 7f1416e62a Remove passing by reference to allow for proper GC
The garbage collector in PHP 5.3.10 does not properly release the file
handle when calling fclose() due to the fact that it is passed by
reference.
This has the side-effect of preventing file locks to be released as well
when the files_locking app is enabled.

This fix removes the useless passing by reference and now the file
handle and file lock are freed properly.
2014-09-15 11:58:18 +02:00
Joas Schilling a23396452f Set overwritewebroot when installing owncloud to avoid problems
Backport of 249558966e to stable7
2014-09-15 11:06:47 +02:00
Arthur Schiwon 1981d220c5 if only one attribute is requested, the returned array has 0 as key instead of attribute name. fixes #10888 2014-09-15 11:01:21 +02:00
Lukas Reschke 572720fb7a Do not double decode values
Fixes https://github.com/owncloud/core/issues/11012
2014-09-15 07:59:04 +02:00
Thomas Müller 0732131cd9 content size checks are not valid for LOCK 2014-09-12 22:06:28 +02:00
Thomas Müller 2ffcff228c content size checks are not valid for LOCK 2014-09-12 21:53:28 +02:00
Jan-Christoph Borchardt bec08955b2 fix nojavascript message alignment 2014-09-11 23:06:45 +02:00
Johan Björk f040529e6d Converted an array to PHP5.3 compatible version 2014-09-11 18:01:11 +02:00
Johan Björk 5ac620cb04 Fixes #8326: deletion of directories on S3 2014-09-11 18:01:01 +02:00
Jan-Christoph Borchardt e26a5ff715 fix folder icon alignment, fix #10866 2014-09-11 17:07:52 +02:00
Jan-Christoph Borchardt b7c7ec26c7 fix svg of calendar filetype icon 2014-09-11 17:07:46 +02:00
Jan-Christoph Borchardt 7f1e32764d fix size of toggle icon, make container square 2014-09-11 17:07:40 +02:00
Jan-Christoph Borchardt 3f5cefb07f improve style of checkmark icon, less bold, fitting ownCloud style 2014-09-11 17:07:34 +02:00
Jörn Friedrich Dreyer 463ad5a50d repair search lucene before installing 2014-09-11 14:24:11 +02:00
Lukas Reschke ec9517f98b Add X-UA-Compatible to all templates
Replaces https://github.com/owncloud/core/pull/10850
2014-09-11 12:39:45 +02:00
Vincent Petry 36680a5a81 Merge pull request #10998 from owncloud/use-section-in-form
Use section in first element in user_ldap
2014-09-11 12:07:31 +02:00
Lukas Reschke 04597aedcb Use section in first element 2014-09-10 18:47:29 +02:00
Vincent Petry 1a9e08ae4d Merge pull request #10973 from owncloud/stable7-issue/10847
[Stable7] Use correct language package so the subject is correctly translated
2014-09-10 14:57:32 +02:00
Vincent Petry dedb47390b Do not load extra user backends when an upgrade is due
Whenever an upgrade is due, do not load extra user backends

Backport of d6bfd90bf8 from master
2014-09-10 10:42:56 +02:00
Lukas Reschke 95eb9bf8ae Merge pull request #10884 from owncloud/stable7_backport_issue_10674
Backport issue 10764
2014-09-10 10:31:26 +02:00
Joas Schilling cc0a855103 Use correct language package so the subject is correctly translated
Fix #10847

Conflicts:
	lib/private/share/mailnotifications.php
2014-09-09 23:44:15 +03:00
Joas Schilling 19dd866c7e Fix broken new lines in plain text mail template 2014-09-09 23:40:56 +03:00
Bernhard Posselt 8e89c51e87 more sugar for including lists of templates 2014-09-09 19:40:56 +02:00
Bernhard Posselt 2a859f84a8 append .html since componets always use html files 2014-09-09 19:40:39 +02:00
Bernhard Posselt 8869dcf1af add template functions for html imports 2014-09-09 19:40:18 +02:00
Bernhard Posselt ca121d8438 add shortcut functions for style and script 2014-09-09 19:40:02 +02:00
Jörn Friedrich Dreyer f5bac5fb2d make objectstore tests check fileid on rename 2014-09-09 10:27:34 +02:00
Jörn Friedrich Dreyer c52f66cc73 Keep fileid on move in objectstore, fixes #10848 2014-09-09 10:27:21 +02:00
Jörn Friedrich Dreyer 5e5d9e0a80 allow . in dbname on web install 2014-09-09 09:43:58 +02:00
Lukas Reschke b98c22d39b Don't show warning when has_internet_connection is set to false
Revert

Add disabled
2014-09-09 09:20:03 +02:00
Jan-Christoph Borchardt b609d36e3c also add no-JavaScript notice to log in and sharing pages because they do not work without JS either 2014-09-08 22:01:56 +02:00
Jan-Christoph Borchardt a7968604d8 fix styling and wording of no-JavaScript message 2014-09-08 22:01:49 +02:00
Clark Tomlinson 9b99c81a9d Using countUsers method to return true count of users 2014-09-08 18:52:14 +02:00
Lukas Reschke 96bb1f7f45 Check for admin user instead of subadmin 2014-09-08 18:25:23 +02:00
Vincent Petry 85cde16feb Catch exceptions when moving files
When moving files on storages that don't expose permissions, the storage
itself might throw an exception when the permission is denied.

This fix ensures that exceptions are caught and forwarded to the client
instead of just hanging.

Backport of e43c9b84c4 from master
2014-09-08 16:26:01 +02:00
Oliver Kohl D.Sc 1e4431ba01 Update cron.php 2014-09-08 09:54:23 +02:00
Oliver Kohl D.Sc 994f36e498 CRON call ends in null exception
[error] 4461#0: *186285 FastCGI sent in stderr: "PHP message
: PHP Fatal error:  Call to a member function execute() on null in /var/www/ownc
loud/cron.php on line 125" while reading response header from upstream, client:
217.13.183.252, server: cloud.mycloud.com, request: "GET /cron.php HTTP/1.1", upstre
am: "fastcgi://unix:/var/run/php5-fpm.sock:", host: "cloud.mycloud.com", referrer: "
https://cloud.mycloud.com/"
2014-09-08 09:54:18 +02:00
Lukas Reschke 640abbe099 Move trusted domain check to init()
handleRequest() is not called from remote.php or public.php which made these files party available but all included apps in there produced errors.

As the expected behaviour is anyways that a trusted domain warning is shown I moved this to init()

Fixes https://github.com/owncloud/core/issues/10064
2014-09-05 18:20:40 +02:00
Jörn Friedrich Dreyer 1f2550e3da add / to url to match route 2014-09-05 16:55:36 +02:00
Vincent Petry cfca88f20e Scroll to new file/folder after adding
When creating a new file from the menu, the list now scrolls to that
file.
2014-09-05 16:55:36 +02:00
Vincent Petry 8e77ca6201 Fixed scrollto for search results
Now passing the "scrollto" URL argument to the file list class which
will also automatically scroll and highlight the matching element.

This code is triggered by the search box when in a different folder and
also by the activity app.
2014-09-05 16:55:36 +02:00
Lukas Reschke 41d8157937 Add isAppstoreEnabled instead of hijacking the URL 2014-09-05 15:14:29 +02:00
Lukas Reschke 6534304196 Remove different URL for EE
This can now be achieved by setting `appstoreenabled` to `false` in config.php
2014-09-05 15:14:19 +02:00
Jesus Macias 7bd4f6cac5 Backport issue 10764 2014-09-05 13:23:09 +02:00
Vincent Petry 69cc2044f0 Added permission check for drag and drop
When dropping files onto a read-only folder, a notification
is now shown instead of attempting to upload.

This for both the drag for upload and drag from inside the file list
cases.

Backport of f1bfe35cda from master
2014-09-05 12:21:42 +02:00
Jörn Friedrich Dreyer eb682a3022 Merge pull request #10878 from owncloud/remove_leftover
remove a left over that uselessly fetches all users
2014-09-05 11:59:12 +02:00
Arthur Schiwon e638a9a444 remove a left over that uselessly fetches all users 2014-09-05 10:27:34 +02:00
Vincent Petry f268eee86c Added unit tests for cache of enabled apps 2014-09-04 18:02:58 +02:00
Vincent Petry 28e1480d1c Added test for needUpgrade for core 2014-09-04 18:02:54 +02:00
Vincent Petry 81c4043d61 Fix upgrade process when apps enabled for specific groups
Fix issue where the currently logged user was causing side-effects when
upgrading.
Now setting incognito mode (no user) on update to make sure the whole
apps list is taken into account with getEnabledApps() or isEnabled().
2014-09-04 18:02:49 +02:00
Lukas Reschke bd5796a0d1 Merge pull request #10558 from owncloud/ajaxify_user_list_for_files_external_stable7
Ajaxify user list for files external stable7
2014-09-04 13:16:52 +02:00
pdessauw 919d19c906 Highlight every uploaded files and scroll down to the last one
Backport of 0d078e48ce from master
2014-09-04 10:45:41 +02:00
Vincent Petry 459c78106d Merge pull request #10823 from oparoz/patch-1
Typo in whichOpenOffice test
2014-09-04 10:20:50 +02:00
Olivier Paroz 444e21ab15 Typ in whichOpenOffice test 2014-09-02 22:11:49 +02:00
Raghu Nayyar b59d58fdc1 Merge pull request #10789 from owncloud/fix-z-index
fix z-index of navigation sidebar for mobile devices
2014-09-03 01:03:51 +05:30
Volkan Gezer b26dd3c76b russian translation backport. closes #10759 2014-09-02 17:53:52 +02:00
Morris Jobke 3d35c7edcc fix z-index of navigation sidebar for mobile devices 2014-08-31 19:41:58 +02:00
Morris Jobke 6eb1f7a474 update public interface for getUserFolder 2014-08-31 13:27:53 +02:00
Morris Jobke f3f1d1ee73 Add optional user ID parameter for getUseFolder 2014-08-31 13:27:53 +02:00
Arthur Schiwon 11b2835cc3 retrieve local users, groups and group members in a sorted way 2014-08-31 11:56:54 +02:00
Jörn Friedrich Dreyer 8b86df308b allow empty hostname and dots in service name for oracle autosetup 2014-08-29 17:11:38 +02:00
Arthur Schiwon 98ac45fa78 Backport of #9214
Wizad: email attribute detection

remove Access as hard dependency, inject it instead

add unit test for mail detection

write log message, if original value was changed

undo falsely changed log file

trigger email detection by Wizard upon any user filter filter change. before it happenend only upon user automatic list filter creation, but not on manual editing

adjust static method vars as well
2014-08-29 15:02:08 +02:00
Robin McCorkell 617636d5a7 Add missing 'personal' mount configuration option 2014-08-29 13:12:36 +01:00
Jan-Christoph Borchardt 4d9fd199ef user mgmt: move 'Show storage location' and 'Show last log in' to settings area 2014-08-29 12:53:17 +02:00
Stephane V cc820eb824 Adds 2 checkboxes at the top of userlist in the settings, to display/hide optional columns
This fixes #9367.
2014-08-29 12:53:11 +02:00
Jan-Christoph Borchardt 135d40203c define min height/width for icon classes to make sure they show 2014-08-29 12:51:57 +02:00
Jan-Christoph Borchardt 30cc4b9293 allow horizontal scrollbar for personal and admin settings 2014-08-29 10:33:43 +02:00
raghunayyar 04e14ab5a6 Enhancement: Adds input styles to input type dates too. 2014-08-28 17:56:24 +02:00
Arthur Schiwon a133833fb9 fix wizard test, adjust to changed parameters of the tested method, introduced by 9caa354cfc 2014-08-28 11:39:16 +02:00
Arthur Schiwon 2b001adce0 backport of #8623
set result entry identifier earlier, i.e. before a continue for the same level can happen. otherwise  will always get the same value and we end up in an infinite loop

add unit test to make sure the infinite loop never comes back

Conflicts:
	apps/user_ldap/tests/wizard.php
2014-08-28 11:38:31 +02:00
Lukas Reschke 5a8db83c48 Escape error messages 2014-08-28 09:37:11 +02:00
Frank Karlitschek a3dcbe5bce 7.0.2 2014-08-26 12:03:37 +02:00
Lukas Reschke dac8dead07 Redirect user after clicking on link
Use DI
2014-08-25 22:15:54 +02:00
Lukas Reschke 09ab1f16c0 Expose setSystemValue 2014-08-25 22:15:54 +02:00
Lukas Reschke 0a2e471163 Add a trusted domain wizard
Adds a little button to the trusted domain warning, if an admin clicks on the warning he will be redirected to ownCloud and asked whether he want to trust this domain.

By far not the cleanest code, or clean at all, but does the job and I don't see a reason to make a lot of changes for this little improvement.
2014-08-25 22:15:54 +02:00
Vincent Petry a70fe184e7 Do not load apps when an upgrade is due
This makes it still possible to update from the command line, but
disables custom commands from apps
2014-08-25 16:21:03 +02:00
kondou e552573bed Warn user on resetting passwords via occ when encryption is enabled 2014-08-25 15:30:55 +02:00
Robin Appelman ffdcab6cd5 Stream downloads from Swift object stores without downloading it first 2014-08-25 13:24:25 +02:00
Vincent Petry c38fcb520a Fix share dropdown when links are not allowed
When links are not allowed, the email field does not exist and
autocomplete returns null. This causes Javascript errors.

The fix prevents entering the bogus block when links aren't allowed, as
it doesn't make sense to enter it in such cases anyway.

Backport of 98d06094e7 from master
2014-08-21 15:31:43 +02:00
Jörn Friedrich Dreyer af17de9467 fix deletion of shares 2014-08-21 15:12:06 +02:00
Vincent Petry 6c1e19b386 Do not close container/slider when clicking on single select field 2014-08-21 08:40:26 +02:00
Arthur Schiwon 2307a5a6b5 it does not affect gravity on planet earth, but only for tipsy 2014-08-21 08:40:17 +02:00
Arthur Schiwon a3a97cf1f5 make singleselect check for gravity wish, and make it south for default quota 2014-08-21 08:40:09 +02:00
Morris Jobke 4e4b299ceb replace spaces with tabs in apps.js 2014-08-21 08:39:59 +02:00
Vincent Petry e9497182ba Fix default quota settings field
The default quota settings field is initially hidden which makes it
impossible for singleSelect() to make its width measurements.

This fix uses the app navigation slide "show" event to defer the
singleSelect() initialization on the default quota field.

Refactored setQuota() into UserList._updateQuota().
Refactored duplicate event handler code into UserList.onQuotaSelect().
2014-08-21 08:39:01 +02:00
Vincent Petry 02ac579eae Use global apps slide toggle logic
Remove local app settings slide logic and make it use the global one
triggered by the "data-apps-slide-toggle" attribute.
2014-08-21 08:38:55 +02:00
Vincent Petry b94c88266b Trigger events when app-settings visibility changes 2014-08-21 08:38:49 +02:00
Frank Karlitschek 1f52e975fa 7.0.2 RC1 2014-08-21 05:36:33 +02:00
Jörn Friedrich Dreyer a3c6d20ccb use S3Client::encodeKey(), fixes #8325 2014-08-20 22:27:44 +02:00
Jörn Friedrich Dreyer 9caff0be96 add unit test for #8325 2014-08-20 22:27:40 +02:00
Vincent Petry c6e87acb96 Return whole file if range request cannot be granted due to encryption
Whenenver range headers are set and encryption is enabled, it is not
possible to automatically fseek() to the proper position.

To avoid returning corrupt/invalid data or causing a decryption error,
the range headers are stripped so that the SabreDAV code in httpGet()
returns the whole file.

Backport of cc8c1d8e07 from master
2014-08-20 21:56:09 +02:00
Jörn Friedrich Dreyer 992bd6dbf2 replace chosen with select2 to provide ajaxified user and group selection for files_external, fixes #7499
remove minified select2 js

show avatars for users, simpler results

remove unneeded users and groups from settings template

fix css, escape user and group names
2014-08-20 19:25:23 +02:00
Jörn Friedrich Dreyer f74bf923ca add select2 to app specific thirdparty 2014-08-20 19:25:10 +02:00
Arthur Schiwon 899035bfd3 backport of #10340
better check whether string resembles a DN, fixes #9887

adjust login test to code changes

unify tests
2014-08-20 17:45:04 +02:00
Joas Schilling e311535ae1 Ensure that filename is prefixed with a slash 2014-08-20 11:18:46 +02:00
Joas Schilling b1b745c052 Do not filemtime() on "." directory. Use empty string instead
Fix #9928
2014-08-20 11:18:43 +02:00
Joas Schilling a9ce0edecb Remove doubled slash between folder and path 2014-08-20 11:18:40 +02:00
Jan-Christoph Borchardt dce2e5e3b7 remove obsolete 'Download preparing' message for zip downloads, fix #3755 2014-08-19 22:53:17 +02:00
Jan-Christoph Borchardt 80d3f30ada fix multiselect bar offset on shared page 2014-08-19 17:12:07 +02:00
Robin Appelman 7842014a68 fix undefined variable 2014-08-19 14:05:26 +02:00
Robin Appelman 2facba644e only set core version at the end 2014-08-19 14:05:19 +02:00
Robin Appelman 75236b0ee6 Set maintaince mode when updating an app from the app store 2014-08-19 14:05:06 +02:00
Robin Appelman 4d2ab79392 Also set the app version when updating from app store 2014-08-19 14:04:53 +02:00
Robin Appelman 322cd65b9e Send feedback from upgrading apps to the upgrade ui 2014-08-19 14:04:44 +02:00
Robin Appelman c47a32d515 Allow loading app without checking the upgrade 2014-08-19 14:04:31 +02:00
Robin Appelman d9008f8ae4 extract upgrade parts to their own methods 2014-08-19 14:04:24 +02:00
Robin Appelman 22387b8346 handle service not available exceptions in index, remote and public.php 2014-08-19 14:04:13 +02:00
Robin Appelman 9173a661bd Throw an exception when we try to load an app that needs to be upgraded 2014-08-19 14:04:04 +02:00
Robin Appelman c69215c115 Extend OC_Util::needUpgrade to also catch app upgrades 2014-08-19 14:03:50 +02:00
Vincent Petry efca0ab4d4 Hide sharing sections in files app when sharing API is disabled
Backport of 1de5ae8845 from master
2014-08-19 12:52:32 +02:00
Jörn Friedrich Dreyer c4fd3dbd2a properly encode groups as json, not ',' separated 2014-08-19 11:21:04 +02:00
Lukas Reschke 67399901dc Fix copyright 2014-08-19 10:21:50 +02:00
Bjoern Schiessle 23f4e7c1cb fix broken unit tests 2014-08-19 10:21:37 +02:00
Bjoern Schiessle 29e9cb51dc update unit tests with configurable share folder 2014-08-19 10:21:26 +02:00
Bjoern Schiessle 1519f018a4 make share folder configurable 2014-08-19 10:21:16 +02:00
Bjoern Schiessle 2b449dd4fd set incognitoMode to true, getUser should always return false during public upload 2014-08-19 10:13:24 +02:00
Jan-Christoph Borchardt be7cb7298a fix color of links in warnings, fix #10480 2014-08-18 17:18:24 +02:00
Joas Schilling 86009a564e Add a note about overwritewebroot when using system cron
If the current webroot is non-empty but the webroot from the config is,
and system cron is used, the URL generator fails to build valid URLs.
So we notify the admin to set it up correctly.

Fix #9995
2014-08-18 16:32:16 +02:00
Vincent Petry 9d5d0cca7a Added upgrade notice to avoid timeouts 2014-08-18 16:04:39 +02:00
Vincent Petry e0c62bbd64 Fixed folder icon update routine when share owner exists
Whenever a folder has a "data-share-owner" attribute, the icon is now
properly updated to a shared folder icon.

Backport of 607ea636be from master
2014-08-18 14:55:36 +02:00
Georg Ehrke f82467f845 check if array index ocsid is set before accessing it 2014-08-18 10:45:44 +02:00
Stefan Rado cac56279c2 Make skeleton directory configurable. 2014-08-18 09:46:17 +02:00
Lukas Reschke 5e8733a9f6 Fix unit test 2014-08-15 16:52:17 +02:00
Lukas Reschke e7cea79ee7 Move authentication failed logging to checkPassword
Fixes https://github.com/owncloud/core/issues/10366
2014-08-15 16:52:13 +02:00
Clark Tomlinson 1a2bae347a Merge pull request #10440 from owncloud/enforce-debug
Remove ability to trigger DEBUG mode via cookie
2014-08-15 09:13:27 -04:00
Jan-Christoph Borchardt ed6365af4a change error text color to white for better contrast, fix #10424 2014-08-15 14:21:58 +02:00
Oliver Gasser 8cd5e652de Compare upload limit against biggest file
When uploading multiple files from the web interface, compare the PHP
upload limit against the largest file, not against the sum of all files.
2014-08-15 09:42:40 +02:00
pzy 5dd950bc0a Update public.php
added tag to make facebook load a preview picture

Update public.php

add check ifMimeSupported and put the thumbsize in a variable

generate preview for all supported mimes
2014-08-15 09:17:35 +02:00
Thomas Müller e3cf107e1d in order to prevent false-positives on the code checker - exec and eval will not longer be grepped for 2014-08-14 23:20:50 +02:00
Bjoern Schiessle 4c6c22c4e3 we need the recipient as a additional parameter to know for which share the notification was send 2014-08-14 17:45:18 +02:00
Vincent Petry 35c133143a Fix issue when no apps are enabled
Properly initialize $apps array
2014-08-14 13:52:31 +02:00
Bjoern Schiessle 34e0259fa8 new unit test added 2014-08-14 11:45:30 +02:00
Bjoern Schiessle fe119300c7 no error if we try to delete a file which no longer exists 2014-08-14 11:45:13 +02:00
Bjoern Schiessle 9a83dbec76 no special action for folder named 'Shared' needed 2014-08-14 11:44:59 +02:00
Bjoern Schiessle bc1848933d add error message if user wants to rename a file which no longer exists 2014-08-14 11:44:44 +02:00
Robin Appelman e2f23b24f7 Cast file id's to int so we can compare them properly 2014-08-14 00:55:10 +02:00
Jan-Christoph Borchardt 4593d9f819 trigger lazy loading earlier, fix #9823 2014-08-14 00:54:04 +02:00
Thomas Müller 0711ab5de7 Merge pull request #10406 from owncloud/japanese-stable7
fix japanese lang code
2014-08-13 23:57:14 +02:00
Volkan Gezer 1266ebdb10 fix japanese lang code 2014-08-13 22:29:56 +02:00
Volkan Gezer 1b4793db66 Typo fix NL 2014-08-13 22:23:50 +02:00
gekmihesg eb68b0d5c6 Load authentication backends before tryBasicAuth 2014-08-13 16:09:59 +02:00
Bjoern Schiessle ca3d09c940 add unit test for aes256/aes128 2014-08-13 13:06:29 +02:00
Bjoern Schiessle f979a0c09d update existing unit tests 2014-08-13 13:06:15 +02:00
Bjoern Schiessle 09ed6b5ad4 support aes 256 2014-08-13 13:05:41 +02:00
Jörn Friedrich Dreyer 113049b8f2 Merge pull request #10365 from owncloud/check_quota_on_new_via_web_stable7
check quota when trying to download a file via new -> web
2014-08-13 11:54:02 +02:00
Jörn Friedrich Dreyer c8f81e6241 check quota when trying to download a file via new -> web 2014-08-13 10:44:52 +02:00
Bjoern Schiessle 7aa35e9f24 fix broken variable name, recoveryPasswordSupported is now recoveryEnabledForUser 2014-08-12 19:27:09 +02:00
Bjoern Schiessle 9f9c18bd74 add unit tests 2014-08-12 17:54:54 +02:00
Bjoern Schiessle 6af1a2d914 fix detection of system wide mount points 2014-08-12 17:52:40 +02:00
Jan-Christoph Borchardt 3432b2e386 Merge pull request #10271 from miicha/patch-2
Fix display of checkboxes in Pale Moon
2014-08-12 13:00:05 +02:00
Bjoern Schiessle 5b27b01525 remove 'no people found' entry 2014-08-12 10:02:01 +02:00
Tom Needham 3bcca4f344 Add scrollto to the url if sharing a file for long file lists 2014-08-11 18:25:01 +01:00
Tom Needham 8972f74ecf Fix link to files and folders in internal share emails 2014-08-11 18:25:01 +01:00
Thomas Müller 1051460afc in case $_POST['itemSourceName'] does not exist we simply default it to null 2014-08-11 17:42:37 +02:00
Jean-Louis Dupond 6907eb3eb0 Backport of #9848
Fix memberOf detection. Fixes: #9835

Fix remarks in #9848

Fix initializing in #9848
2014-08-11 17:00:38 +02:00
Thomas Müller d1658c1d2c shared files/folders are not mounted 2014-08-11 14:42:56 +02:00
miicha cb0cdd1d74 remove obsolete code comment 2014-08-11 13:36:11 +02:00
Bjoern Schiessle 5c89d9c9ee update unit test, min date should be always today + 1 2014-08-11 10:07:41 +02:00
Bjoern Schiessle 493b724935 set minDate always to today + one day 2014-08-11 10:07:30 +02:00
Jan-Christoph Borchardt b50a4e918b simplify app navigation look
* remove superfluous border as it is distinguished enough via background color
* remove superfluous border from settings entry
* fix settings entry width
2014-08-11 08:46:17 +02:00
Robin Appelman db7b245800 Add group management to the public api 2014-08-10 20:58:31 +02:00
Jan-Christoph Borchardt b3e2f6b457 remove confusing 'automatic logon rejected' message, fix #8591 2014-08-09 22:06:08 +02:00
Thomas Müller db117bd468 Merge pull request #10287 from owncloud/fix_search_in_shared_files_stable7
Fix search in shared files stable7
2014-08-08 17:37:21 +02:00
Bjoern Schiessle 8c892638f5 remove share permissions if user is excluded from sharing 2014-08-08 14:01:49 +02:00
Bjoern Schiessle a8f24ed408 only show "share with others" and "share by link" navigation bar entries if user is allowed to share files 2014-08-08 14:01:37 +02:00
Jörn Friedrich Dreyer 41fe3f2652 add test for search() in shared cache 2014-08-08 11:47:56 +02:00
Jörn Friedrich Dreyer 592a2dc82f traverse folders in php to search in shared files 2014-08-08 11:47:47 +02:00
Bjoern Schiessle 18c023da16 add logout hook to remove keys from session 2014-08-08 09:36:48 +02:00
Georg Ehrke 68ba31fd4c implement a txt preview fallback for the case that ttf is not support 2014-08-07 22:59:25 +02:00
Arthur Schiwon 0c057bf310 ldap_ prefix will be added in invokeLDAPMethod(), having it would lead to a unexisting function, fixes #9829 2014-08-07 21:41:30 +02:00
miicha 4748923dbc Fix display of checkboxes in Pale Moon
In Pale Moon (24.7.1) the checkboxes in the file list are not in the responding line on the icon but all of them are next to the "select all" checkbox.
This fix should not change anything in Firefox and chromium (on windows) but as the comment states it has to be checked on KDE/Qt.
BTW why is position absolute naccessary? For my understanding relative is exactly what you want to use in such a case...
2014-08-07 19:33:44 +02:00
Tom Needham 44ae0868fd Use human readable relative date for oc-dialog-filepickers 2014-08-07 15:17:51 +01:00
Thomas Müller 8f8923a714 we can only close the session if encryption is not used 2014-08-07 14:32:18 +02:00
Dan Jones 9ba8f5b604 fix tiny thumbnails in public preview/share mode 2014-08-07 14:31:14 +02:00
Robin Appelman 2213127094 trim leading slash 2014-08-07 13:44:49 +02:00
Robin Appelman 9598efc7cd Fix SharedCache::getPathById 2014-08-07 13:44:47 +02:00
Robin Appelman 8c56be5722 return null instead of throwing an exception 2014-08-07 13:42:25 +02:00
Robin Appelman 34963b0d89 Fix Folder::getById 2014-08-07 13:42:17 +02:00
Thomas Müller 2b9c093510 Merge pull request #10226 from owncloud/fix-lowlat-cache-autoload-stable7
Fix lowlat cache autoload stable7
2014-08-07 10:30:13 +02:00
Bernhard Posselt 3c68defac2 use id instead of resourceId 2014-08-07 10:19:07 +02:00
Bernhard Posselt 8417f55b01 dont strip the s from the resource 2014-08-07 10:19:00 +02:00
Jörn Friedrich Dreyer 1ca1e1d4d1 fix return documentation 2014-08-07 00:55:22 +02:00
Thomas Müller 5b88d3d3fc prevent PHP errors and enhance logging 2014-08-07 00:55:22 +02:00
Andreas Fischer 12c7ddc18f Add registerAutoloaderCache(). 2014-08-06 21:40:48 +02:00
Andreas Fischer cc1d95cbe5 Memcache\Factory: Remove static, use globalPrefix. 2014-08-06 21:40:38 +02:00
Andreas Fischer ef6a0254f9 InstanceId is properly injected into factory. Remove comment. 2014-08-06 21:40:22 +02:00
Thomas Müller d59b94fa4c Merge pull request #10204 from owncloud/backport-10144-stable7
Backport of #10144 to stable7
2014-08-06 15:44:52 +02:00
Bjoern Schiessle 079390c037 remove trailing slash from path 2014-08-06 15:19:10 +02:00
Bjoern Schiessle 8a038eeeef remove unused variable 2014-08-06 15:18:57 +02:00
Bjoern Schiessle 7540a58ce7 add unit test to make sure getVersions returns the correct result 2014-08-06 10:43:51 +02:00
Bjoern Schiessle 97a62f6bc4 make sure that the versions array contains the correct path 2014-08-06 10:43:38 +02:00
Joas Schilling cc531fc905 Fix isLoggedIn() check for user '0'
Fix #9972

Conflicts:
	lib/private/user/session.php
2014-08-06 10:24:05 +02:00
Joas Schilling 2e04c5e956 Fix getting group '0' from database backend
Fix #9972
2014-08-06 09:55:11 +02:00
scolebrook ec79e5470a Add ability to theme iOS and Android client URLs just like desktop URLs.
* added to personal settings page.
* fix uppercase issue
* remove escaping because it's unneeded
2014-08-06 08:56:31 +02:00
Jan-Christoph Borchardt 9b9fbc60c0 use correct app-icon class for new apps as well, fix icon size 2014-08-06 08:35:56 +02:00
Bjoern Schiessle a1656abb4c don't display share permission if resharing was disabled by the admin 2014-08-05 13:46:23 +00:00
Thomas Müller 8f8f3d1e43 close session right before the download starts - this enables parallel downloads 2014-08-05 14:55:07 +02:00
Arthur Schiwon 3ebdb3593a Hack to avoid Agent DN + Password being overwritten by some ugly browsers with stored site credentials
Conflicts:
	apps/user_ldap/css/settings.css
2014-08-05 12:17:36 +02:00
Jan-Christoph Borchardt 5bc562d2ce fix long filename display in filepicker 2014-08-05 07:47:25 +02:00
Jan-Christoph Borchardt 039b1e3715 also fix filepicker for smaller screen sizes 2014-08-05 07:47:08 +02:00
Jan-Christoph Borchardt b21a1de07a fix date display in filepicker 2014-08-05 07:47:08 +02:00
Remco Brenninkmeijer aba52ff02f Quick fix for #9119. Increase preview to keep empty message more centered and push footer down. 2014-08-05 07:46:27 +02:00
Robin Appelman 3e103f5bee Dont touch non-oc tables when doing the InnoDB repair step 2014-08-04 17:10:18 +02:00
Frank Karlitschek 5a57d2bd42 7.0.1 2014-08-04 15:43:20 +02:00
Morris Jobke ed89a746e2 Merge pull request #10122 from malditoastur/patch-1
Update ast.php
2014-08-04 11:07:57 +02:00
malditoastur 78af01393f Update ast.php
Following the thread in:

https://github.com/owncloud/core/issues/10112

I modify this file hoping to be included in next ownCloud 7.0.x version. (Please, I don't have enough github knowledgment. Sorry if i'm doing something wrong..)
2014-08-02 21:06:13 +02:00
Thomas Müller f359e3432e only if the environment variable RUN_OBJECTSTORE_TESTS is set the object store unit test will be executed 2014-07-31 22:43:45 +02:00
Frank Karlitschek c0f0e79b5e Merge branch 'stable7' of https://github.com/owncloud/core into stable7 2014-07-30 17:40:05 -04:00
Frank Karlitschek 727374a6f3 7.0.1 RC1 2014-07-30 17:39:38 -04:00
Jan-Christoph Borchardt a0f024fec2 set max width for notifications so they won't overlap the whole header 2014-07-30 21:30:08 +02:00
Jan-Christoph Borchardt 32cec6cae4 fix yellow notification style 2014-07-30 21:29:54 +02:00
Jan-Christoph Borchardt 57c954a345 fix notification preventing top bar clickability, fix #9680 2014-07-30 21:29:45 +02:00
Georg Ehrke 24c8774b7f don't preload videos on public sharing, fixes #10042 2014-07-30 21:11:23 +02:00
Georg Ehrke f68fa072c7 extract transparency fix from #8050 2014-07-30 18:37:51 +02:00
Robin Appelman 4f40cde66a Also keep maxY into account when scaling a preview while preserving aspect ratio 2014-07-30 17:31:21 +02:00
Bjoern Schiessle 19bad71da2 make sure that we always find all versions 2014-07-30 17:21:37 +02:00
Bjoern Schiessle 2e8f993299 add unit test for rename and copy operation 2014-07-30 17:21:29 +02:00
Bjoern Schiessle 5eca22d229 make the versions and encryption app aware of the copy operation 2014-07-30 17:21:19 +02:00
Jan-Christoph Borchardt 78ea700752 Merge pull request #9902 from Der-Jan/stable7
Fixed wrong brackets in apps settings
2014-07-30 17:21:38 +02:00
Bjoern Schiessle 60b1a6e75f add unit test 2014-07-30 15:32:20 +02:00
Bjoern Schiessle 0b8135dcc4 make sure that we set the expire date if a date is adefault date is set 2014-07-30 15:32:11 +02:00
Jan-Christoph Borchardt 8f9deb118a also use link icon for the folders .. 2014-07-30 13:20:08 +02:00
Thomas Müller dc41f63930 migration test for sqlite - adding type mapping for 'tinyint unsigned' 2014-07-30 11:50:26 +02:00
Morris Jobke 185e41afdd Fix template rendering for 'blank' templates 2014-07-30 10:33:55 +02:00
Thomas Müller eb665bf3c8 only call exec() if allowed to 2014-07-29 21:39:52 +02:00
Jan-Christoph Borchardt 64094c5384 use more understandable 'link' icon for public links (instead of hard to recognize globe), fix #9707 2014-07-29 20:19:53 +02:00
Michael Göhler 1cd1214b93 max icon size for app menu 2014-07-29 16:32:48 +02:00
Bjoern Schiessle d677040bdc define type in pre hook 2014-07-29 16:28:37 +02:00
Bjoern Schiessle 72459ca50a show a warning in the personal settings and admin settins if the encyption keys are not initialized 2014-07-29 16:26:51 +02:00
Bjoern Schiessle b4a379b7e3 remove share permission if user is excluded from sharing 2014-07-29 14:05:02 +02:00
Bjoern Schiessle 59aa54ddb8 update attributes for share with user list, file should always have delete permissions, this means unshare in this context, and the overview page is always a root view 2014-07-29 14:01:06 +02:00
Thomas Müller 7287789588 Merge pull request #9990 from owncloud/fix-failing-unit-test-stable7
function declaration did not match
2014-07-29 09:17:03 +02:00
Thomas Müller bfb6b7ba90 function declaration did not match 2014-07-29 07:53:44 +02:00
Thomas Müller a50c33a91f Merge pull request #9946 from owncloud/remove-mssql-bundle-stable7
remove MssqlBundle
2014-07-28 22:44:20 +02:00
Thomas Müller 53c1e3d41b function declaration did not match 2014-07-28 22:38:56 +02:00
Thomas Müller 3b760141d6 remove MssqlBundle 2014-07-28 22:21:13 +02:00
Vincent Petry 8757a99f78 Fix enforced share expiration date to be based on share time 2014-07-28 17:58:12 +02:00
Bjoern Schiessle 663e8bc5e2 adjust error code 2014-07-28 17:28:42 +02:00
Bjoern Schiessle 2e28b7fff9 add OCS api call to set expire date for link shares 2014-07-28 17:28:34 +02:00
Thomas Müller 1831ae9c9b Merge pull request #9948 from owncloud/backport-9904-stable7
Dont throw an error when calling $server->getUserFolder when logged out
2014-07-28 17:11:00 +02:00
Thomas Müller 51cbe2a0ee generate copy of sqlite database file in data directory 2014-07-28 16:55:31 +02:00
Thomas Müller 02a61c0b6a ownCloud users are exported as address book 2014-07-28 16:35:37 +02:00
Jan-Christoph Borchardt 7cd1a48222 enable input grouping also outside of log in screen 2014-07-28 15:13:04 +02:00
Morris Jobke 0cabafb513 update getID3 library & add autoload 2014-07-28 15:06:17 +02:00
Robin Appelman df0d00c8c6 Dont try to execute jobs that no longer exist 2014-07-28 13:47:40 +02:00
Jan-Christoph Borchardt 2d7379da2c improve look of search on mobile, save space in top bar 2014-07-28 13:15:43 +02:00
Vincent Petry 9cd741417a Set version AFTER a successful update
If an app upgrade failed, the core version will not be increased either
in the database. This will re-display the update page and make it
possible to redo the apps upgrade.

Note that any core repair routine must take into account that an update
might need to be redone again even though the core's DB state is already
the one of the new version.
2014-07-28 11:21:13 +02:00
Lukas Reschke 05301825e2 Verify whether the URL is valid
Required for https://github.com/owncloud/mail/pull/100#issuecomment-50266017

@karlitschek Backport for stable6 and stable7 requested.
2014-07-28 11:08:15 +02:00
Robin Appelman 87ec3fbf1d Dont throw an error when calling $server->getUserFolder when logged out
Conflicts:
	lib/private/server.php
2014-07-28 10:08:14 +02:00
Der-Jan c72f0e692b Fixed wrong brackets in apps settings 2014-07-25 16:22:31 +02:00
Björn Schießle d28b4caa2f Merge pull request #9892 from owncloud/fix_sharing_update_oc7
fix sharing update, add proper escaping (oc7 backport)
2014-07-25 11:36:36 +02:00
Bjoern Schiessle 06bcf3db8d fix sharing update, add proper escaping 2014-07-25 10:21:18 +02:00
Vincent Petry d6e61745c8 Fix preview animation on uploading
When adding/uploading files, the preview is now animated.
When loading a list of files directly the preview is displayed directly.
2014-07-25 00:00:47 +02:00
Thomas Müller f33c49e2be - adding default value for $recoveryPassword
- set password correctly in lost password
2014-07-24 15:58:30 +02:00
Thomas Müller c152ab4572 register type mappings for unknown/unsupported mysql types 2014-07-24 15:37:49 +02:00
Thomas Müller f75f1b4412 Adding test which breaks because bit and/or enum datatypes are used 2014-07-24 15:37:49 +02:00
Vincent Petry 127aa309fb Prevent cron.php to trigger apps updating 2014-07-23 22:42:41 +02:00
Thomas Müller 303e504fcb only commit in case a transaction is active 2014-07-23 21:37:30 +02:00
Robin Appelman 3c0f5d02ba Fix remote share when remote server is installed at the root 2014-07-23 17:58:39 +02:00
Remco Brenninkmeijer faf0bfb29b Backport of sorting fix from master
Changed default sorting except for names.
Show sorting icons when hovering over
Cleanup of unnecesary addition
Fixed comments from PVince81
Corrected (Netbeans?) inserted spaces
While busy cleaning, also removed extra enters
Adjusted tests for new default sorting
Sorting triangles pointing up for ascending, down for descending

Backport + squash of 1a65d09..319caa7 from master
2014-07-23 15:54:26 +02:00
Frank Karlitschek c7d7ca455a updated the 7.0.0 release with some last minute fixes 2014-07-22 15:54:34 -04:00
Thomas Müller 555fcbdd7d Merge pull request #9777 from owncloud/fix-chunked-upload-stable7
adding special handling of checkPrecondition() for chunked upload
2014-07-22 17:25:50 +02:00
Thomas Müller 69065ceecb Merge pull request #9775 from owncloud/backport-9738-stable7
Backport 9738 stable7
2014-07-22 17:24:33 +02:00
Thomas Müller 61d9967221 adding special handling of checkPrecondition() for chunked upload 2014-07-22 15:49:20 +02:00
Lukas Reschke a393670f7d Remove uneeded strip_tags
This `strip_tags` seems to be completely unneeded and will cause problems with passwords containing stripped characters. (e.g. `<` or `>`)

Needs https://github.com/owncloud/core/pull/9735 to be merged first.
2014-07-22 15:39:34 +02:00
Andreas Fischer 9be9e777c2 Extract Auth Header logic into new function handleAuthHeaders(). 2014-07-22 15:39:33 +02:00
Andreas Fischer 0e732982ae Deduplicate user/password extraction from alternative HTTP headers. 2014-07-22 15:39:33 +02:00
Frank Karlitschek 508fd15975 7.0.0 2014-07-21 18:55:21 -04:00
Joas Schilling e482ba60bc Correctly use groups parameter only when its not empty
Fix #9745

Backport of c84c1f5 from master
2014-07-21 20:45:27 +02:00
Thomas Müller bad2d4d408 perm -> permissions 2014-07-21 17:14:21 +02:00
Joas Schilling a77044da9e Do not force isAdmin as true and so the list is filtered correctly 2014-07-21 14:32:20 +02:00
Joas Schilling 9c6e87849b Fix username for subadmins and only send subadmin groups
Fix #9748
2014-07-21 14:32:20 +02:00
Vincent Petry f80f8d9cc4 Merge pull request #9723 from dupondje/stable7
Small translation fix. Fixes: #9719
2014-07-21 10:49:03 +02:00
Thomas Müller 00c0495703 Merge pull request #9749 from owncloud/backport-9672-stable7
Backport 9672 stable7
2014-07-21 00:36:23 +02:00
Vincent Petry e7f7ac38c9 Added test of OCS privatedata to trigger key duplication 2014-07-20 23:33:11 +02:00
Andreas Fischer 6094da6c76 Document why we have to check with defined() first. 2014-07-20 23:33:11 +02:00
Andreas Fischer 22c957d475 Make MySQL return "number of found rows" instead of number of "affected rows". 2014-07-20 23:33:11 +02:00
Morris Jobke 06158966f1 Merge pull request #9742 from owncloud/fix-repair-innodb-9737-stable7
check if $tables is an array
2014-07-20 21:36:52 +02:00
Arthur Schiwon 47d2e963be $.unique works only for DOM elements 2014-07-20 16:09:01 +02:00
Andreas Fischer 7403476489 Pass existing Net_SFTP object into Net_SFTP_Stream. 2014-07-20 15:16:31 +02:00
Thomas Müller 981bd7da2a check if $tables is an array 2014-07-19 20:24:34 +02:00
Lukas Reschke bab5de8e8f Merge pull request #9706 from owncloud/keep_session_in_sync_stable7
keep session in sync
2014-07-19 10:37:14 +02:00
Arthur Schiwon acf80ba7cc Backport #9576
warn and continue gracefully if bcmath is not installed

make tests deal with missing bcmath
2014-07-18 19:17:19 +02:00
Jean-Louis Dupond abe2c8ce76 Small translation fix. Fixes: #9719 2014-07-18 14:41:37 +02:00
Andreas Fischer 0b8de8087b login() must be called after getServerPublicHostKey(). 2014-07-18 13:35:23 +02:00
Jörn Friedrich Dreyer 34cb09b777 fix user session tests by making them update \OC:: as well 2014-07-18 10:46:17 +02:00
Frank Karlitschek ef202509f3 update upstore api url 2014-07-17 21:52:14 -04:00
Frank Karlitschek cce2cb578f update the appstore api url 2014-07-17 21:51:32 -04:00
Frank Karlitschek 8d851435b6 7.0.0 RC3 2014-07-17 21:18:17 -04:00
Thomas Müller b1575eda3a Merge pull request #9690 from owncloud/kill-too-long-index-stable7
Revert add-share-index
2014-07-17 20:53:59 +02:00
Thomas Müller fc6d1177b7 Revert "add share index"
This reverts commit e19b3a8794.
2014-07-17 17:19:43 +02:00
Thomas Müller a66ee26187 kill unused require of MapperTestUtility.php 2014-07-17 17:18:42 +02:00
Vincent Petry e2f2313eb5 Fixed JS and CSS issues in users page
- Renamed "delete" to "deleteEntry" to make IE8 happy.
- Added missing "svg" class for the "+" button
- Added height to "+" button but was unable to properly align it
2014-07-17 16:46:41 +02:00
Thomas Müller 7886b900f1 fixing namespace of MapperTestUtility
and rename file to be lowercase
2014-07-17 15:53:16 +02:00
Vincent Petry b020e6b308 Merge pull request #9674 from owncloud/stable7-9647
[stable7] Add unit test for multi-user configuration loading
2014-07-17 13:57:38 +02:00
Bjoern Schiessle 4de6896028 check that the file proxies are enabled after each test 2014-07-17 13:17:11 +02:00
Bjoern Schiessle f5aa292587 update keys recursively if a folder was moved 2014-07-17 13:17:06 +02:00
Jörn Friedrich Dreyer 0cde504e80 keep session in sync 2014-07-17 13:03:56 +02:00
Thomas Müller 7e3a4b59a2 Merge pull request #9695 from owncloud/revert-backport-9550-stable7
Revert backport 9550 stable7
2014-07-17 11:02:39 +02:00
Thomas Müller 36039ca0c3 Revert "files: storage: rename should check parent directories of old and new files"
This reverts commit a163b185ab.
2014-07-17 09:57:08 +02:00
Thomas Müller 8af6b723bf Revert "Fix renaming files in the root folder of a MappedLocal storage"
This reverts commit 0895324553.
2014-07-17 09:56:52 +02:00
Robin Appelman 0895324553 Fix renaming files in the root folder of a MappedLocal storage 2014-07-17 09:19:20 +02:00
Morris Jobke e0a69d4c0a fix CSS coding style 2014-07-16 18:05:35 +02:00
Stephane V 198a30d964 Fix #9590. Fix #9612.
For external storage with lots of parameter settings (>4), wrap the content of the cell to let a full view of the parameters.
The rows of the table are now always visible until the end (the trash icon is accessible).
(Note : A strange 3px margin forces me to add a class on the row added by javascript, to be able to align them with the rows rendered by the server.)
2014-07-16 18:05:35 +02:00
Tigran Mkrtchyan a163b185ab files: storage: rename should check parent directories of old and new files
as described by POSIX.1-2008
(see http://pubs.opengroup.org/onlinepubs/9699919799/functions/rename.html)

Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
2014-07-16 16:09:05 +02:00
Robin McCorkell 4fa39283f6 Add unit test for multi-user configuration loading 2014-07-16 14:54:00 +01:00
Bjoern Schiessle ad249155ec introduce some encryption exceptions and catch additional error cases 2014-07-16 15:32:39 +02:00
Bjoern Schiessle ec30cc4f21 make sure that the crypt library is loaded 2014-07-16 15:32:30 +02:00
Vincent Petry ca34fb9ea0 Correctly return the owner display name for children of shares 2014-07-16 14:26:16 +02:00
Vincent Petry f40554fb2e Merge pull request #9584 from anexia-it/bug-9583
Bugfix for issue #9583
2014-07-16 11:20:35 +02:00
Bjoern Schiessle cca04f3514 make sure that 'OC_Theme' exists before checking if the method exists 2014-07-16 10:13:51 +02:00
Jörn Friedrich Dreyer 8ebe6ce7bb fix logger implementation and test 2014-07-15 20:37:07 +02:00
Jörn Friedrich Dreyer 292ce3f484 mkae getRelativePath of file search results overwriteable in subclasses 2014-07-15 20:33:59 +02:00
Jörn Friedrich Dreyer eaa5c530de return relative path 2014-07-15 20:33:50 +02:00
Jörn Friedrich Dreyer ebce1e1c41 use fileinfo object in search results 2014-07-15 20:33:37 +02:00
DeLtAfOx d3b6a6333e backport of #9628
Userlist: async load doesnt fill checked group/subadmin array

Strinct comparsion fix
2014-07-15 19:11:37 +02:00
Lukas Reschke c5c600bd7b Update info.xml 2014-07-15 17:28:43 +02:00
Vincent Petry 078637130e - Added test to trigger index id error
- re-enable encryption migration tests
- sqlite requires reconnect after schema changes

Backport of 10a2955 from master
2014-07-15 17:04:50 +02:00
libasys 3113e99c90 Update share.php
Added empty for error:
```
Undefined index: file_target at /var/www/owncloud/lib/private/share/share.php#1911
```
2014-07-15 16:56:28 +02:00
Bjoern Schiessle 9fa495cf70 throw exception if file is to large for trash bin 2014-07-15 13:57:01 +02:00
Philippe Jung 5a36841144 Backport of #9570
[Issue #9559] identifiers uid=xxx must be considered as user DN and not as owncloud users

File written by blizzz
2014-07-15 11:46:44 +02:00
Stephan Peijnik b51d54a84c Updated code to reflect changes introduced to \OC\Group\MetaData.
Now that fetchGroups() does not exist anymore and getGroups() is called
directory, the 'groups' property does not exist anymore.
Instead, we now generate that array on the fly and return it from getGroups.

Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
2014-07-15 11:15:38 +02:00
Stephan Peijnik a4a0ebf9db Use is_null() instead of empty() when checking the return value of GroupManager::get().
Additionally, $grp was renamed to $group inside
 \OC\Group\MetaData::fetchGroups().

Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
2014-07-15 10:56:20 +02:00
Stephan Peijnik a58f85d3ee Do not remove spaces from group IDs in \OC\Group\MetaData::generateGroupMetaData.
Change suggested by blizz in PR #9584.

Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
2014-07-15 10:56:10 +02:00
Stephan Peijnik 3de1d2cfff Renamed $grp to $group in foreach loop.
Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
2014-07-15 10:55:43 +02:00
Stephan Peijnik 75d45c4e49 Fix indentation.
Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
2014-07-15 10:55:43 +02:00
Stephan Peijnik 0acb76c97f Fixes #9583
lib/private/group/metadata.php: For subadmins also return an array of groups, indexed by their GIDs.
settings/users.php: Convert array of arrays to array of GIDs before calling into OC_Group::displayNamesInGroups.

Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
2014-07-15 10:55:32 +02:00
Thomas Müller 8e8c6c9f72 reduce share action text to the user name only 2014-07-15 09:16:11 +02:00
Arthur Schiwon 334ace9080 Backport of #9562
remove dead code

do not filter groups. but update the user count according to the filter

improve phpdoc

improve metadata runtime cache

add metadata tests

fixing PHPDoc
2014-07-15 08:31:43 +02:00
Robin Appelman 8ec00dcb66 Use the correct path when building the FileInfo for the search result 2014-07-14 21:33:07 +02:00
Thomas Müller b7d717e47c append file extension to the temporary file which contains the downloaded archive - in case of zip files fileinfo doesn't seem to return anything reliable 2014-07-14 17:06:36 +02:00
Robin Appelman 9d3336002b Remove deleted versions from the cache 2014-07-14 15:32:33 +02:00
Robin Appelman c5278a421a Dont delete versions as local files 2014-07-14 15:32:19 +02:00
Robin Appelman 36360a6e8a Expose the user manager in the public server container 2014-07-14 15:14:36 +02:00
Robin Appelman 169b328d41 Add public interfaces for User, UserManager and UserSession 2014-07-14 15:14:29 +02:00
Daniel Hansson 1a01debe68 Fix for #9422 2014-07-14 12:59:07 +02:00
Vincent Petry 1cc8be0701 Added mountType attribute and adapted Delete action text
Added mountType attribute for files/folder to indicated whether they are
regular, external or shared.

The client side then adapts the "Delete" action hint text based on this
information.

Only the mount roots must have the delete icon hint adapted.
To make this detectable on the client side, the mountType can now
be null, "shared", "shared-root", "external" or "external-root".

This also gives room to icon customization on the client side.
2014-07-14 11:54:05 +02:00
Andreas Fischer bae4579d60 Add short description explaining how SFTP ext storage class works. 2014-07-14 11:45:35 +02:00
Andreas Fischer fae2a00922 The file providing the sftp:// scheme needs to be included manually. 2014-07-14 11:45:28 +02:00
Georg Ehrke 9ebb037fc2 improve check for duplicate apps 2014-07-14 10:00:38 +02:00
Georg Ehrke 5bb42bedec add proper version comparision in OC_Installer::isUpdateAvailable 2014-07-14 10:00:33 +02:00
Frank Karlitschek e3d50804f7 7RC2 2014-07-13 22:45:11 -04:00
Vincent Petry 14ea0ea3bc Propagate file action changes to the file lists
Whenever an app needs to register an event late, it does that on the
original file actions object.

Since the file actions that the file list work on is a merged list, not
the original one, the registration event needs to be propagated there as
well.
2014-07-10 16:15:46 +02:00
Thomas Müller 66130ad336 fixing JS syntax errors
remove the group in case the last user has removed from that group

cleanup

use .filterAttr()
2014-07-10 16:13:01 +02:00
Arthur Schiwon a310415b09 increment group counters when a user is created
decrease user count in affected groups after user delete

increase/decrease everyone count on user creation/deletion

avoid global selector
2014-07-10 16:12:53 +02:00
Thomas Müller 10bac56551 adding 'groups' entry to remote apps 2014-07-10 15:47:29 +02:00
Thomas Müller 32c6afba90 fixing typos 2014-07-10 15:47:29 +02:00
Robin Appelman 31d8bce383 debounce the search function 2014-07-10 15:32:17 +02:00
Morris Jobke 2fb022fbc3 fix translations 2014-07-09 16:19:32 +02:00
Volkan Gezer 5911188211 fix apostrophe fixes #9486 2014-07-09 16:19:32 +02:00
libasys 9ccadcfe80 BugFix missing $item on 'file_target' Line 1911
I think this should be right!

Backport of e70a7af6da from master
2014-07-09 16:05:47 +02:00
Arthur Schiwon 9ee46bbe91 test class is already in preferences.php
Conflicts:
	tests/lib/preferences-singleton.php
2014-07-09 13:14:34 +02:00
Arthur Schiwon bc1ff4744b support for AD primary groups
support for primary groups

actually the problem is only known on AD, it is only needed to take care of their attributes

adjust to ADs special behaviour

this change was not intended

cache the SID value so it is not requested over and over again

theres only one, use singular

we are access

add tests for new Access methods

add tests for new Group methods

address scrutinizer findings, mostly doc

call ldap_explode_dn from ldap wrapper, enables tests without php5-ldap

PHP Doc

yo dawg, i heard you like backslashes … php doc fix

PHPDoc updated and typos fixed while reviewing
2014-07-08 21:34:38 +02:00
Vincent Petry 6043a90a71 Fix update cleanup to only affect file and folders
Fix bug in the SQL query that cleans up stray shares for removed
files/folders, which is now correctly limited to that item type instead
of also removing all other share types.

Backport of f4f52cf from master
2014-07-08 18:10:03 +02:00
Thomas Müller 0e62a7dc59 Upload abortion is now detected within the OC_Connector_Sabre_File::put()
OC_Connector_Sabre_AbortedUploadDetectionPlugin is pointless

Adding unit test testUploadAbort()
2014-07-08 17:40:08 +02:00
Thomas Müller 7a6b76f96e Adding new interface \OCP\Activity\IExtentsion
Adding method getNotificationTypes()
Adding method filterNotificationTypes()
Adding method getDefaultTypes()
Adding method translate() and getTypeIcon()
Adding method getGroupParameter()
Adding method getNavigation()
Adding method getNavigation()
Adding method isFilterValid() and getQueryForFilter()
Adding unit tests for \OC\ActivityManager
2014-07-08 16:38:18 +02:00
blizzz a78293dd3f Merge pull request #9500 from owncloud/fix9475
Avoid unnecessary writing to the DB when prefrences are not changed in fact
2014-07-08 16:30:09 +02:00
Robin Appelman 1ce9ba1ebc use case insensitive LIKE when searching for files in mysql 2014-07-08 15:49:05 +02:00
Robin Appelman 2f15ae988f Add repair step to set MySQL collation to utf8_bin
Set default collation of mysql connection to utf8_bin
Set utf_bin as default collation for new tables
2014-07-08 15:14:29 +02:00
Christopher T. Johnson c02e95ff40 Fix Signiture Does Not Match when mounting Amazon S3 external storage
For some reason the aws-sdk-php package does not caclulate the
signiture correctly when accessing an object in a bucket with a name of
'.'.

When we are at the top of a S3 bucket there is a need(?) to have a directory
name.  Per standard Unix the name picked was '.' (dot or period).  This
choice exercises the aws-sdk bug.

This fix is to add a field to the method to store the name to use instead of
'.' which at this point is hard coded to '<root>'.  We also add a private
function 'cleanKey()' which will test for the '.' name and replace it with
the variable.  Finally all calls to manipulate objects where the path is
not obviously not '.' are processed through cleanKey().

An example where we don't process through clean key would be
	'Key' => $path.'/',

Use correct relationship operator

Per feed back use === instead of ==

use '/' instead of '<root>'
2014-07-08 14:26:34 +02:00
Arthur Schiwon 03c13021db also appconfig shall not write to database if the value is unchanged 2014-07-08 12:30:38 +02:00
Morris Jobke 01c0601d39 specify CSS rule for warning & update fieldsets - fixes #9491 2014-07-08 09:45:57 +02:00
Stephane V 8bd5c6e04d Fixes #9497 2014-07-08 01:19:24 +02:00
Arthur Schiwon 76b310de9d add test cases. also split test classes in a file each, looks like only the first class is being executed 2014-07-08 00:20:46 +02:00
Arthur Schiwon ee2886331e do not write to database when the value is the same 2014-07-08 00:19:58 +02:00
Arthur Schiwon ed1c918d9e don't trigger update from checkPassword, it is already called by userExists, this is enough. 2014-07-08 00:19:17 +02:00
Robin Appelman 18f5f85160 When changing the mountpoint of an external storage, ensure the old one is removed 2014-07-07 23:25:26 +02:00
Vincent Petry 19dedf3d61 Do not show recipient for link shares in file list
In the "Shared with link" section, the share_with field can contain a
value when a password was set.

This fix prevents this value to be shown as it is not intended for the
end user.
2014-07-07 20:04:03 +02:00
Georg Ehrke efadfedbaa add ocsids to info.xml 2014-07-07 20:00:08 +02:00
Vincent Petry 60e3195600 Improved external share dialog
Changed title, label and buttons.
Removed icon.
2014-07-07 19:53:19 +02:00
Vincent Petry db72e90504 Fixed dialogs styling, reversed buttons
Default dialog button is now on the right, other one on the left.
2014-07-07 19:52:53 +02:00
Joas Schilling cf982e9818 Add comment to overwrite* configs about CLI/cron problems 2014-07-07 19:40:28 +02:00
Joas Schilling dccab5d20f Only calculate the WEBROOT from scriptName if it contains $SUBURI
If not we are most likely in CLI mode. However to be able to still
generate valid URLs, we need to use the overwrite webroot instead.

Fix #9490
2014-07-07 19:39:58 +02:00
Joas Schilling f5e4ebf2ba Only overwrite serverHost when in unit tests
The intention of the original commit 12f7cb8767
was to fix tests. But cron should always return a valid host not localhost.
2014-07-07 19:39:20 +02:00
Vincent Petry 2bfdd02c2a Fixed shared list sorting
Use Array.sort instead of underscore's sortBy() as they don't use the
same method/function signature.
2014-07-07 19:33:22 +02:00
Thomas Müller 8b97073e13 MySQL: adding repair step to convert MyIsam tables to InnoDB 2014-07-07 15:51:52 +02:00
Georg Ehrke d2fd78a0c9 fix phpDocBlock for OC_App::getAppInfo 2014-07-07 15:03:38 +02:00
Georg Ehrke 59fd9d7517 better validation: cadd extra check if appinfo/info.xml exists 2014-07-07 15:03:33 +02:00
Stephane V 5344d9beab Bug 9147 owncloud/core
Added class="date" in the latest column of the log table to get everything on one line (in the ajax request).
2014-07-07 13:58:01 +02:00
Morris Jobke 127ce3c5d9 fix loading spinner on ctrl click a app entry- fixes #9063 2014-07-07 12:19:07 +02:00
Georg Ehrke 04604dae0d improvements for uninstall button 2014-07-06 23:57:27 +02:00
Volkan Gezer 0fe1f25a9e Merge pull request #9466 from owncloud/design-fix-fieldset-legend
fix fieldset look, fix #8158
2014-07-06 16:06:25 +02:00
Morris Jobke a5d34b435f also make strengthify transparent on setup submit - fixes #9436 2014-07-05 10:31:27 +02:00
Morris Jobke 67cf1d61e1 fix size of breadcrumb separator 2014-07-04 21:37:54 +02:00
Bjoern Schiessle 5549148039 add owner as parameter for delShareKey 2014-07-04 19:00:28 +02:00
Bjoern Schiessle 0319ee3894 make sure that the umount hook always contains the path relative to data/user/files 2014-07-04 19:00:20 +02:00
Bjoern Schiessle 2bd3aa6b21 if a folder gets deleted we unshare all shared files/folders below 2014-07-04 19:00:05 +02:00
Jörn Friedrich Dreyer 36d2aab945 deprecate OC_Search_Provider in favor of \OCP\Search\Provider 2014-07-04 18:29:26 +02:00
Jörn Friedrich Dreyer 0a4e95cc07 fix '' to '/' when determining parent for search result 2014-07-04 18:29:16 +02:00
Robin Appelman b429a71660 Add machine readable error messages to OC\JSON
Reload the files app in case of authentication errors, expired tokens or disabled app

Reloading will triger the full server side handeling of those errors

formatting

fix missing semicolon + some jshint warnings
2014-07-04 16:39:45 +02:00
Jan-Christoph Borchardt b33c61798c show loading feedback also when clicking 'Apps' entry in app list 2014-07-04 16:37:51 +02:00
Thomas Müller 11a2c0249d update snap.js to v2.0.0-rc1 2014-07-04 16:34:19 +02:00
Vincent Petry 86545a90d0 Fix reload call for all subclasses
All subclasses must also properly return the ajax call object.
2014-07-04 16:13:52 +02:00
Jörn Friedrich Dreyer 71261decf1 make search case insensitive on postgres and oracle 2014-07-04 15:53:10 +02:00
Jörn Friedrich Dreyer f390ae53ba introduce and use getCurrentConnection() 2014-07-04 15:26:30 +02:00
Jörn Friedrich Dreyer 195cf273f8 reset collection to 'root' after adding a route to the api 2014-07-04 15:26:21 +02:00
Jörn Friedrich Dreyer 3a1c7182e6 change order of registering api and capabilities to fix file version previews 2014-07-04 15:26:11 +02:00
Robin Appelman c272338897 set localhost as default database host for installation 2014-07-04 15:21:26 +02:00
Morris Jobke 74edbd5df0 fix cursor for other elements in top right corner 2014-07-04 14:58:19 +02:00
Jan-Christoph Borchardt c28fb2de4e fix 'remember' label being slightly off in log in 2014-07-04 14:58:14 +02:00
Jan-Christoph Borchardt b343b18cd9 fix icons being slightly off in log in 2014-07-04 14:58:09 +02:00
Jan-Christoph Borchardt 2224d1c0d3 fix user menu name and image not showing clicky mouse pointer 2014-07-04 14:58:05 +02:00
Vincent Petry b42215a3c9 Fix FileActions merging override
When merging FileActions, the register() functio needs to correctly
override the previously merged action handler without affecting the
original one.
2014-07-04 14:49:15 +02:00
Morris Jobke 2115a9bf1a IE8 fixes 2014-07-04 14:14:12 +02:00
Jan-Christoph Borchardt 843ad18bf3 use icon-confirm instead of text for accepting remote share, works better with translations 2014-07-04 14:14:07 +02:00
Vincent Petry ed4ba00b77 Return and use isPreviewAvailable for share previews
Since the mime type is known, now isPreviewAvailable is returned as well
and used by the JS side to properly render mime icon and previews.
2014-07-04 14:04:53 +02:00
Frank Karlitschek 4a7aaa8914 7RC1 2014-07-03 20:30:45 -04:00
Jan-Christoph Borchardt fc417465c0 Merge pull request #9410 from owncloud/shareownernamewidth
Improved remote share owner display
2014-07-03 23:45:06 +02:00
Vincent Petry dd4273e2e3 Merge pull request #9413 from owncloud/fix_hook_names
fix hook names
2014-07-03 22:01:24 +02:00
Vincent Petry 91cb0a6ead Merge pull request #9402 from owncloud/sharing_improved_dialog
only show message if default expire date is enforced
2014-07-03 18:15:02 +02:00
Vincent Petry c6bba23636 Merge pull request #9408 from owncloud/redirectconsolelogfix
Remove forgotten debug log
2014-07-03 17:58:25 +02:00
Morris Jobke 3cbea82bd0 Merge pull request #9420 from owncloud/trashbin-hidesummarysize
Hide the size in the trashbin summary row
2014-07-03 17:37:33 +02:00
Morris Jobke c223977794 Merge pull request #9407 from owncloud/fix-share-logo
for shared links, use wide logo on desktop and icon on mobile
2014-07-03 17:33:34 +02:00
Vincent Petry 52248d4d81 Hide the size in the trashbin summary row
This also fixes the extra spacing that appearing on the right of the
table.
2014-07-03 17:16:50 +02:00
Morris Jobke a829d07234 Merge pull request #9403 from owncloud/design-fix-fileslistbottom
Fix bottom of files list, add proper space to have room for dropdowns
2014-07-03 16:40:38 +02:00
Vincent Petry 5e4835f9e9 Improved remote share owner display
The parts of the remote share owner name is now split between user name,
domain name and root so they can be formatted / displayed differently.

The user name + domain name are displayed in the tooltip.
2014-07-03 14:15:25 +02:00
Bjoern Schiessle 3c45925e74 fix hook names 2014-07-03 13:52:58 +02:00
Jan-Christoph Borchardt 6c174813b6 Merge pull request #9394 from owncloud/design-fix-rename
fix position of rename function, and text size
2014-07-03 13:44:00 +02:00
Jan-Christoph Borchardt c7101d26db fix checkbox shifting when rename input appears 2014-07-03 13:34:12 +02:00
Jan-Christoph Borchardt dc15223edf Merge pull request #9390 from owncloud/fix-9368
Revert 'hides table header while users load.'
2014-07-03 13:00:40 +02:00
Vincent Petry 2fec6cbd5b Remove forgotten debug log 2014-07-03 12:26:17 +02:00
Jan-Christoph Borchardt e5f68bafb9 for shared links, use wide logo on desktop and icon on mobile 2014-07-03 12:20:44 +02:00
Jan-Christoph Borchardt cee5afa8af reduce file list bottom whitespace a bit 2014-07-03 11:43:59 +02:00
Jan-Christoph Borchardt 6f14034c48 fix left margin of file list summary 2014-07-03 11:40:11 +02:00
Jan-Christoph Borchardt 4c97f2b3af add whitespace to bottom of Files list – more obvious it's the end, and space for share dropdown 2014-07-03 11:36:04 +02:00
Morris Jobke b8ced7025e Merge pull request #9384 from owncloud/eventsrc-fixfallbackwhenclosed
Fixed event source fallback after close
2014-07-03 11:07:02 +02:00
Bjoern Schiessle 79e54994f9 only show message if default expire date is enforced 2014-07-03 10:52:27 +02:00
Jan-Christoph Borchardt e9f616b0a0 Merge pull request #9391 from owncloud/design-mobile-share
Fix mobile share view glitches
2014-07-03 09:45:19 +02:00
Jenkins for ownCloud 1a1c5aa3c0 [tx-robot] updated from transifex 2014-07-03 01:56:24 -04:00
Jan-Christoph Borchardt e695244f32 fix position of rename function, and text size 2014-07-03 02:08:53 +02:00
Jan-Christoph Borchardt 079fee2c2a Merge pull request #9389 from owncloud/fix-nametext-height
fix nametext height, was higher than the row
2014-07-03 01:09:19 +02:00
Jan-Christoph Borchardt 019e1b1065 Merge pull request #9365 from owncloud/design-controls-polish
Design controls polish
2014-07-03 01:08:15 +02:00
Morris Jobke c3cc49d899 Merge pull request #9388 from owncloud/design-fix-sidebar
fix animation of sidebar and prevent horizontal scrollbar, fix #9284
2014-07-03 00:41:03 +02:00
Volkan Gezer bf08e3a85e Merge pull request #9382 from owncloud/server2server-css
fix lineheight of server2server share
2014-07-03 00:39:37 +02:00
Jan-Christoph Borchardt 5a7b58ac45 Merge pull request #9374 from owncloud/link-contribute-promote
add link to contribute and promote pages in personal settings
2014-07-02 23:36:43 +02:00
Jan-Christoph Borchardt 0df04975b0 use same logo for mobile as for when logged in, fix #9360 2014-07-02 23:33:20 +02:00
Jan-Christoph Borchardt 560c530875 hide text of download button, only show icon 2014-07-02 23:21:06 +02:00
Jan-Christoph Borchardt 0a91c22ebb shared view: remove whitespace glitch on right 2014-07-02 23:14:21 +02:00
Jan-Christoph Borchardt ae195c99a1 fix position of shared file buttons 2014-07-02 23:07:30 +02:00
Arthur Schiwon bbea031090 Revert "hides table header while users load."
This reverts commit 0dc12a3737.
2014-07-02 22:56:26 +02:00
Jan-Christoph Borchardt a94130509a fix nametext height, was higher than the row 2014-07-02 22:54:30 +02:00
Jan-Christoph Borchardt 18cd80426b fix animation of sidebar and prevent horizontal scrollbar, fix #9284 2014-07-02 22:46:08 +02:00
Volkan Gezer 586c4236fd fix lineheight of server2server share 2014-07-02 21:46:52 +02:00
Jan-Christoph Borchardt e1e4fde697 Merge pull request #9381 from owncloud/design-icons-shadow
Remove shadow effects from a bunch of icons, reduce size
2014-07-02 21:40:33 +02:00
Vincent Petry 8ef8ef1096 Fix JSHint errors in EventSource class 2014-07-02 21:35:03 +02:00
Vincent Petry 012abbad44 Fixed event source fallback after close 2014-07-02 21:34:43 +02:00
Vincent Petry ed29e7d160 Merge pull request #9329 from owncloud/sharing_check_target
don't move a share mount point into a different mount point
2014-07-02 21:01:03 +02:00
Vincent Petry f1f66ff686 Merge pull request #9373 from owncloud/design-fix-modified
shade color for modified dates again, fix #9363
2014-07-02 21:00:32 +02:00
Jan-Christoph Borchardt 3d0094723c Merge pull request #9369 from owncloud/designfix-update
Update dialog running out of horizontal space in Firefox. fixes #9298
2014-07-02 20:19:29 +02:00
Jan-Christoph Borchardt ad8f1743e3 remove shadow effects from folder icons, reduce size 2014-07-02 20:12:04 +02:00
Jan-Christoph Borchardt a2dda44605 remove shadow effects from info, search and settings icon, reduce size 2014-07-02 20:07:57 +02:00
Jan-Christoph Borchardt 876ff9aaef remove shadow effects from places icons, reduce size 2014-07-02 20:03:09 +02:00
Jan-Christoph Borchardt 03fbd6d540 remove shadow effects from settings icons, reduce size 2014-07-02 19:50:58 +02:00
Jan-Christoph Borchardt 1b83ac7de2 personal: link straight to /promote as @tomneedham said 2014-07-02 19:29:57 +02:00
Jan-Christoph Borchardt d04564fb76 remove border-bottom of controls bar 2014-07-02 18:48:24 +02:00
Vincent Petry 615d037d3e Merge pull request #9364 from owncloud/sharing_rename_mount_points
[sharing] rename mount point of children if parent was renamed
2014-07-02 18:48:07 +02:00
Vincent Petry f4eb90e229 Merge pull request #9311 from owncloud/storage-not-available
Handle storages not being available in webui and webdav
2014-07-02 18:15:58 +02:00
Jan-Christoph Borchardt 4878c734e2 add link to contribute and promote pages in personal settings 2014-07-02 17:41:26 +02:00
Morris Jobke b6aeea8c0b simplify formula and add comment 2014-07-02 17:20:56 +02:00
Morris Jobke ea756a12b0 Merge pull request #9370 from owncloud/design-fix-usermgmt-glitch
Design fix usermgmt glitch
2014-07-02 16:46:28 +02:00
Jan-Christoph Borchardt 053b0a4063 shade color for modified dates again, fix #9363 2014-07-02 16:37:15 +02:00
jbtbnl 26bb0227cc Fix update dialog running out of horizontal space in Firefox. Fixes #9298 2014-07-02 16:15:13 +02:00
Jan-Christoph Borchardt ed37573822 allow horizontal scrollbar in settings to make user mgmt usable on mobile 2014-07-02 16:13:20 +02:00
Jan-Christoph Borchardt c483fb2f04 prevent overflow in user management controls bar, fix #9277 2014-07-02 16:07:55 +02:00
Thomas Müller eaf32a7b54 Merge pull request #9362 from owncloud/public-servicewarningfix
Fix service warning
2014-07-02 15:42:47 +02:00
Jan-Christoph Borchardt 2a9fb130ec make sure table header is white instead of slightly grey 2014-07-02 15:40:52 +02:00
Bjoern Schiessle ea31ab7b5c rename mount point of children if parent was renamed 2014-07-02 15:39:38 +02:00
Morris Jobke d2f3ff5c34 Merge pull request #9245 from owncloud/server2server-sharing-design-fixes
drop unneeded code
2014-07-02 15:34:57 +02:00
Vincent Petry 44c1dc8153 Fix service warning 2014-07-02 15:30:34 +02:00
Morris Jobke 904e3102d3 Merge pull request #9288 from owncloud/fix_dispatcher_null_values
don't typecast null values inside dispatcher.php
2014-07-02 15:29:33 +02:00
Jan-Christoph Borchardt 2a1fcb1eb3 reduce transparency of controls bar for less distraction 2014-07-02 15:26:38 +02:00
Jan-Christoph Borchardt c632ea854f change controls bar color to white for less grey-in-grey design 2014-07-02 15:25:17 +02:00
Robin Appelman edb67f9f4d Remove invalid mounts from the active fs 2014-07-02 15:00:12 +02:00
Robin Appelman 0008db9995 Fix unit test 2014-07-02 14:39:45 +02:00
Morris Jobke 59629e688c Merge pull request #9341 from owncloud/sharing-fileactions-fix
Fix fileActionsReady event after deferred file actions update
2014-07-02 14:36:59 +02:00
Steffen Lindner 5ec3771506 Merge pull request #9350 from Gomez/master
initialize a dummy memory session - fixes https://github.com/owncloud/ac...
2014-07-02 13:57:36 +02:00
Morris Jobke 456770fde9 Merge pull request #9344 from owncloud/files-scrollissue
Fix files list scroll behavior
2014-07-02 13:26:23 +02:00
Morris Jobke 5e986271ef Merge pull request #9336 from owncloud/fix-version-dropdown
increase width of version dropdown - fixes #9270
2014-07-02 12:04:04 +02:00
Steffen Lindner 22394fa4f5 Fix indent 2014-07-02 12:00:35 +02:00
Steffen Lindner 9433b94fd5 initialize a dummy memory session - fixes https://github.com/owncloud/activity/issues/78 2014-07-02 11:52:45 +02:00
Volkan Gezer 805a7cf485 Merge pull request #9338 from owncloud/fix-redirect-for-appframework
Redirect after session expiry to the previous loaded page
2014-07-02 11:39:41 +02:00
Jenkins for ownCloud 9933b33166 [tx-robot] updated from transifex 2014-07-02 01:55:17 -04:00
Morris Jobke d31e532780 fix redirect URL unit test 2014-07-02 01:06:58 +02:00
Vincent Petry 32d2457e58 Fix files list scroll behavior
View container height needs to be accurate and span over the whole
scroll container for infinite scrolling to work properly.
2014-07-01 21:48:06 +02:00
Vincent Petry 025b71d068 Use fileActionsReady to re-render sharing icons
Whenever file actions are modified, either by registering new actions or
when appending a new page of entries, the sharing app is now notified so
it can correctly refresh the sharing icon status.

Additionally, the core's loadIcons() method is also used to load the
existing shares and also refresh the sharing icons afterwards.
2014-07-01 21:32:04 +02:00
Vincent Petry 94c3bac9ed Merge pull request #9327 from owncloud/migrator-postgreskeywordtest
Added migrator test for reserved keyword
2014-07-01 20:40:18 +02:00
Vincent Petry 3d921ed3c3 Merge pull request #9334 from owncloud/defaultappfix
Default app fix
2014-07-01 20:39:13 +02:00
Jan-Christoph Borchardt 7760fd4bef add ellipsizing to restore string if text is too long 2014-07-01 20:37:14 +02:00
Bjoern Schiessle bb935978fa don't move a share mount point into a different mount point 2014-07-01 19:38:55 +02:00
Vincent Petry 509cdebab7 Fix fileActionsReady event after deferred file actions update 2014-07-01 18:50:54 +02:00
Vincent Petry fd68034357 Fixed remote share password param detection 2014-07-01 17:34:01 +02:00
Bjoern Schiessle 735eac6c9d add a explicit interface for the home storage 2014-07-01 17:31:33 +02:00
Morris Jobke 19a6dc5420 Merge pull request #9335 from owncloud/fix-expire-message-layout
fix the layout of the enforced expiry date message
2014-07-01 17:00:56 +02:00
Vincent Petry 34ab3b09a6 Update submodule to include the PostgresPlatform patch 2014-07-01 16:59:45 +02:00
Vincent Petry 7c17452028 Added unit test for default app URL 2014-07-01 16:55:29 +02:00
Morris Jobke b6a4cc20f7 Redirect after session expiry to the previous loaded page
* fixes #6945
2014-07-01 16:54:52 +02:00
Morris Jobke eaf9d6eccc increase width of version dropdown - fixes #9270 2014-07-01 16:17:00 +02:00
Morris Jobke e3dd0164ff fix the layout of the enforced expiry date message 2014-07-01 16:09:10 +02:00
Vincent Petry 3e78f41d00 Use getAbsoluteUrl for redirection URL
Also separate the function into getDefaultPageUrl() and
redirectToDefaultPage() to make it testable.
2014-07-01 16:02:38 +02:00
icewind1991 ff416eaa57 Merge pull request #9330 from owncloud/jumpingheader
Hides table header while users load in User Management
2014-07-01 15:43:31 +02:00
Vincent Petry c005515ebd Support for multiple default apps
If a default app isn't visible for the user, try the next one.
Else fallback to the "files" app.
2014-07-01 15:42:26 +02:00
Robin Appelman 8161104420 Catch StorageInvalidException in webdav 2014-07-01 15:03:29 +02:00
Robin Appelman 8339618ead More error catching in list.php 2014-07-01 14:58:17 +02:00
Robin Appelman 8061a4ccc0 Remove external shares if the share is invalid 2014-07-01 14:58:07 +02:00
Vincent Petry 577d06ea4d Merge pull request #9328 from owncloud/extstorage-annoyingwarnings
Fix warnings when personal is not set
2014-07-01 14:51:01 +02:00
blizzz 616f9b1e03 Merge pull request #9156 from owncloud/solve-8959
search term for users and groups may occur anywhere in the name or displ...
2014-07-01 14:37:09 +02:00
Robin Appelman 1c43081d38 Detect removed public shares 2014-07-01 14:36:06 +02:00
Vincent Petry 894d69184a Add bak defaultapp setting 2014-07-01 14:28:45 +02:00
blizzz 16ce23d19d Merge pull request #9006 from owncloud/ldap_fix_bgjob
LDAP: fix background job, fixes #8995
2014-07-01 14:28:04 +02:00
Vincent Petry 09dea42f7e Merge pull request #9326 from owncloud/add_missing_backticks
add missing backticks
2014-07-01 13:43:12 +02:00
raghunayyar 0dc12a3737 hides table header while users load. 2014-07-01 17:05:44 +05:30
Vincent Petry 5e6f6da786 Fix warnings when personal is not set 2014-07-01 13:32:57 +02:00
Frank Karlitschek 431f8bd08e Merge pull request #9287 from owncloud/indie-json
add indie.json for Indie App Store listing
2014-07-01 07:25:27 -04:00
Vincent Petry e4f068961e Added test for reserved keywords 2014-07-01 12:55:36 +02:00
Vincent Petry b752aff51d Fix migrator tests to use the correct migrator instances 2014-07-01 12:54:35 +02:00
Jörn Friedrich Dreyer abc521dbf7 add missing backticks 2014-07-01 12:29:30 +02:00
Jan-Christoph Borchardt 75a5746b70 Merge pull request #9306 from owncloud/publicneedsupgrade
Return 503 in  public.php and OCS API when upgrade is due
2014-07-01 11:52:39 +02:00
Morris Jobke 08e49e9b07 Merge pull request #9313 from owncloud/design-icon-cancel
change 'Cancel upload' text to x icon for more space in breadcrumbs bar
2014-07-01 11:00:17 +02:00
Vincent Petry 19ab6165e7 Merge pull request #9300 from owncloud/extstorage-listfilterfix
Use filtered list for ext storage list mounts API
2014-07-01 09:56:47 +02:00
Morris Jobke 88e6f5c318 Merge pull request #9292 from owncloud/issue/9161
Use get random bytes as uniqeid() is not unique in some cases
2014-07-01 09:51:45 +02:00
Steffen Lindner a67d24377e Merge pull request #9307 from Gomez/master
Fixes typo with sendmail detection - fixes #9203
2014-07-01 09:36:24 +02:00
Jenkins for ownCloud a878b42b42 [tx-robot] updated from transifex 2014-07-01 01:54:43 -04:00
Björn Schießle f3973c1c20 Merge pull request #9240 from owncloud/enc_check_if_file_exists
[encryption] check if file still exists before removing encryption keys
2014-06-30 21:23:59 +02:00
Arthur Schiwon 16275eca84 loop over usernames, not passwords 2014-06-30 20:43:50 +02:00
Jan-Christoph Borchardt 07ba9442db Merge pull request #9305 from owncloud/design-share-fixes
Design share fixes
2014-06-30 18:46:37 +02:00
Jan-Christoph Borchardt 24277f0dd6 change 'Cancel upload' text to x icon for more space in breadcrumbs bar 2014-06-30 18:20:35 +02:00
Robin Appelman 99960d7747 Handle StorageNotAvailableException in webdav 2014-06-30 16:36:11 +02:00
Bjoern Schiessle 618c9fd033 improved error message 2014-06-30 16:28:40 +02:00
Robin Appelman 30c240a145 If loading a directory fails, navigate back to the previous directory 2014-06-30 16:27:31 +02:00
Robin Appelman 4526bc0ba6 Handle StorageNotAvailableException in ajax/list.php 2014-06-30 16:12:12 +02:00
Robin Appelman d78a2a9f78 Add StorageNotAvailableException 2014-06-30 15:46:37 +02:00
Vincent Petry 972fffbe02 Return 503 OCS response with requested format 2014-06-30 15:37:38 +02:00
Steffen Lindner 1b871da59e Fixes typo with sendmail detection - fixes #9203 2014-06-30 15:01:12 +02:00
Vincent Petry 2e45eb8ad6 Return 503 in public.php and OCS API when upgrade is due
To prevent unexpected behavior, public.php and the OCS API calls will
return 503 Service Unavailable when an upgrade is due.
2014-06-30 14:48:03 +02:00
Jörn Friedrich Dreyer f35f14aa37 Merge pull request #9303 from owncloud/issue/8841
Do not strict compare item source id so the dropdown is closed correctly
2014-06-30 14:46:46 +02:00
Björn Schießle fa7446d86d Merge pull request #9301 from owncloud/dont_check_external_stoage_app
[server2server-sharing] no longer check if the external storage app is enabled
2014-06-30 14:22:16 +02:00
Joas Schilling 5e4ac548bb Use attr() instead of data() so the item ids work as intended
Fix #8841
2014-06-30 14:21:27 +02:00
Jan-Christoph Borchardt 63e6495e82 make expiration message grey, less present in dropdown 2014-06-30 14:08:36 +02:00
Jan-Christoph Borchardt c5fa9153ae fix expire message going out of box, fix #9280 2014-06-30 14:08:11 +02:00
Jan-Christoph Borchardt a4c693dd75 remove obsolete CSS, fix visual bug in share dialog #9255 2014-06-30 14:00:43 +02:00
Bjoern Schiessle 372d58544f no longer check if the external storage app is enabled, we use no the webdav implementation from core 2014-06-30 12:34:49 +02:00
Vincent Petry 8977a68548 Use filtered list for ext storage list mounts API
Now the external storage correctly returns the mount points visible only
for the current user by using the method getAbsoluteMountPoints() which
is already filtered.

Since that call was missing the backend name which is important for the
UI, this one was added as well.
2014-06-30 12:33:11 +02:00
Joas Schilling d94d307f52 Merge pull request #9207 from owncloud/prevent-default-for-mail-test
Fix test mail behaviour
2014-06-30 11:22:20 +02:00
Joas Schilling 0c711e1cfa Use get random bytes as uniqeid() is not unique in some cases
Fix #9161
2014-06-30 11:10:10 +02:00
Jenkins for ownCloud 589f68ebf6 [tx-robot] updated from transifex 2014-06-30 01:54:47 -04:00
Georg Ehrke c30bea45e9 don't typecast null values inside dispatcher.php 2014-06-29 22:40:50 +02:00
Jan-Christoph Borchardt da3bcfabc7 add indie.json for Indie App Store listing 2014-06-29 22:03:24 +02:00
Thomas Müller 9032ce4535 Merge pull request #9266 from owncloud/fix_objectstore_etag_update
always regenerate etag when writing back file to objectstore
2014-06-29 20:59:20 +02:00
Jenkins for ownCloud ebf93448f2 [tx-robot] updated from transifex 2014-06-29 01:56:00 -04:00
Morris Jobke 67d029a21e Merge pull request #9261 from owncloud/shorten_userid_columns
shorten userid columns to 64 chars, ref #9186
2014-06-28 15:41:36 +02:00
Morris Jobke 9890b1509d Merge pull request #8777 from owncloud/l10n-utils-and-defaults
more strings to translate in utils also some fixes in defaults
2014-06-28 15:40:49 +02:00
Volkan Gezer d918e5a68c Merge pull request #9278 from owncloud/l10n-servershare-dialog
fix server share dialog title
2014-06-28 14:44:37 +02:00
Volkan Gezer ae68a773c0 more strings to translate in utils also some fixes in defaults 2014-06-28 13:29:24 +02:00
Morris Jobke d5462fdb50 Merge pull request #9265 from owncloud/fix-whitespace
fix trailing whitespace noted by Scrutinizer
2014-06-28 12:26:09 +02:00
Morris Jobke cec20d5049 Merge pull request #9020 from owncloud/l10n-external-errors-fix
some strings to localize external mount api responses. fix #8094
2014-06-28 11:40:32 +02:00
Morris Jobke 2b8745842b trigger db update 2014-06-28 11:18:58 +02:00
Jenkins for ownCloud 26d0978993 [tx-robot] updated from transifex 2014-06-28 01:54:54 -04:00
Volkan Gezer 11788c9579 fix server share dialog title 2014-06-28 01:54:51 +02:00
Björn Schießle 75222501ee Merge pull request #9264 from owncloud/share-linkshareusefilesource
Use file_source to find matching share for nested link shares
2014-06-27 23:31:34 +02:00
Bjoern Schiessle 1004836fd3 unit tests 2014-06-27 23:09:31 +02:00
Bjoern Schiessle e4c45b5e26 check if file exists before deleting keys, and add debug output for every
delete operation
2014-06-27 23:09:31 +02:00
Bjoern Schiessle 706a8ace58 normalize path before comparison to make sure that we always find the mount point 2014-06-27 22:53:26 +02:00
Arthur Schiwon fe0b75ccab also adapt result check from readAttribute 2014-06-27 20:09:16 +02:00
icewind1991 1a3e698294 Merge pull request #9263 from owncloud/remote-share-update
Better detecting of remote changes for external shares
2014-06-27 19:31:18 +02:00
Arthur Schiwon ef7ab856f6 fix instantiation of Access class 2014-06-27 18:49:11 +02:00
Arthur Schiwon df7678f01e specify no attribute for group exists check, as done with users 2014-06-27 18:49:11 +02:00
Jörn Friedrich Dreyer 23fa75f5ac always regenerate etag when writing back file to objectstore 2014-06-27 18:49:06 +02:00
Jan-Christoph Borchardt b7cb4f5a63 fix trailing whitespace noted by Scrutinizer 2014-06-27 18:25:56 +02:00
Vincent Petry d9d816bd98 Unit tests for share dropdown with nested link share 2014-06-27 18:21:02 +02:00
Vincent Petry 7a1b45c43b Merge pull request #9260 from owncloud/fileactions-lateregisterinpublicpage
Allow late registration of file actions in public page
2014-06-27 18:00:32 +02:00
Jan-Christoph Borchardt a18658fa7f Merge pull request #9256 from owncloud/design-mobile-shared
show share action of shared items darker to distinguish from non-shared,...
2014-06-27 17:59:48 +02:00
Vincent Petry 0bd17eff42 Use file_source to find matching share for nested link shares 2014-06-27 17:56:09 +02:00
Morris Jobke 44e1bfb0ea Merge pull request #9259 from owncloud/fix-rename-icon
fix rename icon, fix #9257
2014-06-27 17:41:23 +02:00
Robin Appelman 1bb1504d24 Improve comment 2014-06-27 17:31:51 +02:00
Robin Appelman db3f0cee4a Fix parsing of webdav permissions 2014-06-27 17:28:56 +02:00
Robin Appelman 6f5d5b9a30 Also check for updated permissions for webdav storages 2014-06-27 17:27:47 +02:00
Robin Appelman 5b8c2ac750 Use the etag to check for updates in webdav storages where available 2014-06-27 17:10:46 +02:00
Vincent Petry fd8b5680dd Merge pull request #8383 from owncloud/object_storage
Object storage
2014-06-27 16:53:03 +02:00
Jörn Friedrich Dreyer b4f40e4da0 shorten userid columns to 64 chars, ref #9186 2014-06-27 16:48:42 +02:00
Vincent Petry 0ff30a7d5e Remove missed console.log in file list 2014-06-27 16:10:37 +02:00
Vincent Petry 13b7937381 Allow late registration of file actions in public page 2014-06-27 16:10:20 +02:00
Jan-Christoph Borchardt e33fa226cd fix rename icon, fix #9257 2014-06-27 15:53:32 +02:00
Jan-Christoph Borchardt b86b7fd143 show share action of shared items darker to distinguish from non-shared, fix #8898 2014-06-27 15:39:54 +02:00
Morris Jobke 3b2fd5e4e6 Merge pull request #9254 from owncloud/fileactions-deferred
Sync file list with file actions
2014-06-27 15:03:21 +02:00
Jörn Friedrich Dreyer 25dbbbadd3 use normalize path to convert '.' to '' in objectstorestorage 2014-06-27 15:00:29 +02:00
Jan-Christoph Borchardt b975f0e718 Merge pull request #9174 from owncloud/breadcrumbfix
Breadcrumb width calculation fix
2014-06-27 13:51:18 +02:00
Vincent Petry 586b3a9683 Sync file list with file actions
Whenever file actions are registered later, now the file lists are
automatically notified.

Added FileActions.addUpdateListener() to be able to receive such
notifications.

This removes the need for apps to manually call FileActions.display()
after registering new actions.

This fixes issues with race conditions when file actions are
registered after the file list was already rendered.
2014-06-27 13:41:01 +02:00
Thomas Müller 4d6019b73f Merge pull request #9247 from owncloud/move-webdav-class-to-core-master
Move webdav class to core master
2014-06-27 12:59:59 +02:00
Jörn Friedrich Dreyer ab93f1949d update hasUpdated description, overwrtie testStat for objectstore test 2014-06-27 12:14:31 +02:00
Vincent Petry 4b5bf606cb Merge pull request #9215 from owncloud/officemimetypesupdatefix
Office mime types update fix
2014-06-27 11:23:19 +02:00
Vincent Petry ec4cf96f0d Breadcrumb width calculation fix
Rewrote the breadcrumb calculation to be more readable.

Breadcrumb now has a setMaxWidth() method to set the maximum allowed
width which is used to fit the breadcrumbs.

The breadcrumb width is now based on the container width, passed through
setMaxWidth() by the FileList class.

Now using fixed widths for the test crumbs to simulate consistent
widths across browsers which rendering engines might usually yield
different results.
2014-06-27 11:11:34 +02:00
Thomas Müller ef4057d382 remove pointless require - we should kill all require_once like that in our tests 2014-06-27 09:30:42 +02:00
Thomas Müller 171475b95a fix autoloader 2014-06-27 08:52:40 +02:00
Thomas Müller c745240543 Move \OC\Files\Storage\DAV to core in order to reduce inter-app dependencies 2014-06-27 08:52:28 +02:00
Jenkins for ownCloud 36f771e9f0 [tx-robot] updated from transifex 2014-06-27 01:55:44 -04:00
icewind1991 58c03f5e85 Merge pull request #9241 from owncloud/backgroundjob-check
Check if classes/method exists before trying to call them in background jobs
2014-06-27 02:24:22 +02:00
Robin Appelman f93457c41d Fix check if class exists 2014-06-27 00:52:37 +02:00
Morris Jobke d9aa8c9f0e drop unneeded code 2014-06-27 00:30:14 +02:00
Frank Karlitschek 2daffbc44e Merge pull request #9051 from owncloud/Bagera-master
Fix delete action height
2014-06-26 17:48:55 -04:00
icewind1991 1b1bebdcb2 Merge pull request #9236 from owncloud/sharing-settingswording
Fix wording for remote shares in settings page
2014-06-26 22:56:46 +02:00
Robin Appelman 437094bbfc Check if classes/method exists before trying to call them in background jobs 2014-06-26 22:40:12 +02:00
Vincent Petry c6b89cc55a Fix wording for remote shares in settings page 2014-06-26 19:35:57 +02:00
Vincent Petry 7ee90ddd59 Add missing quotes for Oracle 2014-06-26 19:25:37 +02:00
Raghu Nayyar 5b189315b5 Merge pull request #9234 from owncloud/fix-ellipsis-for-folders
Fix ellipsis for folders on mobile screens
2014-06-26 22:45:40 +05:30
Thomas Müller 7804bd010c Merge pull request #9230 from owncloud/fix-repair-step-php-53
Redeclared as public to allow invocation from within the closure in php ...
2014-06-26 17:20:09 +02:00
Vincent Petry 3d2fd7cd1a Merge pull request #9213 from owncloud/upgrade-donotloadappsinremote
Prevent loading apps in remote when an upgrade is due
2014-06-26 17:10:42 +02:00
Vincent Petry 8526556110 Merge pull request #9206 from owncloud/occ-scan-user
Prevent running the files:scan command as the wrong user
2014-06-26 17:03:23 +02:00
icewind1991 46adf8cb19 Merge pull request #9223 from owncloud/occ-scan-arguments
Add error message when no users specified to files:scan command
2014-06-26 17:01:39 +02:00
Morris Jobke cbd5e31d33 fix padding for last cell in summary of trashbin 2014-06-26 16:58:49 +02:00
Vincent Petry 67d0a3c15e Fixed mime type repair step 2014-06-26 16:40:12 +02:00
Morris Jobke 9eb7ed4925 Fix ellipsis for folders on mobile screens
* fixes #9162
2014-06-26 16:37:34 +02:00
Jan-Christoph Borchardt 1dc6e1767c Merge pull request #9211 from owncloud/fix-hidden-share-button
Fix hidden share button and checkbox layout
2014-06-26 16:23:39 +02:00
Vincent Petry b7d79a90b0 Merge pull request #9210 from owncloud/better_validation_in_getAppPath
better validation for OC_App::getAppPath()
2014-06-26 15:52:12 +02:00
Björn Schießle aabee3e4b0 Merge pull request #9171 from owncloud/enc_always_use_oc_view
[encryption] always use oc view
2014-06-26 15:11:08 +02:00
Thomas Müller 4c80c9595f Redeclared as public to allow invocation from within the closure in php 5.3 2014-06-26 14:27:41 +02:00
Vincent Petry fd04b3070f Add error message when no users specified to files:scan command 2014-06-26 11:58:38 +02:00
Jörn Friedrich Dreyer f96a535f80 fix objectstore test execution 2014-06-26 11:30:00 +02:00
Björn Schießle 1822bba5e9 Merge pull request #9193 from owncloud/sharing_etag_propagation
make sure that the etags get propagated correctly
2014-06-26 10:26:24 +02:00
Jenkins for ownCloud a5154450cf [tx-robot] updated from transifex 2014-06-26 01:54:40 -04:00
Frank Karlitschek 63a50bb3f7 7.0 beta 1 2014-06-25 19:01:52 -04:00
Vincent Petry 93a6792da7 Merge pull request #9205 from owncloud/remoteshare-fixurlpath
Fix parsing of remote URL when mounting remote shares
2014-06-25 19:59:39 +02:00
Vincent Petry b749292c18 Added test case for when target mime types already exist 2014-06-25 19:49:18 +02:00
Vincent Petry b1e778d5fd Moved office mimetype update to a repair step 2014-06-25 19:49:18 +02:00
Vincent Petry 4e43e3626e Prevent loading apps in remote when an upgrade is due 2014-06-25 18:17:17 +02:00
VicDeo 7c362ab55e Merge pull request #9194 from owncloud/revertloadapps
Bring back loadApps() in base.php
2014-06-25 18:52:56 +03:00
Jörn Friedrich Dreyer 42e9d49d72 update files_external swift to php-opencloud v1.9.2 2014-06-25 17:15:59 +02:00
Morris Jobke 3da9003426 Fix hidden share button and checkbox layout
fixes #9101
2014-06-25 16:32:24 +02:00
Morris Jobke a9d0e9a5d5 Merge pull request #9202 from owncloud/urlhashfix
Do not clear URL hash when no external mount params given
2014-06-25 16:28:52 +02:00
Georg Ehrke 09356bc5b3 better validation for OC_App::getAppPath() 2014-06-25 16:24:55 +02:00
Morris Jobke 6e2aaaaa31 Fix test mail behaviour
* ref #8854
* prevent default of "send test mail" button
* drop unused form serialization
* use display name of user for test mail
2014-06-25 15:32:40 +02:00
Robin Appelman 9a2ed86672 Prevent running the files:scan command as the wrong user 2014-06-25 15:22:49 +02:00
Bjoern Schiessle 38ff8173ab make sure that hooks are registered for the tests 2014-06-25 15:20:52 +02:00
Vincent Petry d22559200c Fix parsing of remote URL when mounting remote shares
This fix allows for having the remote ownCloud instance live in a
subpath like "http://example.com/basedir/subdir/owncloud".
Such URLs are now parsed correctly.

Added unit test for URL parsing.
2014-06-25 15:11:43 +02:00
icewind1991 16396e2e33 Merge pull request #9123 from owncloud/webdav-move-permissions
Fix permissions check when moving a file to a different directory over webdav
2014-06-25 15:09:58 +02:00
icewind1991 c94c69aea1 Merge pull request #9189 from owncloud/sharing_fix_permissions
Sharing fix permissions
2014-06-25 15:01:34 +02:00
Jörn Friedrich Dreyer e792d38c11 remove rackspace opencloud libs from files_external 3rdparty 2014-06-25 14:54:43 +02:00
Jörn Friedrich Dreyer 8e6cb6dc54 delete object without downloading it first 2014-06-25 14:53:38 +02:00
Arthur Schiwon f3ecf819ec extend Dummy user and group implementation to pass tests 2014-06-25 13:13:53 +02:00
Robin Appelman 113749bd96 really always take root of the substorage 2014-06-25 13:00:11 +02:00
Bjoern Schiessle d3d1955ef4 fix unit tests 2014-06-25 12:38:26 +02:00
Vincent Petry 9de3d8225b Fix parsing URL hash when no "?" was specified 2014-06-25 12:37:11 +02:00
Jenkins for ownCloud b1116880f8 [tx-robot] updated from transifex 2014-06-25 06:33:53 -04:00
Bjoern Schiessle 3d0805f27d always use a \OC\Files\View 2014-06-25 12:27:30 +02:00
Bjoern Schiessle 709691548d always use oc filesystem for rename operation 2014-06-25 12:27:30 +02:00
Vincent Petry 363f8f3205 Do not clear URL hash when no external mount params given
Whenever external share parameters were passed through the URL hash, the
URL hash will now be cleared.

In other cases, the hash needs to be left alone because it is used as
workaround for the lack of history API in IE8 / IE9

Removed getParamterByName() and use OC.Util.History.parseUrlQuery() that
does the same, including replacing the "+" with spaces.
2014-06-25 12:24:46 +02:00
Bjoern Schiessle a0b85fc5e4 make sure that during share and unshare the etags get propagated correctly 2014-06-25 12:11:56 +02:00
Arthur Schiwon 89f2691515 adjust access constructor to master 2014-06-25 11:46:21 +02:00
Arthur Schiwon 452efa5fab Port of LDAP Wizard: get correct total no of users, groups and complete list of groups on big setups #9002
fix PHPdoc

Conflicts:
	apps/user_ldap/lib/connection.php

add method to count groups on LDAP

Conflicts:
	apps/user_ldap/lib/access.php

LDAP Wizard: count users and groups with the power of paged search

Conflicts:
	apps/user_ldap/lib/wizard.php

consolidate requirement check

fix PHPdoc

Conflicts:
	apps/user_ldap/lib/access.php

Wizard: get really all groups from LDAP by power of Paged Search

Conflicts:
	apps/user_ldap/lib/wizard.php

make all this work in an early configuration state in the wizard by marking  the config active and ignoring the validation state.

Conflicts:
	apps/user_ldap/lib/connection.php

simplify two methods a bit, because they are not used for group search anymore

Conflicts:
	apps/user_ldap/lib/wizard.php

remove unused vars; increase scrutinizer happiness
2014-06-25 11:45:55 +02:00
Arthur Schiwon 553c2ad33a clean up created groups after testing, and correct parameter order 2014-06-24 21:56:08 +02:00
Arthur Schiwon 121d52860e return int, not string 2014-06-24 21:54:57 +02:00
blizzz c6bcb07f83 Merge pull request #9145 from owncloud/everyonecount
Enhancement: Displays users and admin count in the Users Management.
2014-06-24 20:58:35 +02:00
Bjoern Schiessle 92a82f02b3 always take root of the substorage 2014-06-24 18:53:51 +02:00
Vincent Petry dd2ef47ed3 Merge pull request #9168 from owncloud/files-phpwarningondelete
Remove warning when deleting all entries
2014-06-24 18:18:14 +02:00
Vincent Petry d18234112b Merge pull request #9180 from owncloud/fix-error-on.update-page
fixes the layout for error messages on the update page
2014-06-24 17:48:17 +02:00
Vincent Petry a120d6e9a3 Bring back loadApps() in base.php
loadApps() had been deleted by mistake in
799205488c
2014-06-24 17:37:58 +02:00
Morris Jobke 6be236913c Merge pull request #9181 from owncloud/enc_recursive_mkdir
always use '/' as directory seperator
2014-06-24 16:37:42 +02:00
Vincent Petry 8aa51a69fa Removed unused padding-right of the controls bar
Removing this doesn't affect the controls bar visually but does affect
the breadcrumb calculation when getting available width.
2014-06-24 16:32:18 +02:00
Vincent Petry a7e7e86df0 Test runner now loads CSS and hides testArea
- serve CSS and font files properly to make sure that measurements are
  correct for the tests that need them (breadcrumb)
- added opacity to testArea to make sure nothing is visible during
  testing
2014-06-24 16:32:18 +02:00
Robin Appelman 92f2a430a8 Don't bother checking for external updates for objectstore storages 2014-06-24 14:48:59 +02:00
Robin Appelman eb97eee964 Only initialize the swift container when manipulating an object 2014-06-24 14:42:52 +02:00
Robin Appelman 544963f414 Allow adding object stores with the files_external mount config 2014-06-24 14:36:57 +02:00
Robin Appelman 159b603d13 Add support for rackspace swift backends 2014-06-24 14:36:29 +02:00
Bjoern Schiessle 3fc7357ade add/update unit tests 2014-06-24 14:00:15 +02:00
Bjoern Schiessle 70ca292fd9 only the mount point has delete and update permissions to enable rename operation 2014-06-24 13:55:04 +02:00
Bjoern Schiessle 84d36df70b make sure that we always return the correct permissions 2014-06-24 13:39:37 +02:00
Bjoern Schiessle 9c45a3196b add unit tests 2014-06-24 10:43:07 +02:00
Bjoern Schiessle 6b85fe819c always use '/' as directory seperator 2014-06-24 09:29:11 +02:00
Morris Jobke e2fd6dc3ab fixes the layout for error messages on the update page 2014-06-24 08:39:43 +02:00
Jenkins for ownCloud 6a4a474aa9 [tx-robot] updated from transifex 2014-06-24 01:54:39 -04:00
Morris Jobke cc559c5b4b Merge pull request #9074 from geez0x1/master
Update the modified date in UI on file reversion
2014-06-23 23:20:04 +02:00
Thomas Müller f913b1629b Merge pull request #9158 from owncloud/no-recursion-on-rmdirr-master
fix recursion on rmdirr
2014-06-23 23:18:10 +02:00
Thomas Müller fba694edae update PHPDoc $fileInfo is a SplFileInfo 2014-06-23 23:15:30 +02:00
Lukas Reschke e070e292bf Merge pull request #9170 from owncloud/files-renamevalidationblur
Fix blurring of invalid file name on rename
2014-06-23 22:48:46 +02:00
raghunayyar 720fa33274 Better Logic to display user count for everyone. 2014-06-24 00:50:36 +05:30
Arthur Schiwon 5dab762006 add tests 2014-06-23 18:33:13 +02:00
Joas Schilling c98b7fe7fc Merge if statements 2014-06-23 18:10:08 +02:00
Joas Schilling 167ba14af7 Merge pull request #9159 from owncloud/enabledapp-cache-loggedin
Only cache enabled apps when logged in
2014-06-23 18:02:57 +02:00
Vincent Petry 536a190846 Merge pull request #9124 from owncloud/move-permissions
Fix moving files into read only public shares
2014-06-23 17:05:35 +02:00
Vincent Petry 0ab66d9b48 Added unit test for the helper's rmdirr 2014-06-23 16:48:25 +02:00
Jörn Friedrich Dreyer 5756aba594 add disclaimer to objectstore example config 2014-06-23 16:42:05 +02:00
Vincent Petry 7d4747ea16 Fix blurring of invalid file name on rename
When renaming to an existing file name, blurring the field should not
remove it.

This fix keeps the field until escape is pressed instead of replacing it
with a broken empty space.
2014-06-23 16:35:11 +02:00
Jörn Friedrich Dreyer 28c1a95575 use common storage test 2014-06-23 16:29:01 +02:00
Vincent Petry 909e505c2e Remove warning when deleting all entries
When deleting all entries, only "allfiles" is defined but not "file" or
"files", which caused a PHP warning to be logged.
2014-06-23 15:57:45 +02:00
Vincent Petry 6850d0c6d7 Merge pull request #8931 from owncloud/filelist-usepathforaction
[master] Use actual file path on rename/delete
2014-06-23 15:53:23 +02:00
Vincent Petry 8c82098281 Merge pull request #8974 from owncloud/router-preventloadappsonupgrade
Prevent loadApps on upgrade
2014-06-23 15:15:50 +02:00
Robin Appelman 2547945779 Add comment 2014-06-23 15:14:35 +02:00
icewind1991 4d216e8e2a Merge pull request #9153 from owncloud/files-unselectafterdelete
Clear file selection when list is repopulated
2014-06-23 14:42:00 +02:00
Thomas Müller ed31f30afd dir itself has to be removed as well 2014-06-23 14:40:55 +02:00
Robin Appelman d24c0f4d42 Dont allow opening writable streams on a read only dav mount 2014-06-23 14:35:19 +02:00
Robin Appelman 8b41689fe6 Only cache enabled apps when logged in 2014-06-23 13:55:21 +02:00
Thomas Müller f83821c388 fix recursion on rmdirr 2014-06-23 13:54:27 +02:00
Frank Karlitschek 65e4348080 Merge pull request #9150 from owncloud/remoteshare-fixsetuporder
Setup the external share manager in a hook
2014-06-23 07:29:20 -04:00
Vincent Petry 074d3a8f07 Clear file selection when list is repopulated
When calling FileList.setFiles() the current selection needs to be
cleared.
2014-06-23 12:55:42 +02:00
Arthur Schiwon 01a012980a search term for users and groups may occur anywhere in the name or displayname, not just in the beginning 2014-06-23 12:03:09 +02:00
Vincent Petry 9b001ed903 Setup the external share manager in a hook
To make sure the external shares are initialized in the right order and
make sure the session is correctly initialized before, the external
share manager is now set up in a filesystem setup hook.
2014-06-23 11:57:43 +02:00
Jörn Friedrich Dreyer 7ec53571c4 use 'object' as the fakedir stream name 2014-06-23 11:07:01 +02:00
Arthur Schiwon 81ecbbb061 trusted domains shall not be ignored on autosetup 2014-06-23 10:33:15 +02:00
Vincent Petry 53ad15e0e3 Merge pull request #9138 from owncloud/fix-documentation
Add explanation about the current implementation of updateApp
2014-06-23 10:32:41 +02:00
Jenkins for ownCloud b8b7c97a41 [tx-robot] updated from transifex 2014-06-23 01:54:38 -04:00
Bart Visscher 089139f8ea Add explanation about the current implementation of updateApp 2014-06-22 12:45:59 +02:00
Jenkins for ownCloud 2b4c2a7b14 [tx-robot] updated from transifex 2014-06-22 01:54:36 -04:00
Frank Karlitschek e30dac9afb 7.0.0 alpha 2 2014-06-21 18:52:47 -04:00
Morris Jobke 436d022316 Merge pull request #9120 from owncloud/fileactions-filelistfallback
Fixed file actions fallback
2014-06-21 11:28:11 +02:00
Jenkins for ownCloud da0e4b0af0 [tx-robot] updated from transifex 2014-06-21 01:54:37 -04:00
Morris Jobke 1f17814e40 Merge pull request #9121 from owncloud/filepicker-avoidtwice
Prevent showing the file picker twice
2014-06-20 22:41:57 +02:00
Morris Jobke 0c2447e487 Merge pull request #9102 from owncloud/viewermode-controls
Fixed controls bar in viewer mode
2014-06-20 22:37:26 +02:00
Arthur Schiwon 93edacb357 Backport subset of #4179, re-established Oracle compatibility for LDAP
Conflicts:
	apps/user_ldap/lib/access.php
2014-06-20 20:49:34 +02:00
Morris Jobke d5819a5ecd Merge pull request #9108 from owncloud/uploadintofolderfix
Fix many issues with drag and drop upload
2014-06-20 19:01:05 +02:00
Robin Appelman 24f15fca64 Fix unit tests 2014-06-20 15:40:38 +02:00
Robin Appelman 80e6d357a2 Fix permissions check when moving a file to a different directory over webdav 2014-06-20 14:29:13 +02:00
Vincent Petry 763d9ded1d Prevent showing the file picker twice
In case the filepicker function is called twice, only show it once.
2014-06-20 13:39:46 +02:00
Vincent Petry 502573eb2e Fixed file actions fallback
Some apps are calling FileActions.display() directly but omit the new
fileList argument.

This fix makes the fileList argument correctly fall back to the default
file list (the one from the "All files" section)
2014-06-20 12:58:04 +02:00
Jörn Friedrich Dreyer c112a1d323 move to stream based IObjectStore interface, rearrange & reformat code 2014-06-20 12:27:47 +02:00
Jenkins for ownCloud ca96b9d3d5 [tx-robot] updated from transifex 2014-06-20 01:54:32 -04:00
Vincent Petry 8ae2468345 Fix appending of rows after upload
When uploading files or folders, they only need to be appended or
updated when their path or a section of their path is inside the current
directory (which happens for folder upload)

Fixes issue where file was appended when dragging on a parent directory
onto the breadcrumb.

Fixes appending issue when uploading folders.
2014-06-19 18:21:42 +02:00
Vincent Petry 9ef7410abe Fixed uploading by drag and drop into folder 2014-06-19 16:14:10 +02:00
Morris Jobke e8e53c81f8 Merge pull request #9105 from owncloud/fix_8874
Make sure last seen tooltip always appears even after searching and filt...
2014-06-19 15:16:33 +02:00
Arthur Schiwon 85894654ae Make sure last seen tooltip always appears even after searching and filtering 2014-06-19 14:30:22 +02:00
Jenkins for ownCloud e1fd10f226 [tx-robot] updated from transifex 2014-06-19 01:55:38 -04:00
Morris Jobke ed10f56994 Merge pull request #9071 from owncloud/extstorage-list-unittests
Added JS unit tests for ext storage
2014-06-19 01:21:21 +02:00
Morris Jobke 1973fdb11d Merge pull request #9093 from owncloud/remove_unused_code
remove unused code
2014-06-19 01:17:36 +02:00
Vincent Petry 1236eb2afa Fixed controls bar in viewer mode 2014-06-18 20:10:28 +02:00
Björn Schießle edbc6b5db1 Merge pull request #9068 from owncloud/trashbin_unittests_master
fix trash bin expire operation and add unit tests
2014-06-18 15:32:16 +02:00
Jörn Friedrich Dreyer f2fe00e972 fix rebase, use 'object::user:<username>' or 'object::store:<storageid> as storage id, by default use container/bucket name for storageid, make storageid configurable, store user only for HomeObjectStoreStorage, change updateObject() to writeObject() 2014-06-18 15:20:26 +02:00
Bjoern Schiessle bcc88be4c7 adjust encryption tests to the trash bin changes 2014-06-18 14:41:16 +02:00
Bjoern Schiessle 05cd150fd2 add additional tests for the trash bin 2014-06-18 14:41:16 +02:00
Bjoern Schiessle e06fa200b3 make sure that we always use the right user 2014-06-18 14:41:16 +02:00
Bjoern Schiessle e20bb71a42 remove unused code 2014-06-18 13:26:42 +02:00
Bjoern Schiessle 8052d2901d initialize array 2014-06-18 13:23:53 +02:00
Jörn Friedrich Dreyer 5cae863408 change architecture from inheritance to composition 2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer 9335a5f07f remove duplicate method 2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer 5722e31d1a add autocreate config option for containers, implement autocreate and delete of containers, use generated container names for tests 2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer 1410cb10b4 add 'objectstore' configuration example 2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer 4e65889f54 only use one config option 'objectstore' for root and home storage configuration 2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer 7493ff0624 fix unit test by always initializing the root of the storage in the constructor 2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer c18836c8ae add initial swift test with trystack 2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer 10de4a7b90 move creation of / and users 'files' from storage constructor to setupFS / mount initialization 2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer 652af71ba9 update 3rdparty 2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer 87aaf39259 fix checking unset array values, deduplicate code, remove file from cache if it could not be stored in the objectstore 2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer eca536d8b4 minor code cleanup 2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer c020e8e658 use exceptions to notify abstract parent class of problems 2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer 60a8419a1f when root storage cannot be mounted throw an exception visible to the end user 2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer 1374ba9adf fix fallback config for default home storage 2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer f1bf1326b1 require updated 3rdparty with rackspace libs 2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer ccb698a6a8 move swift and abstract code to core 2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer 85ccfad37c change 'object_storage' config param to 'root_storage'
copy skeleton only for local filesystems
2014-06-18 12:53:19 +02:00
Jörn Friedrich Dreyer 2bf7e5c02f make objectstore setup more robust, don't pass user to object store mounted as root 2014-06-18 12:53:19 +02:00
Jörn Friedrich Dreyer 3c66a8c8ed allow configuring objectstore as home and root storage 2014-06-18 12:53:19 +02:00
Bjoern Schiessle a921ad8925 fix rename of encryption keys 2014-06-18 12:19:33 +02:00
Vincent Petry 799205488c Prevent loadApps on upgrade
Moved OC::needUpgrade() to OCP\Util::needUpgrade() to make it accessible
form the router.
Moved maintenance + upgrade check to the router.
2014-06-18 11:10:07 +02:00
Jenkins for ownCloud baf46c74cd [tx-robot] updated from transifex 2014-06-18 01:55:13 -04:00
Lukas Reschke d4bdcb7a9b Merge pull request #9047 from owncloud/fix_preload_fundamental_apps
Load fundamental apps, before any possible customizing app may follow
2014-06-18 07:29:04 +02:00
Bjoern Schiessle b486f48fbc fix trash bin expire operation and add unit tests 2014-06-17 22:36:30 +02:00
geez0x1 7576dde0a3 Update the modified date in UI on file reversion 2014-06-17 22:22:03 +02:00
Vincent Petry 58c204abb4 Added JS unit tests for ext storage
Added JS unit tests for the external storage file list extension.
2014-06-17 18:29:07 +02:00
icewind1991 8d1cf79152 Merge pull request #8399 from owncloud/server-server-sharing
Add server<->server sharing
2014-06-17 17:40:05 +02:00
Vincent Petry cce58368ad Merge pull request #9065 from owncloud/migrator-keepprimaryindexname
Do not rename primary key index when renaming table
2014-06-17 16:43:33 +02:00
Vincent Petry c5e33f5172 Merge pull request #9067 from owncloud/pass-db-hostname
Obviously have to pass the hostname as is when there is no ':' in the hostname
2014-06-17 15:56:52 +02:00
Björn Schießle a548de3611 Merge pull request #9029 from owncloud/table-to-paragraph-layout-for-share
Migrate table layout to p layout for share settings
2014-06-17 15:46:24 +02:00
Vincent Petry ffdc1c2fcf Added unit test for checkMigrate with primary key + autoinc
Added unit test to make sure that checkMigrate() works when adding a
primary key and autoincrement column to a table schema.
2014-06-17 15:23:18 +02:00
Vincent Petry 7aa11b4361 Do not rename primary key index when renaming table
When the migrator renames a table, for example for upgrade simulation,
it should not rename the primary key to avoid messing up with the diff
because the MySQL Doctrine code expects that index to always be called
"primary".
2014-06-17 15:23:18 +02:00
Andreas Fischer 9db0a82a26 We obviously have to pass the hostname as is when there is no ':' in the hostname.
This reverts commit 73062040e6.
2014-06-17 14:48:32 +02:00
Morris Jobke 9e74787c8a Migrate table layout to p layout for share settings
ref #8906
2014-06-17 14:33:14 +02:00
Robin Appelman 07fdeba50b Fix moving movablemount over webdav 2014-06-17 14:10:11 +02:00
Robin Appelman 2219087df6 organize js a bit better 2014-06-17 13:47:36 +02:00
Robin Appelman f2ebac5c76 Better error handeling in testremote 2014-06-17 13:15:34 +02:00
Robin Appelman 361607c72d testremote is for public access 2014-06-17 13:08:24 +02:00
Morris Jobke e7365c9507 fix broken buttons for IE8-11 2014-06-17 11:45:55 +02:00
Morris Jobke 17685adb87 fixing layout issue - mostly alignment 2014-06-17 11:24:39 +02:00
Jenkins for ownCloud ce179dcdcb [tx-robot] updated from transifex 2014-06-17 01:55:43 -04:00
Volkan Gezer dd2dd7eaae Merge pull request #9059 from owncloud/simplify-warning-layout
simplify security warning on admin page
2014-06-16 21:30:46 +02:00
Lukas Reschke bd4f3849a3 That file was accidentally commited. Partially revert https://github.com/owncloud/core/commit/f2fc214ce0455ce9a9def36bd09285e82b5eabec 2014-06-16 20:38:21 +02:00
Lukas Reschke f2fc214ce0 Add deprecation notice to load* functions
This functions are deprecated and/or removed since ownCloud 7. Additionally a issubdirectory check has been added here to prevent developers to use this function in a potentially insecure way.

Port of https://github.com/owncloud/core/pull/9033
2014-06-16 20:33:04 +02:00
Morris Jobke a5f1846170 simplify security warning on admin page 2014-06-16 20:25:02 +02:00
Morris Jobke c42d087fc5 Merge pull request #9053 from owncloud/small_ux_improvement
share settings, small ux improvement
2014-06-16 20:18:51 +02:00
Morris Jobke 99467898e1 Merge pull request #9055 from owncloud/add_new_keynote_mimetype
add new keynote mimetype
2014-06-16 20:13:35 +02:00
Volkan Gezer 08c8ae699f Merge pull request #9049 from owncloud/fix-upload-button
fix CSS for upload button - fixes #8939
2014-06-16 18:23:55 +02:00
Jörn Friedrich Dreyer cd77f92f4c add new keynote mimetype 2014-06-16 16:25:12 +02:00
Robin Appelman b188550c22 Also support removeable mounts with rmdir 2014-06-16 16:24:42 +02:00
Robin Appelman 0532f5c39a Fix permission for movable storage root 2014-06-16 16:20:40 +02:00
Robin Appelman 3ed4e5b26b Prevent warning 2014-06-16 16:12:32 +02:00
Robin Appelman 9c2918a626 Fix setupFromToken when a password is set 2014-06-16 16:09:56 +02:00
Robin Appelman 0616eb4007 Fix multiple users having the same external share mountpoint 2014-06-16 15:57:01 +02:00
Georg Ehrke 15c215cd03 Merge pull request #8808 from owncloud/update_shipped_apps_from_appstore
Make shipped apps updatable via appstore
2014-06-16 15:54:50 +02:00
Bjoern Schiessle c1ef536896 show explenation only if the setting is activated 2014-06-16 15:33:46 +02:00
Morris Jobke b67588d35c Merge pull request #9048 from owncloud/fix_9041
format group or username for delete notification, fixes #9041
2014-06-16 15:23:08 +02:00
Bagera bc65b25303 Aligning in the table header as well
Aligning the columns and in the rows
2014-06-16 14:15:55 +02:00
Bagera 28f420b337 Aligning with line height
Remove "top:" in favour of setting "line-height" and fixing the
resulting problem with the input field being positioned wrongly.
2014-06-16 14:11:58 +02:00
Bagera e11abccded Fix delete action height
Fix #8530 and align the all actions in the row
2014-06-16 14:11:55 +02:00
Morris Jobke b75fe439e7 fix CSS for upload button - fixes #8939 2014-06-16 13:51:49 +02:00
Georg Ehrke 86f546ff64 disable code check for shipped apps 2014-06-16 13:49:02 +02:00
Arthur Schiwon f12c4f6d11 style 2014-06-16 13:46:31 +02:00
Arthur Schiwon 3ebb1565a7 escape before output, fixes #9041 2014-06-16 13:44:41 +02:00
Robin Appelman 5b1b6572f7 Make testremote more robust 2014-06-16 13:21:00 +02:00
Robin Appelman 6e06e1da0e Add route which went missing during rebase 2014-06-16 13:20:39 +02:00
Morris Jobke 4fbab3c12d Merge pull request #9040 from owncloud/fix-xss
Sanitize name of sharee
2014-06-16 13:13:28 +02:00
Arthur Schiwon 7b704eeb5e Load fundamental apps, before any possible customizing app may follow 2014-06-16 13:12:21 +02:00
Morris Jobke 3069091e61 Merge pull request #9030 from owncloud/default-allow-user-mount-backends
AllowUserMount defaults now to all backends fixes #7958
2014-06-16 13:10:01 +02:00
Robin Appelman a469efb1f1 Add some safety checks 2014-06-16 12:42:28 +02:00
Volkan Gezer 83b45926ee Merge pull request #8716 from owncloud/forget-documentation
app manager forgets the documentation links workaround for #8081
2014-06-16 12:24:39 +02:00
Morris Jobke 0a2c676cda fix camelCase and avoiud re-wrapping $() 2014-06-16 11:35:48 +02:00
Morris Jobke 78b6f59523 fix typo - Backups -> Backends 2014-06-16 11:33:51 +02:00
Vincent Petry a48bcceb23 Merge pull request #8917 from owncloud/repair-routine-base
Add support for repair step classes
2014-06-16 11:13:10 +02:00
Vincent Petry d21845557e Merge pull request #9027 from owncloud/fix-password-saved-share-layout
fix layout of password protected shares
2014-06-16 11:11:03 +02:00
Jenkins for ownCloud ec5448bf7d [tx-robot] updated from transifex 2014-06-16 01:54:35 -04:00
macjohnny e5224782fa Merge pull request #9022 from owncloud/speedup-nested-ldap-groups
drastic speedup for nested ldap groups
2014-06-16 07:50:53 +02:00
Jenkins for ownCloud 4d6fc6f309 [tx-robot] updated from transifex 2014-06-15 01:55:06 -04:00
Lukas Reschke 35740cf941 Do even more sanitization 2014-06-14 20:56:54 +02:00
Lukas Reschke 1066f4ec9a Sanitize name of sharee
Fixes a XSS introduced with https://github.com/owncloud/core/commit/271684dcfec16122b88e03780b41af7120f27e45
2014-06-14 20:45:10 +02:00
Morris Jobke 06ec82fd68 Fix path 2014-06-14 15:26:27 +02:00
Lukas Reschke 01de7b8b9e Merge pull request #9028 from owncloud/table-to-paragraph-layout-for-https
migrate table layout to paragraph layout for HTTPS setting
2014-06-14 13:08:58 +02:00
Frank Karlitschek db9ac13574 Merge pull request #8618 from owncloud/yet-another-ajax-lost-password
Basic ajax lost password
2014-06-14 12:01:13 +02:00
Robin Appelman 9670d3e98b Always send a POST body 2014-06-14 10:22:38 +02:00
Robin Appelman be93b0d01d Fix permissions functions for webdav external storages 2014-06-14 10:22:38 +02:00
Robin Appelman 4bc8a2550d Fix public share webdav permissions 2014-06-14 10:22:38 +02:00
Robin Appelman 49f9b7ea8e fix modified date for external shares 2014-06-14 10:22:38 +02:00
Robin Appelman 455fbafb48 Fix undefined index error 2014-06-14 10:22:38 +02:00
Bjoern Schiessle 3bf7b54cd5 block server-to-server share if files_external is not activates, can be reverted once we moved to the webdav implementation in core 2014-06-14 10:22:38 +02:00
Bjoern Schiessle 84a651e46d add settings to disable server to server sharing 2014-06-14 10:22:38 +02:00
Robin Appelman e7b58ed2bd Properly expose read only public shares as read only 2014-06-14 10:14:08 +02:00
Robin Appelman 87e311b996 Fix storage being passed to cache/watcher and scanner when using storage wrappers 2014-06-14 10:14:08 +02:00
Robin Appelman decb51aee6 Fix deleting of external shares 2014-06-14 10:14:08 +02:00
Robin Appelman 3f2cb39aba Properly set read permissions for webdav storages 2014-06-14 10:14:08 +02:00
Robin Appelman c8c8106168 generate better storage ids 2014-06-14 10:14:08 +02:00
Robin Appelman ce0aa7d4a8 Use the movable mount system for external shares 2014-06-14 10:14:08 +02:00
Robin Appelman c61f759a8b Fix check for shared files inside shares 2014-06-14 10:14:08 +02:00
Robin Appelman 790d51ea1e Fix checking for external share in encryption 2014-06-14 10:14:07 +02:00
Bjoern Schiessle 277f25222a if file doesn't exist, check parent folder 2014-06-14 10:14:07 +02:00
Robin Appelman 2005c162bd Fix prompting for password 2014-06-14 10:14:07 +02:00
Robin Appelman 64ced76beb Save mountpoints relative to the user 2014-06-14 10:14:07 +02:00
Robin Appelman 43c56fcd07 Generate a unique name 2014-06-14 10:14:07 +02:00
Robin Appelman e6f3850890 Update for changes in master 2014-06-14 10:14:07 +02:00
Bjoern Schiessle c580aeb455 exclude mounted server-to-server shares from encryption 2014-06-14 10:14:07 +02:00
Bjoern Schiessle 961317d911 make sure to enable incognito mode when mounting a public link and update init status of the encryption app 2014-06-14 10:14:07 +02:00
Robin Appelman 87b0021e56 Scan the entire remote share at once by requesting the full file tree from the remote server 2014-06-14 10:14:07 +02:00
Robin Appelman 30f5b2bd7c Improve detection of whether we're in the files app 2014-06-14 10:13:24 +02:00
Robin Appelman 21ced89beb Dont return false for internalPath 2014-06-14 10:13:24 +02:00
Robin Appelman a900c7aa94 Fix removing remote shares 2014-06-14 10:13:24 +02:00
Robin Appelman 1c149da52f Support path lengths up to 4000 chars 2014-06-14 10:13:24 +02:00
Robin Appelman c6a83b2f17 Fix exposing single files over webdav 2014-06-14 10:13:24 +02:00
Robin Appelman cf5a72c103 Add interface for adding a public share to a different ownCloud instance 2014-06-14 10:13:24 +02:00
Robin Appelman d7de35376d Add interface for accpeting external shares 2014-06-14 10:13:23 +02:00
Robin Appelman 0156ef8166 Add coments to database and dont use sql keywords as table names 2014-06-14 10:10:38 +02:00
Robin Appelman a44baaf8eb add remote/add external shares to manager 2014-06-14 10:10:37 +02:00
Robin Appelman 65f3b2fad2 Add server<->server sharing backend 2014-06-14 10:10:37 +02:00
Jenkins for ownCloud 4a26219ecf [tx-robot] updated from transifex 2014-06-14 01:55:24 -04:00
Morris Jobke fd5fad194d remove double space 2014-06-14 01:03:03 +02:00
Morris Jobke 35f7565e9b Merge pull request #8978 from owncloud/movie_preview_improvements
movie previews: use file directly when it's stored locally and encryption is not enabled
2014-06-14 01:01:59 +02:00
Georg Ehrke 65028c459b don't skip code check for skipped apps
those apps will have to use the public api
2014-06-13 21:51:16 +02:00
Georg Ehrke c378e76412 skip certain tests for shipped apps 2014-06-13 21:45:31 +02:00
Volkan Gezer 2b82e3c251 Merge pull request #9025 from owncloud/fix-mail-settings
fix mail settings save function - ref #8854
2014-06-13 18:26:14 +02:00
Morris Jobke 86e1d8ca54 AllowUserMount defaults now to all backends fixes #7958 2014-06-13 18:14:41 +02:00
Frank Karlitschek 87101e6638 Merge pull request #9018 from owncloud/dbms-socket-support
Refactor OC_DB::connect() to properly support sockets.
2014-06-13 18:09:51 +02:00
Morris Jobke dc2212cd46 migrate table layout to paragraph layout for HTTPS setting 2014-06-13 16:54:47 +02:00
Morris Jobke fc9787ed64 fix layout of password protected shares
* add password icon
* fix upshifted arrow button - fixes #9024
2014-06-13 16:38:42 +02:00
Morris Jobke dda5e6c85b add proper Exception message for invalid token 2014-06-13 16:18:58 +02:00
Morris Jobke 1cb7239cb7 use array_merge for merging arrays in PHP 2014-06-13 16:18:39 +02:00
Morris Jobke ed8b7fc101 complete renaming uid to userId 2014-06-13 16:18:21 +02:00
Morris Jobke ebbf228309 remove whitespace at end of line 2014-06-13 16:03:13 +02:00
Morris Jobke a53cfcb9d1 Migrate ´ to ' 2014-06-13 16:02:41 +02:00
Morris Jobke cedca03ef5 Remove infield label, add password icon, fix layout 2014-06-13 15:56:21 +02:00
Morris Jobke d0b71dffca reformat method call and fix paranthesis mismatch 2014-06-13 15:39:44 +02:00
Bernhard Posselt 2b2b1b487c more style fixes 2014-06-13 15:34:52 +02:00
Bernhard Posselt a6e45a8d0e use more stuff from core :) 2014-06-13 15:34:52 +02:00
Victor Dubiniuk e026b1dc19 Add missing use 2014-06-13 15:34:52 +02:00
Victor Dubiniuk 59ff71f781 Fix check for user existence 2014-06-13 15:34:52 +02:00
Victor Dubiniuk 47c6fd0c85 Remove debug output 2014-06-13 15:34:52 +02:00
Victor Dubiniuk 4b359ad20c Change routes. Update templates 2014-06-13 15:34:52 +02:00
Victor Dubiniuk 218d0add36 Changes according to review 2014-06-13 15:34:52 +02:00
Victor Dubiniuk a7fbd91e53 Use appframework 2014-06-13 15:34:52 +02:00
Victor Dubiniuk 23ed038a27 Basics 2014-06-13 15:34:51 +02:00
Morris Jobke f5da0052cf fix mail settings save function - ref #8854 2014-06-13 15:31:35 +02:00
Morris Jobke c09f5680c9 Merge pull request #9010 from owncloud/fix_8941_admin_settings_message
move mail template settings to templateeditor repo
2014-06-13 13:07:41 +02:00
Jörn Friedrich Dreyer 42bf466fa1 move mail template editor from core to standalone templateeditor repo 2014-06-13 12:00:23 +02:00
Jörn Friedrich Dreyer 7e8784c075 access admin settings result message correctly 2014-06-13 11:59:14 +02:00
Morris Jobke b91db84050 Merge pull request #8714 from owncloud/minor-fixes
fix some minor issues
2014-06-13 08:30:57 +02:00
Jenkins for ownCloud 083cf63cc2 [tx-robot] updated from transifex 2014-06-13 01:54:32 -04:00
Morris Jobke aa8f17bc63 Merge pull request #9017 from owncloud/maxheartbeatinterval
Added max heartbeat interval to prevent integer overflow
2014-06-13 00:19:07 +02:00
Volkan Gezer cea2c77fd2 fix some minor issues 2014-06-13 00:16:36 +02:00
Georg Ehrke 0890ce4f91 Update preseed-config.php 2014-06-13 00:07:43 +02:00
macjohnny 767aa4e35f drastic speedup for nested ldap groups
add a function getUserGroupIds for retrieving group ids instead of group objects. this significantly improves performance when using many (nested) groups.

Changes a function call in getUserGroups to only retrieve group ids instead of objects.
this change significantly improves performance when using owncloud with many groups, e.g. nested ldap hierarchy (1.2.840.113556.1.4.1941), since getUserGroups gets called in oc_share::getItems, which is needed for every page request.
in my particular case, it took more than 10s to load the calendar page and more than 6s to load the file page.
this was in an environment with 100 user groups (nested) per user. The performance was bad due to the following call stack:
self::getManager()->getUserGroups($user)
  - getGroupObject() (executed for every group!)
     - groupExists() (resulting in many ldap-requests)
since the groups are loaded from ldap, it is unnecessary to check whether the group exists or not.
2014-06-13 00:04:06 +02:00
Volkan Gezer 565f0b281c some strings to localize external mount api responses. fix #8094 2014-06-12 20:31:07 +02:00
Andreas Fischer 73062040e6 Don't specify host when using a socket. 2014-06-12 20:22:45 +02:00
Andreas Fischer 0932760304 Rename variable to indicate that it can be port and socket. 2014-06-12 20:18:38 +02:00
Andreas Fischer 3d8eabedbd No need to check the port number as this will fail anyway. 2014-06-12 20:17:30 +02:00
Andreas Fischer 4ca1e3cc02 Move getValue() to where required. This actually is not required "global data". 2014-06-12 19:59:40 +02:00
Andreas Fischer 17c2e63449 Move check for : to where it belongs, getting rid of $socket = false; 2014-06-12 19:56:51 +02:00
Andreas Fischer 4b87586487 Extract common variables of $connectionParams. 2014-06-12 19:53:33 +02:00
Andreas Fischer 6da2beeaff Inline $port expression, getting rid of $port variable. 2014-06-12 19:48:37 +02:00
Vincent Petry 6a0f5cfc61 Added unit tests for heartbeat interval min/max values 2014-06-12 18:42:09 +02:00
Vincent Petry ce168c286a Added max heartbeat interval to prevent integer overflow
When using big session timeout values, the interval value might
overflow and cause the setInterval() call to ping the server in a loop
without any delay.

This fix adds a maximum ping interval of 24 hours.

Forward port of 00ec5fc193 from stable6.
2014-06-12 18:41:19 +02:00
Vincent Petry b595c982d0 Merge pull request #8968 from owncloud/scanner-parent-repair
Repair broken parent link in the scanner
2014-06-12 17:40:44 +02:00
Vincent Petry 05e351416e Fixed instanceof to use interface instead of class 2014-06-12 17:38:26 +02:00
Vincent Petry ca690c4d02 Added RepairStep interface and default repair step lists
The updater is using "before update" repair steps and "regular" repair
steps.
The "regular" repair steps are also used by the CLI tool.

Currently no steps exist but can be added later in the static methods in
the \OC\Repair class.

Added unit test to test messaging, error and exception cases.
2014-06-12 17:38:26 +02:00
Vincent Petry 6fcd1af4db Add support for repair step classes
This also makes it possible to unit test each repair step class
individually
2014-06-12 17:38:26 +02:00
Morris Jobke ab7cff6dfd Revert "Merge pull request #8998 from macjohnny/master"
This reverts commit 482eded8b3, reversing
changes made to 354cace14a.
2014-06-12 14:56:46 +02:00
Vincent Petry 8e463926a0 Merge pull request #9004 from owncloud/cleanup-storages
Added check and cleanup for storage/filecache
2014-06-12 14:50:18 +02:00
macjohnny 482eded8b3 Merge pull request #8998 from macjohnny/master
drastic speedup for nested ldap groups
2014-06-12 14:49:15 +02:00
Bernhard Posselt 354cace14a Merge pull request #9003 from owncloud/fix_liskov_in_admin_mail_template_settings
fix liskov substitution principle in admin mail template settings
2014-06-12 14:33:13 +02:00
Vincent Petry 19c73a8464 Added check and cleanup for storage/filecache
Some tests don't clean up the file cache and sometimes entries are
reused by mistake in subsequent test suites.

This cleans up the file cache and storage after every test suite and
also shows an annoying warning.
2014-06-12 13:45:39 +02:00
Morris Jobke dff4ad3e00 Merge pull request #8999 from owncloud/issue/8996
Issue/8996 IE8 issues with the new menu
2014-06-12 13:34:32 +02:00
Morris Jobke d17094e0a5 Move IE8 fixes to fixes.css 2014-06-12 13:33:32 +02:00
Vincent Petry 3e1576011f Merge pull request #8980 from owncloud/better-accept-header
handle http accept headers more gracefully
2014-06-12 13:28:03 +02:00
Jörn Friedrich Dreyer 72436b68bf fix liskov substitution principle in admin mail template settings, fixes #8997 2014-06-12 12:38:34 +02:00
macjohnny e8e2e47e68 Update manager.php 2014-06-12 11:29:20 +02:00
macjohnny b1094cfe82 Update group.php 2014-06-12 11:28:57 +02:00
Joas Schilling 6c0e27ac99 Fix missing caret in header menu for IE8 2014-06-12 11:01:35 +02:00
Joas Schilling 324075bc78 Fix header menu background in IE8 2014-06-12 11:00:44 +02:00
Joas Schilling 7896b866df Reduce size of png files so they match the svg
Fix #8996
2014-06-12 10:55:25 +02:00
macjohnny 0af8aa689f drastic speedup for nested ldap groups
Changes a function call in getUserGroups to only retrieve group ids instead of objects.
this change significantly improves performance when using owncloud with many groups, e.g. nested ldap hierarchy (1.2.840.113556.1.4.1941), since getUserGroups gets called in oc_share::getItems, which is needed for every page request.
in my particular case, it took more than 10s to load the calendar page and more than 6s to load the file page.
this was in an environment with 100 user groups (nested) per user. The performance was bad due to the following call stack:
self::getManager()->getUserGroups($user)
  - getGroupObject() (executed for every group!)
     - groupExists() (resulting in many ldap-requests)
since the groups are loaded from ldap, it is unnecessary to check whether the group exists or not.
2014-06-12 09:51:23 +02:00
macjohnny ede2aa236e Update manager.php
add a function getUserGroupIds for retrieving group ids instead of group objects. this significantly improves performance when using many (nested) groups.
2014-06-12 09:41:23 +02:00
Vincent Petry 5def2a72dd Merge pull request #8991 from owncloud/fix-php53-arraycombine
Fixed array_combine for PHP 5.3
2014-06-12 09:08:50 +02:00
Jenkins for ownCloud 55b5ddd735 [tx-robot] updated from transifex 2014-06-12 01:54:34 -04:00
josh4trunks 1b02991a1d Fixes based on suggestions
I use the term socket for any extension, either unix socket, or internet socket (port).

I check if the socket is all digits
* only integers 0 and larger would pass this test.
I then check if the string is less than or equal to the maximum port number.

By using "if($socket)" I make sure socket isn't false, empty, or the string '0'.

I don't believe I need to initialize $port because $port will always be set if $socket is true. Please show me if I am wrong here. Thanks
2014-06-11 21:47:45 -07:00
Vincent Petry 4e4c2b04c8 Fixed array_combine for PHP 5.3 2014-06-11 19:13:49 +02:00
Vincent Petry 452b45ed1d Merge pull request #8986 from owncloud/disable_tests
disable failing tests
2014-06-11 18:34:35 +02:00
Vincent Petry 75a53b3c49 Merge pull request #8901 from owncloud/permissions-update-cache
Save the permissions in the filecache if it's not saved yet
2014-06-11 18:28:55 +02:00
Vincent Petry 67413e3ada Use assertNotSame when checking etags
Sometimes etags contain a "e" character which makes PHP believe it's a
number and make the tests fail
2014-06-11 17:28:18 +02:00
Bjoern Schiessle 4cef7f9d4b disable failing tests 2014-06-11 17:21:57 +02:00
Vincent Petry 2facfe9984 Merge pull request #8985 from owncloud/share-grouporderfix
Added ORDER BY to enforce share entry order
2014-06-11 17:20:22 +02:00
Vincent Petry 65b3d293ce Added ORDER BY to enforce share entry order
Sometimes MySQL decides to return the shares in the wrong order, but
some parts of the code seem to require the order to be known, at least
so that the parent shares come before the children shares.

This fix adds an ORDER BY clause to force the order by id.
2014-06-11 14:28:30 +02:00
Frank Karlitschek 7742791bc2 increase to 7.0 alpha 1 2014-06-11 10:54:45 +02:00
Vincent Petry 491c96eaa9 Merge pull request #8966 from owncloud/fix_failing_tests_on_master
Fix failing tests on master
2014-06-11 10:05:38 +02:00
Jenkins for ownCloud f769c52522 [tx-robot] updated from transifex 2014-06-11 01:55:07 -04:00
Bernhard Posselt 93169eca1e also handle lowercase headers 2014-06-11 01:20:09 +02:00
Morris Jobke e89f1784a3 Merge pull request #8972 from owncloud/use_imagettftext_take2
make text preview backend use imagettftext, fixes #8087
2014-06-11 01:07:32 +02:00
Bernhard Posselt 0252d39bb6 fix indention 2014-06-11 00:57:00 +02:00
Bernhard Posselt 1002281dae handle http accept headers more gracefully 2014-06-11 00:54:25 +02:00
Georg Ehrke 7396e5f455 movie previews: use file directly when it's stored locally and encryption is not enabled, fixes #7756 2014-06-10 22:08:27 +02:00
jbtbnl 077a542d59 Merge pull request #8971 from owncloud/sidebar-disablesnapperinielte9
Disable snapper init for IE <= 9
2014-06-10 21:59:55 +02:00
Georg Ehrke 5e9fa64819 don't show update button when appstore is disabled or no writable dir exists 2014-06-10 18:39:34 +02:00
Georg Ehrke e047e28ac5 make text preview backend use imagettftext, fixes #8087 2014-06-10 17:29:40 +02:00
Vincent Petry 015c5062e5 Disable snapper init for IE <= 9
Snapper doesn't work at all for IE8 and IE9 and messes up with the main
container layout when enabled.

This commits disables snapper for these browsers.
2014-06-10 17:14:49 +02:00
Robin Appelman 6b1d8a56bb remove unused argument 2014-06-10 15:42:37 +02:00
Robin Appelman 054083b9cd add some comments 2014-06-10 15:37:43 +02:00
Robin Appelman 21cfd1014a Repair broken parent link in the scanner 2014-06-10 15:26:18 +02:00
Bjoern Schiessle 9dc0befcca call self::getNumericStorageId() to get the numeric ID 2014-06-10 14:48:19 +02:00
Bjoern Schiessle f4a183e753 wwe no longer have a versions table 2014-06-10 14:47:32 +02:00
Bjoern Schiessle 1d9b4aadbf no need to prepare a statement twice 2014-06-10 14:46:47 +02:00
Georg Ehrke 602404c631 fix php doc block 2014-06-10 13:58:41 +02:00
Georg Ehrke 6bf06890e7 always return a bool in OC_App::updateApp 2014-06-10 13:56:05 +02:00
Georg Ehrke 5d4f3baf56 fix php doc block 2014-06-10 13:51:20 +02:00
Georg Ehrke 1ab9bdcaa0 remove unnecessary @return 2014-06-10 13:01:10 +02:00
Morris Jobke ecc41fe0c3 Merge pull request #8908 from owncloud/fix-placeholders
fix split translations. fix for the discussion in the description
2014-06-10 10:47:23 +02:00
Jenkins for ownCloud 6546b589ce [tx-robot] updated from transifex 2014-06-10 01:54:54 -04:00
jbtbnl b2c86b7a07 Merge pull request #8928 from owncloud/too-long-filename-fix-v2
Ellipcises too long filenames
2014-06-09 13:09:18 +02:00
Robin Appelman a978607011 Use &= 2014-06-09 12:47:00 +02:00
Thomas Müller 961e4e5c7c adjust unit test assert values 2014-06-09 12:44:40 +02:00
Thomas Müller aa38bd2b31 adding PHPDoc 2014-06-09 12:34:35 +02:00
Robin Appelman 41d2354191 Save the permissions in the filecache if it's not saved yet 2014-06-09 12:34:35 +02:00
Morris Jobke 3239d1099c Merge pull request #8948 from owncloud/fix-logger-race-condition
set logger before registrate to an error handler
2014-06-09 11:07:10 +02:00
Morris Jobke 63c5c7bd21 set logger before registrate to an error handler 2014-06-09 10:02:23 +02:00
Jenkins for ownCloud e5c47a5e30 [tx-robot] updated from transifex 2014-06-09 01:54:32 -04:00
Morris Jobke e769ef9bbb Merge pull request #8916 from owncloud/rmdirr-test-cleanup-fix
Added hacky fix for long path cleanup routine
2014-06-08 20:46:00 +02:00
Morris Jobke e3429b63a2 improve ellipsis of filename for different screen sizes 2014-06-08 17:48:53 +02:00
Morris Jobke 1037533a9e Merge pull request #8937 from owncloud/design-sizing
Layout fixes
2014-06-08 12:31:24 +02:00
raghunayyar f3a605230a @jancborchardt's commit for cross browser compatibility of extension. 2014-06-08 15:06:01 +05:30
Jenkins for ownCloud 1f2722053f [tx-robot] updated from transifex 2014-06-08 01:56:13 -04:00
Volkan Gezer bcbebe8dd2 Merge pull request #8942 from owncloud/fix-user-search-field
fix hidden user group search field
2014-06-08 03:11:54 +02:00
Volkan Gezer e34a8bb9d6 fix hidden user group search field 2014-06-07 21:12:12 +02:00
raghunayyar 09206f8a49 Adds class name to span element inside filename. 2014-06-07 23:54:21 +05:30
Jan-Christoph Borchardt c0973fe7e8 display empty content message a bit higher up so it's easier to see 2014-06-07 12:08:12 +02:00
Jan-Christoph Borchardt 49e15f0130 app settings: only display text fields at full width, not buttons 2014-06-07 12:07:50 +02:00
raghunayyar d71bb7dbe4 Adds multiple media queries for filename. 2014-06-07 14:23:49 +05:30
Jenkins for ownCloud e0446a1df5 [tx-robot] updated from transifex 2014-06-07 01:56:13 -04:00
Björn Schießle 3da47db33c Merge pull request #8927 from owncloud/expire_only_link_shares
only expire link shares
2014-06-06 19:24:15 +02:00
Raghu Nayyar dfe6bd61bf Merge pull request #8935 from owncloud/missed-apps-tag
wrap App text with t() to let it use locales
2014-06-06 22:39:31 +05:30
Vincent Petry 506f7adb12 Merge pull request #8925 from owncloud/extstorage-sidebar
Added external storage list in files app
2014-06-06 18:59:37 +02:00
Raghu Nayyar dc77910758 Merge pull request #8933 from owncloud/fix-logo-glitch
Fix logo glitch
2014-06-06 22:08:10 +05:30
Volkan Gezer 713a1c683b wrap App text with t() to let it use locales 2014-06-06 18:31:04 +02:00
Bjoern Schiessle 9c00f5ddb6 set minDate and maxDate in datepicker 2014-06-06 17:40:16 +02:00
Thomas Müller 647dcce514 Merge pull request #8253 from owncloud/pk-on-all-tables-master
Primary keys on all tables master
2014-06-06 16:40:11 +02:00
Thomas Müller c053f27381 Merge pull request #8921 from owncloud/fix-remove-storage-master
No need to create a storage within remove
2014-06-06 16:16:44 +02:00
Jan-Christoph Borchardt 6f0f738f08 reduce padding by 1px after increasing image 2014-06-06 15:58:30 +02:00
Jan-Christoph Borchardt 85a002468d fix logo glitch, add whitespace around form 2014-06-06 15:54:19 +02:00
Bjoern Schiessle f15d7dfec0 only expire link shares 2014-06-06 15:47:37 +02:00
Vincent Petry e39e6a5584 Fixed delete button CSS in ext storage list 2014-06-06 15:33:33 +02:00
Volkan Gezer f56b86e857 fix split translations 2014-06-06 15:31:51 +02:00
Volkan Gezer 6f3b95052f app manager forgets the documentation links 2014-06-06 15:22:02 +02:00
Vincent Petry d3d0035a9a Use actual file path on rename/delete
When renaming or deleting a file that is in a subdirectory, performing
the action from the sharing overview or another file list view, the
actual directory of the file must be used instead of the current
directory.
2014-06-06 15:17:55 +02:00
Vincent Petry 710d017eec Added more columns to ext storage list
Now using system mount and personal mount calls to get the relevant
mount points including backend information.
2014-06-06 15:06:26 +02:00
Vincent Petry a47ef52ae2 Fixed ext storage list sorting 2014-06-06 15:06:26 +02:00
Vincent Petry 01c2c3107a Added external storage list in files app 2014-06-06 15:06:26 +02:00
Jan-Christoph Borchardt 933c05566e Merge pull request #8922 from owncloud/design-controls-transparency
Bugfixes for mobile
2014-06-06 14:52:55 +02:00
Jan-Christoph Borchardt 1a519b851d Merge pull request #8923 from owncloud/app-settings-input
app settings: display input fields at full width
2014-06-06 14:52:23 +02:00
raghunayyar 1d1f958bea Ellipcises too long filenames 2014-06-06 17:30:18 +05:30
Thomas Müller fe8bae31dc adding PK to table encryption
adding auto increment/PK to table files_trash

adding PK to table ldap_user_mapping and ldap_group_members

adding PK to table ldap_group_mapping

truncate permissions table to allow smooth creation of primary key

adding unit test for creating an auto increment column on a table which already contains data

remove unneeded table files_trashsizes

fix unit test

no need to truncate *PREFIX*permissions

On Oracle adding auto increment columns is not working out of the box - Oracle migrations are to be done manually
2014-06-06 13:33:56 +02:00
Vincent Petry 5cebb6fb9b Merge pull request #4553 from owncloud/update_search_classes
Update search classes
2014-06-06 13:24:16 +02:00
Jan-Christoph Borchardt 08b5f787cc app settings: display input fields at full width 2014-06-06 13:01:24 +02:00
Thomas Müller 204eb256f3 Merge pull request #8895 from owncloud/mimetype_fixes
add more and fix office mimetypes, migrate wrong mimetypes
2014-06-06 12:29:43 +02:00
Jörn Friedrich Dreyer 7af67eb630 increase version number of files and migration trigger 2014-06-06 12:28:36 +02:00
Jan-Christoph Borchardt ecdfea241f fix left padding of controls bar for apps without navigation 2014-06-06 12:28:28 +02:00
Jan-Christoph Borchardt b5b4350ada slight transparency for controls bar for more open feel 2014-06-06 12:24:44 +02:00
Jan-Christoph Borchardt a6f9dd9c4b fix apps without app-navigation 2014-06-06 12:22:31 +02:00
Jan-Christoph Borchardt 23c83c076c unify controls bar, remove duplicate from user management 2014-06-06 12:22:09 +02:00
Jörn Friedrich Dreyer a59b5249d3 add more and fix office mimetypes, migrate wrong mimetypes 2014-06-06 12:00:25 +02:00
icewind1991 c47d4ebbac Merge pull request #8666 from owncloud/mount-remove
Support for (re)moving mountpoints
2014-06-06 11:57:43 +02:00
Vincent Petry 0661d737e6 Merge pull request #8900 from guruz/webdav_permission_moveable_renameable
WebDAV Permissions: Distinguish between renameing and moving
2014-06-06 11:51:39 +02:00
Vincent Petry ff12969276 Merge pull request #8905 from owncloud/update-cli-skipcheckmigrate
Added CLI arguments for upgrade simulation steps
2014-06-06 11:42:14 +02:00
Thomas Müller 26993f2167 No need to create a storage within remove 2014-06-06 11:39:35 +02:00
Jörn Friedrich Dreyer 7c29645f22 allow apps to add translation for search result typeid 2014-06-06 11:28:43 +02:00
Thomas Müller 289accc31b Merge pull request #8159 from owncloud/mobile-sidebar-swipe
Mobile sidebar swipe
2014-06-06 11:27:04 +02:00
Jörn Friedrich Dreyer 2801f0f222 use non static access to search 2014-06-06 11:02:05 +02:00
Jörn Friedrich Dreyer 56470fa9b3 fix namespace for legacy search classes 2014-06-06 11:01:35 +02:00
Vincent Petry 6e2358c3a6 Added hacky fix for long path cleanup routine 2014-06-06 10:41:49 +02:00
Thomas Müller 3a7b30795c Merge pull request #8783 from owncloud/remove-serializers
Remove controller serializers
2014-06-06 10:33:16 +02:00
Vincent Petry 5e27ac3e0d Added CLI arguments for upgrade simulation steps
Added "dry run" argument to only run the update simulation.
Added argument to disable migration (useful for bigger setups where
table duplication would take too much space)
2014-06-06 10:11:14 +02:00
Vincent Petry b2bae9313d Fixed viewer mode for sidebar swipe 2014-06-06 10:04:28 +02:00
Thomas Müller ff651a3e0d Merge pull request #8909 from owncloud/fix-temporary-storage-rmdirr-master
use system function to recursive remove the directory used by temporary ...
2014-06-06 10:02:23 +02:00
Robin Appelman 46f70aabfd Dont connect hooks twice 2014-06-06 09:56:02 +02:00
Bjoern Schiessle 0b2ae314c7 check if permissions exists 2014-06-06 09:56:02 +02:00
Robin Appelman 60ea4388ed Limit permissions to share permissions 2014-06-06 09:56:02 +02:00
Bjoern Schiessle 3459f99dd6 make sure that we only delete shares for the current user 2014-06-06 09:56:02 +02:00
Bjoern Schiessle eec1c4398a only unshare user share if it was shared with the current user 2014-06-06 09:56:02 +02:00
Bjoern Schiessle 5bbfdc35d7 make sure that we remove all shares refering to the same parent 2014-06-06 09:56:02 +02:00
Bjoern Schiessle 86d7371d0c fix unshareFromSelf() 2014-06-06 09:56:02 +02:00
Bjoern Schiessle 09970e1816 update unit tests and make sure that we return the right permissions for files within a shared folder and for the shared folder itself 2014-06-06 09:56:02 +02:00
Bjoern Schiessle 574de2d91b the mount point always have delete permissions to allow unmount 2014-06-06 09:56:01 +02:00
Bjoern Schiessle ca6631a710 add some tests 2014-06-06 09:56:01 +02:00
Bjoern Schiessle ad5d8d7980 nake sure ti create new db entry when user renames a group share 2014-06-06 09:56:01 +02:00
Robin Appelman ea07f0a18e Fix unit test 2014-06-06 09:56:01 +02:00
Robin Appelman 28615cca9c Fix unit tests 2014-06-06 09:56:01 +02:00
Bjoern Schiessle a5752a8463 fix db query 2014-06-06 09:56:01 +02:00
Robin Appelman e362373a30 Movable storage root can always be moved and deleted 2014-06-06 09:56:01 +02:00
Robin Appelman a432459685 use triple equals 2014-06-06 09:56:01 +02:00
Robin Appelman 42a362f249 Fix phpdoc and comments 2014-06-06 09:56:01 +02:00
Bjoern Schiessle 501f98f084 update share API tests, file shares never have delete permissions 2014-06-06 09:56:00 +02:00
Bjoern Schiessle 9a48e87253 make sure that we have a path relative to data/user/files to work with 2014-06-06 09:56:00 +02:00
Bjoern Schiessle 0ce07bb6c4 update mount point if file_target changed 2014-06-06 09:56:00 +02:00
Bjoern Schiessle 844b1e3fc6 add additional unit tests 2014-06-06 09:56:00 +02:00
Bjoern Schiessle cf5eb0fef5 remove unused variable 2014-06-06 09:56:00 +02:00
Bjoern Schiessle 24f3f6823e get unique_name value directly from the share array 2014-06-06 09:56:00 +02:00
Bjoern Schiessle 5132ae5e69 fix mount point move up if the parent no longer exists 2014-06-06 09:56:00 +02:00
Bjoern Schiessle b0a74edbb2 allow moving files to the root 2014-06-06 09:56:00 +02:00
Bjoern Schiessle 884b9a0ecf bring back updateFileTarget() got lost during last rebase 2014-06-06 09:56:00 +02:00
Bjoern Schiessle 329bfd81c3 remove encryption keys if user unshares a file 2014-06-06 09:55:59 +02:00
Bjoern Schiessle 1b0b977678 remove share mount 2014-06-06 09:55:59 +02:00
Robin Appelman dea5219244 Fix folder name for storage root 2014-06-06 09:55:59 +02:00
Bjoern Schiessle bf5e9357fc don't allow to share single files with delete permissions, user should only be possible to unshare a single file but never to delete it 2014-06-06 09:55:59 +02:00
Robin Appelman a66c2e6a47 Fix the removeMount for personal mounts 2014-06-06 09:55:59 +02:00
Robin Appelman 4fbc991ea2 Add the removing logic for mounts 2014-06-06 09:55:59 +02:00
Robin Appelman 14ce44acc8 Move shared mount moving from the storage to the mount 2014-06-06 09:55:59 +02:00
Robin Appelman cabe2873c4 Make personal external mount points (re)movable from the files app 2014-06-06 09:55:59 +02:00
Robin Appelman 8abe1c3f1a Don't do rename hooks for cache when moving the mountpoint 2014-06-06 09:55:58 +02:00
Robin Appelman 60a659c87e Add a system for (re)movable mount points 2014-06-06 09:55:58 +02:00
Vincent Petry d764aaa427 Fixed Snap mock
Also fixed JSHint errors
2014-06-06 09:55:32 +02:00
Vincent Petry b8ab77a475 Added debounce on resize 2014-06-06 09:50:46 +02:00
Thomas Müller 79b65269c9 Merge pull request #8877 from owncloud/getpath-storage-check
Verify that we have a valid storage in View->getPath
2014-06-06 09:44:57 +02:00
Thomas Müller d359765bdc Update PHPDoc 2014-06-06 09:44:34 +02:00
Jan-Christoph Borchardt 5d02b5663b prevent scrollbar when sidebar is open 2014-06-06 09:44:16 +02:00
Georg Ehrke a110973b3a some additional type checks 2014-06-06 09:41:53 +02:00
Jan-Christoph Borchardt 1745fe1664 Merge pull request #8911 from owncloud/common-lang
Add Turkish to common languages
2014-06-06 09:38:10 +02:00
Georg Ehrke 498aa66648 add additional type check 2014-06-06 09:33:34 +02:00
Thomas Müller ad4ec414c9 use system function to recursive remove the directory used by temporary storage 2014-06-06 09:29:31 +02:00
Jenkins for ownCloud ca739a59f0 [tx-robot] updated from transifex 2014-06-06 01:57:10 -04:00
josh4trunks 55ccd6da51 Update notes on dbhost 2014-06-05 20:17:50 -07:00
Morris Jobke 584c47b433 Disable snapper on bigger screens and on public/login page 2014-06-06 01:32:33 +02:00
Jörn Friedrich Dreyer aaf0d13171 make search non-static, add ISearch to server container, make legacy a static wrapper for it, move provider and result to public api 2014-06-06 01:17:02 +02:00
Georg Ehrke 0fe8f77c17 Merge branch 'master' into update_shipped_apps_from_appstore
Conflicts:
	lib/private/app.php
	settings/templates/apps.php
2014-06-05 22:54:27 +02:00
Volkan Gezer 11a857f653 Add Turkish to common languages 2014-06-05 22:32:35 +02:00
Jan-Christoph Borchardt 9063a25bb4 slightly widen sidebar to 250px, works better with apps and on mobile 2014-06-05 21:19:28 +02:00
Jörn Friedrich Dreyer 5034bd1b12 minor phpdoc cleanup and imports 2014-06-05 19:49:21 +02:00
Andrew Brown 5dc2e73fe0 Simplify client-side result customization
The issue was that search results from other providers (contacts,
calendar, etc.) were unformatted, like 'event' or 'contact', while the
built-in event types (folder, file, etc.) were being modified by custom
result functions to something like 'Files' or 'Folders'. The fix is to
capitalize and translate all result types by default. Custom formatting
is still allowed (and example documentation has been added) but the
built-in result formatters where now unnecessary and were removed.
2014-06-05 19:23:44 +02:00
Andrew Brown 7a224f5762 Move new search results to 'lib/private/search' 2014-06-05 19:23:44 +02:00
Andrew Brown 8a223eb62d Move legacy search to 'lib/private/legacy'
This fixes errors where apps would try to start providers using
OC_Search and would fail. Also, made OC_Search simply inherit from
\OC\Search.
2014-06-05 19:23:44 +02:00
Andrew Brown 794a133f9a Re-add type to legacy OC_Search_Result class 2014-06-05 19:23:44 +02:00
Jörn Friedrich Dreyer 3510674d24 use path param to create scrollto url 2014-06-05 19:23:44 +02:00
Jörn Friedrich Dreyer 9b63f945e3 decode filename for scrollto 2014-06-05 19:23:44 +02:00
Jörn Friedrich Dreyer b03755c0ec fix minor typos 2014-06-05 19:22:22 +02:00
Andrew Brown 70be98f6d0 Add audio and image result types 2014-06-05 19:22:22 +02:00
Andrew Brown c46d514733 Add audio and image result types 2014-06-05 19:22:22 +02:00
Jörn Friedrich Dreyer afd24385a8 fix formatting 2014-06-05 19:22:22 +02:00
Andrew Brown a6583d3976 Add legacy adapters for file search 2014-06-05 19:21:47 +02:00
Andrew Brown ac72828eae Move to new namespace convention and add new result sub-classing 2014-06-05 19:21:47 +02:00
Thomas Müller 70e0ae0637 Merge pull request #8483 from owncloud/encryption_use_oc_preferences
[encryption] use oc preferences
2014-06-05 18:54:25 +02:00
Bernhard Posselt 587a8df566 remove controller serializers 2014-06-05 18:00:36 +02:00
Jan-Christoph Borchardt 9748597215 remove prevention of scrollbar, breaks some pages 2014-06-05 17:47:14 +02:00
Jan-Christoph Borchardt 2163d556bf prevent horizontal scrollbar 2014-06-05 17:28:01 +02:00
Vincent Petry 1c59808517 Merge pull request #8865 from owncloud/improve_share_settings
Improve share settings
2014-06-05 17:23:42 +02:00
Jan-Christoph Borchardt 990405d6ee fix position of sidebar toggle, fix Files controls position problems 2014-06-05 17:21:49 +02:00
Jan-Christoph Borchardt 96278e0201 close sidebar when switching navigation entry, except on add or change settings 2014-06-05 17:06:21 +02:00
Thomas Müller e9011a8c55 adding unit tests for encryption data migration 2014-06-05 16:54:04 +02:00
Bjoern Schiessle eb29b2984c use oc_preferences instead of oc_encryption to store encyption settings 2014-06-05 16:54:04 +02:00
Bjoern Schiessle 2d83424a29 allow to set pre-condition for setValue 2014-06-05 16:54:03 +02:00
Thomas Müller 4b650a20a4 Merge pull request #8893 from owncloud/feature/get-users-by-preference
Add method to get users by their preference
2014-06-05 16:52:00 +02:00
Thomas Müller 9e84a0a1af Merge pull request #8902 from owncloud/fix_ldap_typo_2
fix typo in var name
2014-06-05 16:49:22 +02:00
Thomas Müller fad3bd7fc0 reenable checkCode() 2014-06-05 16:32:46 +02:00
Thomas Müller 6aab50f8aa fix unit tests 2014-06-05 16:32:12 +02:00
Arthur Schiwon 928945ec7e fix typo in var name 2014-06-05 16:16:08 +02:00
jbtbnl bb60e850dd Merge pull request #8891 from owncloud/design-emptycontent
fix size and unbold empty content message
2014-06-05 16:04:04 +02:00
Robin Appelman 00539cf8f9 Verify that we have a valid storage in View->getPath 2014-06-05 15:50:19 +02:00
Bjoern Schiessle 6578f00b4b unify share settings 2014-06-05 15:49:34 +02:00
Bjoern Schiessle cf9099c788 This settings doesn't belong together
Revert "make reshare settings foldable"

This reverts commit c01f196f72.

Conflicts:
	settings/templates/admin.php
2014-06-05 15:44:56 +02:00
Bjoern Schiessle c991e148a6 improve share settings working 2014-06-05 15:44:55 +02:00
Jörn Friedrich Dreyer 0ce1f34f8a Merge pull request #8897 from owncloud/fix-multiselect
fix files multiselect bar now that the app list is gone
2014-06-05 15:32:31 +02:00
Thomas Müller 3dbfd1fe46 Merge pull request #8529 from owncloud/remove-legacy-routing
Remove legacy routing code
2014-06-05 15:22:46 +02:00
Joas Schilling d493c0c9ac Sort the result before comparing 2014-06-05 15:21:53 +02:00
Markus Goetz e6665a0542 WebDAV Permissions: Distinguish between renameing and moving 2014-06-05 14:39:06 +02:00
Jan-Christoph Borchardt dca5a03f8b fix files multiselect bar now that the app list is gone 2014-06-05 13:23:08 +02:00
Jan-Christoph Borchardt 86a9cb2a6b add app sidebar toggle and swipe on mobile 2014-06-05 13:19:56 +02:00
Thomas Müller e1beb8c6c3 Merge pull request #8889 from owncloud/mtime-reuse
Don't update the mtime if the storage mtime hasn't changed
2014-06-05 13:18:18 +02:00
Jan-Christoph Borchardt 24641c909e adjust CSS to styleguide, remove left padding, prevent user-selection 2014-06-05 13:12:07 +02:00
Vincent Petry bbdcbb9911 Merge pull request #8866 from owncloud/flock-quotafix
Fixed quota wrapper to return the value from flock()
2014-06-05 13:11:45 +02:00
Thomas Müller e34b51124b Merge pull request #8894 from owncloud/public-share-js-overwrite
Dont overwrite OCA.Sharing
2014-06-05 13:04:30 +02:00
Thomas Müller f955209a5a Merge pull request #8890 from owncloud/cleanup-trashsizes-table-master
table files_trashsizes was still used in some locations -> removed
2014-06-05 13:00:50 +02:00
Robin Appelman 690e0b5070 Dont overwrite OCA.Sharing 2014-06-05 12:52:08 +02:00
Joas Schilling 4b18967129 Hack around oracle for CLOB fields 2014-06-05 12:19:48 +02:00
Jan-Christoph Borchardt 9e56acbdc9 add snap.js script 2014-06-05 11:52:17 +02:00
Jan-Christoph Borchardt 1ad2101801 add menu icon 2014-06-05 11:51:59 +02:00
Joas Schilling 879237f32a Add method to get users by their preference 2014-06-05 11:50:43 +02:00
Lukas Reschke 7c4abce373 Move authentication to it's own call 2014-06-05 11:45:45 +02:00
Lukas Reschke ac7fb1b23e Remove legacy routing code
The getfile routing code was absolutely legacy and not needed anymore. Additionally \OC::$REQUESTEDAPP was never set to the actually accessed application.

This commit removes the legacy routing code and ensures that $REQUESTEDAPP is always set so that other applications (e.g. the firewall or a two-factor authentication) can intercept the currently accessed app.

Testplan:
[x] Installation works
[x] Login with DB works
[x] Logout works
[x] Login with alternate backend works (tested with user_webdavauth)
[x] Other apps are accessible
[x] Redirect on login works (e.g. index.php?redirect_url=%2Fcore%2Findex.php%2Fsettings%2Fapps%3Finstalled)
[x] Personal settings are accessible
[x] Admin settings are accessible
[x] Sharing files works
[x] DAV works
[x] OC::$REQUESTEDAPP contains the requested application and can be intercepted by other applications
2014-06-05 11:45:45 +02:00
Thomas Müller d0eb8f8668 Merge pull request #8880 from owncloud/webdav-read-permissions
Use the permissions exposed by ownCloud for webdav external storages
2014-06-05 11:38:02 +02:00
Jan-Christoph Borchardt fdfba14405 Merge pull request #8883 from owncloud/files-slide-toggle
use slide toggle for files app
2014-06-05 11:33:56 +02:00
Robin Appelman 9dab6ec2ec Fix uit tests 2014-06-05 11:31:55 +02:00
Jan-Christoph Borchardt 0ac1086ef6 fix size and unbold empty content message 2014-06-05 11:29:56 +02:00
Bernhard Posselt 844c6c3328 use slide toggle for files app 2014-06-05 11:26:24 +02:00
icewind1991 bd373d9621 Merge pull request #7878 from owncloud/quota-extstorageswitch
Added switch to count external storage data in quota
2014-06-05 11:23:32 +02:00
Vincent Petry e0c4e960d9 Merge pull request #8861 from owncloud/share-overview-linklist
Added Shared with link sidebar section in files app
2014-06-05 10:59:54 +02:00
Jörn Friedrich Dreyer f1bf06f8cf Merge pull request #8884 from owncloud/move-flock-to-app
remove file locking - code will continue to live in it's own app
2014-06-05 10:54:24 +02:00
Thomas Müller 1c20c72efe Merge pull request #8620 from owncloud/design-navigation-two
Toggle app navigation not only on mobile, but on desktop as well
2014-06-05 10:53:22 +02:00
Jan-Christoph Borchardt 218131d30d fix leading decimal Scrutinizer coding style issue 2014-06-05 10:52:06 +02:00
Thomas Müller 6fcd135d0e table files_trashsizes was still used in some locations -> removed 2014-06-05 10:44:32 +02:00
icewind1991 09cc7c2d44 Merge pull request #8862 from owncloud/share-overview-fixmimetype
Fix mime type returning for shared with others files
2014-06-05 10:29:03 +02:00
Vincent Petry 71b86136c2 Merge pull request #8878 from owncloud/update-checkmigrationforapps
Simulate apps database schema update on upgrade
2014-06-05 10:28:30 +02:00
Robin Appelman 3e73251750 Don't update the mtime if the storage mtime hasn't changed 2014-06-05 10:08:25 +02:00
Thomas Müller ff3ded6cb2 Merge pull request #8852 from owncloud/kill-permissions-master
Kill permissions table
2014-06-05 10:05:05 +02:00
Morris Jobke e186871996 fix unit test template 2014-06-05 09:46:19 +02:00
Thomas Müller da3974bcb2 - drop permissions table and related code
- the file/folder's permission is now stored in the file cache
- BackGroundWatcher has been removed - this has meanwhile be replaced by occ files:scan which can be executed in a cron jobs
- increase version to trigger database migration
2014-06-05 08:22:01 +02:00
josh4trunks ea162c8a39 Fix variable not always being defined. 2014-06-04 23:03:13 -07:00
Jenkins for ownCloud cb61d8a226 [tx-robot] updated from transifex 2014-06-05 01:57:20 -04:00
josh4trunks e77c9bb97e Work with MySQL Sockets
This passes anything that is not a valid port (0<int<65535) as a unix socket.
I tested this with unix sockets; this needs to be tested with a non-standard mysql port as well but I don't foresee any issues.

To use a unix socket, even one different than PHP's mysql.default_socket..
* Database Host = localhost:/path/to/socket
2014-06-04 22:50:23 -07:00
Morris Jobke e3cbcadbd8 fix first failing test 2014-06-05 00:40:15 +02:00
Morris Jobke 39eeb7def9 Merge pull request #8882 from owncloud/remove-placeholdercall
remove obsolete placeholder call, fix #8881
2014-06-05 00:07:13 +02:00
Thomas Müller c044ff99ce Merge pull request #8724 from owncloud/update-sabre-2.0
Update SabreDAV to 1.8.10
2014-06-04 23:05:34 +02:00
Thomas Müller ec7225da66 remove file locking - code will continue to live in it's own app 2014-06-04 20:11:54 +02:00
Vincent Petry 95fda3c17c Do not load apps when upgrade is needed
This prevents routes like "core/js/oc.js" to automatically load apps and
trigger their update prematurely.
2014-06-04 18:52:52 +02:00
Morris Jobke 7a20d22daa Merge pull request #8824 from owncloud/mail_template_editing_in_webui
minimal mail template editor for administrators
2014-06-04 18:44:44 +02:00
Jan-Christoph Borchardt e26936e94f remove obsolete placeholder call, fix #8881 2014-06-04 18:44:12 +02:00
Morris Jobke 210a1ef7e6 add to app navigation after enabling 2014-06-04 18:22:40 +02:00
Robin Appelman 9eb177e8bc Use the permissions exposed by ownCloud for webdav external storages 2014-06-04 18:19:52 +02:00
Thomas Müller a2db53b928 Merge pull request #8471 from owncloud/versioning_no_longer_track_the_size
[versioning] let the file cache track the size of the versions
2014-06-04 18:19:48 +02:00
Vincent Petry d4ffafe467 Removed simulate db update flag and split into separate methods 2014-06-04 18:17:46 +02:00
Morris Jobke e734caecba Merge pull request #8876 from owncloud/design-css-settings
personal settings: unbold clients header and remove obsolete CSS
2014-06-04 17:52:10 +02:00
Thomas Müller 48eee0b432 use the right interface \Sabre\DAVACL\PrincipalBackend\BackendInterface 2014-06-04 17:47:09 +02:00
Georg Ehrke 00b7f365bc remove not needed unlink in installer test 2014-06-04 17:18:20 +02:00
Vincent Petry 5b97369b00 Simulate apps database schema update on upgrade
When upgrade, also simulate the database schema update for apps before
doing the actual upgrade.
2014-06-04 17:16:44 +02:00
Jan-Christoph Borchardt 71ba457372 personal settings: unbold clients header and remove obsolete CSS 2014-06-04 17:05:44 +02:00
Morris Jobke ca43fba513 Merge pull request #8791 from owncloud/share-overview-sharewithstatus
Update share action text to display owner/recipients
2014-06-04 17:04:30 +02:00
Jan-Christoph Borchardt c6196c022d Merge pull request #8875 from owncloud/app-css-relative
explicit position:relative for app-content, fixes first run layout
2014-06-04 16:51:43 +02:00
Jan-Christoph Borchardt 411e6525b1 remove obsolete position rule from files app 2014-06-04 16:50:55 +02:00
Jan-Christoph Borchardt 9c6f604321 explicit position:relative for app-content, fixes first run layout 2014-06-04 16:41:11 +02:00
Jan-Christoph Borchardt 44dca8b740 hover effect for app switcher label 2014-06-04 16:33:12 +02:00
Georg Ehrke 724d027f19 add unit test 2014-06-04 16:29:41 +02:00
Jan-Christoph Borchardt bc47e56f9f fix related layout issues in user management 2014-06-04 16:24:39 +02:00
Vincent Petry da889ff029 Added experimental switch to count external storage data in quota
This includes all mountpoints except the Shared one in
the used space calculation.

Added unit tests for ext storage inclusion in quota calculation
2014-06-04 16:08:59 +02:00
Jan-Christoph Borchardt 358a4ce753 add a bit of whitespace to the bottom of the app list 2014-06-04 15:57:23 +02:00
Jan-Christoph Borchardt 5a38560115 reduce opacity of app icon when loading 2014-06-04 15:54:23 +02:00
Jan-Christoph Borchardt 8f4221edde more CSS rearranging, removing duplicate code 2014-06-04 15:49:04 +02:00
Jan-Christoph Borchardt f1ce58de3e rearrange CSS, remove duplicate code 2014-06-04 15:46:36 +02:00
Jan-Christoph Borchardt d831afc792 move 'add apps' entry into normal navigation instead of a new line 2014-06-04 15:27:46 +02:00
Jan-Christoph Borchardt 26bf64631d better loading feedback for app start, move from JS to CSS 2014-06-04 15:07:15 +02:00
Thomas Müller fc1d6f4c3c fixes during test 2014-06-04 15:01:36 +02:00
Jan-Christoph Borchardt 96cfe97dae show 'Apps' as fallback label for app switcher if no app title is present (for example in Settings) 2014-06-04 14:38:25 +02:00
Jan-Christoph Borchardt e291a04dee show loading feedback 2014-06-04 14:38:25 +02:00
Jan-Christoph Borchardt 7cdd4fee9a separate home icon and menu toggle 2014-06-04 14:38:25 +02:00
Jan-Christoph Borchardt 3b3b0f6e2e show appname on mobile since now there's enough space 2014-06-04 14:38:25 +02:00
Jan-Christoph Borchardt cfffd1a890 cut ownCloud text from logo when logged in, place appname there 2014-06-04 14:38:25 +02:00
Jan-Christoph Borchardt 934048b32c reduce font size of appname in header 2014-06-04 14:38:25 +02:00
Morris Jobke 190fc8adf5 drop "push" element - no sticky footer needed anymore 2014-06-04 14:38:25 +02:00
Vincent Petry 52d9e313d1 Remove obsoleted code to trigger navigation menu
Now that the navigation menu is always togglable, the media query
dependent code can be removed.
2014-06-04 14:38:24 +02:00
Jan-Christoph Borchardt 8eadc2fbd7 fix navigation bubble width and height on mobile 2014-06-04 14:29:46 +02:00
Jan-Christoph Borchardt e27a409287 show appname next to logo for better hint at navigation 2014-06-04 14:29:46 +02:00
Jan-Christoph Borchardt 19d7d87964 toggle the navigation on desktop, not only on mobile 2014-06-04 14:29:46 +02:00
Jan-Christoph Borchardt e2e05c4798 adjust controls bar position for removed nav bar 2014-06-04 14:29:46 +02:00
Jan-Christoph Borchardt 35308f5b09 hide navigation by default, not only on small screens, first step 2014-06-04 14:29:46 +02:00
Vincent Petry b5f0a17918 Merge pull request #8822 from owncloud/cache-change-propagator
[WIP] Improved propagation of cache changes
2014-06-04 13:03:14 +02:00
Vincent Petry 3507964820 Fixed quota wrapper to return the value from flock() 2014-06-04 12:36:53 +02:00
Morris Jobke 5adb8f0a8a Merge pull request #8844 from owncloud/design-icons
[WIP] simplify icons, remove shadow
2014-06-04 12:23:08 +02:00
Thomas Müller 76e04027bc Upgrade SabreDAV to 1.8.10
Updating SabreDAV namespaces
2014-06-04 12:22:23 +02:00
Georg Ehrke 2c00ab13cf update autoloader 2014-06-04 11:34:09 +02:00
Vincent Petry 816db7aef1 Fixed wording to "Shared by link" 2014-06-04 11:32:30 +02:00
Bernhard Posselt ade6ed3797 Merge pull request #8701 from owncloud/slide-up-toggle
Create reusable data attribute for apps setting slideup
2014-06-04 11:31:04 +02:00
Vincent Petry c88509902e Fix mime type returning for "shared with others" files
Use "path" instead of "file_target", as the latter is not always set /
reliable.
2014-06-04 11:26:03 +02:00
Jan-Christoph Borchardt a244172219 Merge pull request #8853 from owncloud/design-typeface
Use Open Sans as typeface
2014-06-04 11:16:03 +02:00
Morris Jobke 8874c74a74 Merge pull request #8860 from owncloud/phpstorm-code-style
add phpstorm code style
2014-06-04 11:12:35 +02:00
Vincent Petry b3fdda1751 Added "Shared with link" sidebar section in files app
Added section to only show link shares.

Please note that the filtering is currently done on the client side
which might not be the most efficient way of doing it.
2014-06-04 11:10:11 +02:00
Morris Jobke d3128f0694 IE -> IE8 only 2014-06-04 11:07:28 +02:00
Morris Jobke d1176f546a move from tff to woff and fix IE8 2014-06-04 10:58:52 +02:00
Robin Appelman 962cd50ae7 add phpstorm code style 2014-06-04 10:58:51 +02:00
Vincent Petry af6a65cbf3 Do not update action icon recipients for file list
Since the files app doesn't have the recipient information on load it
cannot initially render the recipients in the action icons.

For this reason the action icon will not be updated with the recipients
after changing the shares, for consistency.
2014-06-04 10:48:01 +02:00
Vincent Petry 07f1b263c9 Use recipient display names when updating shares in the UI
Since OC.Share didn't have any array containing the list of shares for
the current file, OC.Share.currentShares has been introduced to contain
the full share item structure instead of the reduced one
OC.Share.itemShares.

The event "sharesChanged" is now passing OC.Share.currentShares, which
itself includes the display name to be displayed for the recipients in
the action icon.
2014-06-04 10:37:04 +02:00
Thomas Müller 4ab77f90d2 Merge pull request #8662 from owncloud/f-lock
f-lock
2014-06-04 10:26:02 +02:00
Robin Appelman 3bcdad62fb Fix unit tests 2014-06-04 10:01:50 +02:00
Georg Ehrke 56a8010c9f remove console.log in apps.js 2014-06-04 09:51:43 +02:00
Thomas Müller 9e31118675 Merge pull request #8842 from owncloud/ldap_cli_methods
command line tools to see, modify and test existing LDAP configurations
2014-06-04 09:37:04 +02:00
Thomas Müller 86623358f0 Merge pull request #8849 from owncloud/trash_expire_fix
get files in trash from file cache
2014-06-04 09:36:40 +02:00
Thomas Müller 9f3fcf036c fixing typo 2014-06-04 09:36:27 +02:00
Jan-Christoph Borchardt 6b2b903ea6 Merge pull request #8468 from owncloud/remove-infieldlabels
Remove infieldlabels
2014-06-04 09:28:20 +02:00
Thomas Müller 917f389747 workaround to get the unit test going 2014-06-04 08:21:28 +02:00
Jenkins for ownCloud f5c4754c2b [tx-robot] updated from transifex 2014-06-04 01:57:48 -04:00
Bjoern Schiessle 2c8288d8f9 get the storage from the view 2014-06-04 07:55:46 +02:00
ringmaster 0a417b1174 Use ->instanceOfStorage() not instanceof for Storage instances. 2014-06-04 07:55:46 +02:00
ringmaster 0e85618c42 Can't use assertInstanceOf on wrapped storage; use assertTrue(instanceOfStorage() instead. 2014-06-04 07:55:46 +02:00
Bjoern Schiessle 48eb0515e9 only lock if unlink is called for a file 2014-06-04 07:55:46 +02:00
Bjoern Schiessle 2b30fb4862 fix unit test after adding the additional parameter to addStorageWrapper() 2014-06-04 07:55:46 +02:00
Bjoern Schiessle ab6680e9ab name the storage wrapper to make sure that we don't apply the wrapper multiple times 2014-06-04 07:55:46 +02:00
Bjoern Schiessle 3a698bce6e don't ask for fileInfo if we already have one 2014-06-04 07:55:45 +02:00
ringmaster cda87fd9c4 Normalize lock exception messages. 2014-06-04 07:55:45 +02:00
Bjoern Schiessle e6712bc12e make sure to close the stream at the end of each test 2014-06-04 07:55:45 +02:00
ringmaster ba887d2b17 Restore the reference to this used exception class. 2014-06-04 07:55:45 +02:00
ringmaster 54865815f5 Move Lock to private namespace, add interface. Update PHPDoc. 2014-06-04 07:55:45 +02:00
ringmaster c9c6a0ab1e Don't error out on console. 2014-06-04 07:55:45 +02:00
ringmaster 392a1b6662 Removed unused vars/declarations, update PHPDoc. 2014-06-04 07:55:45 +02:00
Lukas Reschke 826b14e36b Fix typo 2014-06-04 07:55:45 +02:00
Lukas Reschke 9bbc4b0034 Fix typo 2014-06-04 07:55:44 +02:00
ringmaster 896bc526e6 Remove unused methods. 2014-06-04 07:55:44 +02:00
ringmaster 6b94732bdf Respect locked files, surface correct exception. 2014-06-04 07:55:44 +02:00
ringmaster 428510a4f8 Simpler log unique id. 2014-06-04 07:55:44 +02:00
ringmaster f9dbdb7c5c Add actual locking and log changes necessary for debugging. 2014-06-04 07:55:44 +02:00
ringmaster dc1e3620d2 Continued flock work. 2014-06-04 07:55:44 +02:00
ringmaster 5365ae416e flock changes. Work in progress. 2014-06-04 07:55:44 +02:00
Jan-Christoph Borchardt 0ec3f1dd2d unbold the username 2014-06-03 20:02:50 +02:00
Robin Appelman a6bb1e1bf8 Fix size calculation during recursive scan 2014-06-03 19:54:59 +02:00
Morris Jobke 3a1994d001 Merge pull request #8686 from owncloud/session-early
Make the session available as early as possible
2014-06-03 19:23:30 +02:00
Thomas Müller 6764d5b122 Merge pull request #8698 from owncloud/sharing_improve_permissions
get permissions directly from share storage to avoid additional db calls
2014-06-03 19:13:51 +02:00
Jan-Christoph Borchardt 29c5ec4fa6 do not use italic typeface style, instead lighter color 2014-06-03 19:12:31 +02:00
Thomas Müller 70ae7fa091 Fix casing and PHPDoc 2014-06-03 19:10:18 +02:00
blizzz 21d1e5eccc Merge pull request #7930 from owncloud/fix_7785_master
LDAP: put out fetching of user meta data into a fully tested class of it...
2014-06-03 19:09:33 +02:00
Jan-Christoph Borchardt 80627dfd2c use Open Sans as typeface 2014-06-03 19:07:08 +02:00
Thomas Müller 8ee15025f0 Fix merge conflict 2014-06-03 19:05:21 +02:00
icewind1991 cdf8a123e7 Merge pull request #8264 from owncloud/app-enable-by-group
Add the option to enable apps only for specific groups
2014-06-03 19:01:12 +02:00
Thomas Müller e4c3ff03d6 Merge pull request #8809 from owncloud/appconfig-caching
Improve caching in AppConfig
2014-06-03 18:59:37 +02:00
Jörn Friedrich Dreyer b5a145b297 convert mail template editor to app framework for a restful api 2014-06-03 16:53:03 +02:00
Morris Jobke f87a91fa00 Merge pull request #8837 from owncloud/issue/8720
Fix cursor and background of app navigation
2014-06-03 16:46:04 +02:00
Bjoern Schiessle 05cf34ea1f get files in trash from file cache 2014-06-03 16:45:11 +02:00
Thomas Müller cfc1d5623e Merge pull request #8840 from owncloud/share_settings
by default don't show option to send mail notifications for shares
2014-06-03 16:42:44 +02:00
Morris Jobke 714b04d06c Merge pull request #8577 from owncloud/apps-sidebar-narrower
reduce width of app sidebar a bit
2014-06-03 16:39:41 +02:00
Morris Jobke 73025d6d48 Merge pull request #8843 from owncloud/design-detail-sharedropdown
fix positioning issue of share dropdown in intermediate widths
2014-06-03 16:35:31 +02:00
icewind1991 68b15f3282 Merge pull request #7015 from owncloud/db-migration-check-copy
Check database migration on a copy of the table first
2014-06-03 16:27:06 +02:00
Georg Ehrke 19129b3db2 use isset() instead of array_key_exists() 2014-06-03 16:23:33 +02:00
Morris Jobke cea7d4961e move to updated version of placeholder 2014-06-03 16:18:06 +02:00
Jan-Christoph Borchardt de38de8ff8 simplify logout and caret icons, remove shadow 2014-06-03 15:59:41 +02:00
Jan-Christoph Borchardt 8a6063ff07 fix text alignment in input fields 2014-06-03 15:30:10 +02:00
Jan-Christoph Borchardt eace692eff fix icon alignment in input fields 2014-06-03 15:30:10 +02:00
Jan-Christoph Borchardt 9396b22fe3 add missing placeholder shim for change password fields in IE8/9 2014-06-03 15:30:10 +02:00
Jan-Christoph Borchardt b67c4b2441 remove tilde selector for IE8 compatibility 2014-06-03 15:30:09 +02:00
Morris Jobke a63c3311ca remove scruntinizer config for infield 2014-06-03 15:30:09 +02:00
Jan-Christoph Borchardt 46fd40b700 fix show password icon in personal settings 2014-06-03 15:30:09 +02:00
Jan-Christoph Borchardt 4ef94ddd2e infield label removal: remove last occurences of infield labels 2014-06-03 15:30:09 +02:00
Jan-Christoph Borchardt 4ca665ac10 infield label removal: remove JS file and references to it 2014-06-03 15:30:09 +02:00
Jan-Christoph Borchardt 04aa085292 infield label removal: fix installation screen 2014-06-03 15:30:07 +02:00
Jan-Christoph Borchardt 7177d3a496 first step of infield label removal, fix login screen 2014-06-03 15:28:59 +02:00
Thomas Müller a5dd8e84f1 Merge pull request #8827 from owncloud/add-sqlite-info
add info about sqlite on setup page
2014-06-03 15:07:59 +02:00
Thomas Müller 587159c73e Merge pull request #8838 from owncloud/backgroundjob-legacy-gc
Support having legacy `OC_Cache_FileGlobalGC` background jobs
2014-06-03 15:06:35 +02:00
Thomas Müller 79b3558c6d Merge pull request #7151 from owncloud/user-jquery
Continuing the New User management
2014-06-03 15:04:30 +02:00
Jan-Christoph Borchardt 69e5d5b8c0 remove specific sidebar size from Files app 2014-06-03 13:24:44 +02:00
Jan-Christoph Borchardt 2163951484 reduce width of app sidebar a bit 2014-06-03 13:16:21 +02:00
Jan-Christoph Borchardt 2183b58cdc fix positioning issue of share dropdown in intermediate widths 2014-06-03 13:13:15 +02:00
Arthur Schiwon e962999896 get rid of @read in PHP doc after rebase 2014-06-03 13:01:14 +02:00
Arthur Schiwon ba82d80f32 adjust group tests 2014-06-03 12:59:11 +02:00
Arthur Schiwon 3fed96af0e clean up 2014-06-03 12:59:11 +02:00
Arthur Schiwon f9a9085faf class descriptions 2014-06-03 12:59:10 +02:00
Arthur Schiwon 5336e9a156 newlines 2014-06-03 12:59:10 +02:00
Arthur Schiwon d52fbd7e55 adjust test to changed convention in storing quota 2014-06-03 12:59:10 +02:00
Arthur Schiwon 342e1fd3bf port of PR #8038 2014-06-03 12:59:10 +02:00
Arthur Schiwon 11f7823e1b precaution: lowercase string for comparison 2014-06-03 12:59:10 +02:00
Arthur Schiwon e07ebdd7d0 adjust user backend test 2014-06-03 12:59:10 +02:00
Arthur Schiwon e32fa3de4a fix parameter order 2014-06-03 12:59:10 +02:00
Arthur Schiwon b0d1b2557c adjust Access test 2014-06-03 12:59:09 +02:00
Arthur Schiwon 6d64d7ec3f LDAP: put out fetching of user meta data into a fully tested class of its own and update them (mail, quota, etc.) directly after mapping. Fixes #7785 properly on master 2014-06-03 12:59:09 +02:00
Thomas Müller 2b1a7a76c3 Merge pull request #8425 from owncloud/columns_should_be_nullable_by_default
columns should be nullable by default
2014-06-03 12:55:42 +02:00
Thomas Müller a3202f1f03 bring back the line breaks 2014-06-03 12:48:36 +02:00
Thomas Müller d60e4b9efa remove +3 in multiselect.js 2014-06-03 12:42:36 +02:00
Jan-Christoph Borchardt de012667c7 Apps: fix wording and layout for 'enable only for specific groups' 2014-06-03 12:42:36 +02:00
Bart Visscher 49f1e4a811 Fix syntax error 2014-06-03 12:42:36 +02:00
Robin Appelman 0f82b8efb3 Preserve changed groups when switching between apps 2014-06-03 12:42:36 +02:00
Robin Appelman 953e194245 Dont show group settings for login, filesystem, etc apps after enabling them 2014-06-03 12:42:36 +02:00
Robin Appelman e3567242b2 Remove debug statements 2014-06-03 12:42:36 +02:00
Robin Appelman 7e07ff6f4f Disable enabling apps by groups for filesystem, authentication and loggin apps 2014-06-03 12:42:36 +02:00
Thomas Müller 402a31f196 adding some line breaks 2014-06-03 12:42:36 +02:00
Robin Appelman 3b1f291c60 Fix sorting of apps 2014-06-03 12:42:35 +02:00
Robin Appelman 7272779456 Prevent js error 2014-06-03 12:42:35 +02:00
Robin Appelman c09852e006 Fix phpdoc 2014-06-03 12:42:35 +02:00
Robin Appelman 53dc30af4f Add option to enable app for specific groups 2014-06-03 12:42:35 +02:00
Robin Appelman bf9b634fd8 Trigger change event on multiselect change 2014-06-03 12:42:35 +02:00
Robin Appelman b4025b3174 Allow enabling apps by group by setting the config value to a json encoded array of groups 2014-06-03 12:42:35 +02:00
Robin Appelman 6ed3194863 Use a map to prevent having to use search 2014-06-03 12:40:23 +02:00
Robin Appelman bff9e11ff9 Remove duplicate cache cleanup 2014-06-03 12:38:15 +02:00
Arthur Schiwon 75d320cc91 fix description texts 2014-06-03 12:36:42 +02:00
Arthur Schiwon 4bfb162558 command line tools to see, modify and test existing LDAP configurations 2014-06-03 12:35:18 +02:00
Thomas Müller d3e830e938 Merge pull request #8729 from owncloud/add-phpseclib-master
use phpseclib from 3rdparty
2014-06-03 12:19:04 +02:00
Thomas Müller 17cbfc714a use phpseclib from 3rdparty
rename class Crypt_Blowfish to Legacy_Crypt_Blowfish
2014-06-03 12:18:30 +02:00
Morris Jobke 25c676f203 simplify SQLite warning 2014-06-03 12:02:23 +02:00
Robin Appelman 4429b54ce4 Fix typo 2014-06-03 12:00:39 +02:00
Robin Appelman f297bf14f9 Fix unit tests 2014-06-03 11:55:18 +02:00
Joas Schilling 1d0ac9a2c5 Fix tests 2014-06-03 11:45:53 +02:00
Morris Jobke f88482355f check for user count and files count 2014-06-03 11:39:16 +02:00
Bjoern Schiessle 5097bcc16d improve settings name 2014-06-03 11:29:51 +02:00
Bjoern Schiessle 8e583f55dc set "allow users to send mail notification for shared files default" setting to "no" now that we have the activity app 2014-06-03 11:29:28 +02:00
Robin Appelman 82b982a4eb Better unique names for temporary tables 2014-06-03 11:24:31 +02:00
Robin Appelman 3be2643168 Add generateChangeScript() back 2014-06-03 11:19:58 +02:00
Robin Appelman 397a763c49 add a getter for the table 2014-06-03 11:18:46 +02:00
Robin Appelman c6053b2830 Quote identifiers on mysql 2014-06-03 11:18:45 +02:00
Robin Appelman 6f71419f2b Skip migration checks for all sql backends besides mysql, postgres and sqlite 2014-06-03 11:18:45 +02:00
Robin Appelman a59f6818eb Only quote identifiers for oracle during migration 2014-06-03 11:18:45 +02:00
Robin Appelman 4d7045e701 Fix unit tests 2014-06-03 11:18:17 +02:00
Robin Appelman b4cee3d4e9 skip tests for oracle 2014-06-03 11:18:17 +02:00
Robin Appelman 3b4555ca91 Try and check migration before applying it 2014-06-03 11:18:17 +02:00
Robin Appelman adeac7aa39 Check sqlite migration on a copy of the database file 2014-06-03 11:17:21 +02:00
Robin Appelman 35550e8d9a Fix migrator for postgres 2014-06-03 11:17:21 +02:00
Robin Appelman 5243562f45 skip migration tests for sqlite 2014-06-03 11:17:21 +02:00
Robin Appelman be80dce585 Fix temporary schema creation 2014-06-03 11:17:21 +02:00
Robin Appelman 58c61c8336 Fix generating migration test schemas 2014-06-03 11:17:21 +02:00
Robin Appelman 0035147be9 Create unique names for temporary indexes 2014-06-03 11:17:21 +02:00
Robin Appelman 9c6a93a87c Add a mechanism to try the database migration on a copy of the tables before running it on the "real" data 2014-06-03 11:17:21 +02:00
Vincent Petry 1297b2b883 Multiple fixes to sharing overview
- scrolling to next page now correctly renders share icons
- reshareing/unsharing a reshare will now still keep "Shared by" label
2014-06-03 11:04:57 +02:00
Robin Appelman ec9bf8a2d6 Support having legacy OC_Cache_FileGlobalGC background jobs 2014-06-03 11:01:01 +02:00
Robin Appelman 3e14affa9b Add some comments 2014-06-03 10:57:18 +02:00
Thomas Müller b62cb00771 Merge pull request #8833 from owncloud/fix-file-handling-option
fix empty file handling option
2014-06-03 10:49:40 +02:00
Joas Schilling 74e2a4b154 Use active instead of hover for active sidebar option
Fix #8720
2014-06-03 09:57:18 +02:00
Joas Schilling 74c647bb6a Do not overwrite cursor in sidebar 2014-06-03 09:55:50 +02:00
Thomas Müller 332eb39920 Merge pull request #8831 from owncloud/dollar-sign-escape-l10n
replace $ by \$
2014-06-03 09:47:29 +02:00
Morris Jobke 7ad7f59162 fix empty file handling option 2014-06-03 09:38:19 +02:00
Morris Jobke 9107cd2bde replace $ by \$ 2014-06-03 08:13:57 +02:00
Morris Jobke 68a4fd44e6 add notification on admin page 2014-06-03 08:01:39 +02:00
Morris Jobke 5add56b6ca Merge pull request #7485 from owncloud/scrutinizer_fix_1_kondou
Scrutinizer cleanup
2014-06-03 07:44:52 +02:00
Morris Jobke d6e521006a Merge pull request #8828 from owncloud/design-help-sidebar
move Help section from controls bar to sidebar
2014-06-03 07:36:30 +02:00
Jan-Christoph Borchardt 6270902650 Merge pull request #8821 from owncloud/kill-zip-download-restriction
drop allowZIPdownload and maxZIPSize as options
2014-06-03 01:47:40 +02:00
Jan-Christoph Borchardt c84b226cb5 add arrow icon for external links 2014-06-02 23:18:25 +02:00
Jan-Christoph Borchardt 2e6a27614e move Help section from controls bar to sidebar 2014-06-02 22:59:16 +02:00
Morris Jobke a4dd4cbb8f add info about sqlite on setup apge 2014-06-02 22:56:50 +02:00
kondou af32c67923 Fix a typo 2014-06-02 22:06:50 +02:00
Georg Ehrke eea501b847 various fixes as requested by pr reviewers 2014-06-02 21:39:15 +02:00
Frank Karlitschek f12a5248a3 Merge pull request #8820 from owncloud/design-details
Design details
2014-06-02 21:26:43 +02:00
kondou 4257d10c2b Add some more spaces for operators 2014-06-02 21:09:41 +02:00
kondou 770382aea9 Some readability improvements 2014-06-02 21:09:41 +02:00
kondou 9bc3f3cf30 Scrutinizer cleanup 2014-06-02 21:09:41 +02:00
Robin Appelman 6689d67a5b Fix recursive scanning 2014-06-02 21:04:36 +02:00
Bjoern Schiessle 916f859377 check if it is a share storage 2014-06-02 20:39:20 +02:00
Thomas Müller 2a10e78c58 no need to empty array in a special way 2014-06-02 20:17:40 +02:00
Bjoern Schiessle e0a5f3b570 get permissions directly from share storage to avoid additional db calls 2014-06-02 20:17:40 +02:00
Jörn Friedrich Dreyer 37afab87b5 minimal mail template editor for administrators, refs #7177 2014-06-02 19:22:58 +02:00
Vincent Petry c88c0b9a13 Merge pull request #8812 from josh4trunks/avatar_rotate
Automatically Rotate Avatar based on exif data
2014-06-02 19:06:46 +02:00
Thomas Müller 2bb902d028 use OC_DB::dropTable() 2014-06-02 18:57:53 +02:00
Bjoern Schiessle a7f6a051ad return size '0' if the trashbin folder doesn't exists yet 2014-06-02 18:56:04 +02:00
Bjoern Schiessle 7ad0fee0b5 let file cache handle the versions size 2014-06-02 18:55:13 +02:00
Vincent Petry 640fbc016d Now using shareOwner for the share owner
Makes it consistent with the regular file list fileData
2014-06-02 18:52:31 +02:00
Morris Jobke e8ec81110d Merge pull request #8806 from owncloud/add_share_index
add share index
2014-06-02 18:47:13 +02:00
Morris Jobke da090099f4 fix unit tests 2014-06-02 18:39:52 +02:00
Morris Jobke 9a67986473 add OCP\Config:deleteSystemValue 2014-06-02 18:31:43 +02:00
Morris Jobke 390d8e53b4 Merge pull request #8676 from owncloud/encryption_improvements
cleanup encryption code, improved return codes
2014-06-02 18:28:18 +02:00
Morris Jobke fbe42a771f fix unit tests after introduction of animations - adds delays for click trigger 2014-06-02 18:09:41 +02:00
Vincent Petry 0944565f60 More unit tests and fixes for share 2014-06-02 18:08:56 +02:00
Jan-Christoph Borchardt 679d10ca00 change shared folder icon to use share icon instead of people 2014-06-02 17:43:58 +02:00
Morris Jobke dd8b7b7af8 Merge pull request #8613 from owncloud/filesize-alignment
Improve aligment of file size
2014-06-02 17:37:53 +02:00
Jan-Christoph Borchardt cd61fb06eb move Deleted Files to bottom of sidebar 2014-06-02 17:33:42 +02:00
Arthur Schiwon 39982c2aea fix grouplist behaviour (blank after filtering) 2014-06-02 17:32:59 +02:00
Morris Jobke bdfad3440c fix success status symbol to a circle 2014-06-02 17:25:08 +02:00
Morris Jobke 079b709f28 bump version 2014-06-02 16:47:15 +02:00
Morris Jobke 57ef089aac drop allowZIPdownload and maxZIPSize as options 2014-06-02 16:29:03 +02:00
Jan-Christoph Borchardt 3b4004f9e5 more subtle hover effect on sortable column, text instead of background 2014-06-02 16:23:22 +02:00
Vincent Petry d677e3860d Added unit tests for share.js and share icon 2014-06-02 15:59:06 +02:00
Jan-Christoph Borchardt a447caf8d3 fix misalignment of modified dates, shift to right 2014-06-02 15:55:49 +02:00
Frank Karlitschek 51602f67e0 Merge pull request #8712 from owncloud/l10n-fully-translatable-webdav
fully translatable user_webdav
2014-06-02 15:53:18 +02:00
Jan-Christoph Borchardt 708758f34e remove unused table sizing CSS 2014-06-02 15:52:57 +02:00
Morris Jobke de23ae735b add OC.menuSpeed to control the animation speed of menu toggle 2014-06-02 15:34:42 +02:00
Morris Jobke 5d457dafc1 display "<1 kB" for really small files
* added parameters for humanFileSize to trigger that behaviour
* add unit tests for that
2014-06-02 15:33:09 +02:00
raghunayyar 72ba396905 Adds Animation to Toggling Navigation on < 768px widths 2014-06-02 15:30:39 +02:00
Jan-Christoph Borchardt 16e81c1d37 shift files app breadcrumbs to account for missing app list 2014-06-02 15:26:18 +02:00
Robin Appelman e002ff6065 propagate changes in the scanner 2014-06-02 15:24:08 +02:00
Robin Appelman 0158788a2a Split of cache writes in the scanner to their own methods 2014-06-02 14:52:21 +02:00
Robin Appelman a31f089266 Add a change propagator class to handle propagating etag and mtime changes 2014-06-02 14:39:12 +02:00
Morris Jobke 6f4bdbdb94 Merge pull request #8784 from owncloud/fold-reshare-settings
make reshare settings foldable
2014-06-02 14:37:10 +02:00
Jan-Christoph Borchardt 9ffa5780db fix height of select boxes for OS X 2014-06-02 14:32:07 +02:00
Arthur Schiwon e235de98e6 this line was lost on rebase 2014-06-02 13:22:06 +02:00
Bjoern Schiessle b16b17f920 ceanup encryption code, improved return codes 2014-06-02 13:15:11 +02:00
Arthur Schiwon b15a5a7ca0 undo lastLogin changes in base and user/user as this has now been properly done in #8681 2014-06-02 12:55:45 +02:00
Arthur Schiwon 75cc16f2bd remove debug output 2014-06-02 12:53:59 +02:00
Arthur Schiwon 2d83c68f05 make search parameter optional, which is already the case in the medthod it is passed to 2014-06-02 12:53:59 +02:00
Arthur Schiwon 28a012410a polish JSDoc 2014-06-02 12:53:59 +02:00
Arthur Schiwon 92b8344489 replace setTimeout and clearTimeout handling by _.debounce 2014-06-02 12:53:59 +02:00
Arthur Schiwon ec572607e1 remove group rename stuff, there is not support in the backends yet. to do for oc8. 2014-06-02 12:53:59 +02:00
Arthur Schiwon 7b63c2c036 cleanup 2014-06-02 12:53:59 +02:00
Arthur Schiwon a9e8d53c8f fix PHPDoc 2014-06-02 12:53:59 +02:00
Arthur Schiwon 122ebf28f7 typo 2014-06-02 12:53:59 +02:00
Arthur Schiwon d030c28d69 bind undo to current deleteHandler 2014-06-02 12:53:59 +02:00
Jan-Christoph Borchardt 29ef2f7a2f user mgmt: hide group rename function because it’s not supported in the backend yet 2014-06-02 12:53:59 +02:00
ringmaster fc7438b221 Fix UserList.empty(), use _.defer() instead of setTimeout() 2014-06-02 12:53:58 +02:00
ringmaster 4de14fe6da Javascript cleanup for groups. 2014-06-02 12:53:58 +02:00
ringmaster c38548a1aa Rebase cleanup.
Removing code that should not have been restored.
Originally removed in 45fd8f6d.
2014-06-02 12:53:58 +02:00
ringmaster ad1c34db45 Revisions from review.
* Explicit toString()-based getters for uid and displayname data.
* Restored user check for group multiselect in new user creation form.
* Removed jQuery colon expr for uid.
2014-06-02 12:53:58 +02:00
ringmaster 1115d68f25 Fix broken span. 2014-06-02 12:53:58 +02:00
ringmaster 097887a659 Add the admin group to the group list data.
Fixes the admin group disappearing from the list when updating the display as the result of a search.

This group data should probably be managed on the page entirely by the javascript GroupList object, but this seems like the interim method.
2014-06-02 12:53:58 +02:00
ringmaster 747c011615 More specific selectors, javascript cleanup.
* Assigned jQuery selector results to variables for speed.
* Moved all .attr('data') calls to .data() calls.
* Added :data(uid) selector.
* Split the multiselect checkhandlers into separate functions.
* De-duped click event on password change/img.
* Used fluent interface on jQuery object for event binding.
* Removed redundant tag names in class selectors.
* Fixed incorrect date display for last login.
* Added Userlist.has() to search for uid.
* General code convention compliance fixes.

to-do: Group dropdowns currently don't add the admin group after the search result, not sure why yet.
2014-06-02 12:53:58 +02:00
Thomas Müller f324aa7b24 fix some jshint errors 2014-06-02 12:53:58 +02:00
Jan-Christoph Borchardt 1abf69893d user management: display table at full width 2014-06-02 12:53:58 +02:00
Jan-Christoph Borchardt 57cc51d21d user management: remove autocompletion of user/password fields, fix #8464 2014-06-02 12:53:58 +02:00
Jan-Christoph Borchardt 66d00cf782 user management: remove unneeded and erroneous user filter reset function 2014-06-02 12:53:57 +02:00
ringmaster 1ae8ec698b Make sure group data is returned. 2014-06-02 12:53:57 +02:00
Arthur Schiwon f9f9550969 small fixes / cleanup 2014-06-02 12:53:57 +02:00
Lukas Reschke f2fed6de4e Rename $accessiblegroups to $accessibleGroups 2014-06-02 12:53:57 +02:00
Lukas Reschke 8141b9181c Add space 2014-06-02 12:53:57 +02:00
Lukas Reschke 59fef54e92 Rename $accessibleusers to $accessibleUsers 2014-06-02 12:53:57 +02:00
Lukas Reschke 0067306fd6 Remove uneeded last comma 2014-06-02 12:53:57 +02:00
Lukas Reschke b56d14260d Rename $isadmin to $isAdmin 2014-06-02 12:53:57 +02:00
Arthur Schiwon a9bd416643 add reset button for the filter field 2014-06-02 12:53:57 +02:00
Arthur Schiwon 3ff123f247 more appropriate label 2014-06-02 12:53:57 +02:00
Arthur Schiwon dea7f45782 stick with current group when the filter is used 2014-06-02 12:53:57 +02:00
Arthur Schiwon 7b8935abda show users whose username starts with the search pattern first
We may want to switch or extend it to display name. I leave it like this for now, continued work on this needs to have sortable columns in mind
2014-06-02 12:53:56 +02:00
Arthur Schiwon 734dd7013e add MetaData class for groups 2014-06-02 12:53:56 +02:00
Arthur Schiwon 5444a1114d cleanup 2014-06-02 12:53:56 +02:00
Arthur Schiwon 3e411c82a5 unify and consolidate group fetching method for initial template fill and ajax request 2014-06-02 12:53:56 +02:00
Arthur Schiwon d87347e64e update GroupList when a users is added or removed to a group 2014-06-02 12:53:56 +02:00
Thomas Müller 3c9788d40c js cleanup + typos 2014-06-02 12:53:56 +02:00
Thomas Müller d779db5aba js cleanup 2014-06-02 12:53:56 +02:00
Arthur Schiwon 08ad073cf5 make string translatable 2014-06-02 12:53:56 +02:00
Arthur Schiwon cbcda49ee3 get translations from settings, not core 2014-06-02 12:53:56 +02:00
Arthur Schiwon 2a8afb0ad9 add PHP doc 2014-06-02 12:53:56 +02:00
Arthur Schiwon 249e42c4cd enable group filtering 2014-06-02 12:53:55 +02:00
Arthur Schiwon dbc854d8b8 Fire up server request only on typing printed or modifying characters and when the string actually changed 2014-06-02 12:53:55 +02:00
Arthur Schiwon 8df50acce7 some documentation 2014-06-02 12:53:55 +02:00
Arthur Schiwon 68dc665c65 dynamically decide whether to load 10 or 30 users 2014-06-02 12:53:55 +02:00
Arthur Schiwon 5b8ba79356 make filter work on server-side 2014-06-02 12:53:55 +02:00
Arthur Schiwon 19fd7cd9c7 When emptying a list, a hidden entry remains. If the user uid is the same as of a user being to be loaded, it will not be appended but removed. Thus, add a random user name to avoid such happenings. 2014-06-02 12:53:55 +02:00
Arthur Schiwon 5f57d72b93 kick out deprecated and dislodged OC.Router 2014-06-02 12:53:55 +02:00
raghunayyar fe4b1f8b10 Enhancement: Adds Group to grouplist when added via multiselect 2014-06-02 12:53:55 +02:00
raghunayyar d3cee79b5a Enhancement: Adding Group on the Sidebar updates the multiselect on the Userlist. 2014-06-02 12:53:55 +02:00
raghunayyar e159f7e4a9 Enhancement: Implements Grouplist Toggle, Courtesy Calendar App Settings. 2014-06-02 12:53:55 +02:00
raghunayyar 7aca126086 Adds @blizzz to authors 2014-06-02 12:53:54 +02:00
Arthur Schiwon b3d68fc175 refactor delete handling and apply it to users and groups 2014-06-02 12:53:54 +02:00
raghunayyar b6b133237a Initial Commit with Group Toggle. 2014-06-02 12:53:54 +02:00
Arthur Schiwon cfba7e20cf don't hide add group when text is entered (except for ESC press) 2014-06-02 12:53:54 +02:00
Arthur Schiwon 853ced644d hide Add Group when clicking away or pressing ESC 2014-06-02 12:53:54 +02:00
Arthur Schiwon a4cfa95545 restructure group.js and put functions to object, also add group list sorting after adding. 2014-06-02 12:53:54 +02:00
Arthur Schiwon 480173569f put Add Group elements hiding and showing into its own function 2014-06-02 12:53:54 +02:00
Arthur Schiwon 330dfeb46b group name input shall not vanish upon click, plus cleanup (groups do not have home folders) 2014-06-02 12:53:54 +02:00
Arthur Schiwon 749afe74df when clicking on Add Group also put the focus into the group name field 2014-06-02 12:53:54 +02:00
Arthur Schiwon faab6c095c move group-click initialization to groups.js and only react on elements with a data-gid attribute given 2014-06-02 12:53:54 +02:00
raghunayyar 65aa20433c Enhancement : Toggle Add Group on Click, @blizzz have a look here. 2014-06-02 12:53:53 +02:00
Arthur Schiwon 17e640af22 set admin gid to Admins filter. I.e. hard-coding the admin group, but this is OC reality atm - other admin groups are not possible. 2014-06-02 12:53:53 +02:00
Arthur Schiwon 506e065f23 stricter test for 0 2014-06-02 12:53:53 +02:00
Arthur Schiwon 004dd73c5e fix user creation, checkSubAdminUser is only available in OC_JSON 2014-06-02 12:53:53 +02:00
Arthur Schiwon b3221f0e4e LDAP: adjust main template according to PR 7291 2014-06-02 12:53:53 +02:00
raghunayyar eed108ec1b Enhancement : The edit icon looks like files app rename fileaction. 2014-06-02 12:53:53 +02:00
raghunayyar 6526b939d3 Enhancement: Transparency added to icons, changes opacity to 1 on hover. 2014-06-02 12:53:53 +02:00
raghunayyar ceb6c4df04 Enhancement: Makes Edit and Delete Icons Tapable, 44px by 44px dimensions. 2014-06-02 12:53:53 +02:00
raghunayyar d51b384c0c Enhancement: Always show edit & delete for the active group. 2014-06-02 12:53:53 +02:00
raghunayyar f946a52819 Rename and Delete Happens only on Active Group. 2014-06-02 12:53:53 +02:00
Arthur Schiwon d650cd66dc mark selected group active 2014-06-02 12:53:53 +02:00
Arthur Schiwon 1f4bc7cb10 port scroll improvements 2014-06-02 12:53:52 +02:00
Arthur Schiwon f7903e92be do not forget to pass parameters to subtemplate 2014-06-02 12:53:52 +02:00
Lukas Reschke 86d3cf53d1 Let's switch to OCP\JSON 2014-06-02 12:53:52 +02:00
Lukas Reschke ed1a23c9a2 Use OCP\JSON instead of OC_JSON 2014-06-02 12:53:52 +02:00
Lukas Reschke 8a8800203e Remove legacy "Check for user comment"
I don't think these comments are necessary anymore and therefore they should get killed.
2014-06-02 12:53:52 +02:00
raghunayyar 16fb48f2eb Adds admin check on groupname changes. 2014-06-02 12:53:52 +02:00
raghunayyar 63645461f0 Fixes Markup in templates. 2014-06-02 12:53:52 +02:00
raghunayyar 9ba4a76214 resolving conflict when picking 8b81a0b 2014-06-02 12:53:52 +02:00
Arthur Schiwon bf88bd108e do not show 0 when administered group has no users 2014-06-02 12:53:52 +02:00
Arthur Schiwon 1734cc09fd sort groups by user count 2014-06-02 12:53:52 +02:00
Arthur Schiwon 7d3ac194e3 do not show 0 when group has no users 2014-06-02 12:53:52 +02:00
Arthur Schiwon 478393e15a load groups when clicking on them 2014-06-02 12:53:52 +02:00
raghunayyar e681e1eec0 Initial Commit: Takes Quota Settings inside Navigation, Changes Create -> Add Group 2014-06-02 12:53:51 +02:00
raghunayyar f751e0bc48 Splits Code for Users and Groups. 2014-06-02 12:53:51 +02:00
Arthur Schiwon 3a92d48104 reduce template function calls 2014-06-02 12:53:51 +02:00
Arthur Schiwon 57ffaddf26 add Last Login column 2014-06-02 12:53:51 +02:00
raghunayyar 970f899726 Initial Commit : Changes Storage to Quota, Implements GroupName editing. 2014-06-02 12:52:53 +02:00
Arthur Schiwon dc28f58951 add Storage Location col 2014-06-02 12:52:53 +02:00
raghunayyar dc1523355b Adds Admin to Grouplist Everywhere 2014-06-02 12:52:53 +02:00
raghunayyar 4a30665ec3 Removes Delete Icon from Admin Group. 2014-06-02 12:52:53 +02:00
raghunayyar 8e4bbe8297 Adds class button to fix font sizes. 2014-06-02 12:52:53 +02:00
raghunayyar 8e34316e04 Fixes User Search by username. 2014-06-02 12:52:53 +02:00
raghunayyar c7af9cd6dd Initial Commit : User Search, Fixes Typos 2014-06-02 12:52:53 +02:00
raghunayyar 223e342664 Fixes delete icon only on hover. 2014-06-02 12:52:52 +02:00
raghunayyar 78e1b71003 Reverts Bogus Changes. 2014-06-02 12:52:52 +02:00
raghunayyar 71160ff853 Deletes Group Clientside Effectively. 2014-06-02 12:52:52 +02:00
raghunayyar ce46cd3680 Implements Group Creation from Sidebar 2014-06-02 12:52:52 +02:00
raghunayyar b506388b75 Reverts last commit, implements user in group count. 2014-06-02 12:52:52 +02:00
raghunayyar b2ca595509 Add GroupList Ajax to Users. 2014-06-02 12:52:52 +02:00
raghunayyar 43ced8c6c7 Splits Controls overlap in files and users. 2014-06-02 12:52:52 +02:00
raghunayyar 0663d954e6 resolve conflicts while picking c0fb623 2014-06-02 12:52:52 +02:00
Vincent Petry 7961d4a87e Update share action text to display owner/recipients
- when a share was changed, update the share action text
- added file data attribute "data-share-recipients"
2014-06-02 12:12:57 +02:00
Arthur Schiwon f0e69b2b99 Port LDAP: fix filter can be reset and broken after upgrade from OC 5 #8579
LDAP: set filter mode to raw, so filters will not be changed and broken after upgrade from oc5, when visiting the LDAP settings and opening filter tabs

get the correct version number for compare -.-

bump version and don't overwrite values on next update if not necessary

simpler and better readable assignment
2014-06-02 12:08:01 +02:00
Vincent Petry f931df2dac Merge pull request #8718 from owncloud/share_icons_for_shared_by
add share icons for folders shared by the current user
2014-06-02 12:03:22 +02:00
Vincent Petry 4e957c7b18 Merge pull request #8443 from owncloud/csrf-on-login-and-logout
Add CSRF check on login and logout
2014-06-02 11:27:20 +02:00
Vincent Petry 09ab642d2b Merge pull request #8807 from owncloud/add_filecache_index
add another index to the filecache to reduce the number of queries witho...
2014-06-02 11:11:04 +02:00
Morris Jobke 27c8c87e94 Merge pull request #8187 from owncloud/escape-more-character
Also encode > and '
2014-06-02 10:59:47 +02:00
josh4trunks d0548b92c0 Automatically Rotate Avatar based on exif data
This commit..
* doesn't check if a local or uploaded file is square to give a user the option to crop square images
* caches uploaded images to an initial temporary file (needed to fix orientation)
* fixes orientation based on exif data
* works for encrypted local images as well
2014-06-01 23:14:37 -07:00
Jenkins for ownCloud d39216c5e7 [tx-robot] updated from transifex 2014-06-02 01:54:37 -04:00
Bernhard Posselt 89bccf7193 Merge pull request #8811 from owncloud/fix-phpdoc-ap
Fix PHPDoc
2014-06-01 22:40:07 +02:00
Lukas Reschke c8b5ae675c Fix PHPDoc
- Remove not anymore existing parameters
- Fix typo
2014-06-01 21:46:05 +02:00
Robin Appelman a4949f4b31 Simplify AppConfig->getValues() 2014-06-01 14:14:30 +02:00
Robin Appelman 91180bfef4 Add caching to AppConfig->getApps 2014-06-01 14:04:17 +02:00
Jenkins for ownCloud 36b0c599f5 [tx-robot] updated from transifex 2014-06-01 01:55:19 -04:00
Lukas Reschke 603b6c13b4 Fix typo 2014-05-31 21:11:29 +02:00
Georg Ehrke c8a8c7e933 read ocsid from shipped apps on install 2014-05-31 18:02:59 +02:00
Georg Ehrke c6dc9aeda8 Merge branch 'master' into update_shipped_apps_from_appstore 2014-05-31 17:55:01 +02:00
Georg Ehrke 020255b4e5 add button for properly uninstalling apps 2014-05-31 17:50:39 +02:00
Vincent Petry 56b60b9cd2 Merge pull request #8798 from owncloud/fix-corejs
Fix undefined JS on login/setup page
2014-05-31 17:26:30 +02:00
Frank Karlitschek a339855b4c add another index to the filecache to reduce the number of queries without a matching index 2014-05-31 16:55:50 +02:00
Frank Karlitschek e19b3a8794 add share index 2014-05-31 16:47:46 +02:00
Georg Ehrke c8636ca4d9 Merge branch 'master' into update_shipped_apps_from_appstore
Conflicts:
	lib/private/app.php
	lib/private/installer.php
2014-05-31 14:55:00 +02:00
Georg Ehrke 2bcfd8e084 make it possible to update shipped apps via the appstore 2014-05-31 12:17:54 +02:00
Jenkins for ownCloud cff9440a37 [tx-robot] updated from transifex 2014-05-31 01:55:46 -04:00
Thomas Müller 86b06c72bb Merge pull request #8800 from owncloud/db-changes-as-required-by-8483
Database code cleanup
2014-05-31 00:47:03 +02:00
Thomas Müller 999f6216dc - fix dropTable() and introduce tableExists()
- kill replaceDB() - this function is unused and it's implementation obviously wrong
- add method annotation OC_DB_StatementWrapper::fetchAll
- remove duplicate code in Test_DBSchema and reuse OC_DB::tableExists
- remove unused variables
2014-05-30 23:34:42 +02:00
Thomas Müller 5dd3e34f57 Merge pull request #8444 from owncloud/cleanup-list-code
Cleanup code of files_sharing/ajax/ a little bit
2014-05-30 22:40:28 +02:00
Thomas Müller 555b9cc245 Merge pull request #7614 from owncloud/test_annotations_working
Check if ReflectionMethod::getDocComment is working
2014-05-30 22:17:30 +02:00
Vincent Petry a0987ebf59 Fix undefined JS on login/setup page 2014-05-30 19:02:19 +02:00
Owen Winkler da6aae28ad Merge pull request #8607 from owncloud/filescan_app_hook
Allow apps to control via a hook skipping add/remove a file during filescan
2014-05-30 12:38:37 -04:00
Lukas Reschke b7f163a701 Merge pull request #8695 from owncloud/jserrorfixes
Fixed undefined object error that appears after a delay
2014-05-30 17:20:09 +02:00
Vincent Petry c8a19adc3a Merge pull request #8779 from owncloud/sel-webdav-onclick
select webdav address on click
2014-05-30 17:18:54 +02:00
Volkan Gezer a36f2c93d6 Merge pull request #8793 from owncloud/name-email-enter-prevent
prevent pageload if pressed enter on name email change. fixes #6179
2014-05-30 17:03:32 +02:00
ringmaster 19f0c47842 Missed one. 2014-05-30 10:40:26 -04:00
Lukas Reschke 756b158230 Merge pull request #8663 from owncloud/files-dndissue
Fixed drag and drop from external files, added tests
2014-05-30 16:28:20 +02:00
Thomas Müller 59b1f4c476 Merge pull request #8781 from owncloud/add-a-warning-to-the-sample
Add a warning to the configuration file
2014-05-30 16:17:19 +02:00
Thomas Müller 31ad1cbdd8 Merge pull request #5365 from owncloud/filesize-improvements-32bit
Add LargeFileHelper / Add CURL filesize workaround / Fix some 32-bit filesize issues
2014-05-30 16:13:48 +02:00
Volkan Gezer bb8ee2e9af fix wording 2014-05-30 16:00:57 +02:00
ringmaster 16ae63bdfd Updates per comments on PR:
* Use "filesystem_cache_readonly" config setting, update comment in config.sample
* Use $this->cacheActive to cache config setting
* Add public Scanner::setCacheActive() to set $cacheActive programmatically
2014-05-30 09:42:41 -04:00
Volkan Gezer d7e63d8fab select webdav address on click 2014-05-30 15:39:25 +02:00
Bjoern Schiessle 717eff22d4 add share icons for folders shared by the current user 2014-05-30 15:14:01 +02:00
Volkan Gezer 4843d13056 prevent pageload if pressed enter on name email change 2014-05-30 15:12:39 +02:00
icewind1991 2ba5701b1a Merge pull request #8778 from owncloud/storage-instanceof
Add storage->instanceOfStorage() to handle instanceof with storage wrappers
2014-05-30 14:58:59 +02:00
Lukas Reschke 517501ffbf Merge pull request #8417 from owncloud/share-overview
Sharing overview page
2014-05-30 13:42:24 +02:00
Vincent Petry 7fac2b62e9 Fixed warning when file_target is not set
In some cases (like in the unit tests) "file_target" is not set yet
whenever the target file system hasn't been mounted yet.
2014-05-30 12:35:04 +02:00
Vincent Petry 5e4e773446 Removed "Share with" column 2014-05-30 10:06:30 +02:00
Vincent Petry 66afd1aa39 Fix fileList fallback in OC.Share for outside files app
OC.Share can be used in non-files apps, so the fileList callback needs
to support that as well.
2014-05-30 10:06:30 +02:00
Vincent Petry e084183d1e Added owner display name in action 2014-05-30 10:06:29 +02:00
Vincent Petry 1d9129eac3 Sharing overview fixes and unit tests
- Fixed renaming and fileActionsReady event
- Added unit tests for shares list
- Fixed public page with defer
- Fixed file actions in sharing overview
- Fixed sharing counterpart list (10 entries max)
- Fixed file path attribute to be used in download action
- Fix sharing list headers
- OC.Share icons now operate on fileList instance
- Fix OC.Share.updateIcon when more than one list in DOM
2014-05-30 10:06:29 +02:00
Vincent Petry 6fbf4d8548 Fix table header colors
Table headers should be 999 even when using links (introduced by the
sorting feature)

When selecting with checkboxes, they must appear black.
2014-05-30 10:06:29 +02:00
Vincent Petry c9d05c66de Fix IE8 issue when icon is not defined
Sometimes no icon file is passed to replaceSVGIcon(), it showed an error
in IE8 and broke the code flow.

This fix adds a check whether the file name is set.
2014-05-30 10:06:29 +02:00
Vincent Petry 0879a63320 Mimetype for sharing overview 2014-05-30 10:06:29 +02:00
Vincent Petry ef59c69dc8 Distinguish legacy file actions from regular file actions
Legacy file actions are registered by legacy apps through
window.FileActions.register(). These actions can only be used by the
main file list ("all files") because legacy apps can only deal with a
single list / container.

New file actions of compatible apps must be registered through
OCA.Files.fileActions. These will be used for other lists like the
sharing overview.

Fixed versions and sharing actions to use OCA.Files.fileActions, which
makes them available in the sharing overview list.
2014-05-30 10:06:29 +02:00
Vincent Petry fa32243d84 Small fixes to sharing overview
- Removed file size from file summary in sharing overview
- Fixed document title
- Fixed empty content text for shared overview
2014-05-30 10:06:29 +02:00
Vincent Petry 06e53b359a Added "dir" in file actions handler context and fixed versions
Added "dir" in file actions handler context so that handlers can know
what the path of the file was without having to look it up from the file
list.

Fixed versions app to use the context.dir instead of the old $('#dir')
element. This makes the versions popup work in the sharing overview.
2014-05-30 10:06:29 +02:00
Vincent Petry d21b8108c8 Fixed navigation order 2014-05-30 10:06:29 +02:00
Vincent Petry 89ff2857fc Add unit tests for fileActionsReady 2014-05-30 10:06:29 +02:00
Vincent Petry 8bdce6698c Added unit test for file action context argument 2014-05-30 10:06:29 +02:00
Vincent Petry 0f105ec747 Removed selection checkboxes 2014-05-30 10:06:29 +02:00
Vincent Petry 85648def56 Fixed sharing permissions 2014-05-30 10:06:29 +02:00
Vincent Petry 60bcdc550e Fixed file actions for sharing views
FileActions can now be clone to be use for separate file list views
without having the side-effect of affecting the main file list view.

Added "Open" action in sharing overview file lists to redirect to the
regular file list when clicking on a folder.
2014-05-30 10:06:29 +02:00
Vincent Petry 279ede33af Improved FileActions with context
A context hash is now passed to file action handlers which makes it
possible to have file list specific file actions.
2014-05-30 10:06:29 +02:00
Vincent Petry 9baf47c2b4 Group shares by type 2014-05-30 10:06:29 +02:00
Vincent Petry 6ebc436505 Added sharing overview page (WIP)
- added sharing overview entries in the sidebar
- use OCS Share API to get the list of files
2014-05-30 10:06:29 +02:00
Bjoern Schiessle dbbb6c5945 extend OCS Share API to allow the user to ask for files shared with him 2014-05-30 10:06:28 +02:00
Jenkins for ownCloud 929882a32a [tx-robot] updated from transifex 2014-05-30 01:55:11 -04:00
Lukas Reschke 5cd0fd2559 Merge pull request #8700 from owncloud/design-smallfixes
Design detail fixes
2014-05-29 21:54:15 +02:00
Lukas Reschke 45d93cc6ec Merge pull request #8759 from owncloud/fix-phpunit
fix 8757, get rid of service locator antipattern
2014-05-29 21:35:47 +02:00
Lukas Reschke b14564480e Merge pull request #8773 from owncloud/l10n-tipsy-delete
show delete hint text on hovering trash
2014-05-29 21:30:50 +02:00
Lukas Reschke 705242d390 Merge pull request #8727 from owncloud/upgrade-overview
Added update overview page
2014-05-29 21:28:47 +02:00
Volkan Gezer c01f196f72 make reshare settings foldable 2014-05-29 21:14:20 +02:00
Robin McCorkell 32a50563d3 Merge pull request #8771 from owncloud/enc_get_mount_from_mountmanager
get mount point from mount manager
2014-05-29 17:52:28 +01:00
Bernhard Posselt b8059fbc86 Merge pull request #8780 from owncloud/remove-deprecated-functions
Remove deprecated functions
2014-05-29 18:45:43 +02:00
Lukas Reschke 62eb5cd6b0 Add a warning to the configuration file
Some people believe that they should copy the sample config to the "real" config. I noticed this several times in IRC and on the bugtracker.

I guess this warning should be enough to avoid this in the future.
2014-05-29 17:43:59 +02:00
Lukas Reschke c8b32f4309 Remove deprecated functions
This functions have been deprecated since Oct 2012 (ownCloud 5), let's finally remove them for ownCloud 7.

Ref https://github.com/owncloud/core/commit/c4b8bb10411a4d601b7f4c8758980005f14850ab
2014-05-29 17:01:30 +02:00
Andreas Fischer 129d8099b9 Typo: getFileSizeViaDOM -> getFileSizeViaCOM 2014-05-29 16:26:02 +02:00
Andreas Fischer 2929d19c7f Document exceptions thrown by \OC\LargeFileHelper. 2014-05-29 16:26:02 +02:00
Andreas Fischer ea246d058e Use "file size" instead of "filesize", then also apply camel case. 2014-05-29 16:26:02 +02:00
Andreas Fischer 0417e52134 Increase file size limit from 2 GiB to 4 GiB when workarounds are unavailable. 2014-05-29 16:26:02 +02:00
Andreas Fischer fb4556033a Cast '{DAV:}getcontentlength' to number instead of int. 2014-05-29 16:26:02 +02:00
Andreas Fischer 0bae68017e Cast to number instead of integer in OC\Files\Cache\HomeCache 2014-05-29 16:26:02 +02:00
Andreas Fischer a34aa1959a Cast to number instead of integer in OC\Files\Cache\Cache 2014-05-29 16:26:01 +02:00
Andreas Fischer a9b28323dd Add LargeFileHelper::__construct() verifying that our assumptions hold. 2014-05-29 16:26:01 +02:00
Andreas Fischer 2c36a4b07a Add helper method for turning int|float into base-10 unsigned integer string. 2014-05-29 16:26:01 +02:00
Andreas Fischer 82e17155bf Rename: LargeFileHelper -> LargeFileHelperGetFilesize 2014-05-29 16:26:01 +02:00
Andreas Fischer fb7ec2bb22 Only call $this->filesize() for files. 2014-05-29 16:26:01 +02:00
Andreas Fischer df29eec72b Windows exec() implementation. 2014-05-29 16:26:01 +02:00
Andreas Fischer 626e87aa54 Output validation for exec() method. 2014-05-29 16:26:01 +02:00
Andreas Fischer 68cc0ba2e1 Unit Tests for LargeFileHelper. 2014-05-29 16:26:01 +02:00
Andreas Fischer c8fa1fd687 Refactor Large File handling code. 2014-05-29 16:26:01 +02:00
Andreas Fischer 3f8f8027d2 Cast to numeric instead of float, i.e. use an integer if possible. 2014-05-29 16:17:13 +02:00
Andreas Fischer 6195f13bda Use CURL to get filesize on 32bit systems. 2014-05-29 16:17:13 +02:00
Robin Appelman 998fa2d9be Pass any methods custom to specific storage implementations to the wrapped storage 2014-05-29 16:13:05 +02:00
Andreas Fischer 9fba8221a6 Merge pull request #8554 from owncloud/add_resetadminpass_command
Add a resetadminpass command to console

* owncloud/add_resetadminpass_command:
  Move resetpassword into user: command space.
  Document type of user project.
  Receive \OC\User\Manager as a constructor dependency.
  Use userManager, color output, return 1 on error
  Add doc, check return-value, fix spacing, require interactive
  Back to the future
  Make ResetAdminPass to ResetPassword
  Add a resetadminpass command to console - fix #8248
2014-05-29 14:43:27 +02:00
Robin Appelman 0ae7a49c8e Fix storage wrapper being called with null 2014-05-29 14:15:48 +02:00
Robin Appelman 99d46af0b4 Use instanceOfStorage instead of instanceof 2014-05-29 13:52:58 +02:00
Robin Appelman 8c5521fdfc Add $storage->instanceOfStorage to handle instanceof for storage wrappers 2014-05-29 13:45:50 +02:00
icewind1991 c0f02be50a Merge pull request #3908 from owncloud/storage-folder-copy-rename
Recursive copy and remove for local storage backends
2014-05-29 13:29:24 +02:00
Jenkins for ownCloud 368006c7af [tx-robot] updated from transifex 2014-05-29 01:54:40 -04:00
Andreas Fischer 678a6b98ff Merge pull request #8748 from owncloud/cli_maintenance_mode
Add ability to enable/disable maintenance mode from cli.

* owncloud/cli_maintenance_mode:
  Use OC\Config instead of OC_Config
  Changed class name to mode
  Add ability to enable/disable maintenance mode from cli.
2014-05-29 03:45:49 +02:00
Volkan Gezer b713f15b99 document always links to the current version of OC 2014-05-29 01:30:24 +02:00
Volkan Gezer 43c6ece31a fully translatable user_webdav 2014-05-29 00:23:23 +02:00
Thomas Müller 3ef9570d02 Merge pull request #8547 from owncloud/path-length-master
Handling long paths properly in \OC\Files\View
2014-05-29 00:08:29 +02:00
Andreas Fischer 5754b0b9e7 Merge remote-tracking branch 'owncloud/master' into add_resetadminpass_command
* owncloud/master: (238 commits)
  Change visibility of scanner internals
  [tx-robot] updated from transifex
  remove legacy OC_Filesystem being used in a hook callback
  add title property to share dialog
  forgotten infobox messages translations
  reverts 188c543 and translates only mail
  fix warning text and margin
  Adjust core apps to use "requiremin" instead of "require"
  Added requiremin/requiremax fields for apps
  [tx-robot] updated from transifex
  unwrapped strings fix
  allow resharing of files with only share permissions
  don't lose file size during rename
  drop superflous statement in phpdoc
  add preRememberedLogin hook and document this and postRememberedLogin in class descripttion. Also fixes documentation of postLogin hook
  [tx-robot] updated from transifex
  fix grammar
  make user_ldap fully translatable
  [tx-robot] updated from transifex
  fix typo
  ...

Conflicts:
	core/register_command.php
2014-05-28 22:57:33 +02:00
Andreas Fischer f81ee94cad Move resetpassword into user: command space. 2014-05-28 22:53:44 +02:00
Andreas Fischer 8981929e92 Document type of user project. 2014-05-28 22:48:35 +02:00
Lukas Reschke 1af293dc13 Merge pull request #8754 from owncloud/3rdparty-upgraded-phpmailer
upgraded phpmailer into v5.2.8 via composer
2014-05-28 22:42:45 +02:00
Andreas Fischer 52e7bf9630 Receive \OC\User\Manager as a constructor dependency. 2014-05-28 22:42:33 +02:00
scolebrook 43759f1f46 Use OC\Config instead of OC_Config 2014-05-28 16:26:13 -04:00
Lukas Reschke 360a79b8f4 Add unit tests for escapeHTML 2014-05-28 22:14:05 +02:00
Volkan Gezer f7cc07ba41 show delete hint text on hovering trash 2014-05-28 20:27:28 +02:00
ringmaster f79948f519 Prevent apps from affecting the scanner via hook. 2014-05-28 13:20:20 -04:00
Lukas Reschke ce9d5df6df Merge pull request #8681 from owncloud/logintimestamp
Record login timestamp per user. Required for new user managament.
2014-05-28 19:06:47 +02:00
Robin Appelman 467e9c2bb0 Remove code duplication 2014-05-28 18:16:24 +02:00
Robin Appelman af35b6ad9d Fix LocalStorage->unlink to work on folder as expected 2014-05-28 18:16:24 +02:00
Robin Appelman 8187164fe1 re-use rescursive copy from common storage 2014-05-28 18:16:24 +02:00
Robin Appelman 488fc402e4 remove unneeded check 2014-05-28 18:16:23 +02:00
Robin Appelman d15ed9b4d3 use \OC\Files\Filesystem::isIgnoredDir 2014-05-28 18:16:23 +02:00
Robin Appelman 1302602173 fix illegal usage of unlink in test case 2014-05-28 18:16:23 +02:00
Robin Appelman ea44f0e20f fix recursive copy and rename for common storage backend 2014-05-28 18:16:23 +02:00
Robin Appelman c3c9612c99 fix recursive copy and rename for mapped local storage backend 2014-05-28 18:16:23 +02:00
Robin Appelman 03ba497a8c add recursive copy to local storage backend 2014-05-28 18:16:23 +02:00
Robin Appelman 38c1da0976 fix recursive rename for local storage backend 2014-05-28 18:16:23 +02:00
Robin Appelman e83b41493f remove unneeded delTree 2014-05-28 18:16:23 +02:00
Robin Appelman c99e254178 aditional test cases for copy and rename 2014-05-28 18:16:23 +02:00
Bjoern Schiessle 9ed5083efd get mount point from mount manager 2014-05-28 17:28:31 +02:00
icewind1991 6d57e4c491 Merge pull request #8768 from owncloud/scanner_visibility
Change visibility of scanner internals
2014-05-28 15:59:57 +02:00
scolebrook 00f811f09c Changed class name to mode 2014-05-28 09:41:34 -04:00
Thomas Müller a2e4bc8d33 # This is a combination of 2 commits.
# The first commit's message is:

adding tests for long paths
increment path field in database up to 4000 (maximum for Oracle - otherwise we could use php's 4096)
increment version to trigger database migration
adding unit test for too long path

# This is the 2nd commit message:

fix too long path
2014-05-28 15:30:44 +02:00
Bernhard Posselt d5e48a4806 fix assertions 2014-05-28 15:23:57 +02:00
Thomas Müller d89c5e2351 Update 3rdparty submodule after merge 2014-05-28 15:16:14 +02:00
ringmaster 3d1ba574e4 Change visibility of scanner internals
so that descendant classes can access them.
2014-05-28 07:59:38 -04:00
Thomas Müller ed8e0f0a92 updating unit test expectations 2014-05-28 13:47:27 +02:00
Joas Schilling dc83b17f49 Fix double "saved" message when changing email settings 2014-05-28 11:50:55 +02:00
Vincent Petry 7e055a9404 Fixed DOM elements, styling and code style issues
- Reduced number of DOM elements
- Also added mention of "config" backup.
2014-05-28 11:29:22 +02:00
Vincent Petry 09645b9221 Merge pull request #8755 from owncloud/fix-8737-master
remove legacy OC_Filesystem being used in a hook callback
2014-05-28 10:57:54 +02:00
Volkan Gezer de1f7c9600 Merge pull request #8750 from owncloud/l10n-add-title-property
add title property to share dialog will close #8638
2014-05-28 10:52:00 +02:00
Jan-Christoph Borchardt 3d701ca3ca Merge pull request #8732 from owncloud/fix-warning-text
fix warning text and margin. fixes #8715
2014-05-28 10:43:28 +02:00
Jenkins for ownCloud 80641cae72 [tx-robot] updated from transifex 2014-05-28 01:56:09 -04:00
Bernhard Posselt 5e9ea2b365 fix 8757, get rid of service locator antipattern 2014-05-28 02:15:16 +02:00
Thomas Müller f03a3d9d05 remove legacy OC_Filesystem being used in a hook callback 2014-05-28 00:13:54 +02:00
Volkan Gezer c100da33bb upgraded phpmailer into v5.2.8 via composer 2014-05-27 23:33:18 +02:00
Thomas Müller 4e2cdb2f8a Merge pull request #8713 from owncloud/typo-files-encr
fix grammar
2014-05-27 23:03:32 +02:00
Bart Visscher a51e9a5cfe Merge pull request #8136 from owncloud/contactsmanager-register
Implement the register function of OC\ContactsManager
2014-05-27 22:35:50 +02:00
Volkan Gezer 9c5fdc5005 add title property to share dialog 2014-05-27 22:09:55 +02:00
ringmaster 26d169b27c Use 'filesystem_check_enable' as a config option. 2014-05-27 16:01:16 -04:00
ringmaster 3b287f8274 Allow the default behavior to come from the config. 2014-05-27 15:21:35 -04:00
ringmaster fdf26c5a3f Rename variable to something more appropriate. 2014-05-27 15:12:56 -04:00
ringmaster 645e7035a4 Allow apps to control via a hook to skip adding/removing a file during filescan 2014-05-27 15:12:54 -04:00
blizzz 339554ae71 Merge pull request #8744 from owncloud/l10n-whoops-user-ldap
forgotten infobox messages translations
2014-05-27 21:00:32 +02:00
scolebrook 7151369e5f Add ability to enable/disable maintenance mode from cli. 2014-05-27 13:03:53 -04:00
Volkan Gezer 8eee8e76d1 forgotten infobox messages translations 2014-05-27 16:39:22 +02:00
Vincent Petry ca45937d84 Fixed styles in update overview page 2014-05-27 16:36:21 +02:00
Vincent Petry 02f682b156 Now showing disabled apps as upgrade status line
- Added app id in update overview.
- Added status message for disabled app for CLI upgrade and web upgrade
2014-05-27 15:20:33 +02:00
Vincent Petry 146583a98d Added update overview page 2014-05-27 14:53:08 +02:00
Volkan Gezer e70ed36d8e Merge pull request #8740 from owncloud/l10n-forgotten-tags
reverts 188c543
2014-05-27 14:47:21 +02:00
Vincent Petry a9661962fe Merge pull request #8736 from owncloud/appinfo-newrequirefields
App info new fields "requiremin" and "requiremax"
2014-05-27 14:28:47 +02:00
Volkan Gezer 1a22478446 reverts 188c543 and translates only mail 2014-05-27 12:58:46 +02:00
Volkan Gezer 46555b50a1 fix warning text and margin 2014-05-27 12:29:08 +02:00
Vincent Petry d38f867055 Merge pull request #8721 from owncloud/sharing_don_lose_filesize
don't lose file size during rename
2014-05-27 12:25:55 +02:00
Vincent Petry 17276af6ad Merge pull request #8733 from owncloud/l10n-forgotten-tags
unwrapped strings fix
2014-05-27 11:55:33 +02:00
Vincent Petry c64e920b4d Adjust core apps to use "requiremin" instead of "require"
Also added a few missing authors.
2014-05-27 11:54:44 +02:00
Vincent Petry d43a7c5f6e Added requiremin/requiremax fields for apps
Apps can now specify a minimum and maximum version of ownCloud in which
they are supported.
2014-05-27 11:54:12 +02:00
Vincent Petry a79f3fd1c0 Merge pull request #8728 from owncloud/sharing_fix_reshare
allow resharing of files with only share permissions
2014-05-27 09:02:52 +02:00
Jenkins for ownCloud a756666585 [tx-robot] updated from transifex 2014-05-27 01:54:54 -04:00
Volkan Gezer 188c5435d8 unwrapped strings fix 2014-05-27 03:48:24 +02:00
Bjoern Schiessle 36f63ea990 allow resharing of files with only share permissions 2014-05-26 20:32:24 +02:00
Bernhard Posselt daecf4b2c1 disable dynamic slide toggle by default and offer a way to enable it 2014-05-26 18:06:47 +02:00
Bernhard Posselt c2330e558e rename to apps.js 2014-05-26 17:31:41 +02:00
Bjoern Schiessle 95bd7fee9c don't lose file size during rename 2014-05-26 14:11:33 +02:00
Arthur Schiwon 3a21c3e2f4 Merge branch 'logintimestamp' of git://github.com/owncloud/core into logintimestamp 2014-05-26 13:56:40 +02:00
Arthur Schiwon 4a4ea67a31 drop superflous statement in phpdoc 2014-05-26 13:56:08 +02:00
Arthur Schiwon 748a219243 add preRememberedLogin hook and document this and postRememberedLogin in class descripttion. Also fixes documentation of postLogin hook 2014-05-26 13:53:26 +02:00
Vincent Petry a34491e288 Merge pull request #8687 from owncloud/recursive-remove-smb
Make the recursive delete more robust
2014-05-26 11:06:13 +02:00
Frank Karlitschek 48d0cebc42 Merge pull request #8674 from owncloud/watch-policy
Add a config option for setting the filesystem watcher policy
2014-05-26 10:48:44 +02:00
Jenkins for ownCloud 790c0e8e7c [tx-robot] updated from transifex 2014-05-26 01:55:36 -04:00
Volkan Gezer 59125cb796 fix grammar 2014-05-25 20:42:52 +02:00
Volkan Gezer 5fa67a4fb0 Merge pull request #8711 from owncloud/l10n-fully-translatable-ldap
make user_ldap fully translatable
2014-05-25 19:26:37 +02:00
Volkan Gezer f880734827 make user_ldap fully translatable 2014-05-25 14:41:59 +02:00
Thomas Müller 3348019bfa Merge pull request #8705 from wakeup/master
fix typo
2014-05-25 11:00:34 +02:00
Jenkins for ownCloud 3029029afd [tx-robot] updated from transifex 2014-05-25 01:54:35 -04:00
Volkan Gezer 426f492f57 fix typo
Suggested by [mnestis](https://www.transifex.com/accounts/profile/mnestis/) on transifex
2014-05-24 14:36:10 +02:00
Bernhard Posselt 9112386cbf query buttons on every click to not worry about weird edge case scenarios 2014-05-24 14:28:24 +02:00
Bernhard Posselt 8a30fe8ce3 use different ns 2014-05-24 14:24:46 +02:00
Bernhard Posselt 11c5ded96c allow apps to add buttons on runtime without negatively impacting performance 2014-05-24 14:23:44 +02:00
Lukas Reschke 1b215b0131 Merge pull request #8688 from owncloud/public-image-positioning
Show less whitespace above publicly shared images
2014-05-24 12:49:12 +02:00
Lukas Reschke c03e7fcfa9 Clarify comment 2014-05-24 10:24:42 +02:00
kondou f216d81408 Use userManager, color output, return 1 on error 2014-05-24 09:49:02 +02:00
Jenkins for ownCloud 2afdd1bf1a [tx-robot] updated from transifex 2014-05-24 01:55:34 -04:00
Bernhard Posselt 41b7e4b8b8 add ; to make jshint happy 2014-05-23 21:28:34 +02:00
Björn Schießle 864cd2455c Merge pull request #8699 from owncloud/sharing_improvements
fix share label creation
2014-05-23 20:53:32 +02:00
Bernhard Posselt 044ba97263 remove unecessary parenths 2014-05-23 19:14:28 +02:00
Arthur Schiwon 7f7999c7d8 print time in 24h format 2014-05-23 19:12:51 +02:00
Bernhard Posselt db1511a11d add a slideup mechanism 2014-05-23 18:49:16 +02:00
Jan-Christoph Borchardt d6a22acd67 Merge pull request #8690 from owncloud/design-noise
remove noise texture from interface
2014-05-23 18:13:02 +02:00
Jan-Christoph Borchardt c6c4bb62e1 move saved notification for mail server, so it's smaller 2014-05-23 18:09:45 +02:00
Jan-Christoph Borchardt b1ccfcde9e fix border-radius in settings to 3px 2014-05-23 18:07:25 +02:00
Jan-Christoph Borchardt 0977911c82 fix height of select boxes for OS X 2014-05-23 18:03:01 +02:00
Jan-Christoph Borchardt 574e4f0579 use user-select: none; on header, navigation and user menu 2014-05-23 17:57:29 +02:00
Jan-Christoph Borchardt 5bf13783e2 darken scrollbar to distinguish from selected sidebar items 2014-05-23 17:43:20 +02:00
Bjoern Schiessle ff4bb3a9e6 fix share label creation 2014-05-23 16:21:15 +02:00
Vincent Petry caf283615d Fixed undefined object error that appears after a delay
Now binding properly with the file list instance object.
2014-05-23 16:13:35 +02:00
Jan-Christoph Borchardt 7be0ce6ada remove noise texture from interface (not necessary, and blurry on high-res) 2014-05-23 14:15:36 +02:00
Robin Appelman 10c1fc8d24 Show less whitespace above publicly shared images 2014-05-23 13:36:16 +02:00
Robin Appelman be8326668a Make the recursive delete more robust 2014-05-23 13:31:45 +02:00
Robin Appelman 8b56d52398 Make the session available as early as possible 2014-05-23 13:27:27 +02:00
Björn Schießle 71e1d919de Merge pull request #8675 from owncloud/sharing-improvements
Sharing improvements
2014-05-23 06:41:34 -04:00
Robin Appelman 151c48494e Add a config option fro setting the filesystem watcher policy 2014-05-23 12:20:31 +02:00
Vincent Petry 0b0e038b8b Merge pull request #8671 from owncloud/log-upload-errors
php upload errors are written to log
2014-05-23 11:33:14 +02:00
Arthur Schiwon 2e85d5a852 increase scrutinizer happyiness by removing minor/informational issues 2014-05-23 11:20:46 +02:00
Bjoern Schiessle 3b279c9056 prevent default action when clicking on the share notification 2014-05-23 11:17:13 +02:00
Arthur Schiwon e9fa74bfb7 save a whitespace 2014-05-23 10:55:54 +02:00
Arthur Schiwon 09bb8e0e3a add cli command to check a users last login 2014-05-23 10:37:34 +02:00
Arthur Schiwon 86880acee9 clean up here is superflous, will already be removed by user session 2014-05-23 10:16:18 +02:00
Thomas Müller 6ffb139a46 Merge pull request #8658 from realriot/master
Changed access mode for Dropbox to 'auto'
2014-05-23 10:14:09 +02:00
Vincent Petry 9c9644e646 Merge pull request #8647 from owncloud/public-image-scaling
Dont scale up the preview for publicly shared images
2014-05-23 10:06:51 +02:00
Arthur Schiwon 60274d1729 test hooks also on login 2014-05-23 00:59:26 +02:00
Arthur Schiwon bf1f5f2af3 also test whether hooks work 2014-05-23 00:54:17 +02:00
Arthur Schiwon c46fada6b3 unit tests for loginWithCookie() 2014-05-23 00:18:07 +02:00
Robin Appelman 157b139b57 Dont scale up the preview for publicly shared images 2014-05-22 16:45:51 +02:00
Bjoern Schiessle 11aa2cf74b always check for unique filename, if a file gets added from outside the mount
point should be adjusted to ne unique again
2014-05-22 14:31:22 +02:00
Bjoern Schiessle 1166d62d9b fileList needs be be declared before the if-statement 2014-05-22 14:31:16 +02:00
Björn Schießle 050df76830 Merge pull request #8599 from owncloud/sharing_disable_for_groups
allow admin to disable sharing for specific groups of users
2014-05-22 08:19:27 -04:00
Robin Appelman ff1f341d97 Fix phpdoc 2014-05-22 13:30:32 +02:00
Vincent Petry c4f6a80bdc Merge pull request #8163 from Xenopathic/files_external_priority
Priority on external storage mounts
2014-05-22 13:17:44 +02:00
Thomas Müller 201cc59fe0 php upload errors are written to log 2014-05-22 12:20:27 +02:00
Vincent Petry d6e1643a0e Fix dropping files below the table 2014-05-22 11:16:42 +02:00
Bjoern Schiessle 12338e0ef0 allow admin to disable sharing for specific groups of users 2014-05-22 10:43:44 +02:00
Remco Brenninkmeijer 4f0370f1da Fix for #8654 2014-05-22 10:35:01 +02:00
Thomas Müller 0249c6d8c7 Merge pull request #8634 from owncloud/handle-excpetions-in-console-master
Handle excpetions in console master
2014-05-22 10:30:33 +02:00
Vincent Petry 25ecd2bdda Merge pull request #8659 from owncloud/get-preference-multiple-user
Add a method to get the values for multiple users to OC\Preferences
2014-05-22 09:59:20 +02:00
Jenkins for ownCloud 69717487f9 [tx-robot] updated from transifex 2014-05-22 01:54:28 -04:00
Robin McCorkell 856c48bc25 Use default priority of 100 if backend default is not set 2014-05-21 22:31:18 +01:00
Robin McCorkell da03ef25d9 Add priority overriding comments 2014-05-21 22:29:16 +01:00
Robin McCorkell 0a8a319915 Fix priority merging logic and add unit test 2014-05-21 22:18:22 +01:00
Robin McCorkell eae45dca71 Add unit tests 2014-05-21 22:18:22 +01:00
Robin McCorkell 2254678a0c Use constants for priority type and add comments 2014-05-21 22:17:21 +01:00
Robin McCorkell a0ccb060fa Use more strict type comparisons 2014-05-21 22:17:21 +01:00
Robin McCorkell e4d3ee7866 Preserve priority if already set 2014-05-21 22:17:21 +01:00
Robin McCorkell 9151d72507 Treat 'all users' as 'global'
A mount applicable to all users is as good a definition of global as can be
2014-05-21 22:17:21 +01:00
Robin McCorkell 05642733a3 Add storage priority support
Each storage backend has a default priority, assigned to any system mounts
created in ownCloud. mount.json can be manually modified to change these
priorities.

The priority order is as follows:
 * Personal
 * User
 * Group
 * Global

Within each mount type, the mount with the highest priority is active.

The storage backend defaults were chosen to be the following:
 * Local - 150
 * Remote storage - 100
 * SMB / CIFS with OC login - 90
2014-05-21 22:17:21 +01:00
Björn Schießle 14a953fbe0 Merge pull request #8416 from owncloud/sharing_keep_mount_points_visible
[sharing] move the mount point up if the parent folder no longer exists
2014-05-21 14:07:49 -04:00
Arthur Schiwon 2c89962919 clean up tryRememberLogin and save the timestamp of users last login 2014-05-21 18:03:37 +02:00
Morris Jobke c586d1f4d5 Merge pull request #8652 from owncloud/logfile_rotate
rotate custom logfile if defined
2014-05-21 17:55:39 +02:00
Vincent Petry 542b395858 Fixed drag and drop from external files, added tests
- Fixed detection whether the drop zone is inside the currently visible
  table
- Now dragging outside the table does nothing instead of uploading,
  because the user might drop on the sidebar
- Added unit tests for the drop handler
2014-05-21 17:38:09 +02:00
Joas Schilling d621a6fe5e Clean the database after the test 2014-05-21 16:00:21 +02:00
Joas Schilling e20fb37038 Correctly create list of placeholders 2014-05-21 14:35:59 +02:00
Bjoern Schiessle 5f403f3e92 move the mount point up if a share is mounted to a subfolder and the subfolder no longer exists 2014-05-21 13:19:17 +02:00
Joas Schilling 66f94273c6 Add a lot of users for testing 2014-05-21 13:17:29 +02:00
Joas Schilling 4fbfe077fb Move return to new line 2014-05-21 13:10:23 +02:00
Björn Schießle 88d26aac7b Merge pull request #8612 from owncloud/share-updateshareiconsafterrename
[master] Fixed issues with renaming
2014-05-21 06:27:07 -04:00
Björn Schießle 319942bccb Merge pull request #8646 from owncloud/publicshare-fixes
[master] Fixed for public link page
2014-05-21 05:41:35 -04:00
Joas Schilling 457a4aa425 Add test case for getValueForUsers() 2014-05-21 11:36:01 +02:00
Joas Schilling cf3cd572b0 Add a method to get the values for multiple users to OC\Preferences 2014-05-21 11:14:52 +02:00
Vincent Petry 9b23a210c9 Merge pull request #8637 from owncloud/enc_improved_error_handling
[encryption] improved error handling during password change
2014-05-21 09:57:45 +02:00
Sascha Schmidt 4b2888cd9a Changed access mode for Dropbox to 'auto' 2014-05-21 09:40:03 +02:00
scolebrook 954d5b27ff use custom logfile path if defined, otherwise use default of owncloud.log in data directory 2014-05-20 11:29:59 -04:00
Vincent Petry 7d98bcf9a2 Fixed JS issues in public page
- fixed subdir detection when uploading into subdir
- add class detection before overriding to avoid JS errors
2014-05-20 13:37:58 +02:00
Vincent Petry 160a2bc36f Fixed download URL in public page 2014-05-20 13:24:52 +02:00
Jenkins for ownCloud 40fc1d5b4b [tx-robot] updated from transifex 2014-05-20 01:54:53 -04:00
Thomas Müller 06af8e09da adding annotation check to checkServer() 2014-05-19 21:51:35 +02:00
Thomas Müller 30f1ec2521 Merge branch 'master' into test_annotations_working
Conflicts:
	lib/private/util.php
2014-05-19 21:42:30 +02:00
Thomas Müller 8749442fec no return on register and unregister 2014-05-19 21:39:19 +02:00
Thomas Müller bb6fac1102 Merge branch 'master' into contactsmanager-register
Conflicts:
	lib/private/contactsmanager.php
2014-05-19 21:35:13 +02:00
Thomas Müller 51a6764f31 Merge branch 'master' into cleanup-list-code
Conflicts:
	apps/files_sharing/ajax/list.php
2014-05-19 20:52:25 +02:00
Thomas Müller f8cb8f4803 Merge branch 'master' into csrf-on-login-and-logout
Conflicts:
	core/templates/login.php
2014-05-19 20:40:55 +02:00
Thomas Müller b6d2d6329d Merge pull request #8639 from owncloud/drop-brief
Remove all occurences of @brief and @returns from PHPDoc
2014-05-19 20:18:32 +02:00
Morris Jobke dc36d30953 Remove all occurences of @brief and @returns from PHPDoc
* test case added to avoid adding them later
2014-05-19 17:50:53 +02:00
Frank Karlitschek 090d127050 Merge pull request #6457 from owncloud/db-convert-tool
Command line tool to convert current database to others, except sqlite
2014-05-19 16:41:31 +01:00
Thomas Müller 95741f3936 Merge pull request #8435 from owncloud/fix-8322-master
Expose permission via WebDAV
2014-05-19 16:52:03 +02:00
Thomas Müller 04e6c12fe2 Merge pull request #8557 from owncloud/custom_session_handling
Allow apps to create custom session handlers.
2014-05-19 15:58:30 +02:00
Bjoern Schiessle d9f715bdad only start migration if the encryption was initialized; allow to overwrite keys if no files exists 2014-05-19 15:53:50 +02:00
Thomas Müller 58e22cefaf fix description of console command maintenance:repair - fixes #8574 2014-05-19 15:29:38 +02:00
Thomas Müller 6929549dad adding try/catch + switch to config object as provided by the server container 2014-05-19 15:26:57 +02:00
Andreas Fischer 6c4b650524 Merge pull request #8585 from owncloud/phpdoc-improvements-apps
PHPDoc improvements /apps

* owncloud/phpdoc-improvements-apps:
  Fix whitespace issues
  Reduce double-space with single-space.
  Remove spaces around | operator in doc block.
  Fix more missing or broken PHPDoc
  PHPDoc fixes for user_ldap
  Fix PHPDoc in /apps
2014-05-19 14:08:42 +02:00
Morris Jobke 1cff73b615 Merge branch 'libasys-patch-1' 2014-05-19 13:14:33 +02:00
libasys 9e1d47bd90 Add generic 'share by link' URL generator in share.js
Some more global definition to autogenerate a "Shared by Link" with token! Why we not add these lines for more global use of the public service feature? At the moment there is a pr for sharing a calendar by Link. With this little mod the calendar can work with the core share api and needs no own js share definition!
2014-05-19 13:12:59 +02:00
Morris Jobke 48977c8579 Merge pull request #7286 from owncloud/issue/4823
Set expiration date by default when adding additional shares
2014-05-19 10:26:54 +02:00
Jenkins for ownCloud d52252998a [tx-robot] updated from transifex 2014-05-19 01:54:46 -04:00
Morris Jobke f633fb537f fix wrong conflict resolution 2014-05-19 01:53:20 +02:00
Joas Schilling d273b55e98 Correctly set expiration dates when adding additional shares 2014-05-19 01:40:32 +02:00
Joas Schilling ab7ae004f7 Automatically copy the share expiration date when new shares are created
Fix #4823
2014-05-19 01:38:47 +02:00
Morris Jobke 804020bb6d Merge pull request #7363 from owncloud/optimize-startup-queries
Optimize some queries that are always executed when loading base.php
2014-05-19 01:21:37 +02:00
Morris Jobke db9cfaa56d Merge pull request #8592 from owncloud/login-timezone
Disable login button until the timezone is set
2014-05-19 01:14:03 +02:00
Jenkins for ownCloud a7509e5fd9 [tx-robot] updated from transifex 2014-05-18 01:55:01 -04:00
Vincent Petry b3d12412ce Merge pull request #8609 from owncloud/ie8-svgfallbackforicons
SVG fallback for a few icons
2014-05-17 18:20:47 +02:00
Jenkins for ownCloud a1b356c7b6 [tx-robot] updated from transifex 2014-05-17 01:57:38 -04:00
Robin McCorkell e7aebc5c32 Fix whitespace issues 2014-05-16 22:23:36 +01:00
Andreas Fischer 5b1ffd7611 Reduce double-space with single-space. 2014-05-16 22:21:57 +01:00
Andreas Fischer e04d956cac Remove spaces around | operator in doc block. 2014-05-16 22:21:57 +01:00
Robin McCorkell 6930ae22e4 Fix more missing or broken PHPDoc 2014-05-16 22:21:57 +01:00
Robin McCorkell a17f9111a0 PHPDoc fixes for user_ldap 2014-05-16 22:21:57 +01:00
Robin McCorkell c4f1de63a8 Fix PHPDoc in /apps 2014-05-16 22:21:57 +01:00
Björn Schießle 42b99b6d0f Merge pull request #8555 from owncloud/sharing_default_expire_only_public_links
use default expire date only for link shares
2014-05-16 14:57:11 -04:00
Björn Schießle b52cb8f557 Merge pull request #8604 from owncloud/sharing_encforce_password
allow admin to enforce passwords for public link shares
2014-05-16 12:23:01 -04:00
Bjoern Schiessle 7a48f24459 use default expire date only for link shares 2014-05-16 18:12:13 +02:00
Vincent Petry 5a0281add8 Fixed issues with renaming
- summary is now untouched on rename instead of bogus incrementation
- fixes "Share" status icon by only triggring "fileActionsReady" once
- row is now reinserted even when rename is cancelled, this removes the
  hacky/buggy code that tried to rename the element back
- added unit tests to cover the fixed cases
2014-05-16 17:42:38 +02:00
Bjoern Schiessle b6e14af861 allow admin to enforce passwords for public link shares 2014-05-16 17:41:09 +02:00
Vincent Petry d5f60a8eb0 Merge pull request #8610 from owncloud/ie8-filesdndbug
Fix drag and drop in IE8
2014-05-16 17:27:50 +02:00
Vincent Petry 1fb0d5412c Merge pull request #6260 from owncloud/jan-navigation-filesidebar
Files app navigation sidebar
2014-05-16 13:00:35 +02:00
Vincent Petry f3d421d24b Fix drag and drop in IE8
For some reason IE8 didn't like the sort function, so using the one from
underscore instead.
2014-05-16 11:25:36 +02:00
Vincent Petry 9d3fcfcac8 SVG fallback for settings icon 2014-05-16 11:17:38 +02:00
Vincent Petry d4801e078e Fallback for triangle icons 2014-05-16 11:15:40 +02:00
Jenkins for ownCloud 43d6650d19 [tx-robot] updated from transifex 2014-05-16 01:55:55 -04:00
Vincent Petry 6fd084243b Fixed many issues, clean up
- fixed upload and storage statistics
- fixed infinite scroll to use the correct contain for scroll detection
- fixed unit test that sometimes fail for rename case
- controls are now sticky again
- fixed selection overlay to be aligned with the table
- fixed "select all" checkbox that had id conflicts
- fixed public page
- fixed global actions permissions detection
- fix when URL contains an invalid view id
- viewer mode now hides the sidebar (ex: text editor)
- added unit tests for trashbin
- clean up storage info in template (most is retrieved via ajax call now)
2014-05-15 17:51:04 +02:00
Vincent Petry 9d38e3602b Namespacing for FileList, FileActions and trashbin app
- FileList is now an instantiable class
- FileActions is now in namespace
- added App class for trashbin app
- moved trashbin overrides into classes extending FileList
- replaced many static calls with "this." or "self." to make the classes
  reusable/extendable
- new URL parameter "view" to specify which view is shown, for example
  "files" or "trashbin"
- added OC.Util.History utility class in core for handling history
- moved URL handling/routing to OCA.Files.App
- popstate will correctly update the current view and notify the view of
  the URL change so it can update the current dir
- added JS unitt tests for the trashbin app
- fixed public app to work with the new namespaces
2014-05-15 17:51:04 +02:00
Vincent Petry fb10bf4048 Files app navigation can now switch
- added new OCA.Files namespace for files classes
- the sidebar can now switch between views/containers
- the trashbin renders in its own container but currently doesn't work
  due to overrides
- added app.js as entry point for JS code (ideally all other files should
  only contain classes and not trigger anything)
2014-05-15 17:51:04 +02:00
Vincent Petry 88ebb15f1d Added navigation manager in files app for the sidebar
Apps can now register navigation items into the sidebar of the files app.
For every sidebar item there is a container.
The container's content is rendered based on the script name given at
registration time.
2014-05-15 17:51:04 +02:00
Vincent Petry 9ccb3279dd Added app navigation for files app
- Added links to trashbin and shared dir
- Moved "WebDAV" settings block to the app nav's settings section
- Added sidebar support in trashbin app as well
2014-05-15 17:51:04 +02:00
Vincent Petry 04f73275ba Now settings CSS class with appid in content DIV 2014-05-15 17:51:04 +02:00
Vincent Petry b2e8aa70cd Merge pull request #8603 from owncloud/trashbinfix
[regression] Fixed trashbin to use correct class
2014-05-15 17:49:18 +02:00
Vincent Petry 818c77684d Fixed trashbin to use correct class
It seems that \OC_Filesystemview has been removed.
Now using the correct class \OC\Files\View()
2014-05-15 15:21:27 +02:00
Jan-Christoph Borchardt 60efa0f1c8 Merge pull request #8140 from owncloud/login-valign
Vertically align public layout to better fit small mobile screens
2014-05-15 15:06:52 +02:00
Robin McCorkell a0f309bbd8 Merge pull request #8589 from fibsifan/files_external_sftp_port
rename URL-fields to Host for SFTP/FTP and SMB external Storage backends
2014-05-15 13:22:22 +01:00
fibsifan 06c084cc3c changing label "URL" to "Host" 2014-05-15 14:09:10 +02:00
Thomas Müller 7abe3b1989 Merge pull request #8587 from Raydiation/master
Small cleanup and language detection for apps
2014-05-15 12:22:47 +02:00
Vincent Petry 3daaf6ba4f Merge pull request #8597 from owncloud/l10n-fix-typo
fix typo encryption
2014-05-15 10:05:37 +02:00
Jenkins for ownCloud d9d684197a [tx-robot] updated from transifex 2014-05-15 01:55:53 -04:00
Volkan Gezer 5291f47c66 fix typo encryption 2014-05-15 01:29:14 +02:00
Thomas Müller 48ee72732e Merge pull request #8567 from owncloud/test-ocshareunittests
Added ground work for OC.Share unit tests
2014-05-14 23:35:58 +02:00
Björn Schießle dab3cb65cf Merge pull request #8522 from owncloud/sharing_ux_improvements
Sharing ux improvements
2014-05-14 12:54:27 -04:00
Vincent Petry 1de068b5cb Disable login button until the timezone is set
On slow computers it might happen that the user manages to login before
the timezone code has a chance to run, which then causes dates to appear
wrong in the UI.

This fix makes sure the login cannot happen until the timezone field is
set.

Note that it's not possible to run the timezone code outside of
document.ready() because at that time the DOM element doesn't exist yet.
2014-05-14 17:00:15 +02:00
icewind1991 4c19acf09b Merge pull request #8403 from owncloud/fix-oc-dialog
fix oc dialog because the body isn't 100% x 100% in dimensions anymore
2014-05-14 13:34:55 +02:00
jbtbnl c98edf18cc Merge pull request #8584 from Bagera/master
avoid row resize on filename edit
2014-05-14 10:05:59 +02:00
Bagera 7b39704c61 Set row height in files table
Sets row height to avoid resize when name is edited
2014-05-14 08:32:48 +02:00
Jenkins for ownCloud c9df98abae [tx-robot] updated from transifex 2014-05-14 01:55:31 -04:00
Bernhard Posselt d8020c3506 use registerService method instead of array access 2014-05-14 01:09:48 +02:00
Bernhard Posselt 9e36c33104 use fetch method instead of fetchRow because fetchRow is only an owncloud internal alias that exists purely for compability 2014-05-14 01:09:48 +02:00
Bernhard Posselt 512373fadf provide a way to detect the language that is being used (e.g. for clientside javascript language selection 2014-05-14 01:09:48 +02:00
Lukas Reschke 166f2af5d8 Merge pull request #8582 from owncloud/remove-outdated-update-sc
We do not support updates from 4.5 > 7.0 or even 3.0 > 7.0
2014-05-14 00:28:05 +02:00
Thomas Müller 5fb94bf76f Merge pull request #8542 from owncloud/phpdoc-improvements
PHPDoc Improvements
2014-05-13 23:23:11 +02:00
Thomas Müller 401bc60981 Merge pull request #8586 from owncloud/more-unit-tests
Add tests for other types that PHP might cast
2014-05-13 23:06:15 +02:00
Lukas Reschke b0381cfe12 Add tests for other types that PHP might cast
Addition to https://github.com/owncloud/core/pull/8572
2014-05-13 22:01:11 +02:00
Thomas Müller 37ba6f503a fixing variable naming 2014-05-13 19:09:15 +01:00
Thomas Müller 58857b8df5 @returns -> @return 2014-05-13 19:09:15 +01:00
Thomas Müller 55fc693750 @breif -> @brief 2014-05-13 19:09:15 +01:00
Thomas Müller fa503a4772 fix PHPDoc 2014-05-13 19:09:15 +01:00
Thomas Müller 650a55e2ba object -> \OC\Preview 2014-05-13 19:09:14 +01:00
Thomas Müller 7853bc4cac adding PHPDoc 2014-05-13 19:09:14 +01:00
Thomas Müller 147007bdd8 fixing typo and missing @throws 2014-05-13 19:09:14 +01:00
Robin McCorkell 4755392c65 More PHPDoc for file functions 2014-05-13 19:09:14 +01:00
Robin McCorkell f7e777f7d2 Fix various code errors detected by Scrutinizer
Fixed:
- An error with a misplaced bracket in lib/private/util.php
- An error with an incorrect function being called in lib/public/contacts.php
2014-05-13 19:09:14 +01:00
Robin McCorkell bac8962bbc Fix Scrutinizer errors 2014-05-13 19:08:14 +01:00
Robin McCorkell bd3bf4b507 Change parameter order of implode 2014-05-13 19:08:14 +01:00
Robin McCorkell 875a8acedf Fix Scrutinizer errors about missing user backend 2014-05-13 19:08:14 +01:00
Robin McCorkell 8ab01599a9 Use OC_User_Interface instead of OC_User_Backend 2014-05-13 19:08:14 +01:00
Lukas Reschke 7e448a376f Fix PHPDoc and typos
Some things my IDE complained about while creating a custom backend.

Fix PHPDoc and typos

Some things my IDE complained about while creating a custom backend.

Conflicts:
	lib/private/group/database.php
	lib/private/group/dummy.php
	lib/private/group/example.php
2014-05-13 19:08:14 +01:00
Robin McCorkell 3bed3d2a23 Change parameter type for useBackend 2014-05-13 19:08:14 +01:00
Robin McCorkell 87b548ed91 Fix all PHPDoc types and variable names, in /lib 2014-05-13 19:08:14 +01:00
Robin McCorkell a7ae2e874a Squash 'a | b' into 'a|b', in /lib 2014-05-13 19:08:14 +01:00
Robin McCorkell b5bc37d2e4 Fix @return array PHPDocs, in /lib 2014-05-13 19:08:14 +01:00
Robin McCorkell b653ad164b Replace @returns with @return, in /lib 2014-05-13 19:08:14 +01:00
Bagera 5757d02b76 fixes #7949
Sets height to form to avoid resizing when filename link is not shown
2014-05-13 20:02:22 +02:00
Lukas Reschke 2d1296bb03 We do not support updates from 4.5 > 7.0 2014-05-13 18:54:43 +02:00
Thomas Müller f5bc680f9c Merge pull request #8572 from owncloud/core-getabsolutepathwithzero
Fixed getAbsolutePath case when path is "0"
2014-05-13 17:41:18 +02:00
Vincent Petry bab8c1f8e5 Fixed getAbsolutePath case when path is "0"
Make sure to correctly check for string emptiness when the passed path
is "0".
2014-05-13 17:38:46 +02:00
Thomas Müller 7babd44dd0 Merge pull request #8524 from owncloud/prompt-dialog
Add prompt dialog to OC.dialogs
2014-05-13 17:32:06 +02:00
kondou f75c863257 Add doc, check return-value, fix spacing, require interactive 2014-05-13 15:57:41 +02:00
Bjoern Schiessle 737be1a10f move expire message to the bottom 2014-05-13 15:27:56 +02:00
Björn Schießle b8de1e5d71 Merge pull request #8398 from owncloud/enc_backup_keys
backup the encryption key after the encryption was disabled
2014-05-13 09:25:16 -04:00
Morris Jobke e934129bf6 Merge pull request #8566 from owncloud/controller-defaults
Allow setting of controller default method values through normal PHP default values
2014-05-13 14:32:07 +02:00
Robin Appelman c85e6d919e Use jquery to get the window width 2014-05-13 13:00:46 +02:00
Bjoern Schiessle a9ac11718e backup the encryption key after the encryption was disabled so that the user
can restore them if needed
2014-05-13 12:35:25 +02:00
Vincent Petry 6d00675d69 Merge pull request #8562 from owncloud/better-addmountpoint
Extract mount point merging logic into separate function
2014-05-13 12:19:41 +02:00
Bjoern Schiessle b985021082 hide default expire message if user sets expire date 2014-05-13 11:56:04 +02:00
Bjoern Schiessle b8dc85b2f6 increase width of share dialog 2014-05-13 11:49:16 +02:00
Robin Appelman 46d6cb739d Don't set the dialog content height to a zero or negative value 2014-05-13 11:37:29 +02:00
Robin Appelman 541495b1b5 Dont use absolute positioning for buttonrow 2014-05-13 11:36:31 +02:00
Bjoern Schiessle d56d03e230 add information about default expire date to the share dialog 2014-05-13 11:28:25 +02:00
Bjoern Schiessle ec045b251c hide input field if default expire date isn't activated 2014-05-13 11:28:25 +02:00
Vincent Petry 627eba5348 Added ground work for OC.Share unit tests 2014-05-13 11:15:06 +02:00
Morris Jobke 22e57d7e5a Merge pull request #8550 from owncloud/fix-sticky-footer
fix sticky footer on log in page
2014-05-13 11:02:14 +02:00
Bernhard Posselt a152e320f6 make it possible to omit parameters and use the default parameters from the controller method 2014-05-13 10:40:49 +02:00
Vincent Petry c06063255f Merge pull request #8526 from owncloud/escape-share-emails-master
escape display name and email
2014-05-13 10:29:54 +02:00
Vincent Petry e3f6abf1f0 Merge pull request #8546 from owncloud/fix-preview-orientation-encrypted-master
Rotate thumbnail when encryption is enabled
2014-05-13 10:27:41 +02:00
Jenkins for ownCloud a60db322c2 [tx-robot] updated from transifex 2014-05-13 01:55:41 -04:00
Robin McCorkell 08a8a409d6 Extract mount point merging logic into separate function 2014-05-13 00:14:30 +01:00
Thomas Müller 8314e5f4d1 fixing typos and adding PHPDoc 2014-05-12 21:58:09 +02:00
Thomas Müller 408189b7e4 Merge pull request #8556 from owncloud/kill-legacy-code-master
Kill legacy code master
2014-05-12 20:55:24 +02:00
Lukas Reschke 2a5e1a1885 Back to the future 2014-05-12 20:05:52 +02:00
Lukas Reschke aea44ee0d5 Merge pull request #8538 from owncloud/make-my-ide-less-complain-about-ldap
Use proper PHPDoc and variable names in the LDAP lib
2014-05-12 19:31:43 +02:00
Lukas Reschke cd7fc5cb80 Use array as type 2014-05-12 19:31:21 +02:00
Thomas Müller ee8a7b53da Merge pull request #8553 from owncloud/fix-8549-master
adding X-Robots-Tag to all responses of ownCloud + move addSecurityHeade...
2014-05-12 17:45:08 +02:00
ringmaster 75bc25f906 Allow apps to create custom session handlers. 2014-05-12 11:08:28 -04:00
Thomas Müller 1d18fd4e6d Merge pull request #8482 from owncloud/public-logger
Make logger available in the container
2014-05-12 16:40:58 +02:00
Thomas Müller f5ed92bf31 remove legacy aka deprecated code: OC_Cache_FileGlobalGC 2014-05-12 16:34:47 +02:00
Thomas Müller e0dd69e4e6 remove legacy aka deprecated code: OC_FilesystemView 2014-05-12 16:30:39 +02:00
Thomas Müller 33987eea83 remove legacy aka deprecated code: OC_Cache 2014-05-12 16:23:33 +02:00
Thomas Müller 4dd1a49a68 remove legacy aka deprecated code: OC_Filesystem 2014-05-12 16:20:07 +02:00
kondou e5e77b370a Make ResetAdminPass to ResetPassword 2014-05-12 16:10:59 +02:00
kondou 011bd0a1c4 Add a resetadminpass command to console - fix #8248 2014-05-12 15:33:26 +02:00
Thomas Müller 3cd32dcb7c adding X-Robots-Tag to all responses of ownCloud + move addSecurityHeaders() to OC_Response, which seems to be a more reasonable place 2014-05-12 15:14:01 +02:00
Thomas Müller 93dbb39e77 adding unit test for message interpolation 2014-05-12 14:17:36 +02:00
Jan-Christoph Borchardt b92c4cb84d fix sticky footer on log in page 2014-05-12 13:40:04 +02:00
Morris Jobke 9d95fff427 fix missing spaces 2014-05-12 13:32:03 +02:00
Vincent Petry 9a9665f361 Merge pull request #8041 from owncloud/files-sortcolumns
File list sorting by clicking on column headers
2014-05-12 12:50:27 +02:00
Thomas Müller 1c731aacaf fix style 2014-05-12 11:30:47 +02:00
Thomas Müller da0e37ef03 Rotate thumbnail when encryption is enabled
When a picture is encrypted, save it to a temporary file first so that
the PHP function for rotation can access it as file.
2014-05-12 11:27:39 +02:00
Thomas Müller d853c60d7e adding interpolation as requested by PSR-3 2014-05-12 10:54:09 +02:00
Jenkins for ownCloud f4e8de3cbb [tx-robot] updated from transifex 2014-05-12 01:55:44 -04:00
Morris Jobke 2054837d01 Merge pull request #8541 from owncloud/hardenIsSubDirectory
Harden issubdirectory()
2014-05-12 01:42:25 +02:00
Morris Jobke 984b509c0b Merge pull request #8540 from owncloud/fix-undefined
$owner is not defined here
2014-05-12 01:32:05 +02:00
Morris Jobke 6499995474 Merge pull request #8477 from owncloud/better-controllers
Better appframework controllers
2014-05-12 01:07:49 +02:00
Morris Jobke 7a6ff56b13 Merge pull request #8274 from owncloud/appframework-db
Port database layer from appframework to core
2014-05-12 00:12:19 +02:00
Morris Jobke 58dc10349a Merge pull request #8518 from owncloud/multiselect-width-fix
reduce multiselect max-width from 400 to 200px to not take too much space
2014-05-11 23:41:35 +02:00
Bernhard Posselt 63f2f16b85 use new controllermethodreflector for corsmiddleware 2014-05-11 17:55:59 +02:00
Bernhard Posselt 474b8f071d Fix typo 2014-05-11 17:54:09 +02:00
Bernhard Posselt 3e58a767ad Fix method signature 2014-05-11 17:54:09 +02:00
Bernhard Posselt fcb1aa36f0 default to null to not fail if type is not annotated via phpdoc 2014-05-11 17:54:09 +02:00
Bernhard Posselt 1d45239c65 adjust license headers to new mail address 2014-05-11 17:54:08 +02:00
Bernhard Posselt cb666c18d6 rename formatter to responder, formatResponse to buildResponse 2014-05-11 17:54:08 +02:00
Bernhard Posselt c590244fa1 add private property for reflector in security middleware 2014-05-11 17:54:08 +02:00
Bernhard Posselt ede7325772 fix broken if 2014-05-11 17:54:08 +02:00
Bernhard Posselt d8da79cab0 add test for not failing when adding more comments after type parameters, do not limit x-www-form-urlencoded to POST 2014-05-11 17:54:08 +02:00
Bernhard Posselt 4dca2038bf add request to dispatcher class 2014-05-11 17:54:08 +02:00
Bernhard Posselt 80648da431 implement most of the basic stuff that was suggested in #8290 2014-05-11 17:54:08 +02:00
Bernhard Posselt a252f59cd4 Merge pull request #8504 from owncloud/cors-middleware
Add cors middleware
2014-05-11 16:54:34 +02:00
Lukas Reschke 2ae1be762c That's bool and not always true 2014-05-11 16:29:59 +02:00
Lukas Reschke 57640742af Use WizardResult|false instead of mixed 2014-05-11 16:28:50 +02:00
Lukas Reschke 416f8b186d Use @return instead of @returns 2014-05-11 16:27:18 +02:00
Lukas Reschke fd5b2d11d6 Rename issubdirectory to isSubDirectory 2014-05-11 15:50:59 +02:00
Lukas Reschke a40e49cae5 Harden issubdirectory()
realpath() may return false in case the directory does not exist since we can not be sure how different PHP versions may behave here we do an additional check whether realpath returned false
2014-05-11 15:49:19 +02:00
Lukas Reschke 60f6d82dcd $owner is not defined here
Fixes https://github.com/owncloud/core/issues/8539
2014-05-11 15:34:54 +02:00
Lukas Reschke cd3ed01483 Fix Typo
I guess that should be `default` and not `defautl`, wondering how this ever worked.
2014-05-11 15:24:42 +02:00
Lukas Reschke fc8be5abc3 Use proper PHPDoc and variable names in the LDAP lib
My IDE was so sad about this that it marked the whole file in red and yellow and forced me to fix this.
2014-05-11 15:17:27 +02:00
Bernhard Posselt e05192a23d Fix method signature 2014-05-11 14:03:58 +02:00
Lukas Reschke e1e1009ccc Redirect to index if the logout link is accessed without valid session
This is needed to prevent "Token expired" messages while login if a session is expired
@see https://github.com/owncloud/core/pull/8443#issuecomment-42425583
2014-05-11 13:09:46 +02:00
Bernhard Posselt 3af30625ab Make db connection protected 2014-05-11 12:54:44 +02:00
Lukas Reschke 62364269c5 Fix Typo, define $ as global 2014-05-11 10:55:00 +02:00
Jenkins for ownCloud b6d76e9985 [tx-robot] updated from transifex 2014-05-11 01:57:00 -04:00
Lukas Reschke 0cc7d84e16 Merge pull request #8520 from owncloud/jslint_polishing_in_file_upload
polish jslint for files-upload.js
2014-05-10 22:43:50 +02:00
Jenkins for ownCloud 05ea8c8a10 [tx-robot] updated from transifex 2014-05-10 01:55:50 -04:00
Bernhard Posselt 9a4d204b55 add cors middleware
remove methodannotationreader namespace

fix namespace for server container

fix tests

fail if with cors credentials header is set to true, implement a reusable preflighted cors method in the controller baseclass, make corsmiddleware private and register it for every request

remove uneeded  local in cors middleware registratio

dont uppercase cors to easily use it from routes

fix indention

comment fixes

explicitely set allow credentials header to false

dont depend on better controllers PR, fix that stuff later

split cors methods to be in a seperate controller for exposing apis

remove protected definitions from apicontroller since controller has it
2014-05-09 23:34:41 +02:00
Bernhard Posselt b4298c68ca - make logger available in the container
- inject logger class into log
- adding PHPDoc comments and fixing typos
2014-05-09 23:26:20 +02:00
Thomas Müller 78c0cc6089 escape display name and email 2014-05-09 23:12:26 +02:00
Thomas Müller b7981910f7 adopt new settings style 2014-05-09 22:53:01 +02:00
Thomas Tanghus 287c8981bc Check if ReflectionMethod::getDocComment is working 2014-05-09 22:44:55 +02:00
Lukas Reschke 1083085e6e Merge pull request #7546 from owncloud/no_freaking_tag_dupes
Tags cleanup
2014-05-09 22:10:45 +02:00
Thomas Müller e5ee84ca9b - update permissions
- change xml tag to perm
2014-05-09 17:18:43 +02:00
Robin Appelman 163a7a47f9 Add prompt dialog to OC.dialogs 2014-05-09 17:09:06 +02:00
Jörn Friedrich Dreyer f0f059576e polish jslint for files-upload.js 2014-05-09 15:22:11 +02:00
Jan-Christoph Borchardt bba2d60d36 Merge pull request #8496 from owncloud/fix-folder-icon
fix folder icon (file had a big background rectangle before)
2014-05-09 14:19:26 +02:00
Andreas Fischer bd4d315d78 Merge pull request #8512 from owncloud/fix-memcached-hasKey
Be more strict in checking the resultCode of memcached hasKey function

* owncloud/fix-memcached-hasKey:
  Memcached hasKey should test for success, the get can fail for other reasons.
2014-05-09 12:41:46 +02:00
Andreas Fischer 603ce95211 Add message about unsupported Microsoft SQL Server. 2014-05-09 12:31:29 +02:00
Andreas Fischer de78be3891 Store normalised DBMS type in $type. 2014-05-09 12:31:08 +02:00
Jan-Christoph Borchardt 4d595f49a0 reduce multiselect max-width from 400 to 200px to not take too much space 2014-05-09 11:09:31 +02:00
Jenkins for ownCloud 9919ec48df [tx-robot] updated from transifex 2014-05-09 01:55:42 -04:00
Vincent Petry 6e7c274d2e Merge pull request #8499 from owncloud/shareextstoragemountpointfix
Fix sharing of ext storage mount points
2014-05-08 22:35:01 +02:00
Bart Visscher 88225db4af Memcached hasKey should test for success, the get can fail for other reasons.
One of the other failures is no running server.
2014-05-08 18:11:29 +02:00
Vincent Petry 05dc694c5c Fix getPathById for Oracle
Added extra code to handle the case of Oracle which saves empty strings
as null values.
2014-05-08 13:33:55 +02:00
Andreas Fischer 8ede209ea3 Merge pull request #8493 from owncloud/we-certainly-don't-want-type-juggling-on-that
Use strict type comparison

* owncloud/we-certainly-don't-want-type-juggling-on-that:
  Use strict type comparison
2014-05-08 13:02:48 +02:00
Vincent Petry af2b7634ee Merge pull request #8293 from owncloud/files_external_fix_readData
Fix issue with personal mount points and sharing
2014-05-08 11:01:54 +02:00
Vincent Petry f73a168694 Added unit test for sharing ext storage mount points 2014-05-08 11:00:19 +02:00
Vincent Petry 28f0e6307f Fix sharing of ext storage mount points
When sharing an ext storage mount point, it will now use the name of the
mount point instead of an empty string for the target path.
2014-05-08 10:03:07 +02:00
Vincent Petry 390549c286 Merge pull request #8221 from owncloud/type-hinting-sharing
Type hinting fixes for sharing
2014-05-08 09:30:50 +02:00
Jenkins for ownCloud 4da6645a94 [tx-robot] updated from transifex 2014-05-08 01:55:39 -04:00
Bart Visscher 9f88141bcd Use 'boolean' as type instead of 'bool' 2014-05-07 20:46:08 +02:00
Björn Schießle a2848ee11c Merge pull request #8497 from owncloud/sharing_cleanup
[sharing] some small clean ups and bug fixes
2014-05-07 14:18:41 -04:00
Bjoern Schiessle f85e968883 Merge branch 'sharing_cleanup' of github.com:owncloud/core into sharing_cleanup 2014-05-07 17:57:32 +02:00
Bjoern Schiessle d3f957c21e remove error_log output 2014-05-07 17:56:52 +02:00
Bart Visscher f569c721a6 Merge branch 'master' into optimize-startup-queries
Conflicts:
	apps/files_sharing/lib/sharedstorage.php
	tests/lib/group/manager.php

removed hasFilesSharedWith from lib/public/share.php and
sharedstorage.php to fix merge
2014-05-07 17:54:38 +02:00
Joas Schilling dbb93074b3 Fix endless loop on windows servers
Directory seperator is \ on windows
However we can just check for path != dirname(path) because that is
the same for '' (empty string), '.' and DIRECTORY_SEPARATOR on all OS
2014-05-07 17:38:29 +02:00
Bjoern Schiessle 31bf2d4b33 we can take the permission directly from the share, no need to call the share api first 2014-05-07 16:49:07 +02:00
Lukas Reschke c4109d9aef Use strict type comparison
We certainly don't want to have type juggling on that.
2014-05-07 15:11:42 +02:00
Lukas Reschke 254fa5eb22 Merge pull request #8488 from owncloud/sabre-notfoundloglevel
Some expected Sabre exceptions are now logged with DEBUG level
2014-05-07 15:05:17 +02:00
Vincent Petry 75d81eefc1 Merge pull request #8223 from owncloud/fix_linkToPublic
Fix linkToPublic and linkToAbsolute.
2014-05-07 14:40:59 +02:00
Vincent Petry a8c83f79ef Merge pull request #8489 from owncloud/share_updater_ignore_part_files
[sharing] share updater ignore part files
2014-05-07 14:31:28 +02:00
Bjoern Schiessle 799d8ca381 check if we have a fileinfo 2014-05-07 11:47:52 +02:00
Bjoern Schiessle bee48f851e ignore part files 2014-05-07 11:47:27 +02:00
Vincent Petry 4a493c8835 Some expected Sabre exceptions are now logged with DEBUG level 2014-05-07 11:43:50 +02:00
Jan-Christoph Borchardt 04ea938331 fix folder icon (file had a big background rectangle before) 2014-05-07 11:13:52 +02:00
Jenkins for ownCloud 283b483100 [tx-robot] updated from transifex 2014-05-07 01:55:48 -04:00
Vincent Petry d16bb09aed Merge pull request #8045 from josh4trunks/nginx_x-accel_send_uri
Send URI instead of filepath to NGINX for X-Accel
2014-05-06 18:41:06 +02:00
Bart Visscher 72864d1c53 Typo 2014-05-06 18:05:06 +02:00
Morris Jobke b9f059bd3e Merge pull request #8466 from owncloud/fix-installation-caret
fix enlarged caret on installation page
2014-05-06 14:55:16 +02:00
Jan-Christoph Borchardt c1dfdbbbb4 fix enlarged caret on installation page 2014-05-06 12:17:13 +02:00
Morris Jobke 9411ba2acd Merge pull request #8459 from owncloud/fix-getUserFolder
fix getUserFolder() of server container
2014-05-05 23:08:42 +02:00
Thomas Müller 45f8d2d3ff Merge pull request #8456 from owncloud/extstorage-unittestssuite
Added ext storage app in autotest unit test run
2014-05-05 19:48:35 +02:00
Vincent Petry 75a77afe6d Merge pull request #8458 from snai/master
Updated Owncloud Mailinglist URL
2014-05-05 19:45:30 +02:00
icewind1991 bd92b94c6a Merge pull request #8455 from owncloud/preview-scaleup
Dont create borders around previews when scaling up is disabled
2014-05-05 18:24:20 +02:00
Morris Jobke 91a5e728c0 fix getUserFolder() of server container 2014-05-05 18:15:48 +02:00
Martin Grohmann b731dd3a64 Updated Owncloud Mailinglist URL 2014-05-05 17:03:09 +02:00
Vincent Petry 0c8ae6eb66 Added ext storage app in autotest unit test run
To make sure that the dynamic mount config and config classes from
external storages are tested, these are now added into the autotest.sh
test run by enabling the app.
2014-05-05 15:03:10 +02:00
Robin Appelman 578eb33c20 Dont create borders around previews when scaling up is disabled 2014-05-05 14:54:34 +02:00
Vincent Petry 1a454f61ed Merge pull request #8386 from owncloud/fix_6946_master
Fix 6946 master
2014-05-05 14:08:45 +02:00
Thomas Müller 341fcdc37a Merge pull request #8407 from owncloud/scale-pics-on-public-sharing-master
Images on public sharing get downscaled to increase use experience - thi...
2014-05-05 10:12:40 +02:00
Thomas Müller d2754af7c3 Merge pull request #8442 from owncloud/fix-typo
Fix typo and PHPDoc
2014-05-05 10:03:47 +02:00
Jenkins for ownCloud 51d1e6c8b1 [tx-robot] updated from transifex 2014-05-05 01:55:47 -04:00
jbtbnl 11300621ef Move vertical alignment of public layout to mobile. Refs #8140 2014-05-04 16:24:01 +02:00
Lukas Reschke 2c483fdca2 Add missing \ 2014-05-04 15:52:25 +02:00
Lukas Reschke 0b7d9e2668 Cleanup code a little bit
- Use OCP\Response constants instead of the HTTP error code
- Use checkAppEnabled() instead of OC_App::isEnabled with an if statement
- Remove uneeded variable $baseURL
- Rename $isvalid to $isValid
2014-05-04 15:51:08 +02:00
Lukas Reschke 73b914ddbc Add CSRF check on login and logout
This is a minor issue and not worth a backport in my opinion as it could break more things than it's worth having it.
2014-05-04 13:56:21 +02:00
Lukas Reschke 5cfc9d973d Fix PHP Doc and use readable variable name 2014-05-04 13:02:58 +02:00
Lukas Reschke 6f57911b44 Does also take int or string 2014-05-04 13:01:57 +02:00
Lukas Reschke d091cca636 Fix typo 2014-05-04 12:53:06 +02:00
Jenkins for ownCloud 9385b97b5f [tx-robot] updated from transifex 2014-05-04 01:56:15 -04:00
Andreas Fischer e381d7d180 Merge pull request #8440 from wakeup/master
Minor changes in config.sample

* wakeup/master:
  Update config.sample.php
  Minor changes in config.sample
2014-05-03 23:39:10 +02:00
Volkan Gezer 1a0fc49018 Update config.sample.php 2014-05-03 15:38:44 +02:00
Volkan Gezer 6dfc63a240 Minor changes in config.sample
* appcodechecker accepts boolean.
* using different ports in trusted domains

Partially fixes #330
2014-05-03 14:41:36 +02:00
Morris Jobke 623161b9a9 Merge pull request #8023 from flyser/master
Fix setting the max-upload-size for really large values.
2014-05-03 11:49:38 +02:00
Jenkins for ownCloud cf20de185c [tx-robot] updated from transifex 2014-05-03 01:56:11 -04:00
Bernhard Posselt 906061a07b Merge pull request #8171 from owncloud/fix-import
be nice and use a relative import so people can use the class without fi...
2014-05-02 22:43:19 +02:00
Thomas Müller 95fe55f9e7 fix broken unit test 2014-05-02 20:35:03 +02:00
Vincent Petry 9e18be6422 Merge pull request #8377 from youngguns-nl/issue_8376
RecursiveDirectoryIterator does not work on NFS
2014-05-02 18:45:09 +02:00
Thomas Müller d163441f3e load image via javascript and use $(document).width() to determine the proper side of the image to be returned 2014-05-02 18:36:58 +02:00
Thomas Müller c92c577b5e - Introduce isShared() and isMounted() on FileInfo class
- Reuse these methods on determineIcon()
- Generate permission string for the desktop client
- expose {http://owncloud.org/ns}permissions as additional WebDAV property containing the permission string
2014-05-02 17:37:16 +02:00
Thomas Müller 20893cc3b3 Images on public sharing get downscaled to increase use experience - this will speed up loading time
- adding keep aspect to core/ajax/preview.php
- remove duplicate method Preview::show()
- no more hard coded mimetype of preview
- remove .png from the preview urls
- keep old route preview.png for backwards compatibility
- aspect preserving previews are now cached
2014-05-02 17:02:57 +02:00
Thomas Müller 49d9631eee Merge pull request #8400 from owncloud/download-button-public-folder
reintroduce download button on public shares
2014-05-02 16:59:09 +02:00
Thomas Müller 6e75b37d04 disable download button if zip download is disabled 2014-05-02 15:53:46 +02:00
Jan-Christoph Borchardt 899c7c0443 fix position and look of public download button 2014-05-02 15:26:21 +02:00
Jan-Christoph Borchardt a280a69ecc remove unneeded header-right details styles 2014-05-02 15:14:41 +02:00
Jenkins for ownCloud 6519b9672a [tx-robot] updated from transifex 2014-05-02 01:55:53 -04:00
Jörn Friedrich Dreyer 6694129cbc columns should be nullable by default 2014-05-01 23:03:45 +02:00
Björn Schießle bf681713c8 Merge pull request #8415 from owncloud/sharing_fix_rename
[sharing] return the new name if a mount point was renamed
2014-05-01 14:58:29 -04:00
Bart Visscher 614cc67f88 Correct return type for getFilePath 2014-05-01 18:12:17 +02:00
Bart Visscher c34659dd89 Better documentation for isValidSource function 2014-05-01 18:11:55 +02:00
Bart Visscher 50f49c57b5 Some more params are optional 2014-05-01 18:11:30 +02:00
Jenkins for ownCloud 17f5a18922 [tx-robot] updated from transifex 2014-05-01 01:56:01 -04:00
Bjoern Schiessle 33883a46f5 return the new name if a mount point was renamed 2014-04-30 20:29:21 +02:00
Lukas Reschke 9ee88104e9 Merge pull request #8412 from owncloud/sharing_fix_part_file_rename
[sharing] fix rename of part files
2014-04-30 17:52:29 +02:00
Thomas Müller 11404b2b12 Merge pull request #8391 from owncloud/router-parameter-sorting
Preserve keys when sorting parameters when generatings urls
2014-04-30 15:10:36 +02:00
Thomas Müller 38989c3458 Merge pull request #8404 from owncloud/fix-checkboxes
Fixed too generic checkbox and link selectors
2014-04-30 14:51:29 +02:00
Morris Jobke dca2d9311a Merge pull request #8408 from owncloud/delete-spinner
Show spinner for all files when deleting all
2014-04-30 14:51:02 +02:00
Morris Jobke 09fb533167 Merge pull request #8405 from owncloud/remove-leftcontent-rightcontent
remove leftcontent and rightcontent CSS, no longer needed
2014-04-30 14:28:33 +02:00
Thomas Müller 4481a8412c Merge pull request #8132 from owncloud/issue/8131
Issue/8131 Fix emitting of filesystem related hooks
2014-04-30 13:57:44 +02:00
Bjoern Schiessle 20e4ad382b get the correct owner path for part files 2014-04-30 12:49:16 +02:00
Bjoern Schiessle 57b671ebec only update the values which really changed 2014-04-30 12:48:16 +02:00
Jenkins for ownCloud 654a6e6c6a [tx-robot] updated from transifex 2014-04-30 01:57:53 -04:00
Vincent Petry 61db16321f Clear selection on reload (when changing sort) 2014-04-29 18:49:11 +02:00
Vincent Petry 10bc67bef9 Show spinner for all files when deleting all 2014-04-29 17:59:30 +02:00
Thomas Müller 003049e8a6 remove file name from upper right button 2014-04-29 17:16:14 +02:00
Jan-Christoph Borchardt 4f873690d3 remove leftcontent and rightcontent CSS, no longer needed 2014-04-29 16:55:35 +02:00
Vincent Petry 2f58e798ec Fixed too generic checkbox and link selectors
It turns out that the sharing dropdown is embedded into the table row
for some reason.

This fix makes use of a more specific selector for the checkboxes and
file name links to make sure it doesn't spill into any other potential
elements like the sharing dialog.
2014-04-29 16:28:43 +02:00
Morris Jobke 14e568b13c fix oc dialog because the body isn't 100% x 100% in dimensions anymore 2014-04-29 15:34:48 +02:00
Thomas Müller df32254133 reintroduce download button on public shares 2014-04-29 15:28:35 +02:00
Sjors van der Pluijm 49822dfcdb refs #8376; spaces=>tabs 2014-04-29 14:59:47 +02:00
Vincent Petry 6b02126dc1 Merge pull request #8382 from owncloud/enc_fix_decrypt_all
fix shouldEncrypt() method and improved decryptAll() unit tests
2014-04-29 12:15:11 +02:00
Robin Appelman 77e6278d09 Preserve keys when sorting parameters when generatings urls 2014-04-29 11:55:19 +02:00
icewind1991 b95aa43a5d Merge pull request #8285 from owncloud/better_getmountby_handling
Handle return values better from Filesystem::getMountBy*
2014-04-29 11:22:11 +02:00
Joas Schilling ced2a4fcf2 Remove unneccessary statement from test 2014-04-29 10:42:49 +02:00
Joas Schilling 39bf700790 Update tests to test for create and update aswell 2014-04-29 10:34:28 +02:00
Joas Schilling c060f6ec7b Deduplicate code 2014-04-29 10:34:28 +02:00
Joas Schilling c1caaa6241 Correctly emit create/update hooks when a large file is being created/update
after being uploaded in .part files

Fix #8131
2014-04-29 10:34:27 +02:00
Joas Schilling 4fa9e46d2b Emit a new hook, when a file is being updated only
The write-hook also is triggered for created files

Fix #8131
2014-04-29 10:34:26 +02:00
Jan-Christoph Borchardt 158b870589 Merge pull request #6870 from owncloud/uncheck-remember-checkbox
do not check 'remember' log in by default
2014-04-29 10:22:02 +02:00
Jenkins for ownCloud b4a5093da8 [tx-robot] updated from transifex 2014-04-29 01:56:49 -04:00
Lukas Reschke 369522dbf5 Merge pull request #8388 from owncloud/reset-3rdparty-master
Update 3rdparty
2014-04-28 22:25:34 +02:00
Thomas Müller 7c0340c63c Merge pull request #7852 from josh4trunks/basic_auth_fix
Fixes login / logout when HTTP Basic Headers are avilable.
2014-04-28 21:46:52 +02:00
Lukas Reschke 318eaa9f56 Merge pull request #8387 from wakeup/master
Update outdated comment
2014-04-28 21:00:22 +02:00
Thomas Müller 6935364b33 add class Pimple to autloader 2014-04-28 20:57:44 +02:00
Thomas Müller bb2f4260c2 Update 3rdparty 2014-04-28 20:32:48 +02:00
Volkan Gezer e7c6111ae3 Update outdated comment 2014-04-28 20:23:18 +02:00
Sjors van der Pluijm e8a287f5bb refs #8376; spaces=>tabs 2014-04-28 19:52:06 +02:00
Sjors van der Pluijm 54f482ff9c refs #8376; added comment and applied patch on other files 2014-04-28 19:32:25 +02:00
Arthur Schiwon 837a02184b the group manager calls exists check less often, adjust test accordingly 2014-04-28 19:19:37 +02:00
Thomas Müller 535302b25e typos, indentation and remove of unused code 2014-04-28 17:59:50 +02:00
Bart Visscher 66b1ad0a9b Merge branch 'master' into type-hinting-sharing
Conflicts:
	apps/files_sharing/lib/share/file.php
	apps/files_sharing/tests/api.php
	lib/private/share/share.php
2014-04-28 17:59:41 +02:00
Thomas Müller 05dc265ea2 html input tag has no closing tag 2014-04-28 17:58:23 +02:00
Thomas Müller ac9e07c589 $RUNTIME_APPTYPES is no longer used - left over from pre OC4 2014-04-28 17:56:20 +02:00
Vincent Petry af22e7ec95 Added unit test in files app for sort function in helper class
Added unit test for the Helper class in the files app that tests the
different sort orders.
2014-04-28 17:42:04 +02:00
Vincent Petry c0e5975ab6 Set default sort of trashbin to timestamp descending 2014-04-28 17:42:04 +02:00
Vincent Petry 688f6162da Add sorting to files list, trashbin and public files 2014-04-28 17:42:04 +02:00
Thomas Müller e055a411ea Merge pull request #7167 from owncloud/files-ajaxload-infscroll
Infinite scrolling for files app
2014-04-28 17:39:02 +02:00
Thomas Müller be6431bab0 Merge pull request #8380 from owncloud/kill_office_fallback
remove preview office fallback as it makes too much trouble and generates inacceptable results
2014-04-28 17:18:36 +02:00
Thomas Müller bf61d841a2 typos, naming, remove unused code, identation 2014-04-28 16:51:57 +02:00
Thomas Müller 197b8ee052 Merge pull request #8340 from tribut/htaccess-escape-dots
Escape literal dots in mod_rewrite regexes
2014-04-28 16:09:03 +02:00
Vincent Petry f99f451026 Fixed drag and drop into folder and onto breadcrumb
Fixed drag and drop code to use FileList.getSelectedFiles() instead of
the visible DOM elements.
2014-04-28 14:55:01 +02:00
Vincent Petry a15b68c10f Fixed selection summary calculation issue 2014-04-28 14:55:01 +02:00
Vincent Petry c29e8b0bae Cleanup of event handlers
Now using _.bind() for event handlers so we can use "this" which is more
readable than a static access to FileList.
2014-04-28 14:55:01 +02:00
Vincent Petry 3c006a5a4d Cleanup and fix trashbin "clear all files" operation 2014-04-28 14:55:01 +02:00
Vincent Petry 3159c2ee64 Fixed drag shadow file sorting 2014-04-28 14:55:01 +02:00
Vincent Petry fd982df6ae Fixed selection to be based on FileList.files
The file selection is now based on the internal model array
FileList.files instead of the visible checkboxes.

This makes it possible to virtually select files that haven't been
rendered yet (select all, then deselect a visible one)

Added more unit tests for selection (with shift and ctrl as well)
2014-04-28 14:55:01 +02:00
Vincent Petry a952d80ad9 Fix trashbin previews and "delete selected" 2014-04-28 14:55:01 +02:00
Vincent Petry 8909b574fa Make sure there are always enough elements visible on the page 2014-04-28 14:55:01 +02:00
Vincent Petry 2883f231d0 Fixed insertion of files
Removed "insert" flag, inserting is by default for FileList.add().
Added "animate" flag to FileList.add().
Added logic to correctly detect when to insert/append elements whenever
the insertion point is visible or not.
Fixed "render next page" logic to work correctly when many pages of
files have been added.
2014-04-28 14:55:01 +02:00
Vincent Petry f6586f6bdf Fixed file sorting to work with scrolling
The FileList.files model is now updated with file operations.
Adding files to the list will add to the model first, then to the DOM.
If the insertion point isn't visible yet, the file won't be added to the
DOM until the user scrolls down.

Updated unit tests to include checking for the correct insertion point.
2014-04-28 14:55:00 +02:00
Vincent Petry 9c2fbea6a4 Fix file selection for infinite scrolling
- moved file selection code to FileList
- fix selection summary when all files are selected
- nextPage now auto-selects files if "select all" checkbox is checked
- fixed trashbin to use the same selection logic as FileList
2014-04-28 14:55:00 +02:00
Vincent Petry 9f62059efa Fix file summary to use the whole file list
- moved the summary code into a new class FileSummary
- FileSummary is calculated only once, then updated with add/remove
- added new OC.Util namespace for JS utility functions
2014-04-28 14:49:39 +02:00
Bjoern Schiessle 73a2d87ab4 fix shouldEncrypt() method and improved decryptAll() unit tests 2014-04-28 14:49:19 +02:00
Vincent Petry efdf0c4df0 Added infinite scrolling (in-memory list) 2014-04-28 14:34:28 +02:00
Thomas Müller f685c3cceb Merge pull request #8381 from owncloud/files_irods
drop files_irods from apps_external
2014-04-28 14:31:31 +02:00
Arthur Schiwon 45e42c25de Group Database backend must not gather user details itself but ask user
backends. This is a port to master from PR #7745

remove OC_GROUP_BACKEND_GET_DISPLAYNAME option for group backends

Conflicts:
	lib/private/group/backend.php

LDAP: getDisplayNamesInGroup is not an option for group backends anymore

Conflicts:
	apps/user_ldap/group_ldap.php
	apps/user_ldap/group_proxy.php

clean up group backends

Conflicts:
	lib/private/group/database.php

remove now unnecessary test

implement getDisplayNames in group manager

adjust user manager tests

test for group manager's displayNamesInGroup

trim must not be used in empty in PHP < 5.5

keep the constant to not provoke PHP warnings

Conflicts:
	lib/private/group/backend.php
2014-04-28 13:49:56 +02:00
Sjors van der Pluijm d7ec1fe447 rewind iterator before iteration starts 2014-04-28 13:05:20 +02:00
Thomas Müller 9128900c56 drop files_irods from apps_external 2014-04-28 12:39:28 +02:00
Thomas Müller e27dc5b6f9 Merge pull request #8309 from DavidPrevot/chosen
Adapt chosen (css) path
2014-04-28 12:34:40 +02:00
Georg Ehrke b68098ebba remove preview office fallback as it makes too much trouble and generates inacceptable results 2014-04-28 12:05:10 +02:00
Sjors van der Pluijm d8be9d96ed fixes #8376 2014-04-28 10:20:24 +02:00
Felix Eckhofer 61ca269292 Remove trailing tab 2014-04-28 09:06:26 +02:00
Felix Eckhofer 460d06c235 Escape literal dots in mod_rewrite regexes 2014-04-28 09:06:26 +02:00
Thomas Müller 727e3e2359 Merge pull request #8327 from owncloud/l10n-files_external-fields
Add translatable mount configs
2014-04-28 08:52:50 +02:00
Thomas Müller 5fd776debf Merge pull request #7473 from owncloud/append-error-document
Remove .htaccess creation code
2014-04-28 08:50:42 +02:00
Jenkins for ownCloud 642f57c1d5 [tx-robot] updated from transifex 2014-04-28 01:56:24 -04:00
Lukas Reschke e910e63140 Merge pull request #8372 from owncloud/give-admins-a-hint
Clarify the trusted_domain error page
2014-04-27 18:28:18 +02:00
Lukas Reschke 1d9ac38da6 Remove an added t by the github webeditor
Notice to myself: Stick to my IDE.
2014-04-27 16:41:09 +02:00
Lukas Reschke 7a8bfeae6e Grammatical fixes 2014-04-27 16:31:04 +02:00
Jenkins for ownCloud 8e5c9eea3a [tx-robot] updated from transifex 2014-04-27 01:54:54 -04:00
Lukas Reschke b6612ef04a Clarify the trusted_domain error page 2014-04-26 23:11:29 +02:00
Thomas Müller a1ddd23289 Merge pull request #8371 from owncloud/example-config
Add another example to the trusted_domains config
2014-04-26 23:00:02 +02:00
Lukas Reschke 2bea7ec2e7 Add another example to the trusted_domains config
Users often ask in IRC or the forum how to add another domain. 
Hopefully they will be able to find it out on their own if we have an example with two domains.
2014-04-26 22:37:30 +02:00
Volkan Gezer 6de6f68ae2 fix single quote sanitization 2014-04-26 18:58:01 +02:00
Lukas Reschke 15d05e55cb Merge pull request #8343 from owncloud/fix-status
Use echo since print_unescaped is not defined
2014-04-26 16:51:29 +02:00
icewind1991 7ac7546b71 Merge pull request #8353 from owncloud/publicshare-webdav
Expose public shares over webdav
2014-04-26 15:55:37 +02:00
Andreas Fischer ff6564af57 "echo" is a language construct. Don't treat it like a function. 2014-04-26 14:50:34 +02:00
Lukas Reschke 96c06c14d8 Merge pull request #8341 from owncloud/template-tests-output-buffering
Improve Template Tests by Removing Manual Output Buffering
2014-04-26 12:29:36 +02:00
Bart Visscher 7c0370105a Fix wrong var name 2014-04-26 11:15:09 +02:00
Bart Visscher fc9371ae10 Merge branch 'master' into contactsmanager-register
Conflicts:
	lib/private/contactsmanager.php
2014-04-26 10:55:25 +02:00
Jenkins for ownCloud c591cf0836 [tx-robot] updated from transifex 2014-04-26 01:55:32 -04:00
Andreas Fischer 63cdf78390 Merge pull request #8355 from owncloud/l10n-expire
typo fix, by translators on transifex

* owncloud/l10n-expire:
  typo fix, by translators on transifex
2014-04-26 01:21:31 +02:00
icewind1991 282ea27ab9 Merge pull request #8356 from owncloud/fix-external-css
fix layout of external storage config table
2014-04-26 00:06:06 +02:00
Morris Jobke ace0293bd1 fix layout of external storage config table 2014-04-25 16:34:48 +02:00
Volkan Gezer ad1265da13 typo fix, by translators on transifex 2014-04-25 16:26:30 +02:00
icewind1991 7599fa94ce Merge pull request #8350 from owncloud/share-search-mime
fix search by mime for shared single files
2014-04-25 15:54:36 +02:00
Robin Appelman b176708505 Expose public shares over webdav 2014-04-25 14:45:18 +02:00
icewind1991 5194f014c9 Merge pull request #7504 from owncloud/webdav-injection
Proper injection of filesystem view into the webdav connector
2014-04-25 14:42:43 +02:00
Robin Appelman 194ea66cb5 Merge branch 'master' into share-search-mime 2014-04-25 14:04:41 +02:00
Robin Appelman b42418246f Also fixed the returned internal path when getting the root shared item by id 2014-04-25 14:04:22 +02:00
icewind1991 6925e722fa Merge pull request #8351 from owncloud/search-mime-substorage
fix paths of searchByMime results on substorages
2014-04-25 14:03:43 +02:00
Robin Appelman 672a8248ce Correct the path returned by getFolderContent for substorages 2014-04-25 13:56:45 +02:00
Jan-Christoph Borchardt b41fc7cb7a Merge pull request #8352 from owncloud/icons
Icon improvements
2014-04-25 13:18:55 +02:00
Morris Jobke 99c2c6b1c6 remove metadata 2014-04-25 13:15:58 +02:00
Jan-Christoph Borchardt 93d2ff73f1 use trash as delete icon to differentiate from close 2014-04-25 12:40:14 +02:00
Robin Appelman 456ca0cf7d fix paths of searchByMime results on substorages 2014-04-25 12:31:44 +02:00
Robin Appelman c53c4b9791 fix search by mime for shared single files 2014-04-25 12:28:10 +02:00
Robin Appelman 4109521cce remove outdated test 2014-04-25 12:24:18 +02:00
Jan-Christoph Borchardt ad9ff07569 compress view-close icon 2014-04-25 12:16:17 +02:00
Robin Appelman 6c20a014ea merge master into webdav-injection 2014-04-25 11:47:06 +02:00
Robin McCorkell 77e3d067f0 Better handle return values from Filesystem::getMountBy*
getMountByStorageId and getMountByNumericId return an empty array on error,
which should be detected to avoid possible errors. This commit also adds in
some new logging points and throws to aid debugging
2014-04-25 09:50:34 +01:00
Jenkins for ownCloud 3fc809dfd8 [tx-robot] updated from transifex 2014-04-25 01:56:28 -04:00
Andreas Fischer 5eafdf156c Merge pull request #8338 from owncloud/phpunit-4.0-compat
Make PHPUnit_Framework_TestListener implementations compatible to 4.0.

* owncloud/phpunit-4.0-compat:
  Normalise testcleanuplistener.php indentation and end of file.
  Make PHPUnit_Framework_TestListener implementations compatible to 4.0.
2014-04-24 22:00:12 +02:00
Lukas Reschke 1cafd1e3b9 Merge pull request #8337 from owncloud/flv-to-mimes
Add flv to known mimetypes
2014-04-24 19:09:01 +02:00
Björn Schießle f520305848 Merge pull request #8026 from owncloud/remove_shared_folder
remove the "Shared" folder
2014-04-24 18:45:45 +02:00
Lukas Reschke d85b64ede6 Use echo since print_unescaped is not defined
Fixes https://github.com/owncloud/core/issues/8342
2014-04-24 18:41:06 +02:00
Victor Dubiniuk fc4be3d0ad Add flv to known mimetypes 2014-04-24 19:09:31 +03:00
Thomas Müller 40257d9736 Merge pull request #8339 from owncloud/fix_unit_tests
fixing unit tests
2014-04-24 17:28:07 +02:00
Andreas Fischer 916b265cd5 Normalise testcleanuplistener.php indentation and end of file. 2014-04-24 16:42:28 +02:00
Andreas Fischer f45080e811 Use PHPUnit's expectOutputString() instead of performing output buffering. 2014-04-24 15:45:07 +02:00
Andreas Fischer 88778b569e Split testP() tests into multiple methods. 2014-04-24 15:36:02 +02:00
Andreas Fischer 0d3ddd9e11 Remove redundant test case for non-HTML string. 2014-04-24 15:34:09 +02:00
Bjoern Schiessle 35321c7d41 add additional rows to the select statement, 'stime' is needed for the expire check 2014-04-24 15:18:25 +02:00
Andreas Fischer e85fe01faf Make PHPUnit_Framework_TestListener implementations compatible to 4.0. 2014-04-24 15:16:57 +02:00
Andreas Fischer f9091a8584 Merge pull request #8304 from owncloud/add-xss-tests
Add unit tests for arrays and quotationmark

* owncloud/add-xss-tests:
  Remove uneeded newline
  Fix indentation
  Add unit tests for arrays and "
2014-04-24 15:09:36 +02:00
Andreas Fischer 522d101607 Merge pull request #8335 from owncloud/sharing_set_default_expire_date
[sharing] allow admin to set default expire date

* owncloud/sharing_set_default_expire_date:
  add setting to set default expire date
2014-04-24 14:03:41 +02:00
Bjoern Schiessle 6650be9913 add setting to set default expire date 2014-04-24 13:34:31 +02:00
Robin Appelman cd0c5990f8 properly quote etags 2014-04-24 11:12:39 +02:00
Robin Appelman 49b44e7e22 Normalize paths when moving properties 2014-04-24 11:12:39 +02:00
Thomas Müller 8127e984bd Merge pull request #8332 from owncloud/l10n-access-untrusted
This adds one more missing untranslated text from lib/share
2014-04-24 10:06:37 +02:00
Thomas Müller 087e73cbfc Merge pull request #8334 from owncloud/protect-co
Preventing access to the config folder
2014-04-24 09:25:32 +02:00
Lukas Reschke c92a138489 Preventing access to the config folder
It isn't uncommon that admins create a backup file of the config (i.e. `config.php.bak`) before performing any changes. This would allow everybody to read the backup of the configuration file which contain several secret and critical values.

I don't believe this is worth a backport or getting added to the installer. It's just a nice to have. People that create public readable backups of their configuration are the one to blame, not us :-)
2014-04-24 08:33:58 +02:00
Jenkins for ownCloud 435672feaa [tx-robot] updated from transifex 2014-04-24 01:55:33 -04:00
Volkan Gezer ff0dab6e92 This adds one more missing untranslated text from lib/share
Also displays the untrusted domain warning in English
2014-04-24 01:42:18 +02:00
Volkan Gezer da61acd1e2 Add translatable mount configs
Will close #8070
2014-04-23 17:58:14 +02:00
blizzz 645ecb7644 Merge pull request #6297 from leo-b/fix_ldap_errors
only check ldap_errno if an ldap_* function actually fails
2014-04-23 16:26:43 +02:00
Thomas Müller 3aee23ee2b Merge pull request #8233 from owncloud/fix-newdialog-ie
fix shift of icons in 'New' menu in IE8/9, fix #7987
2014-04-23 16:17:24 +02:00
Thomas Müller e68aaf1f5b Merge pull request #8284 from owncloud/fix_8280
Adjust renaming of directories with a dot in name
2014-04-23 16:06:50 +02:00
Robin McCorkell c2f7848aeb Adjust renaming of directories, fixes #8280
Directories will not be considered to have an extension, even if a dot is
found.

Stop Scrutinizer being annoyed

But the spaced version looked good!

Stop jsHint being annoyed

These code quality tools are really pestering
2014-04-23 16:04:01 +02:00
Thomas Müller 4ba6f4839d fixing typos and PHPDoc 2014-04-23 15:36:01 +02:00
Robin Appelman e77d89fc4b Revert changes to OC_Connector_Sabre_Server 2014-04-23 14:21:09 +02:00
icewind1991 c8801a41d8 Merge pull request #8324 from owncloud/expired-link-error
Fix error when viewing expired link
2014-04-23 14:13:44 +02:00
Bernhard Posselt 5199e4508a dont update entity and dont run an update query if an entity wasnt changed at all 2014-04-23 13:43:17 +02:00
Bjoern Schiessle b312d38d38 remove hard-coded shared folder 2014-04-23 12:59:22 +02:00
Bjoern Schiessle 7ef8f6d352 always allow to rename the share mount point 2014-04-23 12:54:26 +02:00
Bjoern Schiessle b102222fed split-up the update script and add unit tests for it 2014-04-23 12:54:26 +02:00
Bjoern Schiessle 93469ca468 make it possible to move files out of a shared mount point 2014-04-23 12:54:26 +02:00
Thomas Müller dd1e47b3b8 typos, use, unused and return fixed 2014-04-23 12:54:26 +02:00
Robin Appelman 2049bedcaf Dont throw an error when a storage isn't found for shared cache 2014-04-23 12:54:26 +02:00
Bjoern Schiessle fb88aba8f4 some fixes to make the gallery work, this made it necessary to adjust some tests and the encryption code 2014-04-23 12:54:26 +02:00
Bjoern Schiessle d468cdacf2 add unit tests which got lost during rebase 2014-04-23 12:54:26 +02:00
Bjoern Schiessle 652d417a58 we don't allow to share a folder if it contains a share mount point 2014-04-23 12:54:26 +02:00
Bjoern Schiessle b712393e72 fix etag propagation 2014-04-23 12:54:26 +02:00
Bjoern Schiessle aae22b2d6a update script, create Shared folder and adjust target path for the shares 2014-04-23 12:54:26 +02:00
Bjoern Schiessle bffcbac7a7 allow to rename group share mount points 2014-04-23 12:54:25 +02:00
Bjoern Schiessle 3f6e9e0102 cleanup the shared storage, always keep the whole share resource 2014-04-23 12:54:25 +02:00
Bjoern Schiessle 22e0a4b9a8 external storages: allow to mount a folder called "Shared", it is no longer a reserved name 2014-04-23 12:54:25 +02:00
Bjoern Schiessle c9bd2f7a6c also fetch the etag from file cache 2014-04-23 12:54:25 +02:00
Bjoern Schiessle dfb69e9418 allow user to delete shared files/folders 2014-04-23 12:54:25 +02:00
Bjoern Schiessle d4085d8148 make sure that path is not 'false' 2014-04-23 12:54:25 +02:00
Bjoern Schiessle 33cdd93890 fix deleting of shared files 2014-04-23 12:54:25 +02:00
Bjoern Schiessle bfabd247f4 fix updating of shared files 2014-04-23 12:54:25 +02:00
Bjoern Schiessle a86d97295e fix encryption tests after the removal of the shared folder 2014-04-23 12:54:25 +02:00
Bjoern Schiessle 4c840cb61d fix target generation for group shares 2014-04-23 12:54:25 +02:00
Bjoern Schiessle ed981294f1 fix share api tests 2014-04-23 12:54:25 +02:00
Bjoern Schiessle 27c5a978f9 we no longer need to handle the Shared folder different from any other folder 2014-04-23 12:54:25 +02:00
Bjoern Schiessle 83d6810725 don't overwrite shared folder icon 2014-04-23 12:54:25 +02:00
Bjoern Schiessle 4967435237 show "shared by ..." for share mount point 2014-04-23 12:54:25 +02:00
Bjoern Schiessle 6b19482f3e generate unique target name 2014-04-23 12:54:25 +02:00
Bjoern Schiessle c4e0fb75a4 add api to get shares from a specific user 2014-04-23 12:54:24 +02:00
Bjoern Schiessle 6d87dacad4 fix getMimeType call, we always need to check the source path 2014-04-23 12:54:24 +02:00
Bjoern Schiessle a02fb3722b user should be able to rename/delete shared files if the owner allowed it 2014-04-23 12:54:24 +02:00
Bjoern Schiessle 72bbb9ca20 allow to remove and change mount points 2014-04-23 12:54:24 +02:00
Bjoern Schiessle b02b6d3c23 no exception for the root of the mount point (formerly Shared/), just get the file cache information from the cache 2014-04-23 12:54:24 +02:00
Bjoern Schiessle c377893f0e make sure that we have the right permissions for the mount points 2014-04-23 12:54:24 +02:00
Bjoern Schiessle a27db9e4ca first steps to remove the shared folder:
- mount shares to the root folder instead of "Shared/"
- navigate in shared folder and sub-folders
- show previews
- show correct file permissions
- download/edit files
2014-04-23 12:54:24 +02:00
Bjoern Schiessle cfc52ccc3d add some action items 2014-04-23 12:54:24 +02:00
Robin Appelman 3d0661a1e7 Fix error when viewing expired link 2014-04-23 12:54:18 +02:00
Joas Schilling 704b9e6a0d Merge pull request #8009 from owncloud/feature/add-sharing-target
Add option to getUsersSharingFile() to get the paths for the shared users
2014-04-23 12:49:06 +02:00
Thomas Müller 535e6ff71f Merge pull request #7617 from nishiki/cache_user
Cache user
2014-04-23 12:32:30 +02:00
blizzz 97f21712cd Merge pull request #8164 from owncloud/fix-6651
LDAP: fix random resets of filter
2014-04-23 11:09:35 +02:00
Thomas Müller 032f38b230 Merge pull request #8213 from cbojar/master
Clean up js.js along suggestions from scrutinizer-ci, fixes #8204.
2014-04-23 11:05:00 +02:00
Thomas Müller e0cac32442 fixing some JSHint warnings 2014-04-23 10:08:14 +02:00
Thomas Müller dcc48f9b46 Merge pull request #8068 from wakeup/fix-share.php-string-extraction
Make lib/** share.php strings extractable for translation
2014-04-23 09:58:10 +02:00
Thomas Müller 09f72204ee Merge pull request #8315 from owncloud/fix-8294
add uncompressed jquery files - fixes #8294
2014-04-23 09:28:44 +02:00
Thomas Müller f44e5e9791 Merge pull request #8316 from owncloud/add-new-jquery-to-scrutinizer-ignore
Add new jquery files to exclude list
2014-04-23 09:15:28 +02:00
Jenkins for ownCloud 3f453d1641 [tx-robot] updated from transifex 2014-04-23 01:56:35 -04:00
Volkan Gezer 15f6973779 Add new jquery files to exclude list 2014-04-23 01:13:09 +02:00
Volkan Gezer ce835a3247 add uncompressed jquery files - fixes #8294 2014-04-23 00:07:00 +02:00
David Prévot eebb756c38 Adapt chosen (css) path
Avoid shipping duplicate files in 3rdparty/css.

3rdparty/css/chosen/ already contains chosen.css and chosen-sprite.png
so its useless to duplicate them in 3rdparty/css.

Taking the same approach as in apps/calendar/appinfo/app.php and
apps/files_external/settings.php.
2014-04-22 14:15:09 -04:00
Lukas Reschke 9d3b639ce6 Remove uneeded newline 2014-04-22 20:11:34 +02:00
Lukas Reschke 589c74e176 Fix indentation 2014-04-22 20:10:46 +02:00
Lukas Reschke f07180639c Add unit tests for arrays and "
OC_Util::sanitizeHTML() also supports array but we actually had no unit test for it. Additionally this commit introduces a test for escaping " into &quot;
2014-04-22 20:09:55 +02:00
Arthur Schiwon c1c2f2c49e add additional comments, PHPdoc and check whether it's really applicable 2014-04-22 18:36:43 +02:00
Arthur Schiwon 1c71d5c444 LDAP: cache display names immediately on retrieval, saves tens of unecessary queries to LDAP server in the share dialog for example 2014-04-22 18:36:37 +02:00
Robin Appelman b42ce6c30a Prevent error if previously cached data doesn't have an etag 2014-04-22 15:24:38 +02:00
Volkan Gezer 6e857de6b7 Make lib/** share.php strings extractable for translation
They were not ready for translation as they had no placeholders
and/nor wrapper function to be translated

This should fix: #8011
2014-04-22 14:56:44 +02:00
Volkan Gezer a4ab29da6e Merge pull request #8297 from owncloud/fix-text-master
fix spelling 'Allow user ...' -> 'Allow users ...'
2014-04-22 14:37:40 +02:00
Thomas Müller 0330481c5e Merge pull request #8263 from LEDfan/add-key-to-contacts
Add key to every contact
2014-04-22 14:20:53 +02:00
Tobia De Koninck efff7dd2a4 Change key to addressbook-key 2014-04-22 12:46:09 +02:00
Robin Appelman 3821a09689 merge master into webdav-injection 2014-04-22 12:25:49 +02:00
Raghu Nayyar d56072cf2e Merge pull request #8255 from owncloud/fix-public-download-button
keep long file names in one line to not overflow download button on mobile
2014-04-22 15:44:29 +05:30
Thomas Müller f353e6f669 Merge pull request #8286 from owncloud/use-proper-jsdoc
Use proper JSDoc documentation instead of inconsistent documentation styles
2014-04-22 12:00:25 +02:00
Jan-Christoph Borchardt e7e87f4d9f improve upload and download icons 2014-04-22 11:47:01 +02:00
Jan-Christoph Borchardt 378f79b2d9 improve delete and close icons 2014-04-22 11:37:30 +02:00
Jan-Christoph Borchardt cef795790f thinner add icon 2014-04-22 11:36:39 +02:00
Thomas Müller 54873c7aae Merge pull request #8247 from owncloud/l10n-files_trasbin-fix
Fix localization issues of files_trashbin
2014-04-22 11:34:49 +02:00
Thomas Müller 5049664285 Merge pull request #8239 from owncloud/directlink-overflow
add max-width to directLink input to prevent overflow
2014-04-22 11:23:10 +02:00
Lukas Reschke 381c1c8b6e Fix typo
to => too
2014-04-22 10:43:35 +02:00
Jörn Friedrich Dreyer 4d9ff49f61 Merge pull request #8283 from owncloud/translatable-max-in-upload
make max. text translatable
2014-04-22 10:23:08 +02:00
Thomas Müller 29bc82be8d fixing typos 2014-04-22 09:54:25 +02:00
Thomas Müller 56bc5f8f43 fixing typo 2014-04-22 09:43:29 +02:00
Thomas Müller 54476c468c fix spelling 'Allow user ...' -> 'Allow users ...' 2014-04-22 09:34:08 +02:00
Jenkins for ownCloud a9b4fba528 [tx-robot] updated from transifex 2014-04-22 01:54:58 -04:00
Morris Jobke 0ebb4662ec Merge pull request #8281 from owncloud/public-responses
make download and redirectresponse public
2014-04-22 00:08:04 +02:00
Robin McCorkell abfd7ecb72 Permit personal mount points to be used for sharing
An issue existed where `readData` used `OCP\User::getUser()` to get the user
for personal mount points, which worked in all situations apart from when a
personal mount point was used for sharing, so the return from `getUser()` is
not the user that owns the share. As such, any personal mount points would not
work correctly when shared.

`readData` and `writeData` have been changed from using a `$isPersonal`
boolean to using a `$user` string|null. `$isPersonal = false` can now be
written as `$user = NULL` (or left out in the case of `readData`), and
`$isPersonal = true` can be written as `$user = OCP\User::getUser()`.
2014-04-21 21:42:35 +01:00
Frank Karlitschek ee70eb0808 Merge pull request #8287 from owncloud/phpdoc-base
Some more PHPDoc fixes
2014-04-21 20:13:45 +02:00
Lukas Reschke e88731a477 Some more PHPDoc fixes 2014-04-21 15:44:54 +02:00
Lukas Reschke 51eee3dec1 Fix JSDoc 2014-04-21 14:42:50 +02:00
Lukas Reschke 8fcffae1e2 Reuse selector 2014-04-21 14:28:54 +02:00
Lukas Reschke 539cecbd63 Use proper JSDoc documentation 2014-04-21 13:46:33 +02:00
Jenkins for ownCloud 4fe5ca1908 [tx-robot] updated from transifex 2014-04-21 01:56:06 -04:00
Volkan Gezer 1aa7774178 make max. text translatable 2014-04-21 02:41:33 +02:00
Andreas Fischer f2f5a53d36 Merge pull request #7988 from owncloud/routing-cache-webroot
Keep cached urls with different hostnames or baseurls seperate

* owncloud/routing-cache-webroot:
  Sort parameters and cast to int
  add delimiter between host and baseurl
  Keep cached urls with different hostnames or baseurls seperate
2014-04-20 18:27:23 +02:00
Bernhard Posselt 7e447f4f42 make download and redirectresponse public 2014-04-20 16:12:46 +02:00
Andreas Fischer f2e5494edc Merge pull request #8203 from owncloud/correct-link
Use direct link instead of JS

* owncloud/correct-link:
  Link to previous directory
  Use direct link instead of JS
2014-04-20 15:58:53 +02:00
Andreas Fischer 93ed6a695e Merge pull request #8169 from owncloud/change-to-show
Change from showHTML to show

* owncloud/change-to-show:
  Change from showHTML to show
2014-04-20 15:53:33 +02:00
Andreas Fischer 96137027f8 Merge pull request #8277 from owncloud/add-type-hints
Add type hinting

* owncloud/add-type-hints:
  Add type hinting
2014-04-20 15:40:26 +02:00
Jenkins for ownCloud 8fba61f844 [tx-robot] updated from transifex 2014-04-20 01:56:03 -04:00
Bernhard Posselt 309aa3bcd2 fix phpdoc for entities 2014-04-20 02:55:59 +02:00
Lukas Reschke 199ee18c0c Merge pull request #8229 from owncloud/menutoggle-mobile
do not show menu toggle on public share links as there is no menu
2014-04-20 01:13:24 +02:00
Lukas Reschke 886c5177e7 Fix typo & add type 2014-04-20 01:09:25 +02:00
Lukas Reschke e930ce6436 Add type hinting 2014-04-20 00:55:01 +02:00
Bernhard Posselt 0c736feaba remove useless import 2014-04-19 19:31:49 +02:00
Bernhard Posselt 4a7e0561ca move db into iservercontainer 2014-04-19 19:30:12 +02:00
Bernhard Posselt 0fe4db0992 remove unusued variable 2014-04-19 16:02:15 +02:00
Bernhard Posselt f4bc5ee863 remove unusued variable 2014-04-19 16:00:19 +02:00
Bernhard Posselt 95a83233a9 fix doc strings for db facade 2014-04-19 15:32:17 +02:00
Bernhard Posselt 93237d87ec fix scrutinizer issues 2014-04-19 15:25:36 +02:00
Bernhard Posselt f260951825 port database layer from appframework to core 2014-04-19 14:56:16 +02:00
Jenkins for ownCloud 1abd9c1305 [tx-robot] updated from transifex 2014-04-19 01:56:06 -04:00
LEDfan b78c1373b6 Add key to every contact 2014-04-18 14:30:44 +02:00
Jenkins for ownCloud d23c4697d0 [tx-robot] updated from transifex 2014-04-18 01:56:04 -04:00
Volkan Gezer f434c3a213 Fix localization issues of files_trashbin 2014-04-17 21:10:21 +02:00
blizzz 36c8dec10a Merge pull request #8220 from owncloud/type-hinting-ldap
Fix PHPdoc in user_ldap
2014-04-17 18:15:40 +02:00
Bart Visscher 9583549556 camelCase vars in OC\ContactsManager 2014-04-17 17:56:23 +02:00
Morris Jobke 2026c7558e Merge pull request #8249 from owncloud/correct-m
Use JS as content-type due to mimesniffing
2014-04-17 17:14:34 +02:00
Jan-Christoph Borchardt d82a31d121 keep long file names in one line to not overflow download button on mobile 2014-04-17 17:11:28 +02:00
Morris Jobke 707658c00a Merge pull request #8205 from owncloud/fix-8202
Add one more LOWER.
2014-04-17 16:10:33 +02:00
Morris Jobke a2a0eb370b Merge pull request #8222 from owncloud/type-hinting
Type hinting fixes
2014-04-17 16:08:15 +02:00
Morris Jobke fe654ece99 Merge pull request #8246 from Gared/master
Fix javascript error in calendar app
2014-04-17 15:37:35 +02:00
Morris Jobke 0b4431216d Merge pull request #8236 from owncloud/header-right-fix
remove duplication of header and 'header-right' element, also ellipsize when too wide
2014-04-17 15:18:40 +02:00
Robin McCorkell 13b463cc17 Merge pull request #8189 from Xenopathic/misc_fixes
Various fixes
2014-04-17 11:56:51 +01:00
Jörn Friedrich Dreyer 8a0c8a1956 Merge pull request #8240 from owncloud/thumbnail-on-short-videos-master
videos which are shorter then 5 seconds will now get a proper thumbnail ...
2014-04-17 11:15:05 +02:00
Lukas Reschke eecd4bd18e Use JS as content-type due to mimesniffing 2014-04-17 10:40:19 +02:00
Jenkins for ownCloud a7d7ca2fb3 [tx-robot] updated from transifex 2014-04-17 01:56:06 -04:00
cbojar 4a541e38e0 Clean up js.js along suggestions from scrutinizer-ci, fixes #8204.
Also used JSHint.com to find a few other issues.

-Strict comparisons (===)
-Fixed regex escaping errors
-Refactored OC.buildQueryString to use jQuery.map
-Missing semicolons
-Braces around if block

Left some of the mixed spaces/tabs as they are for alignment in comments.
2014-04-16 22:51:09 -04:00
Morris Jobke 5a1a056c6d Merge pull request #8183 from owncloud/move-security-headers
Move security headers
2014-04-16 23:46:20 +02:00
Morris Jobke 2f6eed4f9d Merge pull request #7994 from owncloud/fix-login-fields
Fix login fields
2014-04-16 23:17:49 +02:00
Stefan 1d8eb44677 Fix javascript error in calendar app
Fix owncloud/calendar#409
If you haven't allowed to share items per email the element "email" will never appear and you will get a null exception.

License: WTFPL
2014-04-16 22:41:57 +02:00
Jan-Christoph Borchardt 7178e39569 Merge pull request #8235 from owncloud/fix-error-mobile
fix error display on smaller screens, fix #8090
2014-04-16 21:35:43 +02:00
Lukas Reschke 81c23b02da Link to previous directory 2014-04-16 21:10:14 +02:00
Thomas Müller a4389340b8 escape $second + update PHPDoc 2014-04-16 19:45:55 +02:00
Bart Visscher 81751cb616 Add missing param hint 2014-04-16 17:54:10 +02:00
Jan-Christoph Borchardt 03ad908c30 fix overlapping infield labels 2014-04-16 17:49:46 +02:00
Jan-Christoph Borchardt 067a5cdee7 fix database infield label indentation 2014-04-16 17:44:05 +02:00
Jan-Christoph Borchardt 6a79b7f2b5 fix sizing for fields when password is shown 2014-04-16 17:43:15 +02:00
Thomas Müller d0f8cc20c5 videos which are shorter then 5 seconds will now get a proper thumbnail at 1 second 2014-04-16 17:16:03 +02:00
Jan-Christoph Borchardt e68006c0ce Merge pull request #8157 from owncloud/share-expiration-smooth-hide
Expiration date is hidden smoothly
2014-04-16 17:10:14 +02:00
Jan-Christoph Borchardt 9434ed44f8 add max-width to directLink input to prevent overflow 2014-04-16 16:43:35 +02:00
Jan-Christoph Borchardt 9c6f8e59ae fix header code duplication, code style fixes 2014-04-16 16:26:41 +02:00
Jan-Christoph Borchardt 547ddf7775 remove duplication of 'header-right' element, also make it overflow when too wide 2014-04-16 15:53:38 +02:00
Jan-Christoph Borchardt 7110ecbf06 fix error display on smaller screens, fix #8090 2014-04-16 15:31:15 +02:00
Jan-Christoph Borchardt 924aee718c fix shift of icons in 'New' menu in IE8/9, fix #7987 2014-04-16 14:58:27 +02:00
Thomas Tanghus df9d9ac958 Remove unused var 2014-04-16 14:34:13 +02:00
Thomas Tanghus dd36d4b894 Add tests for linkTo, linkToPublic, linkToRemote, linkToRemoteBase 2014-04-16 14:32:08 +02:00
Thomas Tanghus da99e403bc Also fix linkToAbsolute 2014-04-16 14:30:24 +02:00
Jan-Christoph Borchardt 9dabed04a4 do not show menu toggle on public share links as there is no menu 2014-04-16 10:49:16 +02:00
blizzz f6551d214f Merge pull request #7815 from owncloud/ldap_fix_usercount_master
correct LDAP user count on setup with many users (occ user:report)
2014-04-16 10:36:19 +02:00
Jenkins for ownCloud 23f2c48a43 [tx-robot] updated from transifex 2014-04-16 01:57:34 -04:00
Thomas Tanghus 6fe3fd4a0b Fix linkToPublic. Refs #8218 2014-04-15 23:04:35 +02:00
Bart Visscher cc8a4511fe Fix PHPdoc in lib/public
using scrutinizer patch
2014-04-15 22:55:47 +02:00
Bart Visscher a4b7f5155f Fix PHPdoc in lib/private
using scrutinizer patch
2014-04-15 22:55:20 +02:00
Thomas Müller 8bc7174bdc Merge pull request #8104 from owncloud/lukepolo-master
Added the ability to Drag and Drop folders [chrome]
2014-04-15 21:39:32 +02:00
Thomas Müller 83e8981e24 add link to further discussion about that folder check 2014-04-15 21:39:13 +02:00
Thomas Müller 7f4fefd7ad Merge pull request #8211 from owncloud/flush-head-master
Flush the Buffer Early - right after head
2014-04-15 21:34:22 +02:00
Bart Visscher bad41c05b8 Fix PHPdoc in user_ldap
using scrutinizer patch
2014-04-15 21:05:49 +02:00
Bart Visscher a9bf3df82d Fix PHPdoc in OC\Share\Share and OCP\Share 2014-04-15 21:05:44 +02:00
Bart Visscher 999e74e834 Fix PHPdoc in apps/files_sharing
using scrutinizer patch
2014-04-15 21:05:44 +02:00
Lukas Reschke 8322a9e5c2 Merge pull request #8210 from owncloud/enhance-assets-management-master
adding checks and log messages regarding the assets folder
2014-04-15 20:07:07 +02:00
Robin Appelman 295b75cca9 merge master into webdav-injection 2014-04-15 20:05:43 +02:00
Robin Appelman c82adb8c5d merge master into webdav-injection 2014-04-15 20:03:00 +02:00
Lukas Reschke ffab31e3ee Merge pull request #8197 from owncloud/secure_mimetypes
White-list known secure mime types. Refs. #8184
2014-04-15 19:50:33 +02:00
blizzz 9de1cc52c0 Merge pull request #8216 from owncloud/usermanager_fix_limitoffset
Remove limit and offset manipulation when getting users or groups, be…
2014-04-15 19:14:57 +02:00
Andreas Fischer 0a78fb49f5 Pass Connection instead of AbstractSchemaManager to clearSchema(). 2014-04-15 18:20:36 +02:00
Andreas Fischer f1d05d204e Use exceptions for in input validation. 2014-04-15 18:14:26 +02:00
Andreas Fischer 854dd8fa7c Do not block when nothing is passed via stdin. 2014-04-15 18:04:54 +02:00
Arthur Schiwon 450de0091a adjust tests accordingly 2014-04-15 17:53:57 +02:00
Andreas Fischer d2c7a8ee59 Do not ask for password before input parameter validation. 2014-04-15 17:49:28 +02:00
Arthur Schiwon 64679b2e62 Remove limit and offset manipulation when getting users or groups, because it does not work when more than one user or group backend. Fixing it would be too costly performancewise, so we switch back to the model used in OC 5: limit and offset are effective per backend, and not a general constraint 2014-04-15 17:46:48 +02:00
Andreas Fischer 8e758513c8 Remove unnecessary sprintf. 2014-04-15 17:21:55 +02:00
Andreas Fischer 6b2876c64d Move (extended) input validation out into validateInput() method. 2014-04-15 17:20:31 +02:00
Andreas Fischer 5fe25868bc Add message for converting to SQLite being unsupported. 2014-04-15 17:14:26 +02:00
Thomas Müller d826f33fae Merge pull request #8127 from owncloud/searchresults-mobile
make search results work on mobile as well
2014-04-15 17:10:01 +02:00
Andreas Fischer 9823d54bb8 Use a variable for the DBMS tyoe we are converting to. 2014-04-15 17:06:13 +02:00
Thomas Müller 242b3e240d Merge pull request #8209 from owncloud/set-language-explicitly-master
Set language explicitly master
2014-04-15 16:57:38 +02:00
Thomas Müller 30168169b9 Flush the Buffer Early - right after head 2014-04-15 16:56:45 +02:00
Andreas Fischer 714343cd74 Add Bart to PgSqlTools copyright. 2014-04-15 16:29:43 +02:00
Thomas Müller 02726acbc8 adding checks and log messages regarding the assets folder 2014-04-15 16:26:12 +02:00
Robin Appelman 7f77b08098 Sort parameters and cast to int 2014-04-15 15:48:02 +02:00
Andreas Fischer bd37010f35 Merge remote-tracking branch 'owncloud/master' into db-convert-tool
* owncloud/master: (61 commits)
  [tx-robot] updated from transifex
  Make email display name change translatable again
  Ignore jquery.multiselect.js - it's 3rdparty
  javascript code cleanup + fixing syntax errors
  Revert "close-button for share_dropdown"
  close-button for share_dropdown
  [tx-robot] updated from transifex
  The latest developer manual link
  The latest developer manual link
  p() and print_unescaped() also take arrays as parameter
  Check whether the user has permissions to add personal storage backends
  [tx-robot] updated from transifex
  Fix a wrong WebDAV Warning with self-signed-certs
  fix translation link
  upda mailinglist address
  fix contribute link
  default to GET request when no method is set to fix unittests, also set parsed json parameters on the post attribute
  Correctly process request parameters other than GET or POST, dont use globals in the class but inject it
  [tx-robot] updated from transifex
  use references for middleware to fix problems on 5.3
  ...
2014-04-15 15:44:44 +02:00
Thomas Müller 596177727a OCS API calls will always return English messages 2014-04-15 15:32:08 +02:00
Thomas Müller e125dc60cd introduce new function to force a language 2014-04-15 15:12:25 +02:00
Thomas Müller 2eeab60378 Merge pull request #8200 from owncloud/js-cleanup-dialogs-master
javascript code cleanup + fixing syntax errors
2014-04-15 14:20:09 +02:00
Jan-Christoph Borchardt f24b150989 search: fix color hex code 2014-04-15 11:25:38 +02:00
Björn Schießle 2dbb2db7e0 Merge pull request #7780 from owncloud/share-file-exists
Verify that a file exists before we share it
2014-04-15 11:23:17 +02:00
Lukas Reschke 1ea8b644b6 Merge pull request #8207 from owncloud/translate-name-email-change
Make email, display name change translatable again
2014-04-15 08:47:42 +02:00
Jenkins for ownCloud ef63153ff5 [tx-robot] updated from transifex 2014-04-15 01:55:06 -04:00
Volkan Gezer 1903895172 Make email display name change translatable again 2014-04-15 00:27:54 +02:00
Victor Dubiniuk 91d40f5033 remove unneeded LOWER. Fixes #8202 2014-04-14 22:19:21 +03:00
Lukas Reschke 340089f270 Merge pull request #8059 from owncloud/countUsersInGroup
add optional countUsersInGroup method to group backends
2014-04-14 20:45:12 +02:00
Lukas Reschke 9046f7b2f8 Merge pull request #8178 from owncloud/fix-request-parameters
Correctly process request parameters other than GET or POST, dont use gl...
2014-04-14 20:42:26 +02:00
Lukas Reschke 2bda3f9ae0 Use direct link instead of JS
Due to our CSP policy this link won’t work as it it considered as
inline Javascript.

This commit replaces the link with a static link to the files app.

Reimplementation of #8067 - fixes #7742
2014-04-14 20:16:52 +02:00
Thomas Müller 4fcb93578b Ignore jquery.multiselect.js - it's 3rdparty 2014-04-14 19:56:23 +02:00
Thomas Müller 1fdd17b9b1 javascript code cleanup + fixing syntax errors 2014-04-14 19:29:00 +02:00
Julian Müller 463df08088 Revert "close-button for share_dropdown"
This reverts commit 3bc3d4c9f3.
2014-04-14 18:40:24 +02:00
Andreas Fischer 9cc41a2460 Move PostgreSQL sequence resynchronisation out into PgSqlTools class. 2014-04-14 18:37:47 +02:00
Andreas Fischer b0e6542dc2 Add error handling for --clear-schema on Oracle. 2014-04-14 18:37:47 +02:00
Julian Müller 3bc3d4c9f3 close-button for share_dropdown 2014-04-14 18:26:45 +02:00
Thomas Tanghus 2fb68c120b Added explanation to mimetypes.list.php to avoid future confusion. 2014-04-14 18:21:19 +02:00
Andreas Fischer e3b0b40779 Do not quote table names on Oracle. They appear to be already quoted.
Without this commit, Oracle complains as follows:
  [Doctrine\DBAL\DBALException]
  An exception occurred while executing 'INSERT INTO "oc_appconfig" ("""appid""",
  """configkey""", """configvalue""") VALUES (?, ?, ?)' with params ["core",
  "installedat", "1396972927.537"]:

  ORA-01741: illegal zero-length identifier
2014-04-14 17:52:34 +02:00
Thomas Tanghus 51e47319ef White-list known secure mime types. Refs. #8184 2014-04-14 17:17:50 +02:00
Thomas Müller fe364656a4 Merge pull request #8181 from owncloud/fix_wrong_webdav_warning
Fix a wrong WebDAV Warning with self-signed-certs
2014-04-14 16:53:06 +02:00
Thomas Müller 8df19c4379 Merge pull request #8019 from owncloud/thumbnail_fixes
Thumbnail fixes
2014-04-14 16:23:03 +02:00
Thomas Müller 71de321869 Merge pull request #8156 from owncloud/fix-middleware-container
fix the middleware registration process in the container
2014-04-14 14:53:58 +02:00
Lukas Reschke c123dc7de4 Fix typo
Thanks @DeepDiver1975
2014-04-14 10:15:31 +02:00
Jenkins for ownCloud 2a2aabbdaf [tx-robot] updated from transifex 2014-04-14 01:55:09 -04:00
Volkan Gezer d93b5f9927 The latest developer manual link 2014-04-13 23:24:00 +02:00
Thomas Müller 0a473229e0 Merge pull request #8188 from owncloud/print-does-also-take-ar
p() and print_unescaped() also take arrays as parameter
2014-04-13 23:04:04 +02:00
Volkan Gezer 440c040ffc The latest developer manual link 2014-04-13 22:10:38 +02:00
Robin McCorkell 2e95101f86 Merge pull request #8182 from owncloud/check-user-mounti
Check whether the user has permissions to add personal storage backends
2014-04-13 17:13:49 +01:00
Robin McCorkell 8bb003868c Fix user_ldap default setting value 2014-04-13 16:49:23 +01:00
Robin McCorkell eeee9eacea Prevent error from cache update on deleted files 2014-04-13 16:17:13 +01:00
Lukas Reschke eecc400698 p() and print_unescaped() also take arrays as parameter
This fixes some scrutinizer issues.
2014-04-13 16:18:05 +02:00
Robin McCorkell 869e7a51f0 Prevent error in files_trashbin
`glob` can return FALSE when the directory is empty, instead of an empty array,
causing an error at `foreach`.

"Note: On some systems it is impossible to distinguish between empty match and
an error."

See http://www.php.net/manual/en/function.glob.php -> Return Values
2014-04-13 14:51:33 +01:00
Lukas Reschke 6e424eb990 Also encode > and ' 2014-04-13 15:24:35 +02:00
Robin McCorkell fa8814902e Adjust logic for deciding if trashbin empty
Any error in opening the trashbin directory returns 'true' for isEmpty.
An error is prevented by checking if the directory exists before trying to
open it.
2014-04-13 13:49:04 +01:00
Lukas Reschke 387d46cb98 Typo + Line breaks 2014-04-13 12:54:26 +02:00
Lukas Reschke b04d95b116 Remove uneeded usages of nosniff 2014-04-13 12:48:16 +02:00
Lukas Reschke 9de3c1b59d Merge pull request #8165 from owncloud/karma-removewarnings
Remove annoying karma 404 warnings for images
2014-04-13 12:40:42 +02:00
Lukas Reschke a2a850dd91 Fix indentation 2014-04-13 11:52:31 +02:00
Lukas Reschke df67a04385 Move security headers to base.php
Some headers were currently only added to the templates but not to other components (e.g. SabreDAV / JSON / etc...)
The migration to base.php ensures that the headers are served to all requests passing base.php
2014-04-13 11:51:03 +02:00
Lukas Reschke 2454759af7 Check whether the user has permissions to add personal storage backends 2014-04-13 11:01:50 +02:00
Jenkins for ownCloud 982d2bcc5b [tx-robot] updated from transifex 2014-04-13 01:55:12 -04:00
kondou d98ae4f9b2 Fix a wrong WebDAV Warning with self-signed-certs
Occuring in the admin interface
2014-04-13 05:24:29 +02:00
Volkan Gezer 7fa0c3b7b7 fix translation link 2014-04-13 01:47:03 +02:00
Volkan Gezer b92f411a36 upda mailinglist address 2014-04-13 01:45:10 +02:00
Volkan Gezer 4d4db23745 fix contribute link 2014-04-12 23:47:32 +02:00
Bernhard Posselt 62cce982bb default to GET request when no method is set to fix unittests, also set parsed json parameters on the post attribute 2014-04-12 16:17:49 +02:00
Bernhard Posselt e7fa2790f3 Correctly process request parameters other than GET or POST, dont use globals in the class but inject it 2014-04-12 15:02:19 +02:00
Jenkins for ownCloud 329b8f3e99 [tx-robot] updated from transifex 2014-04-12 01:56:11 -04:00
Bernhard Posselt 526100dc90 be nice and use a relative import so people can use the class without firing up owncloud 2014-04-12 01:33:21 +02:00
Andreas Fischer f35eae6442 Remove unnecessary +1 from PostgreSQL sequence correction query. 2014-04-11 21:56:14 +02:00
Andreas Fischer 94522586c1 Better variable names for table arrays. 2014-04-11 21:46:02 +02:00
Andreas Fischer 731571491f Improve message about tables not going to be converted. Mention --all-apps option. 2014-04-11 21:40:45 +02:00
Bernhard Posselt 4af72a076d use references for middleware to fix problems on 5.3 2014-04-11 20:50:49 +02:00
Lukas Reschke 266325eac4 Merge pull request #8168 from owncloud/only-encode-dangerous-char
Only encode dangerous dangerous characters
2014-04-11 20:44:39 +02:00
Lukas Reschke 6343391e58 Change from showHTML to show
There is no need to use `showHTML` here.
2014-04-11 20:38:27 +02:00
Lukas Reschke 77ecfdd1a4 Only encode dangerous dangerous characters
There is no need to encode all characters into HTML entities, only potential dangerous characters as &, ", ', < and > should get encoded.

This may fix issues like https://github.com/owncloud/calendar/pull/394
2014-04-11 19:42:15 +02:00
Lukas Reschke e704bc2bf0 Merge pull request #7807 from sarciszewski/patch-1
Update crypt.php
2014-04-11 19:19:02 +02:00
Björn Schießle 10dc1de644 Merge pull request #8069 from owncloud/fix-localization-issues-with-file-encrypt-app
Fix some localization issues with file encryption/decryption strings
2014-04-11 17:22:13 +02:00
Vincent Petry e92fe47d2a Remove annoying karma 404 warnings for images
Karma now serves images from core to avoid polluting the logs with a lot
of 404 warnings.

This also makes it easier to read the test errors during development.
2014-04-11 15:25:40 +02:00
Volkan Gezer d67cba973e Typo fix. 2014-04-11 15:23:43 +02:00
Thomas Müller 07ea57465b drop folder support on public shared folders 2014-04-11 14:54:13 +02:00
Arthur Schiwon 1c57ffa16f Give hint when composing filter failed 2014-04-11 14:08:12 +02:00
Arthur Schiwon e28227ecdc fix comparison in determineMode, fixes problems with restoring the filter mode (assisted or manually) on page refresh 2014-04-11 13:56:06 +02:00
Arthur Schiwon 6f1e9f8920 Merge branch 'ldap-filter-reset-fix' of github.com:ben-denham/core into fix-6651 2014-04-11 13:48:45 +02:00
Jenkins for ownCloud 36107e1bad [tx-robot] updated from transifex 2014-04-11 01:55:15 -04:00
Thomas Müller dcca5f7bdd Merge pull request #5857 from owncloud/type-ahead-share-by-mail-master
introduce auto completion on share email - integrated with the contactsm...
2014-04-11 00:04:58 +02:00
Volkan Gezer 9e9c109390 Expiration date is hidden smoothly
From now on, it is hidden smoothly as the other fields do.
2014-04-10 21:54:25 +02:00
Lukas Reschke d229856fc5 Merge pull request #8076 from owncloud/enable-dav-browser
Re-enable the sabredav browser plugin to fix sync client setup
2014-04-10 21:47:03 +02:00
Bernhard Posselt 763da4258e fix the middleware registration process in the container 2014-04-10 20:51:03 +02:00
Bernhard Posselt 2fc6fb36ad Merge pull request #8139 from owncloud/fix-middleware-registration
register middleware as string to not force request to be instantiated to...
2014-04-10 20:24:30 +02:00
Thomas Müller 0edacf372c fix single file upload in firefox 2014-04-10 18:07:36 +02:00
Bart Visscher 694244f2e0 Supply the contactsmanager object to the callbacks 2014-04-10 18:07:15 +02:00
Bart Visscher 5c412f480c $key is not needed for registering contactsmanager callbacks 2014-04-10 18:06:31 +02:00
Thomas Müller e401df26bc Merge pull request #8107 from owncloud/dav-negativetimestampfix
Fixed Sabre Node implementation to correctly return timestamps as int
2014-04-10 17:37:53 +02:00
Thomas Müller 7325aefbd1 Merge pull request #8112 from owncloud/karma-enableautowatch
Enable autowatch for karma
2014-04-10 16:57:28 +02:00
Thomas Müller 26a89e369e Merge pull request #8137 from owncloud/routeing-requirements
add requirements to routing
2014-04-10 16:23:01 +02:00
Thomas Müller ecd74d3630 Merge pull request #8138 from owncloud/allow-app-in-routes.php
To isolate the variable scope used inside the $file it is required in it...
2014-04-10 16:09:23 +02:00
Tom Needham 654d5af394 Merge pull request #8027 from owncloud/routes-ocs
Load all routes when matching an ocs route
2014-04-10 12:22:34 +01:00
Vincent Petry 6cc578d1a7 Merge pull request #8018 from owncloud/ocs_result_success_is_100
OC_OCS_Result Class, Only accept 100 code as success
2014-04-10 13:03:10 +02:00
Vincent Petry 8d05848391 Merge pull request #7825 from owncloud/hash-stream
Use streams when generating hashes of remote files
2014-04-10 10:42:04 +02:00
Vincent Petry 9a8457aca0 Merge pull request #8053 from owncloud/preview-hook-root
Pass the correct root to the preview on post_write
2014-04-10 10:31:40 +02:00
Jenkins for ownCloud 7c072510d3 [tx-robot] updated from transifex 2014-04-10 01:55:39 -04:00
jbtbnl b10bf72999 Vertically align public layout to better fit small mobile screens 2014-04-10 00:33:55 +02:00
Bernhard Posselt f06ef8aa4b register middleware as string to not force request to be instantiated too early and thus not having url parameters 2014-04-09 23:59:57 +02:00
Thomas Müller e8be2ac554 In cases folder drag and drop is not supported a proper message is displayed 2014-04-09 23:32:12 +02:00
Thomas Müller 98a5f121fd To isolate the variable scope used inside the $file it is required in it's own method 2014-04-09 22:45:34 +02:00
Thomas Müller 2fc9e27ced use FileList.findFileEl 2014-04-09 22:16:41 +02:00
Thomas Müller d2961dcf11 Merge branch 'master' into lukepolo-master
Conflicts:
	apps/files/js/filelist.js
2014-04-09 22:00:25 +02:00
Bernhard Posselt 70c88027db add requirements to routing 2014-04-09 21:57:32 +02:00
Bart Visscher 511816b878 Implement the register function of OC\ContactsManager 2014-04-09 21:53:06 +02:00
Thomas Tanghus 5b8c7a01e9 Merge pull request #8129 from owncloud/core-svgsupport
Moved SVGSupport call to use OC.Util.SVGSupport()
2014-04-09 19:15:37 +02:00
Joas Schilling 4c309b05ba Merge pull request #8128 from owncloud/fix/undefined-index-storage
Fix Undefined index: storage in share.php
2014-04-09 18:26:17 +02:00
Andreas Fischer 56b6504d59 Extract schema creation code into its own method. 2014-04-09 16:46:21 +02:00
Andreas Fischer 370593361b Add option to create all app schemas instead of just installed app. 2014-04-09 16:42:22 +02:00
Andreas Fischer 5ef7d69d41 Do not attempt to covert to the same DBMS. 2014-04-09 15:57:33 +02:00
Vincent Petry 4f11786a3d Fixed Sabre Node implementation to correctly return timestamps as int
Negative timestamps were returned as string and were confusing other

Sabre API like Sabre_DAV_Property_GetLastModified.

This fix makes sure the timestamp is returned as int when defined.
2014-04-09 15:46:51 +02:00
Andreas Fischer 03a3f66867 Move schema clearing to extra method. 2014-04-09 15:45:30 +02:00
Vincent Petry f84d66a24f Moved SVGSupport call to use OC.Util.SVGSupport() 2014-04-09 15:23:09 +02:00
Andreas Fischer 3e0858e51f private -> protected 2014-04-09 15:21:57 +02:00
Andreas Fischer 78ee4c1327 Merge remote-tracking branch 'owncloud/master' into db-convert-tool
* owncloud/master: (137 commits)
  add comment to clearify when a skip in the foreach happens
  remove obsolete code
  Always define sendmail_is_available
  [tx-robot] updated from transifex
  Make hardcoded exception messages translatable
  Disable sharing in trashbin app
  class Test_Config is already declared
  [tx-robot] updated from transifex
  using array_key_exists() instead of isset() - required because in case the value is null isset is returning false
  fixing undefined exception classes
  unit test testSetAppValueIfSetToNull() added
  unit tests for dynamic backend registration
  ignore underscore.js in scrutinizer.yml
  adding ownCloud globals to jshintrc: OC, t, n
  Use git checkout on directory as some files may not be in git resulting in, e.g.:
  adding underscore.js
  reduce code duplication, fix parse error, prevent page reload on hitting enter while changing the display name - refs #8085
  translations for oc-dialogs reside in code
  Fix copy conflict dialog translation
  [tx-robot] updated from transifex
  ...
2014-04-09 15:20:18 +02:00
Joas Schilling 352063cf0a Fix Undefined index: storage in share.php
There parameter was removed when the code was cleaned up:
{"app":"PHP","message":"Undefined index: storage at
E:\\ownCloud\\owncloud\\lib\\private\\share\\share.php#1160",
"level":0,"time":"2014-04-09T12:56:23+00:00"}
2014-04-09 15:14:44 +02:00
Morris Jobke d8f56e3c00 Merge pull request #8049 from owncloud/filepickersvg
Fix file picker SVG issues
2014-04-09 15:05:40 +02:00
Joas Schilling d418e176ce Do not query when the list is empty 2014-04-09 15:02:06 +02:00
Joas Schilling 015b9b1dac Add option to getUsersSharingFile() to get the paths for the shared users 2014-04-09 15:02:05 +02:00
Vincent Petry b19671d204 Merge pull request #8126 from owncloud/remove_obsolete_code_in_sharing_js
remove obsolete code
2014-04-09 14:50:15 +02:00
Jan-Christoph Borchardt 1258cde020 fix search box wrapping on very narrow screens 2014-04-09 13:20:46 +02:00
Jan-Christoph Borchardt 0ad8e1b1e6 search: change date color to grey for less distraction 2014-04-09 12:58:14 +02:00
Jan-Christoph Borchardt d72269d361 increase height of result for better clickability 2014-04-09 12:55:10 +02:00
Jan-Christoph Borchardt ee6fe9718e make search results work on mobile as well 2014-04-09 12:51:41 +02:00
blizzz 9feebeaf40 Merge pull request #7837 from owncloud/fix_7530
LDAP: fix determining objectclasses takes long
2014-04-09 12:27:17 +02:00
Arthur Schiwon dbebf6bb5e add comment to clearify when a skip in the foreach happens 2014-04-09 12:25:48 +02:00
Jörn Friedrich Dreyer 9b0f289143 remove obsolete code 2014-04-09 12:09:28 +02:00
Arthur Schiwon ee3368d2ad replace hardcoded limit of 400 with user controlled ldapPagingSize value 2014-04-09 11:38:51 +02:00
Arthur Schiwon 2e5adadad7 Put inner loop into own method, let's see whether it makes scrutinizer happier 2014-04-09 11:31:56 +02:00
Arthur Schiwon bdc418d1f9 var count is assigned in the inner loop so it must be checked inside there to be properly used as part of the exit condition of the outer loop 2014-04-09 11:31:56 +02:00
Arthur Schiwon 43402c56dd initialize variable 2014-04-09 11:31:56 +02:00
Arthur Schiwon 40f9875f11 LDAP: fix user report i.e. count for LDAP servers with really many users 2014-04-09 11:31:56 +02:00
Arthur Schiwon 8bb27551bd LDAP: make sure cache key for paged result cookie matches when limit or offset is null or 0 2014-04-09 11:31:56 +02:00
Joas Schilling fbb9e11a7e Merge pull request #8122 from owncloud/issue/8048
Always define sendmail_is_available in settings/admin.php
2014-04-09 11:14:24 +02:00
Joas Schilling e79a027e77 Always define sendmail_is_available
Fix #8048
2014-04-09 10:18:46 +02:00
Jenkins for ownCloud 796f719548 [tx-robot] updated from transifex 2014-04-09 01:56:49 -04:00
Thomas Müller 1a09d64a77 Merge pull request #8117 from owncloud/fix-hard-coded-uman-str
Make hardcoded exception messages translatable
2014-04-08 22:45:19 +02:00
Thomas Müller 73ac3d0fcd Merge pull request #7643 from owncloud/chainable_response
Chainable Response in AppFramework
2014-04-08 22:42:43 +02:00
Vincent Petry c1345d3a2d Merge pull request #8111 from owncloud/trash-disablesharing
Disable sharing in trashbin app
2014-04-08 21:00:44 +02:00
Volkan Gezer a4f42676ea Make hardcoded exception messages translatable 2014-04-08 20:07:25 +02:00
Vincent Petry bfb1e0867f Enable autowatch for karma
This way unit tests can be run in multiple browsers with the command
line and tests will re-run automatically when files are changed.
2014-04-08 17:21:11 +02:00
Vincent Petry 35ab6fe5a9 Disable sharing in trashbin app 2014-04-08 17:13:59 +02:00
Thomas Müller 618914282a Merge pull request #8110 from owncloud/fix-failing-config-unit-test
class Test_Config is already declared
2014-04-08 16:26:35 +02:00
Thomas Müller a4fc92b05b class Test_Config is already declared 2014-04-08 14:15:33 +02:00
Arthur Schiwon 2407321625 add tests for LDAP 2014-04-08 12:57:06 +02:00
Arthur Schiwon 142fc5f3af fix return value when a search string was passed to return integer instead of array 2014-04-08 12:53:59 +02:00
Arthur Schiwon 9597f41904 add group tests 2014-04-08 12:32:30 +02:00
Arthur Schiwon 5f8d9b3a4e ask implementsAction instead of checking method_exists for easier testing 2014-04-08 12:31:11 +02:00
Arthur Schiwon 96cb75f5cf implement countUsersInGroup in LDAP group backend 2014-04-08 12:04:38 +02:00
Arthur Schiwon 698297feb3 add optional countUsersInGroup method to group backends 2014-04-08 12:04:38 +02:00
Thomas Müller 411a810ebe Merge pull request #8032 from owncloud/fs-backend-registration
Files External: allow dynamic backend registration
2014-04-08 11:27:02 +02:00
Jenkins for ownCloud 4ad4b9768c [tx-robot] updated from transifex 2014-04-08 01:57:51 -04:00
Thomas Müller 9360dbf8a4 Merge pull request #8102 from owncloud/fix-appconfig-master
Fix appconfig master
2014-04-08 07:20:37 +02:00
Thomas Müller 68b7822cf5 js style fixes according to our jshintrc rules 2014-04-07 23:45:35 +02:00
Thomas Müller 7dd0074655 fixing mkdir code to respect external file systems as well 2014-04-07 23:17:35 +02:00
Thomas Müller d15a4719d2 fix folder upload in js 2014-04-07 23:04:08 +02:00
Thomas Müller 971a311fee adding parentId to file info array 2014-04-07 23:03:19 +02:00
Thomas Müller 6d373e97c3 remove unused exit() 2014-04-07 23:02:49 +02:00
Thomas Müller 3587c88fe9 Merge branch 'master' of https://github.com/lukepolo/core-1 into lukepolo-master
Conflicts:
	apps/files/js/file-upload.js
2014-04-07 22:28:16 +02:00
Jörn Friedrich Dreyer be9bc2c727 Merge pull request #8089 from bantu/autotest-checkout-pathspec
Use git checkout on directory as some files may not be in git resulting ...
2014-04-07 21:10:11 +02:00
Thomas Müller c1fd300048 using array_key_exists() instead of isset() - required because in case the value is null isset is returning false 2014-04-07 21:05:48 +02:00
Thomas Müller 85e7921b14 fixing undefined exception classes 2014-04-07 20:57:08 +02:00
Thomas Müller 240d1ae6b9 unit test testSetAppValueIfSetToNull() added 2014-04-07 20:56:43 +02:00
Thomas Müller c86bda0325 Merge pull request #8065 from owncloud/avatar-highdpi
use high resolution avatars on highdpi screens
2014-04-07 20:36:15 +02:00
Thomas Müller 3ac009c2b4 unit tests for dynamic backend registration 2014-04-07 20:18:57 +02:00
Jörn Friedrich Dreyer 3fde1b4342 Merge pull request #8091 from owncloud/jshint-globals-oc-t-n
adding ownCloud globals to jshintrc: OC, t, n
2014-04-07 20:06:28 +02:00
Thomas Müller 4253d63f9f ignore underscore.js in scrutinizer.yml 2014-04-07 17:11:30 +02:00
Thomas Müller 78e5410199 Merge branch 'master' into jshint-globals-oc-t-n
Conflicts:
	.jshintrc
2014-04-07 17:10:45 +02:00
Thomas Müller 1e559f7239 Merge pull request #8088 from owncloud/fix-personal.js
reduce code duplication, fix parse error, prevent page reload on hitting...
2014-04-07 16:59:32 +02:00
Fabian Henze 1245ff8f31 Add unit tests for OC_Helper::phpFileSize function 2014-04-07 15:31:34 +02:00
icewind1991 d3eee01190 Merge pull request #7599 from owncloud/public-pathinfo
Allow using pathinfo based public.php paths
2014-04-07 14:53:44 +02:00
Thomas Müller d7bc23e16d adding ownCloud globals to jshintrc: OC, t, n 2014-04-07 14:50:32 +02:00
Thomas Müller 0fe32eee13 Merge pull request #8083 from owncloud/fix-link-to-sync
Remove wrong whitespace from URL and use HTTPS
2014-04-07 14:38:47 +02:00
Thomas Müller 21a54ba50f Merge pull request #8086 from owncloud/fix_copy_conflict_translations_in_js
Fix copy conflict dialog translation
2014-04-07 14:38:00 +02:00
Andreas Fischer de07f25bc2 Use git checkout on directory as some files may not be in git resulting in, e.g.:
error: pathspec 'tests/data/lorem-copy.txt' did not match any file(s) known to git.
error: pathspec 'tests/data/testimage-copy.png' did not match any file(s) known to git.
2014-04-07 14:06:20 +02:00
Thomas Müller b2f8490be2 adding underscore.js 2014-04-07 14:05:58 +02:00
Thomas Müller 647abe512b reduce code duplication, fix parse error, prevent page reload on hitting enter while changing the display name - refs #8085 2014-04-07 14:04:16 +02:00
Robin Appelman 51fbf0bcbc add delimiter between host and baseurl 2014-04-07 13:27:18 +02:00
Robin Appelman 84285011ce Merge branch 'master' into routing-cache-webroot 2014-04-07 13:24:51 +02:00
blizzz 3c9f588449 Merge pull request #6221 from leo-b/ldap_get_all_groups
fix updateGroups background job for ldap servers with > 1000 groups
2014-04-07 13:00:32 +02:00
Jörn Friedrich Dreyer 779dff31c4 translations for oc-dialogs reside in code 2014-04-07 11:58:32 +02:00
Jörn Friedrich Dreyer c90b0ac00b Fix copy conflict dialog translation 2014-04-07 11:46:47 +02:00
blizzz 0c444fb2fb Merge pull request #8017 from Raydiation/master
Remove dependency on container, removing service locator antipattern
2014-04-07 10:19:18 +02:00
Jenkins for ownCloud e295d48fd4 [tx-robot] updated from transifex 2014-04-07 01:56:11 -04:00
Lukas Reschke 592371f367 Merge pull request #8064 from owncloud/remove-not-existing-functions
Removed two unused functions
2014-04-06 22:24:30 +02:00
Lukas Reschke 6babf90175 Switch to HTTPS 2014-04-06 22:06:38 +02:00
Lukas Reschke 5679f5c37e Remove wrong whitespace from URL and use HTTPS
The whitespace caused the generated links to begin with a whitespace (e.g. `<a href=" http://owncloud.org/sync-clients/" target="_blank">`)

Additionally I switched the link to HTTPS.
2014-04-06 22:04:14 +02:00
Robin Appelman 593977f016 Re-enable the sabredav browser plugin 2014-04-06 14:49:39 +02:00
Volkan Gezer d962f18e3f Update README.md
Update to the correct link (version 6.0)
2014-04-06 14:01:02 +02:00
Volkan Gezer 9043fdd772 Update README.md 2014-04-06 13:58:44 +02:00
Volkan Gezer 7f553ee26c Update README.md
Change version.
2014-04-06 13:58:06 +02:00
Jenkins for ownCloud a9d49de465 [tx-robot] updated from transifex 2014-04-06 01:56:11 -04:00
jbtbnl 86adee98bf Merge pull request #8072 from owncloud/slideshow-buttons
Fix slideshow buttons being invisible
2014-04-06 01:17:43 +02:00
Robin Appelman ceb6666e73 Fix slideshow buttons being invisible 2014-04-06 00:16:14 +02:00
Volkan Gezer 286323f7a4 Fix some localization issues with file encryption/decription strings 2014-04-05 19:28:53 +02:00
Jenkins for ownCloud 2124eaba92 [tx-robot] updated from transifex 2014-04-05 01:56:08 -04:00
Tom Needham 861394c88d Merge pull request #8061 from owncloud/remove-uneeded-file
Remove uneeded file
2014-04-05 00:13:33 +01:00
Robin Appelman 3c35e82a37 use high resolution avatars on highdpi screens 2014-04-04 23:35:32 +02:00
Jörn Friedrich Dreyer 797bb7b9cc Merge pull request #8062 from owncloud/remove-echo
Replace echo with `p` or `print_unescaped`
2014-04-04 23:17:13 +02:00
Lukas Reschke ce1b382905 Delete auth.css 2014-04-04 22:38:26 +02:00
Lukas Reschke 33a2aa8865 Delete oauth.css 2014-04-04 22:38:16 +02:00
Lukas Reschke 1b55c312e5 Removed two unused functions
These two functions were actually not usable and only a todo since ages. I think it's better to remove it than having dead and unmaintained code.
2014-04-04 22:27:05 +02:00
Lukas Reschke 35ee1e902a Replace echo with p or print_unescaped
Using echo instead of `p` or `print_unescaped` is a bad style, to prevent people from copying it  I've adjusted it.
2014-04-04 22:23:23 +02:00
Lukas Reschke b2f8e34388 Remove uneeded file
This file seems not to be actually used anywhere.
2014-04-04 22:14:51 +02:00
Vincent Petry 710bbd3491 Merge pull request #8058 from owncloud/preview-highdpi
Show higher resolution previews for high dpi screens
2014-04-04 18:45:49 +02:00
icewind1991 4028301dea Merge pull request #8055 from owncloud/getfileinfo-exists
dont scan not existing files in View->getFileInfo
2014-04-04 18:07:29 +02:00
Vincent Petry 0597c5226a Merge pull request #8039 from owncloud/chunking-removeexpireinhaskey
Do not expire chunks while checking for their existence
2014-04-04 17:18:54 +02:00
Robin Appelman 01d93f81f6 Show higher resolution previews for high dpi screens 2014-04-04 17:10:46 +02:00
Thomas Müller ccf1287fbf adding unit test for cache mechanism 2014-04-04 16:21:50 +02:00
Robin Appelman b61ec7352b dont scan not existing files in View->getFileInfo 2014-04-04 15:10:07 +02:00
Robin Appelman e76c246718 Pass the correct root to the preview on post_write 2014-04-04 15:02:08 +02:00
Vincent Petry 09ac61f53b Merge pull request #8047 from owncloud/jshint-line-length-120
extending javascript line length to 120
2014-04-04 12:00:01 +02:00
Vincent Petry d4f9cc567a Fix SVG close button of file picker 2014-04-04 11:52:15 +02:00
Vincent Petry 05a7bfed71 Fix file picker to correctly show SVG file icons 2014-04-04 11:44:11 +02:00
Thomas Müller f029312e5b fixing typos/spellings 2014-04-04 11:37:47 +02:00
Vincent Petry a4eafca77f Moved code to replace svg with png to OC.Util
- Moved code that replaces the "svg" extension for the given file to
core as OC.Util.replaceSVGIcon.
- Added unit test for OC.Util.replaceSVGIcon
- Moved "replaceSVG" to OC.Util.replaceSVG and deprecated the global
"replaceSVG" function.
- Added alias for SVGSupport() as OC.Util.hasSVGSupport() (for now)
2014-04-04 11:34:26 +02:00
Thomas Müller 086eb71cfe extending javascript line length to 120
adding xit to globals
2014-04-04 10:36:19 +02:00
Vincent Petry 8a10c44eb3 Merge pull request #8015 from owncloud/storageinfo-reuse
Allow reusing FileInfo for getStorageInfo
2014-04-04 10:18:02 +02:00
Jenkins for ownCloud 0805f678cc [tx-robot] updated from transifex 2014-04-04 01:57:01 -04:00
josh4trunks 2d9b46e3b9 Remove missed stuff from merge 2014-04-03 22:17:31 -07:00
josh4trunks 5b402aa846 Fixed Typo 2014-04-03 22:12:57 -07:00
josh4trunks a266144750 Don't always $cookie_path, only set it when needed 2014-04-03 22:12:57 -07:00
josh4trunks d1106f1749 cookie would be useless if value is not set 2014-04-03 22:12:57 -07:00
josh4trunks 63df8354da Don't to set the cookie it wasn't needed. 2014-04-03 22:12:57 -07:00
josh4trunks 4ddf5d92f2 Fixes login / logout when HTTP Basic Headers are avilable. 2014-04-03 22:12:57 -07:00
josh4trunks 9b4643f386 Send URI instead of filepath to NGINX for X-Accel 2014-04-03 20:46:54 -07:00
Morris Jobke bf7624fb25 Merge pull request #6968 from owncloud/files-ajaxload
Ajaxify files list for files + trashbin + public page
2014-04-03 22:02:05 +02:00
Vincent Petry ab56f69416 Do not expire chunks while checking for their existence
The expiration should be done by the gc() function on login, not while
isComplete() is calling hasKey() for every chunk.
2014-04-03 21:12:35 +02:00
Thomas Müller 388142ecc6 Exclude javascript specs from code analysis 2014-04-03 20:05:40 +02:00
Thomas Müller 20f26068e7 Merge pull request #7476 from owncloud/type-hinting
Type hinting
2014-04-03 20:02:27 +02:00
Thomas Müller e3b9a86184 remove duplicate method checkDependencies() 2014-04-03 17:17:44 +02:00
Thomas Müller c6976d89a6 use command -v to detect if smbclient exists 2014-04-03 17:09:40 +02:00
Vincent Petry d1e78d7a6b Correctly set svg for crumb divider 2014-04-03 17:08:06 +02:00
Thomas Müller 14a5381977 Merge branch 'master' into fs-backend-registration
Conflicts:
	apps/files_external/templates/settings.php
2014-04-03 17:04:16 +02:00
Vincent Petry 7c9537f33a Fixed dirInfo check for non existing dir in files ajax call 2014-04-03 17:04:13 +02:00
Thomas Müller c0ebc1dfb1 Update backends and their configurations 2014-04-03 16:57:26 +02:00
Vincent Petry 2b8bb01211 Fixed mime type attribute access in file overwrite dialog 2014-04-03 16:55:01 +02:00
Vincent Petry 3101663129 Removed redundant free space and upload limit in public page 2014-04-03 16:50:21 +02:00
tomneedham b00592ade5 Fix test case for api response code 2014-04-03 14:47:55 +00:00
Philipp Kapfer 730bca98b4 Moved dependency checks to end of class files
Dependency messages now appear below the configuration options instead of above
Reworked dependency check method to support consolidated messages for multiple backends

Conflicts:
	apps/files_external/lib/google.php
	apps/files_external/lib/swift.php
	apps/files_external/templates/settings.php
2014-04-03 16:46:22 +02:00
Philipp Kapfer ff9a4a6d91 Added cURL dependency for Amazon S3, Dropbox and SWIFT
Conflicts:
	apps/files_external/lib/amazons3.php
	apps/files_external/lib/swift.php
2014-04-03 16:38:43 +02:00
Vincent Petry e2969062ca Merge pull request #7969 from Xenopathic/files_external_fix
Fix error log spam
2014-04-03 16:31:58 +02:00
Philipp Kapfer 46379113a1 Changed dependency check messages from warnings to notes
Added check for duplicate dependency check messages to display only the first
2014-04-03 16:31:54 +02:00
Philipp Kapfer 8ca897df76 Added cURL dependency check to Google Drive and WebDAV backend
Added check for backend's checkDependencies method to OC_Mount_Config::getBackends() when backend is configured to have some instead of blindly calling it and crashing

Conflicts:
	apps/files_external/lib/config.php
	apps/files_external/lib/google.php
2014-04-03 16:30:48 +02:00
Philipp Kapfer f7da4280ca Modified app to dynamically register backends instead of hard-coding them
Moved dependency check to the individual backends instead of the config

Conflicts:
	apps/files_external/appinfo/app.php
	apps/files_external/lib/config.php
2014-04-03 16:21:52 +02:00
Thomas Müller a2efdb8722 Merge pull request #7970 from owncloud/webdav-upload-hash
Fix uploading files containing a # in the path for webdav
2014-04-03 16:09:44 +02:00
Robin McCorkell eaad6a4e27 Fix error log spam
Regression from e002b7242c
2014-04-03 13:43:02 +01:00
Robin Appelman 7dafdfbe88 add tests for sharing files the users doesn't have access to 2014-04-03 13:14:34 +02:00
Robin Appelman db95f49b7e Load all routes when matching an ocs route 2014-04-03 13:01:20 +02:00
Jörn Friedrich Dreyer c7324f7e44 fix float comparison for negative results 2014-04-03 12:00:53 +02:00
Jenkins for ownCloud 54783550e8 [tx-robot] updated from transifex 2014-04-03 01:56:12 -04:00
Fabian Henze 7cdb16979a Fix setting the max-upload-size for really large values.
php can only parse filesize units up to gigabytes, not terabytes or petabytes.
2014-04-03 01:17:28 +02:00
icewind1991 6d378515f8 Merge pull request #8014 from owncloud/uploadsize-reuse
Reuse known free space in the files app
2014-04-02 18:40:34 +02:00
Jörn Friedrich Dreyer b9a8bd7e1f extract more methods 2014-04-02 18:32:32 +02:00
Vincent Petry a6de5efbab Merge pull request #7978 from owncloud/enc_cleanup
there is no need to re-calculate the shares after a touch
2014-04-02 18:23:33 +02:00
Jörn Friedrich Dreyer 436a78db44 extract method isCachedBigger 2014-04-02 18:00:21 +02:00
Bernhard Posselt 5f3b8c45d7 Remove dependency on container, removing service locator antipattern 2014-04-02 17:54:33 +02:00
tomneedham 6b017201b8 Only accept success as 100 like the OCS spec does 2014-04-02 15:50:51 +00:00
Jörn Friedrich Dreyer bca6cc6f74 remove unnecessary code 2014-04-02 17:34:48 +02:00
Jörn Friedrich Dreyer b8248f4a0a compare floats with epsilon 2014-04-02 17:32:27 +02:00
Robin Appelman da5541ac02 Allow reusing FileInfo for getStorageInfo 2014-04-02 17:10:57 +02:00
Robin Appelman 1e6a79e244 Reuse known free space in the files app 2014-04-02 16:53:45 +02:00
Vincent Petry 0be9de5df5 Files, trashbin, public apps use ajax/JSON for the file list
Files app:

- removed file list template, now rendering list from JSON response
- FileList.addFile/addDir is now FileList.add() and takes a JS map with all required
  arguments instead of having a long number of function arguments
- added unit tests for many FileList operations
- fixed newfile.php, newfolder.php and rename.php to return the file's
  full JSON on success
- removed obsolete/unused undo code
- removed download_url / loading options, now using
  Files.getDownloadUrl() for that
- server side now uses Helper::getFileInfo() to prepare file JSON response
- previews are now client-side only

Breadcrumbs are now JS only:

- Added BreadCrumb class to handle breadcrumb rendering and events
- Added unit test for BreadCrumb class
- Moved all relevant JS functions to the BreadCrumb class

Public page now uses ajax to load the file list:

- Added Helper class in sharing app to make it easier to authenticate
  and retrieve the file's real path
- Added ajax/list.php to retrieve the file list
- Fixed FileActions and FileList to work with the ajax list

Core:

- Fixed file picker dialog to use the same list format as files app
2014-04-02 15:33:47 +02:00
Morris Jobke 16d10844cd Merge pull request #7995 from owncloud/fix-h3-styles
fix h3 style, move out from settings to apps CSS
2014-04-02 14:45:58 +02:00
Vincent Petry b616cc1f2d Merge pull request #8003 from owncloud/extstorage-sftp-upgradephpseclib
Upgraded phpseclib to version 0.3.6 (SFTP ext storage)
2014-04-02 14:10:09 +02:00
Robin Appelman 850a0e7388 Verify that a file exists before we share it 2014-04-02 13:47:11 +02:00
Morris Jobke 7bdc085022 Merge pull request #8006 from wakeup/master
Fix admin-dir_permissions redirection when cannot write warning is shown.
2014-04-02 13:21:53 +02:00
Morris Jobke 1782dcbb50 Merge pull request #7977 from owncloud/fix_enc_if_sharing_is_disabled
always encrypt files to owner
2014-04-02 13:20:51 +02:00
Vincent Petry c0746f6b49 Merge pull request #7968 from owncloud/core-overwritewebrootwithroot
Allow using "/" in "overwritewebroot"
2014-04-02 12:56:36 +02:00
Volkan Gezer b6ad7c3cdd Fix admin-dir_permissions redirection when cannot write warning
is shown.
2014-04-02 12:41:46 +02:00
Vincent Petry 3f9beb8c6b Upgraded phpseclib to version 0.3.6 2014-04-02 12:31:59 +02:00
Vincent Petry 4cc70ec39d Merge pull request #7979 from owncloud/core-fixfilegetcontentsloop
Correctly read the full stream in file_get_contents
2014-04-02 10:55:50 +02:00
Jan-Christoph Borchardt 5301056ab1 fix h3 style, move out from settings to apps CSS 2014-04-02 09:18:33 +02:00
Thomas Müller 7086c386fd Merge branch 'master' into append-error-document
Conflicts:
	lib/private/setup.php
	lib/private/updater.php
2014-04-02 08:48:37 +02:00
Jenkins for ownCloud 73dd5ff26c [tx-robot] updated from transifex 2014-04-02 01:56:39 -04:00
Robin Appelman 1c7a71ca77 use binary safe read 2014-04-02 04:38:54 +02:00
Robin Appelman 54a15a8001 Use streams when generating hashes of remote files 2014-04-02 04:38:54 +02:00
Vincent Petry 268206cec5 Fixed parseQueryString to handle empty values and plus signs
- now correctly parse query strings with '+' signs
- empty values are now parsed either as null or empty string
- added unit test for parseQueryString()
2014-04-01 23:02:34 +02:00
Thomas Müller d762e25cc5 Merge pull request #7989 from owncloud/files-deletefileregressionfix
Fixed broken delete file action
2014-04-01 22:54:05 +02:00
Thomas Müller 82d1ea240e Merge pull request #7884 from owncloud/use-idn_to_ascii-if-available
idn_to_ascii is only used if available
2014-04-01 22:51:23 +02:00
Thomas Müller 86ab1cf476 typos fixed
PHPDoc comments added
2014-04-01 22:17:31 +02:00
Vincent Petry d811026ec9 Merge pull request #7935 from owncloud/getpath-shared
Make getPath work for shared files
2014-04-01 21:59:09 +02:00
Morris Jobke bd2cf6ee29 Merge pull request #7817 from owncloud/app-navigation-for-apps
Makes #app-navigation a part of app management.
2014-04-01 21:38:43 +02:00
Bart Visscher 630b5b648f Merge pull request #7997 from owncloud/correct-remember-trashbin-state
Correct the remembering of the trashbin app state in encryption test
2014-04-01 21:23:53 +02:00
Bart Visscher f37a76c396 Remember before change works better 2014-04-01 19:46:46 +02:00
Jan-Christoph Borchardt 0c441724bc make infield labels use less space so pasting in is easier 2014-04-01 17:21:05 +02:00
Jan-Christoph Borchardt c926e98ea9 fix log in input sizing caused by core input field switch to px 2014-04-01 17:18:03 +02:00
Vincent Petry 0e93c3fd9a Merge pull request #7986 from owncloud/files-fixredirectwhendirnotexists
Fix dirInfo check when dir does not exist
2014-04-01 16:51:30 +02:00
Morris Jobke 017d7953d7 Merge pull request #7984 from owncloud/wording-applicable2
External Storage: change confusing 'applicable' to 'available for', default to »All Users«
2014-04-01 16:44:31 +02:00
Vincent Petry aaa8d6ec02 Fixed broken delete file action 2014-04-01 16:09:48 +02:00
Vincent Petry 6e6a131b32 Merge pull request #7696 from owncloud/chunk-remainingspacefix
Fixed chunking and insufficient storage check
2014-04-01 16:09:19 +02:00
Robin Appelman 9c8596e95b Keep cached urls with different hostnames or baseurls seperate 2014-04-01 15:43:27 +02:00
Vincent Petry 0bede65947 Fix dirInfo check when dir does not exist 2014-04-01 15:15:03 +02:00
Vincent Petry 27eff1ac30 Merge pull request #7293 from owncloud/update-shares-postgres
fix update to remove shares where file doesn't exist on postgres
2014-04-01 14:56:37 +02:00
Jan-Christoph Borchardt acfb3cfff5 external storage: set storages to be available for All Users by default 2014-04-01 14:31:22 +02:00
Jan-Christoph Borchardt 0a112de676 external storage: change confusing 'applicable' to 'available for' 2014-04-01 14:26:06 +02:00
blizzz a179335775 Merge pull request #7940 from owncloud/settings-userlistajaxcallfix
Fixed user list offset call
2014-04-01 14:17:05 +02:00
Björn Schießle c45793033d Merge pull request #7912 from owncloud/enc_move_checks_to_pre_hook
move check if a file should be encrypted to the pre hook
2014-04-01 13:56:46 +02:00
Vincent Petry be0660f84f Merge pull request #7943 from hjort/master
Correction: failure on sharing when user ID was prefixed by zero
2014-04-01 12:57:16 +02:00
Vincent Petry 5807681c09 Merge pull request #7975 from owncloud/fix-7973-master-2
remove pl_PL - fixes #7973
2014-04-01 12:38:47 +02:00
Vincent Petry 18acfa8bb3 Merge pull request #7915 from owncloud/replace-personalblock
Replace personalblock with .section
2014-04-01 11:20:16 +02:00
Morris Jobke a94ac41512 Merge pull request #7966 from owncloud/url_generation_hack
Check if web root has already been appended
2014-04-01 10:59:53 +02:00
Morris Jobke 0d2a81a095 apply proposed change 2014-04-01 10:48:55 +02:00
Vincent Petry 0067a4eac2 Added missing fclose in file_get_contents and file_put_contents 2014-04-01 10:08:16 +02:00
Vincent Petry d6ce45fe61 Correctly read the full stream in file_get_contents
When using user-defined stream wrappers, PHP will
return a maximum of 8192 bytes even if more was
requested.

This fix uses stream_get_contents to make sure the full stream is read
and not only the first 8 KB.

Added unit test with a bigger test file to cover this case.
2014-04-01 10:07:16 +02:00
Jenkins for ownCloud 7a4a836abe [tx-robot] updated from transifex 2014-04-01 01:56:15 -04:00
Bart Visscher 6b061c236d Merge branch 'master' into type-hinting
Conflicts:
	lib/private/image.php
	lib/private/l10n.php
	lib/private/request.php
	lib/private/share/mailnotifications.php
	lib/private/template/base.php
2014-03-31 21:38:54 +02:00
Björn Schießle 0ca80254ec Merge pull request #7967 from owncloud/sharing_fix_select_statement
select statement always need to contain file_source respectively item_source
2014-03-31 21:34:42 +02:00
Andreas Fischer 5b64a27df9 Undo 3rdparty update. 2014-03-31 21:09:54 +02:00
Andreas Fischer 01141e1520 Type hinting. 2014-03-31 21:07:48 +02:00
Andreas Fischer b39a74ff6c Some more colors. 2014-03-31 20:51:30 +02:00
Andreas Fischer f9853b253c Deduplicate connection handling code into \OC\DB\ConnectionFactory 2014-03-31 20:09:07 +02:00
Andreas Fischer a585cec530 Remove unnecessary and incorrect comments. 2014-03-31 19:27:18 +02:00
Bjoern Schiessle c578ab68fe there is no need to re-calculate the shares after a touch 2014-03-31 18:24:53 +02:00
Andreas Fischer e67cf99cef \InvalidArgumentException is in root namespace. 2014-03-31 18:20:24 +02:00
Andreas Fischer 5dbbe6d08b Doc blocks for properties do not repeat the property name. 2014-03-31 18:20:04 +02:00
Bjoern Schiessle 8e34812393 always encrypt files to owner 2014-03-31 18:19:48 +02:00
Thomas Müller fe2c6f4e6d remove pl_PL - fixes #7973 2014-03-31 18:03:42 +02:00
Andreas Fischer b002f11771 Use question color. 2014-03-31 17:06:06 +02:00
Andreas Fischer e768ead820 Remove whitespace at end of lines. 2014-03-31 17:06:02 +02:00
Robin Appelman 76c63a5760 Fix uploading files containing a # in the path for webdav 2014-03-31 17:00:32 +02:00
Morris Jobke ab696edba6 Merge pull request #7916 from owncloud/fix-input-sizes
Fix input sizes
2014-03-31 15:56:19 +02:00
Vincent Petry cf361b6b4a Allow using "/" in "overwritewebroot"
Whenever the reverse proxy is using "/" as the webroot, it is now
possible to set that value in "overwritewebroot"
2014-03-31 15:36:48 +02:00
Andreas Fischer 2d69c4c2d3 Merge remote-tracking branch 'owncloud/master' into db-convert-tool
* owncloud/master: (663 commits)
  [tx-robot] updated from transifex
  [tx-robot] updated from transifex
  Sub-dir was prepended twice
  Sub-dir was prepended twice
  [tx-robot] updated from transifex
  Use UrlGenerator in OC\Util::redirectToDefaultPage(). Fix #7936
  Emit event after setting a new expiration for a share
  adding @method annotation to declare methods which can be called on the wrapped statement object
  Fix CURLOPT_FOLLOWLOCATION bug with open_basedir or safe_mode restriction enabled.
  don't write file if opening a stream to encrypt the data fails
  Do not retrieve storage stats for trash bin
  [tx-robot] updated from transifex
  prevent dimmed ocdialog div from scrolling
  fix breadcrumbs for IE8
  enable SVG->PNG fallback for 'New' menu
  enable SVG->PNG fallback for newly uploaded files and folders
  specify logo to not repeat when container is bigger
  fix SVG replacement for logo so it works in IE8, fix #7866
  Fix swift touch operation
  [tx-robot] updated from transifex
  ...

Conflicts:
	3rdparty
2014-03-31 15:33:01 +02:00
Bjoern Schiessle aa867ad647 don't call getFileInfo() to avoid to open the same file twice 2014-03-31 15:29:16 +02:00
Bjoern Schiessle 8ebb1f15d3 move check if a file should be encrypted to the pre hook 2014-03-31 15:29:16 +02:00
Bjoern Schiessle 3a731a01b1 select statement always need to contain file_source respectively item_source 2014-03-31 15:03:35 +02:00
Robin Appelman 0c2585f3ac Improve phpdoc 2014-03-31 14:29:55 +02:00
Thomas Tanghus 6292aa57af Check if web root has already been appended 2014-03-31 14:24:38 +02:00
Morris Jobke 8bd308ffed merge CSS rules 2014-03-31 13:51:53 +02:00
Jan-Christoph Borchardt 2be2a5d2c5 external storage: fix merge conflict, indentation 2014-03-31 13:12:04 +02:00
Jan-Christoph Borchardt 6ac85480f7 replace last personalblock fieldset within files_external 2014-03-31 13:00:46 +02:00
Jan-Christoph Borchardt 615de6534f fix duplicate rules for button/input styles, em to px 2014-03-31 12:27:26 +02:00
Vincent Petry 65e3f63400 Merge pull request #7939 from owncloud/wring_redirect_on_login
Use UrlGenerator in OC\Util::redirectToDefaultPage(). Fix #7936
2014-03-31 10:50:05 +02:00
Jenkins for ownCloud 5b552c84da [tx-robot] updated from transifex 2014-03-31 01:55:43 -04:00
raghunayyar 881c66df52 Removes highlighting of selected items, padding from apps management. 2014-03-30 15:48:47 +05:30
Jenkins for ownCloud bfb0b9a044 [tx-robot] updated from transifex 2014-03-30 01:55:42 -04:00
Thomas Tanghus 7278f2f567 Sub-dir was prepended twice 2014-03-29 20:40:49 +01:00
Thomas Tanghus 3a7829f784 Sub-dir was prepended twice 2014-03-29 20:39:55 +01:00
Jenkins for ownCloud 915fa3da74 [tx-robot] updated from transifex 2014-03-29 01:55:44 -04:00
Thomas Müller 80c6f883a8 Merge pull request #7845 from duritong/fix_submodule_url
use https as submodule url
2014-03-28 21:54:50 +01:00
Morris Jobke 73c81ae709 Merge pull request #7932 from owncloud/update-phpdoc-statement-wrapper-master
adding @method annotation to declare methods which can be called on the ...
2014-03-28 21:20:09 +01:00
Rodrigo Hjort 51b727cfca Correction: failure on sharing when user ID was prefixed by zero 2014-03-28 15:08:59 -03:00
Vincent Petry 82f98fb3d3 Fixed user list offset call 2014-03-28 18:12:34 +01:00
Thomas Tanghus c14107550d Use UrlGenerator in OC\Util::redirectToDefaultPage(). Fix #7936 2014-03-28 18:05:48 +01:00
Vincent Petry 0ae9ed4244 Merge pull request #7934 from owncloud/addEventToExpirationDate
Emit event after setting a new expiration for a share
2014-03-28 17:35:20 +01:00
Robin Appelman fe78d963d9 Implement getPath for shared files 2014-03-28 15:26:15 +01:00
Robin Appelman f331d5f9d4 Give storages the option to implement the getById behaviour for View->getPath 2014-03-28 15:15:56 +01:00
Morris Jobke 841069e8cb Merge pull request #7770 from jamesryanbell/master
SVG support detection
2014-03-28 15:14:12 +01:00
Morris Jobke e4069e1553 Emit event after setting a new expiration for a share
all credits to @frisco82
https://github.com/owncloud/core/pull/5335
2014-03-28 15:00:13 +01:00
Björn Schießle 7adb5ae2c5 Merge pull request #7929 from owncloud/enc_dont_write_file_if_enc_fails
don't write file if opening a stream to encrypt the data fails
2014-03-28 14:59:05 +01:00
Alexander Bergolth b158939283 adapt description of paging size configuration 2014-03-28 14:20:01 +01:00
Alexander Bergolth 0d9d70b51c change default ldap paging size to 500 2014-03-28 14:02:19 +01:00
Thomas Müller 70db348475 Merge pull request #7824 from owncloud/hash-parameter-order
Fix parameter order for Storage\Local::hash
2014-03-28 13:06:07 +01:00
Thomas Müller f1b085df01 adding @method annotation to declare methods which can be called on the wrapped statement object 2014-03-28 12:57:27 +01:00
Vincent Petry d0012e729a Merge pull request #7879 from owncloud/sharing_cleanup_public_api
sharing api cleanup, first step
2014-03-28 12:23:11 +01:00
Vincent Petry 5068c57845 Merge pull request #7613 from owncloud/fix_urlGenerator2
Add \OC::$WEBROOT to URLGenerator::getAbsoluteURL()
2014-03-28 12:12:49 +01:00
Thomas Müller 2d592ddc8f Fix CURLOPT_FOLLOWLOCATION bug with open_basedir or safe_mode restriction enabled.
Squashed commit of the following:

commit eaf4f43f687db59137a0b00bc0e12ed4eb0d0943
Merge: 1e9c5be 1e7d7bd
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date:   Fri Mar 28 11:49:04 2014 +0100

    Merge branch 'master' of https://github.com/kev300/core into kev300-master

commit 1e7d7bdd8b5c7f301501cb822cdf2ef0ad3f2872
Author: kev300 <admin@gadeco.de>
Date:   Tue Dec 17 14:11:42 2013 +0100

    Update util.php

commit 3f0723f054a27a506be7f26932ccb54fff6f2be9
Author: kev300 <admin@gadeco.de>
Date:   Tue Dec 17 14:09:15 2013 +0100

    Update util.php

commit 512176abdcfbe5b2b060b91033abc9608912d1f8
Author: kev300 <admin@gadeco.de>
Date:   Tue Dec 17 14:02:04 2013 +0100

    Update util.php

commit 6cbefd080188d287024e0b047b88dd4525d6c2c1
Author: kev300 <admin@gadeco.de>
Date:   Mon Dec 16 16:44:46 2013 +0100

    Update util.php

    Fix CURLOPT_FOLLOWLOCATION bug with open_basedir or safe_mode restriction enabled.
2014-03-28 12:09:29 +01:00
Vincent Petry 040f430f0c Merge pull request #7829 from owncloud/cachefolderlocation
Cache folder is now configurable
2014-03-28 12:08:38 +01:00
Bjoern Schiessle b9100bc2de don't write file if opening a stream to encrypt the data fails 2014-03-28 12:02:49 +01:00
Thomas Müller 1e9c5be33d Merge pull request #7703 from rnveach/jstest
Fixing issues found with running 'autotest-js' locally
2014-03-28 11:41:21 +01:00
Vincent Petry ef2c176eef Merge pull request #7678 from owncloud/test-bootstrap-fileproxy-cleanup
Cleanup the fileproxy proxies on test bootstrap
2014-03-28 11:33:57 +01:00
Björn Schießle 0757f87dba Merge pull request #7872 from owncloud/trash-disablestoragestats
Do not retrieve storage stats for trash bin
2014-03-28 11:22:19 +01:00
Vincent Petry f3d6b2f3e9 Do not retrieve storage stats for trash bin 2014-03-28 11:21:33 +01:00
Robin McCorkell e806b6d9a0 Merge pull request #7842 from Xenopathic/files_external_config_optional
Enable the use of 'optional' on password fields for mount configuration
2014-03-28 10:02:28 +00:00
Vincent Petry 0436453353 Merge pull request #7720 from ideaship/autoconfig_fix
fix autoconfig
2014-03-28 10:41:46 +01:00
Thomas Müller 5fa8f7cf12 Merge pull request #7107 from owncloud/load-apps-proper-master
Load apps proper master
2014-03-28 10:33:55 +01:00
Thomas Müller e3b951f412 Merge pull request #7724 from owncloud/mobile
[WIP] Mobile optimization for base layout and Files app
2014-03-28 10:27:15 +01:00
Jenkins for ownCloud ccc55f40e6 [tx-robot] updated from transifex 2014-03-28 01:55:47 -04:00
Jörn Friedrich Dreyer 2561107b4e prevent dimmed ocdialog div from scrolling 2014-03-28 02:43:33 +01:00
Morris Jobke d2e5dd2a15 Merge pull request #7913 from owncloud/fix-logo
fix SVG replacement for logo so it works in IE8, fix #7866
2014-03-28 02:29:35 +01:00
Morris Jobke 6a8e93ffa6 fix breadcrumbs for IE8 2014-03-27 23:53:19 +01:00
Vincent Petry 531f3cf1a8 Merge pull request #7911 from owncloud/ext-fixswifttouchoperation
Fix swift touch operation
2014-03-27 18:10:45 +01:00
Jan-Christoph Borchardt ec46a07195 convert input metrics to px 2014-03-27 17:13:36 +01:00
Jan-Christoph Borchardt 53b1e4a00b remove additional radio button width declaration 2014-03-27 17:13:12 +01:00
Jan-Christoph Borchardt 5b2abb32a6 remove CSS rules for personalblock, remove it from core 2014-03-27 17:00:47 +01:00
Jan-Christoph Borchardt 25326b89da replace personalblock fieldset with section class in core user_ apps 2014-03-27 17:00:47 +01:00
Jan-Christoph Borchardt 6de572c6e6 replace personalblock fieldset with section class in files apps 2014-03-27 17:00:47 +01:00
Jan-Christoph Borchardt 69be5bdbd8 replace personalblock fieldset with section div in admin and personal settings 2014-03-27 17:00:47 +01:00
Jan-Christoph Borchardt bf77c580c1 general styles for the content area 2014-03-27 17:00:47 +01:00
Jan-Christoph Borchardt 832d3c954e enable SVG->PNG fallback for 'New' menu 2014-03-27 14:48:54 +01:00
Jan-Christoph Borchardt f88b24d532 enable SVG->PNG fallback for newly uploaded files and folders 2014-03-27 14:48:35 +01:00
Jan-Christoph Borchardt ba82175e11 specify logo to not repeat when container is bigger 2014-03-27 14:37:41 +01:00
Jan-Christoph Borchardt d2de6e7a66 fix SVG replacement for logo so it works in IE8, fix #7866 2014-03-27 14:31:24 +01:00
Vincent Petry 2a08e35d72 Fix swift touch operation
The touch() operation now uses "UpdateMetadata()" instead of "Update()"
which doesn't clear the object's contents.

This fixes syncing, as the sync client needs to use touch to update the
object's mtime.
2014-03-27 12:34:30 +01:00
Vincent Petry 1f6259d9c2 Merge pull request #7875 from Xenopathic/files_external_smb_auto
SMB/CIFS mounts using ownCloud login, fixes #7843
2014-03-27 12:18:51 +01:00
Vincent Petry 1469ce7b38 Merge pull request #7898 from owncloud/ext-swiftmtime
Fixed mtime reading from OpenStack API
2014-03-27 09:31:37 +01:00
Vincent Petry c9ccacb9ea Merge pull request #7902 from owncloud/ext-xsendfileextstoragefix
Use the correct resolve method to resolve file storage (x-sendfile)
2014-03-27 09:31:17 +01:00
Jenkins for ownCloud ed0cba0ff4 [tx-robot] updated from transifex 2014-03-27 01:56:30 -04:00
Vincent Petry b48510c978 Use the correct resolve method to resolve file storage
When detecting whether the file to be downloaded is on external storage,
the correct path needs to be used.

It turns out that \OC\Files\View is needed to resolve the path correctly
relative to the user's home.
2014-03-26 18:14:35 +01:00
Vincent Petry fa00a18677 Fixed mtime reading from OpenStack API
The API seems to return floating point values, which prevents
the hasUpdated() check to work and causes the scanner to rescan
everything every time.
2014-03-26 17:20:40 +01:00
Thomas Müller 10e62bfd68 Merge pull request #7893 from owncloud/no-routed-link-for-css-files
css files are not to be routed through index.php anymore
2014-03-26 16:48:54 +01:00
Thomas Müller be78cd53f9 Merge pull request #7896 from Xenopathic/misc_text_fixes
Miscellaneous text fixes for core apps
2014-03-26 16:47:24 +01:00
Robin McCorkell 50dba97bde Miscellaneous text fixes for core apps 2014-03-26 15:43:03 +00:00
Jan-Christoph Borchardt eeaefd84c3 change mobile breakpoint for shared view to 768px as well 2014-03-26 16:32:09 +01:00
Robin McCorkell a1dca821f9 Use braces on single line if statements 2014-03-26 15:11:09 +00:00
Vincent Petry d57bb70b03 Merge pull request #7889 from owncloud/routing-warning
Fix undefined index warning in router
2014-03-26 15:52:31 +01:00
Robin McCorkell cd5ebac7c4 Fix error in $isPersonal setting 2014-03-26 14:37:29 +00:00
Thomas Müller 93b984ecf8 css files are not to be routed through index.php anymore 2014-03-26 15:36:55 +01:00
Robin McCorkell b077528087 Perform proper checking for share availability
To check for shares, the code attempts to connect anonymously to the share.
In most cases this will fail with NT_STATUS_ACCESS_DENIED, so the regex array
used for parsing the output of smbclient in smb4php has been overridden to
treat such output as success.

The 'test' method for storage classes can now take a single parameter,
$isPersonal, which allows the storage to adjust the tests performed based on
if they are being configured as personal shares or as system shares.
2014-03-26 14:36:45 +00:00
Robin McCorkell cac4aaa8c4 Rename SMB_Auto to SMB_OC and change visible name
SMB_Auto is now SMB_OC, and the name has been changed from
"SMB / CIFS Auto" to "SMB / CIFS using OC login"
2014-03-26 14:35:07 +00:00
Robin McCorkell 86aa6104e6 Revoke sharable permission on automatic SMB shares
Shares authenticated with user credentials (aka not hard coded) cannot be
accessed by other users, breaking sharing. This change completely revokes
sharing for such shares
2014-03-26 14:35:07 +00:00
Robin McCorkell 3445c062ec Use loginname instead of display name
getDisplayName would return the display name of the user, not great if it is a
canonical string. The uid passed back from 'login' is the UUID of the user, so
also not suitable. The login name from the session is the username the user
used to log in to ownCloud in the first place, which is what is needed.
2014-03-26 14:35:07 +00:00
Robin McCorkell ba63e46b5e SMB/CIFS mount using OwnCloud logon credentials
Selecting 'SMB/CIFS Auto' in the mounts configuration allows an SMB/CIFS
mount to be configured that uses the credentials of the user logging in to
authenticate to the server.

Optionally, the username can be used as the share name, permitting home shares
to be dynamically mounted.
2014-03-26 14:35:07 +00:00
Vincent Petry b656c68ede Merge pull request #7888 from owncloud/extstorage-multiplemountpointconfig
Fix merging of external storage configurations
2014-03-26 14:30:35 +01:00
Robin Appelman 371a924c92 merge master into webdav-injection 2014-03-26 14:26:07 +01:00
Vincent Petry 028973cbea Merge pull request #7885 from owncloud/extstorage-prettyprintjson
Pretty print mount.json when possible
2014-03-26 13:34:31 +01:00
Robin Appelman 9b2bb7c6ab fix undefined index warning in router 2014-03-26 13:02:11 +01:00
Vincent Petry e002b7242c Fix merging of external storage configurations
Merging of configurations is whenever the same config is available for
multiple users/groups, in which case the config is considered as a
single one by the UI, and shows multiple users/groups selected.

Fixed merging logic to make sure that class, mount point and options are
the same before merging them.

Fixed merging to work correctly when the same mount point path is used
for separate users and configs. These are now correctly shows in the UI
as separate entries.
2014-03-26 12:41:25 +01:00
Vincent Petry 8d95c0d013 Pretty print mount.json when possible 2014-03-26 11:32:03 +01:00
Thomas Müller 83b4bcfdbf idn_to_ascii is only used if available 2014-03-26 11:17:23 +01:00
Vincent Petry e76be308eb Remove unused setUserVars utility method
That method was moved to the external storage recently so
isn't needed here any more.
2014-03-26 09:39:09 +01:00
Vincent Petry cbfd16089b Fixed share upgrade cleanup tests to use the correct ids 2014-03-26 09:29:28 +01:00
Jenkins for ownCloud 75d8de378c [tx-robot] updated from transifex 2014-03-26 01:56:21 -04:00
Thomas Müller 8958b9147b adding ellipsis on file names to public file list as well 2014-03-26 00:14:38 +01:00
Thomas Müller d0f84e936f adding proper notification area for multi line messages 2014-03-26 00:04:11 +01:00
Thomas Müller e6392163a4 adding ellipsis on file names 2014-03-25 23:40:40 +01:00
Thomas Müller a54260b517 use minimum-scale=1.0 2014-03-25 23:35:55 +01:00
Thomas Müller 743ca4581d Merge pull request #7748 from owncloud/postgresversionwarning
Added PostgreSQL version warning on upgrade
2014-03-25 23:17:18 +01:00
Thomas Müller 6bfeb342db fixing code style 2014-03-25 23:17:00 +01:00
Thomas Müller 1816f43722 Merge pull request #7864 from owncloud/routing-performance
Routing performance
2014-03-25 23:00:36 +01:00
Thomas Müller 4900ad9119 update type hint in PHPDoc 2014-03-25 22:59:42 +01:00
Thomas Müller ed97d872af Merge pull request #7325 from owncloud/recursive-mkdir-local
Recursive mkdir fixes #7047
2014-03-25 22:45:14 +01:00
Thomas Müller 1ae10b9da3 Merge pull request #7420 from owncloud/cachehooks-first
Manually triger the filecache update hooks before any other hook
2014-03-25 22:41:09 +01:00
Thomas Müller bbc2e37259 Merge pull request #7477 from owncloud/foldersize-reuse
Allow re-using already known fileinfo when calculating folder sizes
2014-03-25 22:33:24 +01:00
Vincent Petry ec9260647a Fixed share updater unit test
Now using \OC_DB::insertId() to retrieve the generated ids because
Oracle ignores the passed values.
2014-03-25 20:18:58 +01:00
VicDeo 86356db044 Merge pull request #7772 from owncloud/filter_more_jsconsole
Also replace console.time/timeEnd when not in DEBUG mode
2014-03-25 20:29:26 +02:00
Vincent Petry 5111fad006 Merge pull request #7689 from owncloud/last_cron_log
Log last cron execution
2014-03-25 19:17:36 +01:00
Bjoern Schiessle 31681a3a27 finally fix the paths for the OCS Share API 2014-03-25 17:52:45 +01:00
Bjoern Schiessle 3653a51af2 fix path creation for re-shares, issue #7662 2014-03-25 17:48:50 +01:00
Bjoern Schiessle 2d8607fae9 don't assign variables in if condition 2014-03-25 17:47:24 +01:00
Bjoern Schiessle 5db3b049fd add todo 2014-03-25 17:47:24 +01:00
Bjoern Schiessle bc0292c16d always return an array 2014-03-25 17:47:24 +01:00
Bjoern Schiessle 154277ab11 seperate formatResults() 2014-03-25 17:47:24 +01:00
Bjoern Schiessle ecde48fce8 don't assign variables in if conditions 2014-03-25 17:47:24 +01:00
Bjoern Schiessle 078fafdc5a use variable 2014-03-25 17:47:24 +01:00
Bjoern Schiessle 3a459db358 seperate transformDBResults 2014-03-25 17:47:24 +01:00
Bjoern Schiessle 6607f7cb5e seperate creation of select statement 2014-03-25 17:47:24 +01:00
Bjoern Schiessle 6afd496d9b remove prepFileTarget() seems that it is no longer in use 2014-03-25 17:47:24 +01:00
Bjoern Schiessle b602662578 add a "helper" and a "hooks" class. Move constants needed by multiple classes
to a "constants" class
2014-03-25 17:47:24 +01:00
Bjoern Schiessle 8b6d1d3bf2 added private share api 2014-03-25 17:47:24 +01:00
Thomas Müller 8b86b94d47 call OC_App::loadApps(); to load all commands of all apps and related functionality 2014-03-25 17:46:05 +01:00
Thomas Müller f9279ac77a killing some more calls to OC_App::loadApps(); - because we load all apps in handleRequest() 2014-03-25 17:42:41 +01:00
Thomas Tanghus 0b4d879619 Fix copy/paste error :P 2014-03-25 15:38:11 +01:00
Robin Appelman d75c3d5f9a Fix routes getting lost when loading app routes twice 2014-03-25 14:28:30 +01:00
Thomas Tanghus aa5bba2bcc 'ID' => 'id' and check existence of EMAIL 2014-03-25 14:22:39 +01:00
Robin Appelman e1d3d0e948 fix incorect array 2014-03-25 14:04:18 +01:00
Robin Appelman c17f415356 Only load core routes for ocs and settings 2014-03-25 13:42:47 +01:00
Thomas Müller 36c9d91f86 Merge pull request #7867 from owncloud/upload-dontclosesessionforencryption
Fix public upload to not close session when encryption is on
2014-03-25 12:43:26 +01:00
Thomas Müller 531c9564b3 Merge pull request #7861 from owncloud/idn-domains-support-on-emails-master
idn have to be converted before being used
2014-03-25 12:38:32 +01:00
Jenkins for ownCloud b92dad992f [tx-robot] updated from transifex 2014-03-25 01:55:34 -04:00
Vincent Petry e72b2e6e3b Fix public upload to not close session when encryption is on
The encryption app needs to create keys when uploading files, so the
session needs to be kept open in such case.
2014-03-24 17:34:37 +01:00
Robin Appelman 9e89ad07c6 Only load core routes when matching a core route 2014-03-24 16:38:01 +01:00
Robin Appelman 0e1cb001b6 Cache generated urls for routes 2014-03-24 15:42:21 +01:00
Robin Appelman f17674fef2 Only load routes from the apps we need 2014-03-24 15:41:46 +01:00
Thomas Müller 3eb5898f7b use \OC_Mail::validateAddress() to validate the email address - fixes #7862 2014-03-24 15:35:07 +01:00
Robin Appelman 0d0aac6fff Load the routes when matching or generating a route instead of when creating the router 2014-03-24 14:55:03 +01:00
Vincent Petry 1e39719926 Added unit tests for external cache folder 2014-03-24 14:32:04 +01:00
Robin McCorkell 690c31ec20 Insert missing brace 2014-03-24 13:27:46 +00:00
Scott Arciszewski 09cc020535 Update crypt.php
Use a 256-bit random value
2014-03-24 08:57:33 -04:00
Thomas Müller fb7f3008d3 idn have to be converted before being used 2014-03-24 13:46:31 +01:00
icewind1991 d87001a093 Merge pull request #7768 from owncloud/trashempty-nocache
Use a more efficient way to determine that the trashbin is empty that doesn't rely on the cache
2014-03-24 13:34:30 +01:00
raghunayyar 3d8ce8104f Adds Style changes to app-navigation in core/css/apps.css 2014-03-24 17:59:53 +05:30
icewind1991 4c8a83e82f Merge pull request #7714 from owncloud/phpunit-config
Allow setting the config dir to use as enviroment variable for phpunit
2014-03-24 13:01:37 +01:00
Vincent Petry 10c9b8eb99 Cache folder is now configurable
When using an external cache folder, it is automatically mounted in
FileSystem::initFileSystem so that any app can use it transparently
by creating a view on the "/$user/cache" directory.
2014-03-24 12:57:11 +01:00
Robin Appelman 6b66b42f6e catch the case where files_trashbin/files doesn't exist 2014-03-24 12:33:44 +01:00
Vincent Petry a25b86a30e Log exception when PostgreSQL version check failed 2014-03-24 11:54:44 +01:00
Jenkins for ownCloud abdc823bb6 [tx-robot] updated from transifex 2014-03-24 01:55:51 -04:00
Jenkins for ownCloud 4a19a97d67 [tx-robot] updated from transifex 2014-03-23 01:55:34 -04:00
Jenkins for ownCloud 0245e64cec [tx-robot] updated from transifex 2014-03-22 01:56:09 -04:00
kondou e6b4d28229 Move success/error squircles to settings 2014-03-21 20:27:22 +01:00
kondou dda7129a24 Merge branch 'master' of https://github.com/owncloud/core into last_cron_log 2014-03-21 20:23:31 +01:00
mh 66c4fc04b8 use https as submodule url
git:// domains might not be allowed in all environments, while cloning
https through a proxy is fine. -> Make checkout in restrictive
environments possible.
2014-03-21 19:38:22 +01:00
blizzz 4be0b3f6cc Merge pull request #7844 from owncloud/fix_7803_blizzz
LDAP: create a new instance of Configuration on clone, fixes #7803
2014-03-21 18:02:10 +01:00
Jan-Christoph Borchardt 905aabf5d4 mobile: document min-width value 2014-03-21 16:43:40 +01:00
Jan-Christoph Borchardt 89ee551158 mobile: adjust breakpoint in JS as well 2014-03-21 16:43:04 +01:00
Jan-Christoph Borchardt 9b9b6ec31e mobile: set a width for navigation popover to it's always 3 columns 2014-03-21 16:40:39 +01:00
Jan-Christoph Borchardt f2566e649f mobile: adjust break to 768, also fix min-widths 2014-03-21 16:36:45 +01:00
adrien 0da61a26ee remove cache all user 2014-03-21 15:50:25 +01:00
Arthur Schiwon 422ccf4cdb add test for cloning and keeping configuration seperate 2014-03-21 15:31:30 +01:00
Arthur Schiwon 86d479cb28 Use array_key_exists instead of isset, because the latter returns false if the assigned value is null 2014-03-21 15:29:49 +01:00
Jan-Christoph Borchardt c6aefada71 do not show Deleted Files on mobile, not optimized yet and button too long 2014-03-21 15:29:37 +01:00
Arthur Schiwon 055a09e487 On clone create a new instance of the Configuration
To avide effects on the original instance of Connection when the clone
is modified, for instance on authentication checks.
2014-03-21 15:27:51 +01:00
Morris Jobke 43313d120d Merge pull request #7820 from owncloud/core-macwarning
Added warning for Mac OS on setup page
2014-03-21 15:06:11 +01:00
Thomas Müller 96e6cb3db4 all authentication apps are loaded at first - everything else relies on these apps 2014-03-21 15:00:25 +01:00
Robin McCorkell c4e7d7989a Enable the use of 'optional' on password fields (JavaScript part)
See ed0c10a10b
2014-03-21 13:51:45 +00:00
Jan-Christoph Borchardt 40c20b2eeb mobile: remove shift for multiselect bar to account for missing navigation 2014-03-21 14:34:05 +01:00
Jan-Christoph Borchardt ecf52e05fb mobile: adjust width of app title, fix overlap 2014-03-21 14:30:11 +01:00
Thomas Müller 6ff96b34ad Merge branch 'master' into load-apps-proper-master
Conflicts:
	apps/files/ajax/rawlist.php
	cron.php
	ocs/v1.php
2014-03-21 14:05:08 +01:00
Robin Appelman 7a8f1389fe fix temporary file based common hash 2014-03-21 13:23:14 +01:00
Vincent Petry 37af74efb3 Merge pull request #7655 from owncloud/shared-unencryptedsize
Fixed warning when browsing Shared folder
2014-03-21 12:28:27 +01:00
Vincent Petry a52bc333a2 Merge pull request #7611 from owncloud/fix-updater
Use $installedVersion instead of $currentVersion
2014-03-21 12:16:51 +01:00
Jörn Friedrich Dreyer c9d97d2ef2 add top:45px to position:fixed controls, fixes alignment on android 4.0.4 browser 2014-03-21 11:56:47 +01:00
blizzz 3f95f9325f Merge pull request #7823 from owncloud/fix_7796
Add FreeIPA UUID compatibility, fixes #7796
2014-03-21 11:27:18 +01:00
Arthur Schiwon 4230983e69 define var 2014-03-21 10:10:49 +01:00
Arthur Schiwon 6f605ecd67 make tests work on systems without php5_ldap 2014-03-21 10:08:17 +01:00
Jenkins for ownCloud bcf388d3c5 [tx-robot] updated from transifex 2014-03-21 01:55:35 -04:00
Arthur Schiwon 3d2ab76347 add tests for cumulativeSearchOnAttribute 2014-03-21 00:17:51 +01:00
Arthur Schiwon a085d7715f fix potential infinite loop when the DN of the first entry was already read. 2014-03-20 22:59:41 +01:00
Arthur Schiwon 561d699ca6 Use the LDAP wrapper for checking resources, needs for proper testing 2014-03-20 22:58:57 +01:00
Arthur Schiwon bd881348e8 Fix wildcard handling and check even less DNs per filter, enough will be looked at anyway 2014-03-20 22:57:50 +01:00
Robin McCorkell 7c3da27bf6 Fix duplicate ipauniqueid 2014-03-20 20:38:06 +00:00
Robin McCorkell 7a0eccfc63 Correct field modifier checking
Existing code checks for the existence of a modifier ('&', '!', '#', '*')
anywhere in the field name, but strips the first character regardless. This
change makes it so that only modifiers at the beginning of the string are
counted.
2014-03-20 18:28:42 +00:00
Robin McCorkell ed0c10a10b Enable the use of 'optional' on password fields
The logic has been changed, in that 'class="optional"' is applied to both
password and text types if the field begins with the optional market, '&'.
2014-03-20 18:27:40 +00:00
Lukas Reschke 2c561c9c50 Merge pull request #7794 from owncloud/extstorage-obfuscatepasswords
Obfuscate passwords in ext storage config
2014-03-20 16:31:12 +01:00
Robin Appelman fffe330bbc Fix parameter order for Storage\Local::hash 2014-03-20 15:32:12 +01:00
Vincent Petry 316a22b463 Merge pull request #7808 from owncloud/quota-usequotaevenwhenfreespaceunknown
Still return quota value when free space is unknown
2014-03-20 15:29:14 +01:00
Vincent Petry d95fde3924 Removed comment 2014-03-20 15:24:05 +01:00
Arthur Schiwon 057c2638e4 LDAP Wizard: when determining objectclasses, we realy do not need to look at every entry. Fixes #7530 2014-03-20 13:58:08 +01:00
Morris Jobke 5747e0e3f9 remove executable flag for file-upload.js 2014-03-20 13:26:21 +01:00
Morris Jobke 95a13e2690 Merge pull request #7814 from oskholl/master
Fix: 'Upload button tooltip doesn't disappear'
2014-03-20 13:25:21 +01:00
Vincent Petry 1e4e0cfcd5 Lazy load phpseclib in ext storage config 2014-03-20 13:21:34 +01:00
Vincent Petry 6de9033d86 Added warning for Mac OS on setup page 2014-03-20 12:57:55 +01:00
Robin Appelman cf23defa52 Fix typo in mount loading 2014-03-20 12:52:09 +01:00
Vincent Petry 36c0f08ec0 Merge pull request #7732 from owncloud/datafolderexistence
Added .ocdata file to check for data folder validity
2014-03-20 11:31:28 +01:00
Morris Jobke 970878b581 Merge pull request #7818 from owncloud/logException_undefined_variable
Fix 'Undefined variable: message' in OCP\Util::logException
2014-03-20 11:14:30 +01:00
Thomas Müller 8a81df0f2c Merge pull request #7651 from owncloud/close-session-faster-master
Close session faster
2014-03-20 11:07:21 +01:00
Thomas Tanghus 51fe3b8ccd Fix 'Undefined variable: message' in OCP\Util::logException 2014-03-20 10:23:40 +01:00
raghunayyar 59d1ee565e Makes #app-navigation a part of app management. 2014-03-20 13:34:50 +05:30
Jenkins for ownCloud 3aa8647634 [tx-robot] updated from transifex 2014-03-20 01:56:42 -04:00
Morris Jobke d76fd16abc Merge pull request #7804 from jbtbnl/master
Remove cursor:pointer CSS from li element
2014-03-19 23:56:58 +01:00
Oskar Hollmann 90839b784f Comment moved to prevent 'Line is too long' warning. 2014-03-19 23:05:03 +01:00
Oskar Hollmann fa28c089fa Fix: 'Upload button tooltip doesn't disappear'
Fixes issue #7461. Tipsy tooltip must be hidden when the upload starts. Otherwise it covers the progress bar and stays in DOM.
2014-03-19 22:09:09 +01:00
Robin McCorkell ca595611f5 Add FreeIPA UUID compatibility, fixes #7796
Ability to use ipauniqueid for the UUID of a user
2014-03-19 20:30:24 +00:00
Vincent Petry 66bc0f0848 Still return quota value when free space is unknown
Fixed the quota storage wrapper to correctly return the quota value when
the free space is not known (which usually happens when the disk_free_space
function is disabled)
2014-03-19 19:07:11 +01:00
Lukas Reschke 01e9e40d83 Merge pull request #7806 from owncloud/add-matroska-video
Add mimetype for MKV videos
2014-03-19 18:32:53 +01:00
Scott Arciszewski 36da3bc359 Update crypt.php
A 1024 kilobyte key would be obnoxiously slow to operate on. I'm assuming you meant 1024-bit?

Also, 183 bytes = 1464 bits.

Here's a safe alternative: 2048 bits, with comment-code sanity
2014-03-19 13:31:51 -04:00
Vincent Petry 9116c39a82 Fixed ext storage password field order issue
The old password field is now preserved in the JSON structure to make
sure that the order is preserved.
This is a quick fix until the UI is fixed to not rely on the PHP array
key order.
2014-03-19 17:56:36 +01:00
Vincent Petry 5b6c36347b Fixed ext storage unit test for groups
Now creating real users and groups for testing external storage mounts
2014-03-19 17:55:34 +01:00
Lukas Reschke 9abe6b7f87 Add mimetype for MKV videos
This will make oC create previews for MKVs.

Test file: http://www.auby.no/files/video_tests/h264_720p_hp_5.1_3mbps_vorbis_styled_and_unstyled_subs_suzumiya.mkv

To test this just apply this change and upload the test file, if an preview is generated this change is most likely working as expecting.
2014-03-19 17:45:20 +01:00
jbtbnl 57cfff7d51 Fix #7758 2014-03-19 16:45:10 +01:00
Vincent Petry 6252c248c2 Merge pull request #7557 from owncloud/issue/7297
Do not allow setting an expiration date in the past
2014-03-19 15:53:08 +01:00
icewind1991 4f95adfb76 Merge pull request #7800 from owncloud/filesort-performance
Improve sorting performance of large lists of files
2014-03-19 15:38:15 +01:00
Vincent Petry 8e0a5ed5df Added tests to check mount point list for a target user 2014-03-19 15:21:54 +01:00
Robin Appelman 214357ca68 Improve sorting performance of large lists of files 2014-03-19 13:53:59 +01:00
Vincent Petry 4cb53f77b2 Moved external storage mounting code to files_external app
Moved the mounting code for external storage from
OC\Filesystem::initMountPoint to files_external using the
post_initMountPoints hook
2014-03-19 12:45:38 +01:00
Joas Schilling 7ab2632085 Use tipsy to display error when selecting a date in the past 2014-03-19 12:11:14 +01:00
Thomas Müller c216c4777b Merge branch 'master' into close-session-faster-master
Conflicts:
	apps/files/ajax/upgrade.php
2014-03-19 11:44:21 +01:00
Vincent Petry 80180bea32 Added IV for ext storage password encryption 2014-03-19 11:42:22 +01:00
Thomas Müller b9fc240b83 Merge pull request #7777 from owncloud/fix/7776
updating 3rdparty submodule
2014-03-19 11:36:00 +01:00
Thomas Müller 33e96597d1 Merge pull request #7790 from owncloud/fix/7788
drop file cache migration OC5 -> OC6
2014-03-19 11:29:50 +01:00
Vincent Petry 40a70ecf79 Added password obfuscation for external storage config
Added obfuscation for all "password" options from external storages.
Added unit tests for reading/writing the configuration.
2014-03-19 10:52:22 +01:00
Vincent Petry e0dada704c Added ext storage unit tests for writing then reload the mount config 2014-03-19 10:52:22 +01:00
Vincent Petry ff5b79edeb Merge pull request #7792 from owncloud/extstorage-fixpersonalstorage
Fix validation of allowed personal backend
2014-03-19 10:00:12 +01:00
Jenkins for ownCloud 7b1d52f5b9 [tx-robot] updated from transifex 2014-03-19 01:55:39 -04:00
Morris Jobke 2aa563b89c Merge pull request #7791 from owncloud/app-setting-auto-scroll
Set overflow-y to auto
2014-03-19 01:07:26 +01:00
Robin McCorkell 340cd2734b Merge pull request #7766 from Xenopathic/master
Fix smb4php to work with home shares
2014-03-18 19:42:04 +00:00
Vincent Petry 1f79f368ef Added unit tests for when adding ext storage mount points
- test config was written correctly (global and local)
- test that personal mount points can be added for allowed backends
- test that personal mount points cannot be added for disallowed backends
- added $skipTest flag to make it possible add mount points without
  doing an actual check/connection (note: this is necessary because the
  static class OC_Mount_Config cannot be mocked)
2014-03-18 18:29:08 +01:00
Thomas Tanghus 13f1f105c8 Set overflow-y to auto 2014-03-18 18:25:30 +01:00
Thomas Müller 76961ce072 fixing javascript error where $(Files.breadcrumbs[1]).get(0) returns undefined - happens on resize to a very small width 2014-03-18 17:59:21 +01:00
Vincent Petry 8ababef4cd Fix validation of allowed personal backend 2014-03-18 17:54:14 +01:00
Jan-Christoph Borchardt 59906fbb4d mobile: show caret indicator next to logo to make clear it is tappable 2014-03-18 17:48:28 +01:00
Thomas Müller 6b9ae27b90 drop file cache migration OC5 -> OC6 2014-03-18 17:14:38 +01:00
Vincent Petry 67b8cfedf9 Define _matchMedia wrapper earlier
The unit test stub didn't work because the _matchMedia wrapper
was defined too late.

This fix defines it earlier.
2014-03-18 16:02:13 +01:00
Vincent Petry cc6c152984 Fixed matchMedia usage to make unit tests work in PhantomJS
PhantomJS has a bug that makes it impossible to properly stub
window.matchMedia. This fix adds a wrapper as OC._matchMedia
that is used for unit tests
2014-03-18 15:52:06 +01:00
Vincent Petry fe04106e0f Add/remove main menu action when switching between desktop/mobile mode 2014-03-18 13:10:13 +01:00
Morris Jobke f6c3667efa Merge pull request #7784 from owncloud/enc-adminpageallowupload
Display admin option for public upload with encryption enabled
2014-03-18 12:49:38 +01:00
Jan-Christoph Borchardt 285fc5ba96 mobile: change CSS order so rename and versions are hidden 2014-03-18 11:50:08 +01:00
Thomas Müller effea790c7 redefine reopen() in class \OC\Session\Internal to avoid accidental calls in productive code 2014-03-18 11:44:22 +01:00
Vincent Petry b75ca9fb50 Display admin option for public upload with encryption enabled
Now that public upload works with encryption, the admin option to toggle
it must be made visible.
2014-03-18 11:28:56 +01:00
Jenkins for ownCloud d744e2c176 [tx-robot] updated from transifex 2014-03-18 01:55:31 -04:00
Thomas Müller a4a185cc71 updating 3rdparty submodule 2014-03-17 22:22:16 +01:00
Thomas Müller 153eadd753 Merge branch 'master' into close-session-faster-master 2014-03-17 21:57:48 +01:00
Thomas Müller 6bbbf8536f introduce reopen() method to be used for unit test execution only - right after a unit test has been executed the session will be reopened 2014-03-17 21:57:10 +01:00
Thomas Müller 756bbe8786 Merge pull request #7649 from owncloud/routing-public
Move routing classes to an interface and expose it in the public api
2014-03-17 21:07:05 +01:00
Vincent Petry 872006da03 Only enable toggle for sidebar in mobile mode 2014-03-17 20:44:30 +01:00
Thomas Müller ea8705bac8 additional class is added to the file actions called e.g. 'action-share', 'action-rename'
in order to allow proper translations of the action's display name an additional parameter has been added to the register function
2014-03-17 20:15:10 +01:00
Thomas Tanghus 413afab424 Replace console.time/timeEnd 2014-03-17 19:39:19 +01:00
Vincent Petry 3cd09f2b09 Added PostgreSQL version warning on upgrade 2014-03-17 18:58:00 +01:00
Vincent Petry 082c4cda50 Increase version to trigger upgrade related to .ocdata 2014-03-17 17:58:19 +01:00
jamesryanbell 4fc96ebb7b SVG support detection
The SVGSupport checkMimeType method was failing on my setup as the headers are all returned in lowercase. I have lowercase all the indexes and modified the if statement so that it doesn't matter what case the headers are returned in
2014-03-17 16:11:49 +00:00
Robin Appelman 38b1529c2a More robust way to check if the folder is empty 2014-03-17 17:03:32 +01:00
Robin Appelman 332c14a878 Use a more efficient way to determine that the trashbin is empty that doesn't rely on the cache 2014-03-17 16:35:08 +01:00
Robin McCorkell 792d0d3314 Fix smb4php to work with home shares
Stat'ing a share with url_stat now checks if the user can run 'ls' in that share rather than checking if the share is listed by the server. This means that OwnCloud can now mount user home shares, which are never listed by the server.
2014-03-17 15:03:25 +00:00
icewind1991 6fbf3dd7c4 Merge pull request #7764 from owncloud/datadir-chmod
use a non-recursive chmod on the datadir
2014-03-17 15:52:44 +01:00
icewind1991 5c72b526a3 Merge pull request #7760 from owncloud/core-roundbytes
Correctly round bytes when converted from human readable format
2014-03-17 15:21:57 +01:00
Lukas Reschke 239069c838 Use $installedVersion instead of $currentVersion 2014-03-17 13:27:42 +01:00
Vincent Petry df7853363a Merge pull request #7761 from owncloud/improve_documentation
clarify the use-case of the encryption app.
2014-03-17 13:23:35 +01:00
icewind1991 4112d63a40 Merge pull request #7727 from owncloud/cli-trusteddomainupgradewarning
Added warning for trusted_domains after CLI upgrade
2014-03-17 13:21:54 +01:00
Vincent Petry 4033eba374 Fixed chunking and insufficient storage check
- fixed free space detection based on the already uploaded chunks
- now deleting chunks as soon as it is read out before writing it into
  the part file, which reduces the space needed when assembling part
files
2014-03-17 13:04:34 +01:00
Vincent Petry bd98538a36 Merge pull request #7704 from owncloud/preview_use_pre_instead_of_post_delete_hook_2
use preDelete instead of postDelete hook
2014-03-17 12:59:35 +01:00
Vincent Petry 43ebd8cb64 Merge pull request #7728 from owncloud/oc_image_show_save_custom_mime
make it possible to influence output type of \OC_Image
2014-03-17 12:58:40 +01:00
Robin Appelman 166dfbf58b use a non-recursive chmod on the datadir 2014-03-17 12:53:55 +01:00
Frank Karlitschek 8a24e1eb96 clearify the use-case of this app 2014-03-17 12:29:17 +01:00
Vincent Petry 145db370d1 Correctly round bytes when converted from human readable format
Instead of leave two decimal places which is confusing, round the byte
values correctly to the closest byte.
2014-03-17 12:15:12 +01:00
Thomas Müller cd038604d3 unit tests for specific image type output added 2014-03-17 08:40:59 +01:00
Thomas Müller 79ba930ef9 fixing PHPDoc 2014-03-17 08:17:56 +01:00
Jenkins for ownCloud 518903c6eb [tx-robot] updated from transifex 2014-03-17 01:56:06 -04:00
Morris Jobke 7ffaf0d70a Merge pull request #7734 from owncloud/icon-class-remove
remove unneeded icon class
2014-03-16 10:24:57 +01:00
Jenkins for ownCloud c89aa6d5fe [tx-robot] updated from transifex 2014-03-16 03:13:21 -04:00
Jenkins for ownCloud b2e929d580 [tx-robot] updated from transifex 2014-03-15 02:14:22 -04:00
Vincent Petry b619ff6076 Return 503 when a config/data dir error exists 2014-03-14 21:05:15 +01:00
Thomas Müller bbbbb033f3 in case of phpunit executions calling header() and exit() is too bad 2014-03-14 18:20:33 +01:00
Georg Ehrke 3527adbbe1 OC_Image::_output() - throw exception instead of falling back to png 2014-03-14 18:19:16 +01:00
Thomas Müller fe05c0c81b move session reset to endTest() - necessary because we need a valid session in the next unit tests setUp() call 2014-03-14 18:16:20 +01:00
Georg Ehrke 9dee3772eb remove image/pjpeg from OC_Image::_output 2014-03-14 18:12:33 +01:00
Vincent Petry 3c46dcd7dd Added .ocdata file to check for data folder validity
In environments where the data folder is mount from another partition,
it is important to check that the data folder we see is actually the
real one. If the mount failed for some reasons, this fix will make
ownCloud temporarily unavailable instead of causing unpredictable
behavior.
2014-03-14 15:36:35 +01:00
Jan-Christoph Borchardt 55c630ea7d remove unneeded icon class 2014-03-14 14:47:40 +01:00
Raghu Nayyar 0f0baa5303 Merge pull request #7725 from owncloud/body-public
add 'body-public' ID to body in base layout so it can be identified via CSS
2014-03-14 16:27:43 +05:30
Georg Ehrke c140010e81 don't change mimetype of whole image object 2014-03-14 11:17:20 +01:00
Vincent Petry 1a116828cf Added warning for trusted_domains after CLI upgrade
If trusted_domains is not set after a CLI upgrade, show a warning in the
output.
2014-03-14 11:16:45 +01:00
Georg Ehrke 0c3c75efd5 always output a png 2014-03-14 11:14:09 +01:00
Georg Ehrke 6f96ab3e90 make it possible to influence output type of \OC_Image 2014-03-14 11:13:45 +01:00
Jan-Christoph Borchardt 74eb9bea22 add 'body-public' ID to body in base layout so it can be identified via CSS 2014-03-14 11:08:16 +01:00
Jan-Christoph Borchardt ac48563efd add spans around replaced 'Shared' indicators to make text hide on mobile 2014-03-14 10:48:28 +01:00
Jan-Christoph Borchardt b37aae9925 mobile: menu togglable for mobile, use code by @PVince81 2014-03-14 10:33:19 +01:00
Jan-Christoph Borchardt ec67d7e635 mobile: first mobile fixes for Files. We still need to hide Rename and Versions 2014-03-14 09:16:53 +01:00
Jan-Christoph Borchardt eb7b125254 mobile: position share dropdown 2014-03-14 09:15:20 +01:00
Jan-Christoph Borchardt 84c96c2bf7 mobile: don't require a minimum width for controls bar 2014-03-14 09:14:52 +01:00
Jenkins for ownCloud 53f5747ac1 [tx-robot] updated from transifex 2014-03-14 01:55:34 -04:00
Jenkins for ownCloud 49deb752cf [tx-robot] updated from transifex 2014-03-13 17:20:51 -04:00
Jenkins for ownCloud 4b802aa7cb [tx-robot] updated from transifex 2014-03-13 17:12:37 -04:00
ben-denham 8a8a32cf43 Changed conditions in user_ldap's ldapFilter.js to use ===, fixed indentation. 2014-03-14 09:17:39 +13:00
Björn Schießle b2757e621c Merge pull request #7686 from owncloud/ocs_fix_paths
finally fix the paths for the OCS Share API
2014-03-13 20:27:07 +01:00
ideaship a5425e84f2 fix autoconfig
In array_merge, $post overrides $opts (concerns data directory).
Always merge $post before calling display().
Default value for dbtype which may still be undefined in display().

Fixes several problems related to autoconfig:
- installation.php only showed $AUTOCONFIG data if it was called after
  install() had come back with errors
- if autoconfig.php was set, installation.php showed an editable field
  with the wrong data in it; then, regardless of any changes, the value
  from autoconfig.php was used
- installation.php used undefined indeces (dbtype, dbIsSet,
  directoryIsSet)
2014-03-13 20:05:11 +01:00
Thomas Müller a7695b8dd0 Merge pull request #7718 from owncloud/fixing-7345-master
map transifex language ja_JP to ja
2014-03-13 18:02:53 +01:00
Thomas Müller 7bd2a51be5 map transifex language ja_JP to ja 2014-03-13 17:57:14 +01:00
Thomas Müller fc697c7298 adding StartSessionListener which initializes the session before each test case execution 2014-03-13 16:19:17 +01:00
Robin Appelman eabeedb306 Merge branch 'master' into cachehooks-first 2014-03-13 15:22:00 +01:00
Bjoern Schiessle 9d32475260 finally fix the paths for the OCS Share API 2014-03-13 15:16:59 +01:00
Robin Appelman a8eb7a5092 Allow setting the config dir to use as enviroment variable for phpunit 2014-03-13 13:33:09 +01:00
Morris Jobke 3c03ff5bb5 Merge pull request #7340 from owncloud/hide_remove_image_avatar
Hide remove image, if there's no custom avatar
2014-03-13 13:20:00 +01:00
Morris Jobke 206364cd1c remove invalid shares with one SQL statement 2014-03-13 13:09:32 +01:00
Vincent Petry 02be15ce2f Added backticks for Oracle in sharing updater unit test 2014-03-13 13:09:32 +01:00
Morris Jobke 4bb303cbd6 Clean up database before setup the database for testing 2014-03-13 13:09:32 +01:00
Morris Jobke ec54bc7709 Refactor update script to class and add unit test 2014-03-13 13:09:32 +01:00
Jamie McClelland d58fda7ff3 fix update to remove shares where file doesn't exist on postgres
Without patch, breaks with: Failed to upgrade "files_sharing".
Exception="SQLSTATE[22P02]: Invalid text representation: 7 ERROR:
invalid input syntax for integer: "5,179""

See: https://github.com/owncloud/core/issues/5758

removing unnecessary cruft - no parameter is set, none to pass.

https://github.com/owncloud/core/issues/5758

removing subquery, making more readable

See: https://github.com/owncloud/core/pull/6016#issuecomment-29510979

parameters to sql calls should be arrays

https://github.com/owncloud/core/pull/6016

boosting version to ensure fix gets executed

properly escaping the sql select statement

removing extraneous closing paren.
2014-03-13 13:09:31 +01:00
Vincent Petry 9fa9c791eb Merge pull request #7671 from fpiraneo/patch-1
Update index.php
2014-03-13 13:04:30 +01:00
Georg Ehrke f438337493 improve validation of getFileInfo in \OC\Preview 2014-03-13 12:32:13 +01:00
Alexander Bergolth c76d952dac make getGroupsChunk() protected instead of private 2014-03-13 10:57:19 +01:00
Alexander Bergolth 7f8b04d3e0 adapt coding style 2014-03-13 09:33:07 +01:00
Jenkins for ownCloud 1295e54173 [tx-robot] updated from transifex 2014-03-13 01:55:50 -04:00
Georg Ehrke 8048868bd7 use preDelete instead of postDelete hook 2014-03-13 03:14:42 +01:00
rnveach e37455493b added missing packages required to run "karma" and "phantomjs" inside
"autotest-js"
2014-03-12 19:22:11 -04:00
rnveach 820b161fc4 added missing ignores for files and directories created by "autotest-js" 2014-03-12 19:20:59 -04:00
Lukas Reschke b506de6f08 Merge pull request #7681 from owncloud/remove-Sabre_DAV_Browser_Plugin-master
remove Sabre_DAV_Browser_Plugin
2014-03-12 22:28:01 +01:00
Vincent Petry b2ac8755ce Merge pull request #6632 from eduardosan/master
Fix PostgreSQL port configuration on install
2014-03-12 18:52:47 +01:00
Vincent Petry 5fcfb2ef84 Merge pull request #7564 from owncloud/issue/7559
Hide QMail when not selected and hide SendMail when not available on the server
2014-03-12 18:32:38 +01:00
kondou 556c6eca23 Use OC_Util::formatDate() 2014-03-12 17:53:39 +01:00
kondou c5440fa133 Move cron status to the right of the heading 2014-03-12 17:29:26 +01:00
Vincent Petry b92be2ef1c Merge pull request #7669 from owncloud/versions_predelete
add preDelete hook for files_versions app
2014-03-12 17:23:54 +01:00
Vincent Petry 881739cbac Merge pull request #7668 from owncloud/trashbin_predelete
add preDelete hook for files_trashbin app
2014-03-12 17:23:38 +01:00
Thomas Müller 612b52abc5 Merge pull request #7695 from owncloud/fix-3rdparty-master
Re-add submodule 3rdparty
2014-03-12 17:12:18 +01:00
Thomas Müller 8ba278bf6a Re-add submodule 3rdparty 2014-03-12 17:10:57 +01:00
kondou 8fafee31ef Use $.hide() instead of .hidden for now
.inlineblock ranks higher than .hidden
2014-03-12 15:42:29 +01:00
kondou dd97d532be Remove OC.Router usage 2014-03-12 15:31:48 +01:00
kondou 1c82b4751e Merge branch 'master' into hide_remove_image_avatar 2014-03-12 15:29:26 +01:00
kondou 547b563464 Log last cron execution
Fixes #2012
2014-03-12 15:20:51 +01:00
Joas Schilling efbca04ab4 Use command -v to check for sendmail
Fix #7559
2014-03-12 11:47:21 +01:00
Vincent Petry ce790119ae Merge pull request #7683 from owncloud/proper-content-type-on-ocs-exceptions
set content-type on ocs exceptions
2014-03-12 10:19:40 +01:00
Thomas Müller 88f6dd7db1 fixing method names 2014-03-12 10:00:22 +01:00
Lukas Reschke 942d5fcff3 Merge pull request #7682 from owncloud/sanitize-fallbackid-master
sanitize fallbackId
2014-03-12 09:22:46 +01:00
Jenkins for ownCloud 8320b8eb7a [tx-robot] updated from transifex 2014-03-12 01:57:17 -04:00
Thomas Müller 743addd1e3 set content-type on ocs exceptions 2014-03-12 00:35:19 +01:00
Thomas Müller 7c78368e8b sanitize fallbackId 2014-03-12 00:18:51 +01:00
Thomas Müller ae13ff112f remove Sabre_DAV_Browser_Plugin 2014-03-12 00:10:16 +01:00
Bart Visscher d798169037 Cleanup the fileproxy proxies on test bootstrap 2014-03-11 21:03:29 +01:00
Thomas Müller 364e1f852f Merge pull request #7674 from owncloud/fix-spelling-master
Authentification -> Authentication
2014-03-11 17:14:10 +01:00
adrien ea6f8ba352 fix remove cache when delete 2014-03-11 16:58:10 +01:00
Björn Schießle 03f40116e1 Merge pull request #7665 from owncloud/fix_ocs_share_api_paths
Fix ocs share api paths
2014-03-11 16:55:52 +01:00
Thomas Müller 5713b0dedb Authentification -> Authentication 2014-03-11 16:24:50 +01:00
Thomas Müller c0b567dbec Fix 3rdparty submodule after transifex sync broke it 2014-03-11 15:40:14 +01:00
Francesco Piraneo G. 3f4a0778c8 Update index.php
On line #69 added id="selectedActionsList" to allow an easy adding of new actions customs apps wants to perform on selected files;
2014-03-11 14:29:26 +01:00
Georg Ehrke 9a5c2d0080 add preDelete hook for files_versions app 2014-03-11 14:17:08 +01:00
Georg Ehrke 0f864c38bb add preDelete hook for files_trashbin app 2014-03-11 14:10:12 +01:00
Robin Appelman d55c7223a9 Merge branch 'master' into foldersize-reuse
Conflicts:
lib/private/files/cache/homecache.php
2014-03-11 13:04:20 +01:00
Bjoern Schiessle a09df0083e add 'received_from' info to the share, so that every share can have a different value 2014-03-11 12:59:37 +01:00
Bjoern Schiessle 36885dc64c fix path creation for re-shares, issue #7662 2014-03-11 12:58:46 +01:00
Vincent Petry c1cb9ee9b0 Merge pull request #7650 from owncloud/quota-totalspace
Fixed total space display when data size exceeds quota
2014-03-11 12:40:59 +01:00
Vincent Petry a53df71b4a Merge pull request #7652 from owncloud/localStorage_remove
Add OC.localStorage.removeItem()
2014-03-11 12:40:14 +01:00
adrien f827761e71 remove static variable, add limit and offset 2014-03-11 11:56:46 +01:00
Vincent Petry 0e4d522dd9 Merge pull request #7659 from owncloud/fix-7596
Fix 7596
2014-03-11 11:36:22 +01:00
Jenkins for ownCloud b0ec38e202 [tx-robot] updated from transifex 2014-03-11 01:59:39 -04:00
Thomas Müller 26ec311cff Changing host after transifex client update on server 2014-03-10 23:24:24 +01:00
Thomas Müller 0de43f1fbe remove magic handling of recipient lists by exploding the string - this functionality is nowhere used this way and nowhere documented - and broken because only $toaddress will be exploded not $toname 2014-03-10 21:56:37 +01:00
Thomas Müller f1ecc758f5 send an individual email to each recipient 2014-03-10 21:54:23 +01:00
Vincent Petry 1cde17d60b Merge pull request #7602 from owncloud/flush-updater-cache
Reset time of last update feed polling after successful update
2014-03-10 19:54:00 +01:00
Lukas Reschke 58b18de90d Merge pull request #7656 from owncloud/xml-entityfixes
Disable XML entities when parsing XML
2014-03-10 19:52:04 +01:00
Vincent Petry 010eef95c0 Fixed total space display when data size exceeds quota
The total space display in the personal page now shows the quota value
instead of used space when used space exceeds the quota (soft quota).
2014-03-10 17:59:14 +01:00
Vincent Petry f4f61f03c9 Disable XML entities when parsing XML 2014-03-10 17:51:13 +01:00
adrien 415b1d03bc fix cache when remove an user 2014-03-10 17:27:51 +01:00
Vincent Petry 022d76c7bb Fixed warning when browsing Shared folder
The virtual "Shared" folder doesn't have an unencrypted_size field.
This fix adds a check to prevent warnings in the log.
2014-03-10 17:25:16 +01:00
Thomas Müller 9fe5033f1e PHPDoc updated 2014-03-10 17:15:19 +01:00
Thomas Müller 41f814515e Merge branch 'master' into close-session-faster-master 2014-03-10 17:00:09 +01:00
Thomas Tanghus 5e6f0dcc6d Fix copy/paste error 2014-03-10 16:26:07 +01:00
Thomas Tanghus 01bcdf5b53 Add function remove() to OC.localeStorage 2014-03-10 16:22:52 +01:00
Vincent Petry 23eeb898a9 Merge pull request #7600 from ideaship/fix_escaped_html
fix: use print_escaped for radio button "checked"
2014-03-10 16:12:39 +01:00
Thomas Müller 9fb9684da7 Merge pull request #7646 from owncloud/fix_ocs_api_unshare
we need the file_source to delete a share successfully
2014-03-10 16:06:17 +01:00
Vincent Petry 4fdf7682c9 Merge pull request #7398 from owncloud/trash_dont_rely_on_db
[trash] fall back if file is not in db
2014-03-10 16:04:47 +01:00
Thomas Müller a074adb2af fix close() implementation in \OC\Session\Internal 2014-03-10 15:36:20 +01:00
Bjoern Schiessle 5ddabd7cd0 fix mimetype detection, introduce fake etag to identify preview images 2014-03-10 15:13:28 +01:00
Bjoern Schiessle 4562909a20 get trash size from file cache 2014-03-10 15:13:28 +01:00
Bjoern Schiessle abad625cac only enable previews if the encryption is disabled 2014-03-10 15:13:28 +01:00
Bjoern Schiessle eab844e226 if file is not in db, fall back to restore file to the users root 2014-03-10 15:13:28 +01:00
Thomas Müller 3c5185edab Merge pull request #7632 from owncloud/fix-7582-master
we first shall check if the current session is valid - otherwise the ses...
2014-03-10 15:10:19 +01:00
Thomas Müller f0603a971d close the session for all DAV calls right after authentication - no need to write to the session afterwards 2014-03-10 14:40:36 +01:00
Robin Appelman 4a2b16d76d update copyright header 2014-03-10 14:40:05 +01:00
Thomas Müller 58c216d0e8 close the session on all file operations 2014-03-10 14:39:27 +01:00
Thomas Müller 73a1ece753 adding an explicit close method to class session - write operations (set and remove) being called after close() will throw an exception 2014-03-10 14:21:12 +01:00
Robin Appelman 26793e1f94 switch OC::getRouter usages to OC::$server->getRouter 2014-03-10 14:06:47 +01:00
Robin Appelman 8ab7d18a6a Move the router classes to a namespace and expose it with a public interface 2014-03-10 14:04:58 +01:00
Vincent Petry 0ffd32a1ae Merge pull request #7629 from owncloud/files-allfileswarningtypo
Fixed log warning when deleting a single file
2014-03-10 11:40:28 +01:00
Bjoern Schiessle 9548670da7 we need the file_source to delete a share successfully 2014-03-10 11:35:54 +01:00
Vincent Petry 92df8deb0a Merge pull request #7631 from ichEben/master
[6.0.2RC1] Share folder as link -- no public upload, drag&drop still works #7422
2014-03-10 10:04:54 +01:00
Vincent Petry 26513bc17b Merge pull request #7624 from owncloud/enc-encryptedusedspacefix
[master] Fixed used space to be based on unencrypted size
2014-03-10 09:38:24 +01:00
Thomas Tanghus a1aacc18df Add @return PHPDocs 2014-03-10 09:31:30 +01:00
Thomas Tanghus 212699e389 Merge pull request #7628 from owncloud/fileinfo-type
Fix FileInfo->getType errors
2014-03-09 23:34:01 +01:00
Thomas Tanghus 8f6ea900f2 Chainable Response in AppFramework 2014-03-09 23:01:16 +01:00
nishiki ba9d8f7c1a fix undifined uid 2014-03-09 12:47:19 +01:00
nishiki 75011c2e09 add query result (boolean) for update or delete 2014-03-09 12:22:47 +01:00
nishiki d8843f6cd3 minor clean code 2014-03-09 12:01:35 +01:00
Jan-Christoph Borchardt 9a31e53313 Merge pull request #7567 from owncloud/apps-scroll-settings
restrict height of settings and make scrollable
2014-03-09 01:22:51 +01:00
Thomas Müller 25f523680a fixing ident 2014-03-07 20:06:06 +01:00
Thomas Müller 0d90b90d94 we first shall check if the current session is valid - otherwise the session-id will be regenerated on login via basic auth 2014-03-07 20:00:34 +01:00
IchEben e7d5715114 only initialise upload dropZone if public upload is allowed 2014-03-07 17:45:24 +01:00
Robin Appelman 51165a1a04 Check if value exists before returning 2014-03-07 15:16:35 +01:00
Vincent Petry 5671aac5ca Fixed log warning when deleting a single file 2014-03-07 15:03:35 +01:00
Vincent Petry 48d63a6278 Return unencrypted_size of folder when queried
This fixes the "used space" to be based on the unencrypted size, not
encrypted size, to be consistent with how quota/space is handled when
encryption is enabled
2014-03-07 14:59:09 +01:00
Robin Appelman 65f52fee4f Fix FileInfo->getType errors 2014-03-07 14:52:44 +01:00
Robin Appelman db6fb198fe don't throw errors in getType 2014-03-07 14:27:23 +01:00
icewind1991 3eb58d9973 Merge pull request #7529 from owncloud/getlocalfile-cache
Add caching for getLocalFile on remote storages
2014-03-07 13:29:47 +01:00
Vincent Petry 7f24d42ca5 Propagate unencrypted_size up to the file cache root 2014-03-07 11:00:22 +01:00
Vincent Petry ba3f5fe53a Merge pull request #7583 from owncloud/trusteddomainerrorpage
[master] Show warning page when accessing server from an untrusted domain
2014-03-07 10:37:16 +01:00
adrien fbde24c89a fix undefined in loadUsers 2014-03-07 08:46:34 +01:00
Thomas Tanghus ada8d4e0c9 Fix unit tests 2014-03-07 02:44:34 +01:00
Thomas Tanghus ceb5b918d7 Add \OC:: to URLGenerator::getAbsoluteURL() 2014-03-06 23:56:11 +01:00
adrien 5cdfc56867 update the cache when add user 2014-03-06 22:34:43 +01:00
adrien dde4f2f917 upgrade the cache user 2014-03-06 22:23:17 +01:00
ben-denham ef65381a0b Moved LdapFilter into a separate js file in user_ldap. 2014-03-07 10:10:42 +13:00
ben-denham 43e79f41f3 Added improved version of patch by @blizzz in https://github.com/owncloud/core/issues/6651#issuecomment-32261257 to stop filter settings from being reset under a race condition. 2014-03-07 09:17:41 +13:00
adrien 08a46e3080 add cache for single users 2014-03-06 17:57:09 +01:00
Vincent Petry 536c33895f Merge pull request #7592 from owncloud/fixstoragefreespace
Fixed upload issue when free space is not known (ex: FTP)
2014-03-06 17:22:40 +01:00
Vincent Petry 1b8cf18c91 Merge pull request #7182 from owncloud/imagerotate_and_loadbase64_fix
Fix imagerotate and move loadFromBase64() one up
2014-03-06 17:18:17 +01:00
Victor Dubiniuk 242cbb802a Reset time of last update feed polling 2014-03-06 18:19:58 +03:00
ideaship e08dbf80dc fix: use print_escaped for radio button "checked"
use of p() results in escaped HTML code: checked=&quot;checked&quot;
where it should be: checked="checked"
2014-03-06 16:03:00 +01:00
Robin Appelman 0f1374c028 Allow using pathinfo based public.php paths 2014-03-06 16:01:13 +01:00
Morris Jobke 256dca935b Revert "adding new javascript function OC.generateUrl(url, params)"
This reverts commit 8e667d1934.
2014-03-06 15:10:32 +01:00
Morris Jobke 5f0a22586f Merge pull request #7579 from owncloud/introduce-generateUrl-master
Introduce OC.generateUrl() in master
2014-03-06 15:07:28 +01:00
Vincent Petry 6e4ea09d52 Merge pull request #7494 from owncloud/fix-7307
Replace OC.Router.generate() with OC.generateUrl()
2014-03-06 14:49:12 +01:00
Robin Appelman 895fc0fa26 Fix check if fileinfo is valid 2014-03-06 14:23:27 +01:00
Vincent Petry bfd0d799d8 Merge pull request #7570 from owncloud/fix_issue_imagick_non_static_4
fix issue with Non-static method Imagick ../..; @ doesn't seem to work in this case
2014-03-06 14:11:44 +01:00
Vincent Petry a2e4452ed3 Merge pull request #7588 from owncloud/noise-repeat
fix noise not repeating
2014-03-06 14:08:46 +01:00
Vincent Petry 0dcac65aa1 Fixed upload issue when free space is not known 2014-03-06 13:53:55 +01:00
Vincent Petry 07f78c8248 Added unit tests for "add()" method for file upload
- Added OC.Upload.init() to make the code testable
- Added unit tests for the add() method of the uploader with some error
  cases
2014-03-06 13:53:34 +01:00
Robin Appelman 84cf40ed82 merge master into webdav-injection 2014-03-06 13:35:06 +01:00
Vincent Petry e129f6845b Added testArea for JS Unit tests
Added a testArea that is outside the viewport but still considered as
visible from the jQuery code.

The testArea is useful when:
- tested code tries to access DOM elements using global ids
- tested code is requiring some UI elements to be visible to activate
  themselves
2014-03-06 12:50:18 +01:00
Jan-Christoph Borchardt 0b0687c9fc fix noise not repeating 2014-03-06 12:38:11 +01:00
Alexander Bergolth f850fcfac5 "reset" ldap pagedSearch control by setting it to a high value 2014-03-06 12:23:20 +01:00
root 6585bd5a50 "reset" ldap pagedSearch control by setting it to a high value
call nextEntry via invokeLDAPMethod
2014-03-06 12:07:03 +01:00
root 8fcc29ee8b only check ldap_errno if an ldap_* function actually fails
fix wizard errors
reset search paging right after the search, not before some of the possible next search operations
cookie contains binary characters, don't log it
  (avoids json_encode(): Invalid UTF-8 sequence in argument errors)
2014-03-06 12:07:03 +01:00
Georg Ehrke eb5265b106 fix merge conflicts 2014-03-06 11:55:45 +01:00
Vincent Petry 9136e6ad30 Fixed X-Forwarded-Host parsing 2014-03-06 11:51:25 +01:00
Vincent Petry c7e204bd36 Added unit tests for serverHost and other related functions 2014-03-06 11:51:17 +01:00
Vincent Petry f8fe2753b1 Added localhost as trusted domain 2014-03-06 11:51:10 +01:00
Vincent Petry 421cff00bd Show warning page when accessing server from an untrusted domain
Added early check for the requested domain host and show a warning
page if the domain is not trusted.
2014-03-06 11:51:08 +01:00
Thomas Müller b46517f012 adding js unit tests for OC.generateUrl() 2014-03-06 00:26:57 +01:00
Thomas Müller 8e667d1934 adding new javascript function OC.generateUrl(url, params) 2014-03-06 00:17:48 +01:00
Thomas Müller 32b29c9d73 Merge branch 'master' into fix-7307
Conflicts:
	core/js/router.js
	settings/js/admin.js
2014-03-06 00:15:08 +01:00
Vincent Petry 1785c0c9b9 Merge pull request #7575 from owncloud/issue/7571
Do not set #dir when on public.php
2014-03-05 19:57:25 +01:00
Lukas Reschke e3156fa5ad Merge pull request #7354 from pschmitt/master
Use 'command -v' to detect whether and where software is installed (instead of 'which')
2014-03-05 19:25:09 +01:00
Joas Schilling 1ab10cb4f7 Do not set #dir when on public.php
Fix #7571
2014-03-05 18:46:55 +01:00
Björn Schießle 9111af0478 Merge pull request #7531 from owncloud/dont_create_shared_folder
don't allow to create a file or folder named 'Shared' in the root folder
2014-03-05 18:13:31 +01:00
Jan-Christoph Borchardt 36fcb0fb4e Merge pull request #7569 from owncloud/scrutinizer-tabs
fix some spaces to tabs issues reported by Scrutinizer
2014-03-05 18:10:01 +01:00
Morris Jobke 0980c48526 Merge pull request #7568 from owncloud/lib_preview_add_fclose
add fclose, fixes issue from bdb96b9af8
2014-03-05 17:36:53 +01:00
Morris Jobke 8c1cd2b83e Merge pull request #7566 from owncloud/button-outlines
Adds 0 Outlines to Buttons
2014-03-05 16:50:22 +01:00
Georg Ehrke dbf83aada2 fix issue with Non-static method Imagick ../..; @ doesn't seem to work in this case 2014-03-05 15:57:45 +01:00
Jan-Christoph Borchardt 7ad7f94797 fix some spaces to tabs issues reported by Scrutinizer 2014-03-05 15:47:12 +01:00
Georg Ehrke 32a5d51fa6 add fclose, fixes issue from bdb96b9af8 2014-03-05 15:37:26 +01:00
Morris Jobke 37d22bf170 Merge pull request #7558 from owncloud/fix_issue_loading_cached_thumb
fix issue with spamming logging files when loading cached thumbnail
2014-03-05 15:23:35 +01:00
Jan-Christoph Borchardt 4a4b32d325 restrict height of settings and make scrollable 2014-03-05 15:08:16 +01:00
raghunayyar 5a9689eb5c Adds 0 Outlines to Buttons 2014-03-05 19:36:36 +05:30
Joas Schilling 0285d5b6e2 Hide QMail when not selected and hide sendmail when not available on the server
Fix #7559
2014-03-05 14:53:20 +01:00
Raghu Nayyar 859cac197e Merge pull request #7560 from owncloud/icons.css-star-fix
add hover/focus states for star icons to hint at action
2014-03-05 19:15:33 +05:30
Jan-Christoph Borchardt bd86642747 Merge pull request #7261 from owncloud/issue/6793
Allow admins to disable certain external storages for users
2014-03-05 14:41:36 +01:00
Vincent Petry 36d7c0b6a7 Merge pull request #7556 from owncloud/enc_dont_create_files_folder
[enc] don't create users files folder
2014-03-05 13:30:11 +01:00
Jan-Christoph Borchardt 4d679de30b add hover/focus states for star icons to hint at action 2014-03-05 13:21:33 +01:00
Georg Ehrke bdb96b9af8 fix issue with spamming logging files when loading cached thumbnail 2014-03-05 13:20:50 +01:00
Robin Appelman a687498547 Fix encryption webdav tests 2014-03-05 13:19:08 +01:00
Joas Schilling d583d61b69 Merge pull request #7412 from owncloud/issue/7175
Add button to send a test mail after changing the email settings
2014-03-05 13:18:41 +01:00
Bjoern Schiessle 2e73c957e5 don't allow to create a file or folder named 'Shared' in the root folder, also exclude all combinations of lower and upper case letters 2014-03-05 13:16:25 +01:00
Joas Schilling 80393d9c0f Do not allow setting an expiration date in the past
Fix #7297
2014-03-05 13:12:58 +01:00
Bjoern Schiessle fbd8c00a89 don't create files folder, let ownCloud core handle it 2014-03-05 12:44:02 +01:00
Vincent Petry 2cfd875e61 Merge pull request #7012 from owncloud/display-share-owner-master
adding share owner information to the file list
2014-03-05 12:43:10 +01:00
Morris Jobke a8ae2f10b9 Merge pull request #7554 from owncloud/issue/7304
Fix position of eye icon on database password field
2014-03-05 11:13:43 +01:00
root 84550fbfb4 fix another oversight... sigh.. 2014-03-05 10:42:35 +01:00
Vincent Petry 6de370b64c Removed obsolete OC.Router stubs in specHelper 2014-03-05 10:27:15 +01:00
Joas Schilling 4ee4f0c365 Fix position of eye icon on database password field
Fix #7304
2014-03-05 10:22:35 +01:00
Joas Schilling 5b8cde48dc Add button to send a test mail after changing the email settings
Fix #7175
2014-03-05 10:01:34 +01:00
Thomas Müller 33b798c3d6 fixing js unit tests 2014-03-05 01:10:39 +01:00
Thomas Müller 7edd8df07f Merge pull request #7521 from owncloud/docstrings_2_kondou
Fix some more docstrings
2014-03-05 00:40:49 +01:00
Thomas Tanghus b54b0b2153 Yet another cleanup 2014-03-05 00:26:06 +01:00
root 4645d0a93a getGroups(): fix overall max search limit for paged searches 2014-03-04 21:12:47 +01:00
root eb1e361824 getGroups() $limit was not handled correctly 2014-03-04 21:07:27 +01:00
root eb59e63c3b revert updateGroups job to use getGroups() instead of getAllGroups() 2014-03-04 19:47:49 +01:00
root 039f7b054a merge functionality of getAllGroups into getGroups 2014-03-04 18:02:27 +01:00
root 15ef3145f8 Merge branch 'ldap_paging_chunksize' into ldap_get_all_groups 2014-03-04 17:24:46 +01:00
root a5813acb64 add ldap_paging_size config option 2014-03-04 17:23:04 +01:00
Vincent Petry 1da90fab84 Merge pull request #7508 from owncloud/ldap-configkeycasing
Fixed configkey casing for PostgreSQL
2014-03-04 17:08:29 +01:00
Tom Needham 9986b470ee Merge pull request #7251 from owncloud/fix-ocsapi-getuser
Add displayname for admins on external api
2014-03-04 15:37:45 +00:00
Robin Appelman 5211566205 update test case 2014-03-04 16:36:03 +01:00
Vincent Petry 620dd4afbd Merge pull request #7481 from tripflex/fix_downloadlink_spaces
replace spaces in download link without encoding entire URL
2014-03-04 16:33:41 +01:00
Robin Appelman a8c67dc675 Add caching for getLocalFile on remote storages 2014-03-04 15:44:58 +01:00
Thomas Müller f42b6f1a4e Merge pull request #7525 from owncloud/fix_S3string
fix https://github.com/owncloud/core/issues/6825
2014-03-04 14:30:30 +01:00
root bacda81bf7 use getAllGroup() in the updateGroups background job
needed in active directory deployments with > 1000 groups
2014-03-04 14:17:22 +01:00
root a135f1ebbb add getAllGroups() that uses a paged search if available
this circumvents server side search limits
(active directory has a limit of 1000 by default)
2014-03-04 14:17:22 +01:00
Robin Appelman 5ef37c28d1 Remove the need for a custom SabreDav server constructor 2014-03-04 13:28:48 +01:00
Frank Karlitschek 0bca969e99 fix https://github.com/owncloud/core/issues/6825 2014-03-04 12:38:56 +01:00
Raghu Nayyar 7c3f3cc933 Merge pull request #7522 from owncloud/email-field-wording
update wording of email field
2014-03-04 15:05:22 +05:30
Morris Jobke af2c2b3a16 update wording of email field 2014-03-04 10:22:54 +01:00
Thomas Müller 1cd0fd6e9e Merge pull request #7497 from owncloud/add-.scrutinizer.yml
add .scrutinizer.yml
2014-03-03 20:05:21 +01:00
Thomas Müller a86e229848 Remove duplicate row 2014-03-03 20:05:14 +01:00
Vincent Petry ad195a881e Merge pull request #7453 from owncloud/preview-fileinfo
Cache the fileinfo in OC\Preview
2014-03-03 18:52:25 +01:00
Vincent Petry 568c9cfe01 Merge pull request #7511 from owncloud/emailtemplatefix
Fix mail template to use p() for colors
2014-03-03 17:45:39 +01:00
Vincent Petry 25251d4bf7 Fix mail template to use p() for colors
Now using p() instead of print_unescaped() for colors.
2014-03-03 17:36:12 +01:00
kondou 5e3b6f1fd9 Fix some more docstrings 2014-03-03 17:32:29 +01:00
Frank Karlitschek 7983c90fdc Merge pull request #7500 from owncloud/theme-mailtemplate
Enable theming of the mail template header
2014-03-03 17:22:33 +01:00
Robin Appelman 06c6163265 Check if fields we need are actually set to prevent errors 2014-03-03 16:48:28 +01:00
Robin Appelman bb8a7a2230 Remove assert since the root size of the home storage is no longer calculated 2014-03-03 16:48:06 +01:00
Jan-Christoph Borchardt 11054c6bb0 Merge pull request #7502 from jbtbnl/master
Do not override button background image
2014-03-03 16:23:19 +01:00
Vincent Petry 761251dfc5 Merge pull request #7506 from owncloud/master-update3rdpartysubmoduleforlibxmlfix
Update 3rdparty submodule pointer to include libxml fixes
2014-03-03 16:17:37 +01:00
Vincent Petry fd5dec0298 Fixed configkey casing for PostgreSQL 2014-03-03 16:15:23 +01:00
Vincent Petry 9c688454df Update 3rdparty submodule pointer to include libxml fixes 2014-03-03 15:41:25 +01:00
Robin Appelman 331fc55e2d Update unit tests to use the new injection 2014-03-03 14:27:24 +01:00
Vincent Petry 79ae3c4527 Allow XML entity loader for MDB2 schema loader
Forward port of 762b0d9 from stable6 to master
2014-03-03 14:17:51 +01:00
jbtbnl e603164517 Do not override button background image 2014-03-03 14:07:44 +01:00
Vincent Petry 84a87b96af Merge pull request #7482 from owncloud/reset-3rdparty-submodule
Update 3rdparty submodule
2014-03-03 13:59:21 +01:00
Robin Appelman fe994669cd Make path for dummy fileinfo absolute 2014-03-03 13:57:08 +01:00
Robin Appelman 9231195c98 Fix FileInfo->getType 2014-03-03 13:51:49 +01:00
Robin Appelman c87658feda Fix updater when getFileInfo fails 2014-03-03 12:56:08 +01:00
Jan-Christoph Borchardt b8d0fc9494 make mail notification header color themable 2014-03-03 12:43:22 +01:00
Jan-Christoph Borchardt eac9eebfdb compress mail notification logo 2014-03-03 12:42:58 +01:00
Jan-Christoph Borchardt 607f205bda mail template: remove off-white background color to better blend into mail client 2014-03-03 12:21:08 +01:00
Thomas Müller dcae91429f add .scrutinizer.yml 2014-03-03 10:55:01 +01:00
Arthur Schiwon b968eed27b remove remaining testing artefact 2014-03-03 10:20:37 +01:00
Arthur Schiwon c7751c0795 intendetion. where did the whitespaces come from? 2014-03-03 10:20:31 +01:00
Arthur Schiwon a8883f4ed2 LDAP: let proxy for multiple server access methods from Access 2014-03-03 10:20:25 +01:00
Thomas Müller 5f711912a1 remove OC.Router.registerLoadedCallback() 2014-03-02 23:45:23 +01:00
Thomas Müller 9f087a2070 fixing download url in files app 2014-03-02 23:41:14 +01:00
Thomas Müller e1030c6b5f adding JSDoc + remove unused function 2014-03-02 23:15:37 +01:00
Thomas Müller 1291303c5a Replace OC.Router.generate() with OC.generateUrl() 2014-03-02 22:30:24 +01:00
Morris Jobke 084050530c Merge pull request #7486 from owncloud/l10n_docstrings
Fix some docstrings in l10n.php
2014-03-01 10:38:48 +01:00
Thomas Tanghus eff7667d26 Merge pull request #7433 from owncloud/config_basic_auth
Config to disable basic_auth username checking
2014-03-01 06:08:32 +01:00
kondou 5d5306175f Fix some docstrings in l10n.php 2014-03-01 03:38:35 +01:00
Bart Visscher 8951328a87 More PHPDoc updates 2014-02-28 21:03:43 +01:00
kondou 3c11dc0006 Merge branch 'master' into hide_remove_image_avatar 2014-02-28 19:28:29 +01:00
Thomas Müller d802ae298f Update 3rdparty submodule 2014-02-28 19:11:40 +01:00
Vincent Petry 88c9ae129e Merge pull request #7480 from owncloud/sabredav-1.7.11
Update SabreDAV to 1.7.11
2014-02-28 19:07:31 +01:00
Myles McNamara 195bdff91f move replace to inside isset 2014-02-28 11:19:19 -05:00
Myles McNamara 4ab7f58745 replace spaces in download link without encoding entire URL 2014-02-28 11:15:49 -05:00
Thomas Müller 1dcb4f740a Update SabreDAV to 1.7.11 2014-02-28 16:55:50 +01:00
Thomas Müller 15d1df055b Merge branch 'master' into display-share-owner-master
Conflicts:
	apps/files_sharing/lib/cache.php
2014-02-28 14:54:10 +01:00
Thomas Müller dd32091016 Merge pull request #7444 from owncloud/fix/7443
remove unused code and fix wrong variable names - some PHPDoc updated
2014-02-28 14:48:21 +01:00
Bart Visscher e2286c6598 Type is with a small letter 2014-02-28 14:37:20 +01:00
Robin Appelman da386aad59 Allow re-using already known fileinfo when calculating folder sizes 2014-02-28 14:23:07 +01:00
Robin Appelman 3ff12ef4ec Also send explicit cache hooks when calling file_put_contents with a resource 2014-02-28 14:21:33 +01:00
Morris Jobke d3866754a4 Merge pull request #7471 from owncloud/fix-css-loading
CSS is now loaded directly instead via PHP
2014-02-28 14:19:36 +01:00
Bart Visscher 35a8dfb2fa More PHPDoc fixes, using scrutinizer patches as hints 2014-02-28 13:53:41 +01:00
Bart Visscher 89e0763d3d Update PHPDoc for I10N, OC_Config, OC\Template\Base and OCP\IL10N 2014-02-28 13:37:41 +01:00
Lukas Reschke 229e3dcba8 A version bump is not necessary here 2014-02-28 13:35:53 +01:00
Lukas Reschke d1c04e1136 Typo + use regular assignment 2014-02-28 13:32:09 +01:00
icewind1991 8a93a2e7d5 Merge pull request #7455 from owncloud/rawlist-fileinfo
Update rawlist to work with new fileinfo object
2014-02-28 12:36:56 +01:00
Lukas Reschke 357fdb1a4d Remove .htaccess creation code
1. We're maintaining the same code twice which leads inevitably to problems as this one. The createHtaccess routine is only used to use the correct paths to the 404 and 403 document.
2. Updating the ownCloud instance as described in our documentation (`Delete everything from your ownCloud installation directory, except data and config.`) will break the links to the ErrorDocuments anyways and show the default error handlers if ownCloud is not installed in the root directory.
2014-02-28 11:59:30 +01:00
Thomas Müller 6335f855f9 Merge pull request #7470 from owncloud/abort-cancel
profile image: relabel technical 'Abort' to more widely used 'Cancel'
2014-02-28 11:57:24 +01:00
Lukas Reschke 4c4bb70cb6 CSS is now loaded directly instead via PHP
269f24cf96 was not changed in setup.php which prevented loading of CSS files in some environments (e.g. my local setup) for apps.
2014-02-28 11:14:18 +01:00
Jan-Christoph Borchardt e78da036c1 profile image: relabel technical 'Abort' to more widely used 'Cancel' 2014-02-28 10:09:34 +01:00
Björn Schießle 61bc76fdd6 Merge pull request #7454 from owncloud/enc_remember_fopen_mode
[enc] remember original fopen access type in pre-proxy
2014-02-28 09:57:58 +01:00
Bart Visscher 47d70da2f5 Use limit=1 so the db can stop searching on the first hit 2014-02-28 09:29:20 +01:00
Vincent Petry fefd724858 Fixed wrong field name
This re-fixes an issue where the unencrypted size isn't updated
correctly when saving a text file in the UI multiple times.

Fixes #7467
2014-02-27 23:53:29 +01:00
Thomas Müller 93b8aba3a1 Merge pull request #7439 from owncloud/unit-test-for-7430
adding test for migrations on columns using keywords
2014-02-27 21:52:46 +01:00
Bart Visscher 3116bede68 Add unit tests for getUserGroups with addUser and removeUser 2014-02-27 21:04:44 +01:00
Bart Visscher cb37a2716a Also clear cached UserGroup when a user is added/removed 2014-02-27 20:09:07 +01:00
Bart Visscher 00e27d5343 Clear the cached user groups when a group is deleted 2014-02-27 19:12:03 +01:00
Raghu Nayyar e304809612 Merge pull request #7382 from jbtbnl/master
Remove necessity of icon class
2014-02-27 21:11:26 +05:30
Morris Jobke 7af846e656 Merge pull request #7452 from owncloud/icon-delete-hover
icons: automatically show delete hover instead of using explicit class
2014-02-27 14:44:29 +01:00
Morris Jobke 49b331be39 add BMP mimetype for BMP previews 2014-02-27 14:39:16 +01:00
Bjoern Schiessle 4ace1a273d remember original fopen access type in pre-proxy because sometimes they change
during the fopen call, e.g. 'r' becomes 'r+' if we open an URL
2014-02-27 14:16:03 +01:00
Robin Appelman 7c92e2e3ad Update rawlist to work with new fileinfo object 2014-02-27 14:04:19 +01:00
Thomas Müller ba4b593f84 Merge pull request #7446 from owncloud/etag_assert_fixes
use assertSame and assertNotSame for etag checks
2014-02-27 13:51:14 +01:00
Thomas Müller f62b8a7896 Merge pull request #7451 from owncloud/fix-jshint
rename config to camelcase
2014-02-27 13:37:18 +01:00
Morris Jobke 6fe1cf7ae4 Merge pull request #7449 from owncloud/remove-input-border
remove border from log in input fields, simpler and works better with themes
2014-02-27 13:24:44 +01:00
Robin Appelman 8282cfff04 Cache the fileinfo in OC\Preview 2014-02-27 13:15:18 +01:00
Jan-Christoph Borchardt 58bc6aee51 icons: automatically show delete hover instead of using explicit class 2014-02-27 12:48:25 +01:00
Jörn Friedrich Dreyer 2ba6cd4e2b initialize etags of temporary storage 2014-02-27 12:44:07 +01:00
Raghu Nayyar 832f6e4e42 Merge pull request #7450 from owncloud/rename-advanced
Installation: relabel 'Advanced' to more descriptive 'Storage & database'
2014-02-27 16:56:28 +05:30
Jan-Christoph Borchardt af467d92f6 Installation: relabel 'Advanced' to more descriptive 'Storage & database' 2014-02-27 12:24:14 +01:00
Thomas Müller a5a671392c rename config to camelcase 2014-02-27 12:16:58 +01:00
Jan-Christoph Borchardt f0cd08ab5d remove border from log in input fields, simpler and works better with themes 2014-02-27 12:13:09 +01:00
Vincent Petry 577e47e207 Merge pull request #7432 from owncloud/enc_cleanup_session_after_decrypt_all
close encryption session after decryption was finished
2014-02-27 11:10:45 +01:00
Jörn Friedrich Dreyer 131c12ad8d use assertInternalType for typechecking 2014-02-27 09:51:26 +01:00
Jörn Friedrich Dreyer 39f2f564a9 use assertSame and assertNotSame for etag checks 2014-02-27 09:39:34 +01:00
Vincent Petry 22adc397de Also quote old column name during DB migration
This fixes alter table commands that didn't quote the old column name
2014-02-27 09:09:16 +01:00
Thomas Müller ab850b961d remove unused code and fix wrong variable names - some PHPDoc updated 2014-02-26 23:56:46 +01:00
Thomas Müller 9e59e64c79 Merge pull request #7421 from owncloud/password-input
disable autocomplete for shared link password input, fix #7419
2014-02-26 22:21:00 +01:00
Thomas Müller d4f15853e8 Merge pull request #7425 from owncloud/issue/7423
Translate string when an error occured while sending a forgot password mail
2014-02-26 22:19:57 +01:00
Thomas Müller 230e5e3788 let's name the column 'select' because this is a keyword on all platforms 2014-02-26 20:47:07 +01:00
Thomas Müller 459b5086d5 adding test for migrations on columns using keywords 2014-02-26 20:42:45 +01:00
kondou da19109f40 Config to disable basic_auth username chacking
This can be confusing and/or annoying
2014-02-26 18:06:13 +01:00
Joas Schilling 922c1909f8 Translate string when an error occured while sending a forgot password mail
Fix #7423
2014-02-26 17:29:47 +01:00
Bjoern Schiessle 86b3cdc132 close encryption session after decryption was finished 2014-02-26 17:18:38 +01:00
Bart Visscher 7f05c23231 Merge pull request #3760 from IMM0rtalis/remove_logout_redirect_slash
- removed slash-adding for logout-header-redirect
2014-02-26 16:05:09 +01:00
Björn Schießle b7385986ae Merge pull request #7393 from owncloud/fix_path_in_sharing_results
fix path in sharing results if it is a file in the Shared folder
2014-02-26 15:19:30 +01:00
Joas Schilling 932c4ee927 Allow admins to disable certain external storages for users
Fix issue #6793
2014-02-26 15:02:41 +01:00
Jan-Christoph Borchardt 6c5cc46380 disable autocomplete for shared link password input, fix #7419 2014-02-26 14:48:15 +01:00
Thomas Müller 2f0db9af07 Merge pull request #7409 from owncloud/issue/5361
Add owncloud version to JS scope
2014-02-26 14:44:12 +01:00
Thomas Müller 4b8717df9d Merge pull request #7416 from owncloud/share_api_7311
[share api] only add "received_from" field if a share was found
2014-02-26 14:42:31 +01:00
Jan-Christoph Borchardt d9a153dbe9 Merge pull request #7174 from owncloud/issue/7166
Add option to change email settings in admin section
2014-02-26 14:41:07 +01:00
Robin Appelman bc49c6be04 Manually triger the filecache update hooks before any other hook 2014-02-26 14:29:13 +01:00
Jan-Christoph Borchardt 84eea47991 Merge pull request #7406 from owncloud/settings-apps.js-style
coding style fixes: cut long lines, whitespace
2014-02-26 14:24:34 +01:00
Morris Jobke beff83feb2 Merge pull request #7410 from owncloud/scrutinizer_fix_kondou
Fix scrutinizer issue in settings/js/apps.js
2014-02-26 13:50:31 +01:00
Thomas Müller 901afbd4cf Merge pull request #7414 from owncloud/fix-3rdparty-submodule
Update 3rdparty submodule
2014-02-26 13:42:36 +01:00
Joas Schilling 9847912257 Remove unused variables, add doc blocks and break lines
Fix #7166
2014-02-26 13:10:46 +01:00
Bjoern Schiessle 3be5e48b0c only add "received_from" if a share was found 2014-02-26 12:52:35 +01:00
Thomas Müller df1a5a2dfa Update 3rdparty submodule 2014-02-26 12:22:21 +01:00
icewind1991 59df3ffdf4 Merge pull request #7279 from owncloud/folderid-reuse
Reuse the folder id in View->getFolderContents
2014-02-26 12:18:34 +01:00
Jan-Christoph Borchardt 8759c35e74 Merge pull request #7399 from owncloud/themable-doc-links
introduce new theme function to allow full creation of documentation lin...
2014-02-26 12:04:52 +01:00
Joas Schilling cb14b1c58d Add owncloud version to JS scope
Fix #5361
2014-02-26 11:50:52 +01:00
kondou 593adab258 Fix scrutinizer issue in settings/js/apps.js 2014-02-26 11:41:32 +01:00
Vincent Petry 37a2f8c6cb Merge pull request #7405 from owncloud/files-admin.js-style
coding style fixes, cut long lines, comments not on same lines, curly braces
2014-02-26 11:10:05 +01:00
Vincent Petry a1600a289c Merge pull request #7401 from owncloud/highlight_selected_app_settings
Highlight the selected app in app-settings
2014-02-26 11:07:43 +01:00
Jan-Christoph Borchardt bc1c136cd6 coding style fixes: cut long lines, whitespace 2014-02-26 10:34:38 +01:00
Joas Schilling 331bd527a7 Hide SMTP options based on selected send mode
Fix #7166
2014-02-26 10:30:22 +01:00
Vincent Petry 5c98e0c7c7 Merge pull request #7328 from owncloud/McNetic-zipstreamer
McNetic zipstreamer
2014-02-26 10:19:12 +01:00
Jan-Christoph Borchardt 2b423e5a44 coding style fixes, cut long lines, comments not on same lines, curly braces 2014-02-26 10:16:54 +01:00
Jan-Christoph Borchardt 1a561fced0 fix for coding style 2014-02-26 09:32:20 +01:00
kondou e32acf933d Highlight the selected app in app-settings 2014-02-26 04:03:41 +01:00
Thomas Müller 574883c47a introduce new theme function to allow full creation of documentation links: buildDocLinkToKey() 2014-02-25 23:06:23 +01:00
Bjoern Schiessle e3f676e009 fix path in sharing results if it is a file in the Shared folder 2014-02-25 17:27:23 +01:00
Robin Appelman 3a21755963 Pass the filesystem view as argument in the sabredav connectors and use the fileinfo object 2014-02-25 16:23:09 +01:00
Vincent Petry 7f7d674c2a Merge pull request #7335 from owncloud/fix-7333
Fix code to search for mount.json in custom data folders
2014-02-25 15:27:47 +01:00
Vincent Petry 9b4af31bac Merge pull request #7371 from owncloud/core-storagemovedeleteall
Replace deleteAll call with unlink call on rename
2014-02-25 14:52:21 +01:00
VicDeo ec9fe3f57f Merge pull request #6299 from leo-b/ldap_nested_groups
Add LDAP nested groups
2014-02-25 15:41:10 +02:00
Björn Schießle e10ca7c2e9 Merge pull request #7374 from owncloud/enc_dont_overwrite_keys
[encryption] don't overwrite keys if rename was done by a stream copy
2014-02-25 12:34:49 +01:00
Vincent Petry 432a42d846 Fix case where port is missing
Forward port of 6d3b5b24fd to master
2014-02-25 11:40:05 +01:00
jbtbnl d28fd8f64d Remove necessity of icon class
Only the icon specific class is needed
2014-02-24 22:37:19 +01:00
Bjoern Schiessle d3a24e945b add test case if a file gets moved out from the shared folder 2014-02-24 17:56:00 +01:00
Bjoern Schiessle ebd73aee8f don't overwrite keys if rename was done by a stream copy 2014-02-24 17:24:43 +01:00
Morris Jobke 5fb1374b0f Merge pull request #7285 from owncloud/mimeicons-svg
Show svg mime icons when no preview is available
2014-02-24 14:12:10 +01:00
Morris Jobke 8d17f6d675 Merge pull request #7320 from owncloud/GuillaumeAmat-patch-1
Update page title when navigating through directories (local)
2014-02-24 13:34:07 +01:00
icewind1991 ddb8cf32e9 Merge pull request #7344 from owncloud/add-js-config-vars
Allow apps to add/modify config js output via hook.
2014-02-24 13:29:54 +01:00
Robin Appelman 7c4f81bd78 rename url parameter 2014-02-24 13:24:10 +01:00
Thomas Müller 0d78d9c180 Merge branch 'master' into McNetic-zipstreamer
Conflicts:
	3rdparty
2014-02-24 12:53:55 +01:00
Vincent Petry a23ef25010 Removed unused deleteAll method on Common storage class
The "deleteAll" method on the Common storage class isn't used anywhere.
Also, it isn't defined on the Storage interface so this fix removes it
completely.
2014-02-24 12:21:48 +01:00
Vincent Petry c465835e85 Replace deleteAll call with unlink call
The method deleteAll() doesn't officially exist on the Storage class as
it's not defined on the interface, which means it fails on the Quota
storage wrapper and might fail on some external storage classes.
Also, this here is the only use case for that one method.
2014-02-24 12:20:11 +01:00
Vincent Petry 539ea0882b Fixed mount config path 2014-02-24 10:35:24 +01:00
Vincent Petry 80c61d480c Added oc_defaults stub in specHelper.js
This is needed for JS Unit tests to run properly as they are expecting
the new "oc_default" map to exist.
2014-02-24 09:45:02 +01:00
Lukas Reschke 11ca014034 Merge pull request #7305 from owncloud/extstorage-configclass
Added extra checks for ext storage class
2014-02-22 08:10:31 +01:00
Lukas Reschke c9ab11a9bd Merge pull request #7259 from owncloud/overwritehost-always
Add overwritehost config on setup and upgrade
2014-02-22 07:35:56 +01:00
Bart Visscher 1d7564dc2f Only check for existence of shared files when doing shared storage setup
The getItemsSharedWith function also retrieves related information,
resulting in work that isn't used here.
2014-02-21 23:07:35 +01:00
Bart Visscher f4f72e77d8 Delay fetching the display name until it is requested 2014-02-21 23:07:35 +01:00
Bart Visscher 6f4ecd32b3 Add more caching in the group manager 2014-02-21 23:07:35 +01:00
Morris Jobke 079d64ce75 Merge pull request #7310 from owncloud/no-css-js-delivery-via-php
No css js delivery via php
2014-02-21 20:37:10 +01:00
Morris Jobke e549977d0e update 3rdparty submodule to current master 2014-02-21 17:31:24 +01:00
root 300b1131b4 replace spaces with tabs
use true instead of 1
2014-02-21 17:09:36 +01:00
Vincent Petry a2000a15f8 Merge pull request #7358 from owncloud/xmlfix-3rdparty
Updated submodule to include XML processing fixes
2014-02-21 17:01:00 +01:00
icewind1991 9b9b2255b6 Merge pull request #7355 from owncloud/new-menu-svg
Use SVG icons in New file menu
2014-02-21 16:18:43 +01:00
Robin Appelman df35929ed2 Merge branch 'master' into add-js-config-vars 2014-02-21 16:07:21 +01:00
Robin Appelman 59ec61dc03 Merge branch 'master' into GuillaumeAmat-patch-1 2014-02-21 16:04:31 +01:00
Robin Appelman f1475671ab Merge branch 'master' into extstorage-configclass 2014-02-21 15:51:41 +01:00
Robin Appelman f86dffd56c Merge branch 'master' into recursive-mkdir-local 2014-02-21 15:43:54 +01:00
icewind1991 fa7fa4a6d3 Merge pull request #7088 from owncloud/sharing-userspathbug
Fix usersPath bug
2014-02-21 15:39:09 +01:00
Robin Appelman 3487a95eab Remove fileid parameter for getFolderContent 2014-02-21 15:36:24 +01:00
Robin Appelman dd98e6333f Split getFolderContentById 2014-02-21 15:35:12 +01:00
Morris Jobke a5c70f16d2 Merge pull request #7351 from owncloud/fix_thumbnails_for_conflicts_in_subdirs
fix thumbnail generation for subdirectories in the conflicts dialog
2014-02-21 15:33:13 +01:00
Robin Appelman 3980a7d9c6 Merge branch 'master' into folderid-reuse 2014-02-21 15:33:12 +01:00
Lukas Reschke fe44ac264b Add overwritehost config on setup and upgrade 2014-02-21 15:19:01 +01:00
icewind1991 aa0bcf7ba4 Merge pull request #7336 from owncloud/IE-wipho-viewport
fix viewport size on windows phone
2014-02-21 15:13:20 +01:00
Vincent Petry c0a6af8219 Updated submodule to include XML processing fixes 2014-02-21 15:12:15 +01:00
Björn Schießle 6bde602c09 Merge pull request #7292 from owncloud/sharing_tests
fix sharing unit tests
2014-02-21 14:24:51 +01:00
Jan-Christoph Borchardt 6f56fd99a6 fix too much distance between text and icon 2014-02-21 14:10:13 +01:00
Jan-Christoph Borchardt 877cfb963a use SVG icons from icons.css for New file menu 2014-02-21 14:07:25 +01:00
Robin Appelman 4715fb12c8 Add url parameter to control whether previews should return 404 when the mimetype is unsupported 2014-02-21 14:06:15 +01:00
Jörn Friedrich Dreyer d9e333c0da use directory from original instead of current dir 2014-02-21 14:01:38 +01:00
Thomas Müller 27ad69eea5 Merge branch 'master' into no-css-js-delivery-via-php 2014-02-21 14:01:24 +01:00
Robin Appelman 3f52eb073d Merge branch 'master' into mimeicons-svg 2014-02-21 14:00:17 +01:00
Thomas Müller 29c43ddb91 Merge pull request #7350 from owncloud/config-gitignore
ignore optional additional config files
2014-02-21 13:58:23 +01:00
Thomas Müller a40cedf507 Merge branch 'master' into McNetic-zipstreamer 2014-02-21 13:57:18 +01:00
Philipp Schmitt 43b1d81f77 Use 'command -v' to detect whether and where software is installed (instead of 'which') 2014-02-21 13:45:57 +01:00
Björn Schießle 9f0fc30251 Merge pull request #7337 from owncloud/test_for_6935
add unit test for \OC\URLGenerator::getAbsoluteURL
2014-02-21 13:45:49 +01:00
Robin Appelman 37a228422c Merge branch 'master' into sharing-userspathbug 2014-02-21 13:43:15 +01:00
Bjoern Schiessle 0c0e4fced5 fix test so that it doesn't depend on the array order 2014-02-21 13:37:47 +01:00
Bjoern Schiessle 6ca4d3bfde fix usersPath and add unit tests 2014-02-21 13:37:46 +01:00
Morris Jobke 387cdc81dc Merge pull request #7309 from owncloud/mobile-header
Header optimizations for mobile
2014-02-21 13:37:01 +01:00
Bjoern Schiessle cf7ef0d356 fix sharing unit tests 2014-02-21 13:36:00 +01:00
Robin Appelman 80481a1e41 Merge branch 'master' into mobile-header 2014-02-21 12:46:09 +01:00
kondou 88882e3fa7 Use addClass('hidden') and removeClass('hidden') 2014-02-21 12:42:07 +01:00
Morris Jobke fc209a5944 Merge pull request #7347 from owncloud/patch-headers-already-sent
Fix "headers are already sent" introduced with #6519
2014-02-21 12:36:24 +01:00
Robin Appelman 292525d10b Merge branch 'master' into patch-headers-already-sent 2014-02-21 11:23:06 +01:00
icewind1991 c9ea8af3a6 Merge pull request #7348 from owncloud/remove-problematic-test
Remove unit tests which causes the filesystem tests to fail
2014-02-21 11:21:50 +01:00
Morris Jobke 2f6639875e ignore optional additional config files 2014-02-21 10:58:05 +01:00
Thomas Müller 0e2ce33ab0 updating 3rdparty 2014-02-21 10:03:02 +01:00
Robin Appelman 2293563488 Remove unit tests which causes the filesystem tests to fail 2014-02-21 10:02:03 +01:00
Thomas Müller f19276f7bc Merge branch 'master' into no-css-js-delivery-via-php
Conflicts:
	config/config.sample.php
2014-02-21 09:51:51 +01:00
Jan-Christoph Borchardt b22d82f941 code style: else on same line 2014-02-21 09:42:19 +01:00
Lukas Reschke f7fa8662e2 Remove session_id_regenerate from here
Jenkins somewhat complains that there are already sent headers.
2014-02-21 08:12:45 +01:00
Lukas Reschke 69325c5eeb Move session_regenerate_id to login() 2014-02-21 08:11:07 +01:00
Thomas Müller fe24aafe7d Merge pull request #7312 from owncloud/ldap_fix_add_test
LDAP: fix and extend tests
2014-02-21 00:42:43 +01:00
ringmaster 58be2eb955 Allow apps to add/modify config js output via hook. 2014-02-20 18:13:27 -05:00
kondou 0e0b4d5575 Hide remove image, if there's no custom avatar
Fix #7308
2014-02-20 21:53:59 +01:00
Luke Policinski 089052b13a Fixed issue with drag and drop not in the root directory, for folders and files 2014-02-20 20:18:27 +00:00
Bjoern Schiessle 1ae6e9ec21 add unit test for \OC\URLGenerator::getAbsoluteURL to verify #6935 2014-02-20 19:06:42 +01:00
Lukas Reschke 917a505af4 Merge pull request #7291 from owncloud/adminess-raghu
Move isadmin to template and rename it to oc_isadmin
2014-02-20 19:01:28 +01:00
Lukas Reschke f11658698d Fix path to the mount file 2014-02-20 18:53:37 +01:00
Robin Appelman daf28225b7 fix viewport size on windows phone 2014-02-20 18:42:59 +01:00
Jan-Christoph Borchardt d5739e83d1 remove additional transition rule, reduce width of collapsed search bar 2014-02-20 18:40:08 +01:00
Morris Jobke dde9193b2b Merge pull request #7332 from owncloud/IE10-viewport
fix IE10 viewport sizeing
2014-02-20 18:35:44 +01:00
Lukas Reschke 6cb64a4fce Fix code to search for mount.json in custom data folders 2014-02-20 18:34:27 +01:00
Morris Jobke 65843e2459 Improve jQuery element selector
see https://github.com/owncloud/core/pull/7012/files#r9337198
http://24ways.org/2011/your-jquery-now-with-less-suck/
2014-02-20 18:24:43 +01:00
Thomas Müller d0c8b310b9 uppercase text and fix dialog popup 2014-02-20 18:24:42 +01:00
Thomas Müller 179fbada32 show share owner within shared folders as well 2014-02-20 18:24:42 +01:00
Thomas Müller 2b84f5e0b9 remove duplicate selectors and declaration 2014-02-20 18:24:42 +01:00
Thomas Müller 271684dcfe update share owner 2014-02-20 18:24:42 +01:00
Thomas Müller d6e89a9a28 store the share owner in a data-attribute instead of a separate span 2014-02-20 18:24:42 +01:00
Thomas Müller 7c68025010 adding share owner information to the file list 2014-02-20 18:24:42 +01:00
Robin Appelman d9bb21146f fix IE10 viewport sizeing 2014-02-20 18:14:40 +01:00
Jan-Christoph Borchardt d466458469 restrict zooming in to not mangle layout accidentally 2014-02-20 17:37:48 +01:00
Robin Appelman f710205ee7 Make unit tests expect the svg icons 2014-02-20 16:56:09 +01:00
Robin Appelman 0624476aa1 Merge branch 'master' into mimeicons-svg 2014-02-20 16:55:18 +01:00
Thomas Müller ec45a3c0e2 Merge pull request #6962 from owncloud/quota-space-root
Allow passing a root folder to get the used space from in the quota wrapper
2014-02-20 16:47:59 +01:00
Jan-Christoph Borchardt bfe6dfe5da Merge pull request #7056 from owncloud/users-scrollperformance
Improve users list scrolling performance
2014-02-20 16:45:36 +01:00
Thomas Müller b35cd54e87 Merge branch 'zipstreamer' of https://github.com/McNetic/owncloud_core into McNetic-zipstreamer
Conflicts:
	lib/private/files.php
2014-02-20 16:36:37 +01:00
Jan-Christoph Borchardt 5cc4a47f4c Merge pull request #6808 from globalpointfamily/remove_ie9_navagation_width_fix
remove fix for IE9 nav bar width
2014-02-20 16:25:08 +01:00
icewind1991 d1b1ad0813 Merge pull request #7290 from owncloud/issue/5463
Correctly redirect to settings page when not selecting cert file for upload
2014-02-20 16:24:31 +01:00
blizzz 984ea7b3ff Merge pull request #7205 from owncloud/fix_7153
LDAP: prevent other configuration from being deleted when deleting the f...
2014-02-20 16:22:43 +01:00
Morris Jobke 658758c3f7 fix intendation 2014-02-20 15:36:52 +01:00
Robin Appelman d1c392d9ad Also make "regular" local storage's mkdir recursive 2014-02-20 15:36:30 +01:00
Joshua Medeiros 76aa4714cf Recursive mkdir fixes #7047 2014-02-20 15:35:00 +01:00
Morris Jobke b946c0f08b Merge pull request #7319 from owncloud/remote-unneeded-if
Remove no longer needed if statement
2014-02-20 15:30:51 +01:00
Vincent Petry 44441b56d6 Fixed trashbin title 2014-02-20 15:16:45 +01:00
Lukas Reschke c869e0116b Merge pull request #6999 from kofemann/mount-config
mount: make location of mount.json configurable
2014-02-20 15:15:00 +01:00
Björn Schießle 4eadc36094 Merge pull request #6935 from owncloud/fix_urlGenerator
Add missing slash in URLGenerator::getAbsoluteURL().
2014-02-20 14:57:03 +01:00
Vincent Petry 476444ab1a Fixed title format 2014-02-20 14:56:28 +01:00
Lukas Reschke e4c3ef2ca6 Merge pull request #7289 from owncloud/fix-filetype-icons
Fix filetype icons
2014-02-20 14:53:41 +01:00
Robin Appelman d329049e53 Remove no longer needed if statement 2014-02-20 14:51:23 +01:00
Vincent Petry 6cf83de60e Merge branch 'patch-1' of github.com:GuillaumeAmat/core into GuillaumeAmat-patch-1 2014-02-20 14:49:54 +01:00
Jan-Christoph Borchardt b8048866c7 Merge pull request #7315 from owncloud/Jakobud-core-css-logos
Jakobud core css logos
2014-02-20 14:36:34 +01:00
Thomas Müller 3219433e20 Merge pull request #7036 from LeBlaaanc/patch-1
Removed '/'. Fixes #7035.
2014-02-20 14:29:41 +01:00
Jörn Friedrich Dreyer 3f6d14be85 Merge branch 'core-css-logos' of github.com:Jakobud/owncloud-core
Conflicts:
	core/css/styles.css
2014-02-20 14:29:23 +01:00
Lukas Reschke 0241ddc759 Merge pull request #6519 from nhirokinet/master
Security Update: session fixation
2014-02-20 14:28:26 +01:00
Thomas Müller fbea02bebb kill $coreStyles and $coreScripts 2014-02-20 14:18:01 +01:00
Thomas Müller 01929096fe revert wrong change to .htaccess 2014-02-20 14:11:31 +01:00
Thomas Müller a0e790227e remove unused functions - have been introduced with the old minimizer approach 2014-02-20 14:11:31 +01:00
Arthur Schiwon d5690a174e LDAP: fix and extend tests 2014-02-20 14:05:45 +01:00
Lukas Reschke 2955d9b483 Indentation 2014-02-20 13:54:05 +01:00
Thomas Müller 31bab55847 Merge branch 'master' into no-css-js-delivery-via-php 2014-02-20 13:52:53 +01:00
icewind1991 742f54b6d5 Merge pull request #7301 from owncloud/fix-fuckup
fix master - #7274 brokes it
2014-02-20 13:40:12 +01:00
Jan-Christoph Borchardt 20b740f8e4 do not show display name on mobile when profile picture is present 2014-02-20 13:37:23 +01:00
Jan-Christoph Borchardt 92d57cb5a7 move avatar into clickable area of user menu 2014-02-20 13:36:52 +01:00
Thomas Müller 8cf73ca42f integrate assetic for asset pipeline-ing 2014-02-20 13:28:27 +01:00
Thomas Müller 7242d00aa6 enable static delivery of css files 2014-02-20 13:27:46 +01:00
Thomas Müller 328428e40a reference 3rdparty branch add-assetic 2014-02-20 13:26:23 +01:00
Thomas Müller ac8e6b15b6 kill references to core.js and core.css 2014-02-20 13:23:24 +01:00
Thomas Müller bf22ed7bdb kill old minimizer code 2014-02-20 13:10:56 +01:00
Lukas Reschke 169f4cf7ff Fix typo 2014-02-20 12:51:15 +01:00
Björn Schießle 16eb43c033 Merge pull request #7247 from owncloud/sharing_cleanup_step1
clean up the sharing ajax calls, add mail notification class
2014-02-20 11:56:20 +01:00
Lukas Reschke 719f1111b6 Merge pull request #6714 from owncloud/files-newfileinvalidcharsfix
Added extra checks for invalid file chars in newfile.php and newfolder.php
2014-02-20 11:53:58 +01:00
Lukas Reschke 8114843973 Merge pull request #7287 from owncloud/subdirectory-harden
Hardening: Remove dangerous characters + Subdirectory Check
2014-02-20 11:46:11 +01:00
Jan-Christoph Borchardt 3e2c56157b reduce width of searchbox on mobile, fix overlap, fix #7282 2014-02-20 11:33:46 +01:00
Lukas Reschke 65c0b73c87 Merge pull request #7255 from owncloud/fix-admin-remote
An admin should not be able to add remote and public services on its own
2014-02-20 11:16:43 +01:00
Jan-Christoph Borchardt 3e235b2699 merge master 2014-02-20 10:51:13 +01:00
Jan-Christoph Borchardt a6fb6abbe0 fix filetype icons for gzip, tex, perl, csv, sh 2014-02-20 10:45:11 +01:00
Thomas Müller 3ce77a35e5 fixing js syntax error 2014-02-20 10:42:54 +01:00
Vincent Petry b060a17b59 Added extra checks for ext storage class 2014-02-20 10:40:10 +01:00
Morris Jobke 3bd984ebf0 Merge pull request #7295 from owncloud/optimize_images_kondou
Optimize images
2014-02-20 10:35:14 +01:00
Lukas Reschke ba7a79372a Variable value is expected and not an echoed output 2014-02-20 10:28:11 +01:00
Lukas Reschke b61f0f11c5 Move oc_isadmin to the config JS script 2014-02-20 10:26:05 +01:00
Vincent Petry 49f2014e0c Revert "Added extra checks for ext storage class"
This reverts commit 9e9a5b9ea1.

Unit tests weren't ready, need further tweaking.
2014-02-20 10:01:49 +01:00
Lukas Reschke 8f22535e75 Merge pull request #7284 from owncloud/ldap_filter_compilation
LDAP: improve compilation of filters
2014-02-20 09:55:02 +01:00
Lukas Reschke 38d6c56249 Merge pull request #7294 from owncloud/extstorage-configclass
Added extra checks for ext storage class
2014-02-20 09:53:52 +01:00
Morris Jobke b76a3993d4 fix master - #7274 brokes it 2014-02-20 09:47:59 +01:00
Guillaume AMAT 577559458d Uses OC.basename instead of custom code 2014-02-19 22:50:49 +01:00
Luke Policinski b01492fecd Feature Added : Ability to drag and drop in Chrome 2014-02-19 21:28:32 +00:00
Luke Policinski 79a6d89bcc Feature Added : Ability to drag and drop in Chrome 2014-02-19 21:23:39 +00:00
kondou 90f351afa2 Optimize some images
and strip metadata from png images with optipng in image_optimization.sh
2014-02-19 21:31:50 +01:00
Bjoern Schiessle 2fd75d8f1c clean up the sharing ajax calls, add mail notification class 2014-02-19 19:33:00 +01:00
Vincent Petry 9e9a5b9ea1 Added extra checks for ext storage class 2014-02-19 19:08:28 +01:00
Lukas Reschke a4f71267f0 Merge pull request #7027 from owncloud/extstorage-webdavurlencodingfixes
Fixed ext storage webdav path encoding
2014-02-19 18:57:59 +01:00
Vincent Petry b2b35cd335 Fixed ext storage webdav path encoding
- Some WebDAV servers like lighttpd need paths in URLs to be properly
encoded
- Added error log output when curl connection failed
- Added check for 'resourcetype' in case the WebDAV server doesn't
  support/return it
- Fixed touch() to return false if the server doesn't implement
  PROPPATCH
- Added optional delay in WebDAV unit tests to use when testing against
  lighttpd's WebDAV
2014-02-19 18:34:08 +01:00
Lukas Reschke 16262e3fd2 Move isadmin to template and rename it to oc_isadmin 2014-02-19 17:56:12 +01:00
Joas Schilling 513940f4a4 Correctly redirect to settings page when not selecting cert file for upload
Fix #5463
2014-02-19 17:07:29 +01:00
kondou 16cbfd0383 Optimize images 2014-02-19 16:44:08 +01:00
Jan-Christoph Borchardt cac4652c10 coding style: spaces around => 2014-02-19 16:28:29 +01:00
Jan-Christoph Borchardt 937a25593b fix lots of file type icons for archives, js, flash, ics, fonts, code, ... 2014-02-19 16:27:38 +01:00
Lukas Reschke 2d5b3899a6 Hardening: Remove dangerous characters + Subdirectory Check
If an user is able to create folders in /core/l10n/ he is able to execute arbitrary code. Therefore I've added an `issubdirectory` check and removed all potential dangerous characters from `$lang`.
2014-02-19 15:38:00 +01:00
Robin Appelman f33d35cd07 Fix svg icons for public shares and external/shared files 2014-02-19 15:08:05 +01:00
Robin Appelman 609a91a9b1 Show svg mime icons when no preview is available 2014-02-19 14:47:29 +01:00
Vincent Petry 952584e9c7 Merge pull request #7195 from owncloud/files-selectall
Do not send file list for select all on Download/delete
2014-02-19 14:33:24 +01:00
Arthur Schiwon c0328b4f0f LDAP: improve compilation of filters 2014-02-19 13:13:01 +01:00
Thomas Müller f9d4780d27 Merge pull request #7275 from owncloud/3rdparty-fix
fix 3rdparty submodule
2014-02-19 12:26:41 +01:00
Jan-Christoph Borchardt 4920373050 Merge pull request #7278 from owncloud/issue/7277
Add event parameter to keyup event
2014-02-19 12:20:47 +01:00
Jan-Christoph Borchardt 7330f61a94 Merge pull request #4799 from owncloud/tune_legacy_cache_webdav_properties_prefixing_master
Concatenate string in SQL instead of PHP
2014-02-19 11:58:48 +01:00
Morris Jobke bcad6e641a Merge pull request #7274 from owncloud/scrutinizer-patch-1
Scrutinizer Auto-Fixes
2014-02-19 11:51:04 +01:00
Morris Jobke f944707a15 fix wrong removes 2014-02-19 11:50:17 +01:00
icewind1991 2d5ab1a5c4 Merge pull request #7260 from owncloud/watcher-policy
Allow setting the frequency of which the file watcher checks for updates
2014-02-19 11:17:27 +01:00
Robin Appelman 1331de554c Reuse the folder id in View->getFolderContents 2014-02-19 10:46:02 +01:00
Joas Schilling c196e59e88 Add event parameter to keyup event
Fix issue #7277
2014-02-19 10:25:52 +01:00
Joas Schilling fdb0d2067f Remove duplicated definition and move OC.msg to js/js.js
Fix issue #7166
2014-02-19 10:20:52 +01:00
Morris Jobke 8caf77f7c9 fix 3rdparty submodule 2014-02-19 10:02:44 +01:00
Robin Appelman eea1abae20 add unit tests for watcher policies 2014-02-19 09:52:51 +01:00
Vincent Petry e517e642be Merge pull request #7257 from owncloud/filelist-fileinfo
use a FileInfo object of the directory when generting the filelist
2014-02-19 09:40:11 +01:00
Scrutinizer Auto-Fixer adaee6a5a1 Scrutinizer Auto-Fixes
This patch was automatically generated as part of the following inspection:
https://scrutinizer-ci.com/g/owncloud/core/inspections/cdfecc4e-a37e-4233-8025-f0d7252a8720

Enabled analysis tools:
 - PHP Analyzer
 - JSHint
 - PHP Copy/Paste Detector
 - PHP PDepend
2014-02-19 09:31:54 +01:00
Thomas Müller 1e321406ee Merge pull request #7114 from owncloud/scrutinizer_documentation_patches
polish documentation based on scrutinizer patches
2014-02-19 07:04:37 +01:00
Bart Visscher a55c56c9e7 Use the patches as proposed in doctrine/dbal 2014-02-18 20:20:58 +01:00
Thomas Müller c6f4f85e27 Merge branch 'master' into scrutinizer_documentation_patches
Conflicts:
	lib/private/migration/content.php
2014-02-18 18:31:33 +01:00
Tom Needham 635b8f6b83 Merge pull request #7252 from owncloud/autocomplete-autocapitalize-autocorrect
do not autocapitalize fields on mobile, fix user name input
2014-02-18 18:26:56 +01:00
icewind1991 3cc7228c7c Merge pull request #7253 from owncloud/preferences-caching
Add caching to OC\Preferences
2014-02-18 18:17:58 +01:00
Thomas Müller 8991e4505a Merge pull request #6796 from owncloud/statementwrapper-bindparam
Add bindParam to the database statement wrapper
2014-02-18 18:13:57 +01:00
Thomas Müller 1e84d6b14b Merge pull request #7190 from owncloud/appconfig-legacy-apps
Remove usage of legacy OC_Appconfig
2014-02-18 18:10:22 +01:00
Vincent Petry bd71a1b7b6 Added file name check in webdav connector
- added file name check for the put, rename and setNames() methods which
  throw a "Bad Request" whenever invalid characters are used
- replaced \OC\Filesystem usage with $this->getFS() to be able to write
  unit tests
2014-02-18 17:54:32 +01:00
Vincent Petry 797e0a614c Added extra checks for invalid file chars in newfile.php and newfolder.php
- added PHP utility function to check for file name validity
- fixes issue where a user can create a file called ".." from the files UI
- added extra checks to make sure newfile.php and newfolder.php also
  check for invalid characters
2014-02-18 17:54:32 +01:00
Tom Needham a573fe7d76 Merge pull request #6650 from owncloud/migration_unit_tests
User migration fix, and basic unit test
2014-02-18 17:35:49 +01:00
Lukas Reschke 3b1083f46e Merge pull request #7176 from owncloud/style
Some style fixes
2014-02-18 17:30:26 +01:00
tomneedham 0beaeed713 Remove unused variables 2014-02-18 16:28:04 +00:00
tomneedham 589a7b220b Fix poor spelling 2014-02-18 16:23:16 +00:00
Thomas Müller e139f7c863 load all apps to get all cron jobs executed 2014-02-18 17:17:08 +01:00
Robin Appelman 2166683e3b Allow setting the frequency of which the file watcher checks for updates 2014-02-18 16:34:25 +01:00
Robin Appelman d18b9f6ea4 use a FileInfo object of the directory when generting the filelist 2014-02-18 15:39:35 +01:00
Thomas Müller 8f5c641cd8 load all apps in ocs/v1.php 2014-02-18 14:51:59 +01:00
Robin Appelman ac2e3ab373 remove some unneeded isset's 2014-02-18 14:27:55 +01:00
Robin Appelman 2e97a4cd32 Fix some phpdoc 2014-02-18 14:26:27 +01:00
Joas Schilling 8387cd8ae3 Add option to change email settings in admin section
Fix issue #7166
2014-02-18 14:26:03 +01:00
Lukas Reschke c19cacb29f Check whether the app is set 2014-02-18 14:12:49 +01:00
Lukas Reschke 1352c63dca Check whether the Key is set 2014-02-18 12:47:05 +01:00
Lukas Reschke dc6f1d875d An admin should not be able to add remote and public services on its own. This should only be possible programmatically.
This change is due the fact that an admin may not be expected to execute arbitrary code in every environment.
2014-02-18 12:32:57 +01:00
tomneedham df38d4ef1a Return 101 if user doesnt exist 2014-02-18 10:36:18 +00:00
Robin Appelman b6f44e9a1d Add caching to OC\Preferences 2014-02-18 11:21:39 +01:00
Jan-Christoph Borchardt dafa8fc37e do not autocapitalize fields on mobile, fix user name input. Also disable autocorrect and specify autocomplete 2014-02-18 10:58:00 +01:00
Vincent Petry 58b1dc5e76 Added loading spinner to users list on scroll 2014-02-18 10:52:05 +01:00
tomneedham 2f1a24eee7 Add displayname for admins 2014-02-18 09:50:46 +00:00
Thomas Müller 92560c5b86 Merge pull request #7243 from owncloud/core-sessionlifetimedefault
Now using PHP session lifetime as default value for the JS config
2014-02-18 10:30:25 +01:00
Thomas Müller 5d3fc03750 Merge pull request #7239 from owncloud/cbr-filetype-icon
add cbr/cbz file type icon, fix #6953
2014-02-18 10:23:54 +01:00
Vincent Petry f9763e1fc5 Now using PHP session lifetime as default value for the JS config
This will fix the heartbeat when the session_lifetime config parameter
hasn't been set explicitly.
2014-02-17 21:33:04 +01:00
Jan-Christoph Borchardt 323cc1166b Merge pull request #7235 from DavidVentura/master
small change for compatibility
2014-02-17 21:16:39 +01:00
icewind1991 617cbfed54 Merge pull request #7240 from owncloud/mimetype-fallback
use file icon as fallback instead of application icon, fix #7237
2014-02-17 21:06:15 +01:00
Vincent Petry 5a80339b51 Merge pull request #7211 from mattcaron/master
Fit shared videos to viewer, just like images. Issue #1648
2014-02-17 20:59:29 +01:00
Jörn Friedrich Dreyer 798dc2c39a Merge pull request #7231 from owncloud/proper-content-type
Use the proper content-type
2014-02-17 20:58:52 +01:00
Jan-Christoph Borchardt c2adf033f2 use file icon as fallback instead of application icon, fix #7237 2014-02-17 20:58:33 +01:00
Jörn Friedrich Dreyer 7e94d98b57 Merge pull request #7233 from owncloud/fix_5567
LDAP: improve wizard strings, fixes #5567
2014-02-17 20:57:56 +01:00
Jan-Christoph Borchardt 0f434038a7 add cbr/cbz file type icon, fix #6953 2014-02-17 20:48:32 +01:00
Vincent Petry c732764eb5 Improve users list scrolling performance
- fixed JS error when avatar mode is disabled
- added spinner at the bottom of the table
- scroll detection now happens earlier
- single/multiselect init is deferred so that the new rows are first appended
  into the list (more responsive) and initialized afterwards
- disabled users sorting after add (assuming they are always sorted on
  the server side)
2014-02-17 19:32:45 +01:00
Matthew Caron aa1a50f5b3 Consolidate two sections, per code review. Issue #1648 2014-02-17 12:57:54 -05:00
Vincent Petry 94b3296a71 Trashbin select all now doesn't send file list
- Fixed "delete" and "restore" actions to not send the file list when
  all files are selected
- When some files are selected, sends the current dir
- Removed "dirListing" attribute as the backend is able to compute the
  value based on the current dir
2014-02-17 18:34:59 +01:00
Bart Visscher 8a6dcdf4a4 Move password interaction to interact function 2014-02-17 18:09:42 +01:00
Bart Visscher bcb78e48b2 Split execute function into multiple functions 2014-02-17 18:02:58 +01:00
David a282afcbbb small change for compatibility 2014-02-17 13:27:07 -03:00
Arthur Schiwon 54f9db403f LDAP: improve wizard strings, fixes #5567 2014-02-17 17:19:48 +01:00
Lukas Reschke 8a2cd0355d Use the proper content-type
We should use the proper content-type `application/xml` instead of the default `text/html` here.

Backport requested.
2014-02-17 16:45:22 +01:00
Jan-Christoph Borchardt 84cd6e035e Merge pull request #7132 from owncloud/issue/6920
Do not select input for all text input fields
2014-02-17 15:01:03 +01:00
Lukas Reschke fe065f5114 Merge pull request #6892 from owncloud/issuetemplate-enhancements
Issue template enhancements
2014-02-17 14:59:00 +01:00
Vincent Petry fe9c982081 Removed quota question 2014-02-17 14:34:15 +01:00
tomneedham a4b6d66703 Merge branch 'master' into migration_unit_tests 2014-02-17 11:03:57 +00:00
tomneedham 049e03c2b9 Finish basic testing of user export 2014-02-17 10:58:27 +00:00
Björn Schießle 5a8d37023a Merge pull request #7155 from owncloud/enc_improved_error_handling
[encryption] improved error handling
2014-02-17 11:13:44 +01:00
Bjoern Schiessle 6778dc5a4a don't block login forever if we are stuck in the middle of the initial encryption 2014-02-17 10:03:57 +01:00
Bjoern Schiessle f2f5769df7 catch errors during decryption 2014-02-17 10:03:57 +01:00
Bjoern Schiessle 2ab062193a catch errors during initial encryption 2014-02-17 09:58:46 +01:00
Thomas Müller 750ffa8231 Merge pull request #7156 from owncloud/backgroundjob-public
Add the background job list to the public server container
2014-02-14 23:11:10 +01:00
Thomas Müller 9fac95c2ab Merge branch 'master' into scrutinizer_documentation_patches
Conflicts:
	lib/private/appconfig.php
2014-02-14 23:03:27 +01:00
Morris Jobke df282d9ef8 Merge pull request #7207 from owncloud/fileinfo-serializable
Remove the JsonSerializable interface from \OC\Files\FileInfo
2014-02-14 22:11:54 +01:00
Matthew Caron 2887fb1f48 Fit shared videos to viewer, just like images. Issue #1648 2014-02-14 16:09:51 -05:00
Thomas Müller 41f0ad2d13 Merge pull request #7204 from owncloud/groupexists-duplicate
Remove duplicate call to groupExists
2014-02-14 21:53:03 +01:00
Robin Appelman 09502fcb36 remove the JsonSerializable interface from \OC\Files\FileInfo 2014-02-14 19:26:06 +01:00
blizzz e2c0c0e256 Merge pull request #7206 from owncloud/fix_enc_tests
fileinfo is no longer a array
2014-02-14 19:09:46 +01:00
Bjoern Schiessle 2933668355 fileinfo is no longer a array 2014-02-14 18:05:59 +01:00
Arthur Schiwon d88c6778ff LDAP: prevent other configuration from being deleted when deleting the first one which has an empty prefix for historical reasons 2014-02-14 15:34:22 +01:00
icewind1991 2a7509ee50 Merge pull request #6748 from owncloud/fileinfo
Add a FileInfo class which holds all info of a file ...
2014-02-14 15:16:39 +01:00
Robin Appelman b35f679483 Fix test cases for group manager 2014-02-14 15:07:08 +01:00
Vincent Petry d7f4547717 Merge pull request #6726 from owncloud/fix_6630
don't urldecode get var, php does this automatically
2014-02-14 14:34:20 +01:00
Robin Appelman 0ba0596341 remove duplicate call to groupExists 2014-02-14 14:25:45 +01:00
Thomas Müller 595b908b74 Merge pull request #7183 from owncloud/remove-force-lowercase
remove forced lowercase from extension, fix #4747
2014-02-14 13:58:42 +01:00
Thomas Müller 4b603cd2f8 Merge pull request #7201 from owncloud/fix_error_msg_imagick_queryFormats
suppress error msg caused by php bug
2014-02-14 12:49:52 +01:00
Vincent Petry afe133d5d1 Merge pull request #7168 from owncloud/issue/7152
Send correct path on file upload when using public app
2014-02-14 12:25:20 +01:00
Georg Ehrke f62f1658ce suppress error msg caused by php bug 2014-02-14 11:23:39 +01:00
Vincent Petry d5397d813c Do not send file list for select all on Download/delete
- When all files are selected, do not send the whole file list
- Download will trigger download for the parent folder, also works
  with root
- Delete will send "allfiles" to the server that will find the file
  list or the passed directory by itself
2014-02-13 20:28:52 +01:00
Robin Appelman 181bbd4325 Remove usage of legacy OC_Appconfig 2014-02-13 16:28:49 +01:00
Thomas Müller 4b84e3a7e8 Merge pull request #4624 from owncloud/convert-oc_appconfig
Convert OC_Appconfig to object interface
2014-02-13 15:51:40 +01:00
Robin Appelman 3b1df29318 sort expected result in tests 2014-02-13 13:56:02 +01:00
Guillaume AMAT 01dc7c5482 Gets the page title from oc_defaults in Files app 2014-02-13 10:48:01 +01:00
Guillaume AMAT 01dee35ebe Adds OC_Defaults values in javascript config 2014-02-13 10:47:03 +01:00
Jan-Christoph Borchardt 6e17d71a0d remove forced lowercase from extension, fix #4747, also coding style fixes 2014-02-13 10:39:38 +01:00
Thomas Müller 30662fa7ac Merge pull request #7178 from owncloud/issue/6277
External FTP Storage should request hostname instead of URL
2014-02-12 23:01:41 +01:00
kondou fc01a13811 Fix imagerotate and move loadFromBase64() one up.
imagerotate() with third parameter being -1 does not seem to work in PHP 5.5

loadFromBase64() one up, so debug-logs aren't spammed (as much) with urlencoded
base64-data from loadFromFile() debug output.
2014-02-12 22:35:49 +01:00
Joas Schilling 658af627ce External FTP Storage should request hostname instead of URL
Fix issue #6277
2014-02-12 18:20:10 +01:00
Bart Visscher ae525d1f12 Fix namespace for Exception 2014-02-12 17:42:55 +01:00
Bart Visscher 2c6411b897 $default of OC_Config::[gs]etValue can have more then string as type 2014-02-12 17:38:32 +01:00
root d10f6e94dc fix coding style to blizzz happy.. ;-) 2014-02-12 16:56:17 +01:00
Joas Schilling 9619459e37 Send correct path on file upload when using public app
Fix issue #7152
2014-02-12 15:49:09 +01:00
icewind1991 7af456730e Merge pull request #6964 from owncloud/storagestatistics-reuse
Reuse the calculated free_space in buildFileStorageStatistics
2014-02-12 15:48:14 +01:00
Robin Appelman d6576c640c Add unit tests for JobList 2014-02-12 13:52:13 +01:00
Robin Appelman 62288971ca Additional phpdoc 2014-02-12 13:32:16 +01:00
Robin Appelman 3aafa837b8 Remove internal methods from the public interface 2014-02-12 13:25:50 +01:00
Robin Appelman 60bd9d512d Merge branch 'master' into backgroundjob-public 2014-02-12 13:21:47 +01:00
Bart Visscher 1fb5f96c37 Style fixes 2014-02-12 09:09:51 +01:00
Bart Visscher addd0fba38 number as number 2014-02-12 09:09:45 +01:00
Guillaume AMAT a62b393d02 Update page title when navigating through directories 2014-02-12 00:54:35 +01:00
Thomas Müller 3699728a3a Merge pull request #7085 from owncloud/quick-fix-7019-master
Load authentication apps to get users from all backends
2014-02-11 18:41:08 +01:00
Bart Visscher 3abcd13979 Allow converting from any db type 2014-02-11 18:01:41 +01:00
Bart Visscher eede20c5ac Check target DB type 2014-02-11 17:59:50 +01:00
Vincent Petry c442a03d3a Merge pull request #7075 from owncloud/quota-storagexsendfile
Added isLocal() method to storage, used for xsendfile
2014-02-11 14:49:39 +01:00
Robin Appelman 50cc6a85e5 Add explicit sorting 2014-02-11 14:26:40 +01:00
Robin Appelman a6399f9cef Add the background job list to the public server container 2014-02-11 14:00:24 +01:00
Robin Appelman a7c50514ac Merge branch 'master' into convert-oc_appconfig 2014-02-11 13:26:54 +01:00
Arthur Schiwon 72f134cfce intendation 2014-02-11 10:50:10 +01:00
Arthur Schiwon af781bdea7 fix DI 2014-02-11 10:50:03 +01:00
Arthur Schiwon 32afdcbefe Inject logger 2014-02-11 10:49:59 +01:00
Arthur Schiwon 20bfbb0fd9 wrong tld 2014-02-11 10:49:54 +01:00
Arthur Schiwon 9a39cd3b38 test for share dialoge sorter 2014-02-11 10:49:46 +01:00
Arthur Schiwon 82716ced48 sort following entries in alphabetical order 2014-02-11 10:49:41 +01:00
Arthur Schiwon 41e8d44cf7 move sorter into a class 2014-02-11 10:49:34 +01:00
Arthur Schiwon 1d0a236563 respect coding guidelines 2014-02-11 10:49:27 +01:00
Arthur Schiwon 71e4d965a1 on filtering the share box users and groups whose name begins with the search term shall appear on top, fixes #6430 2014-02-11 10:49:22 +01:00
Bart Visscher 082abdc620 Merge branch 'master' into migration_unit_tests 2014-02-10 21:32:17 +01:00
Vincent Petry bea80ffe20 Merge pull request #6881 from owncloud/remove-user-storage-entry
Also remove the user's home storage from the storage table when deleting a user
2014-02-10 15:04:05 +01:00
Arthur Schiwon 14d1abf63f LDAP: improve debug message 2014-02-10 14:45:37 +01:00
Arthur Schiwon 18e1a10e96 LDAP: also try MS AD's thumbnailPhoto when looking for an avatar image 2014-02-10 14:45:31 +01:00
Tom Needham 84607db284 Merge pull request #6988 from owncloud/oc_api_fix_warinigs
[ocs API] getData() always needs to return an array
2014-02-10 13:43:16 +00:00
Morris Jobke eba1d574cf Merge pull request #7134 from owncloud/issue/5794
Make google drive client secret and dropbox api secret a password field
2014-02-10 14:34:24 +01:00
Robin Appelman e6df86f4cb Merge branch 'master' into quota-space-root 2014-02-10 14:03:06 +01:00
Robin Appelman 753af3a3ff Merge branch 'master' into storagestatistics-reuse 2014-02-10 14:01:32 +01:00
Robin Appelman 5ffc43cba0 Merge branch 'master' into remove-user-storage-entry 2014-02-10 13:53:01 +01:00
Morris Jobke 02bdb47049 Merge pull request #7140 from owncloud/enc_dont_login_during_encryption
refuse login as long as the initial encryption is running
2014-02-10 13:25:39 +01:00
Arthur Schiwon 299d37154b LDAP: add documentation info in info.xml 2014-02-10 12:59:11 +01:00
Vincent Petry 6b5a7035ee Merge pull request #7126 from nickvergessen/issue/6683
Only add files to file list when uploading to current directory
2014-02-10 12:14:05 +01:00
Arthur Schiwon e156f85bfb Rephrase and clarify log message 2014-02-10 11:29:08 +01:00
Arthur Schiwon a76840d206 Wizard: enable base DN for editing, if not base DN could have been detected. Also part of fix for #6670 2014-02-10 11:29:02 +01:00
Arthur Schiwon e825a008c9 Wizard: disable LDAP referrals, fixes #6670 2014-02-10 11:28:55 +01:00
Arthur Schiwon a908bd5695 throw an info message, when base dn test failed 2014-02-10 11:28:46 +01:00
Arthur Schiwon bc17b40650 LDAP: extend LDAP wrapper search method for sizelimit, improves performance in wizard 2014-02-10 11:28:38 +01:00
Thomas Müller 45d07906b8 Merge pull request #7131 from owncloud/issue/6269
Change MySQL to MariaDB/MySQL in the frontend
2014-02-10 11:09:03 +01:00
Bjoern Schiessle 050e84a08f refuse login as long as the initial encryption is running 2014-02-10 10:56:11 +01:00
Thomas Müller 8c7fb64b8b Merge pull request #7066 from owncloud/check_svg_installed
properly check if pdf and svg modules are installed
2014-02-10 10:28:32 +01:00
Thomas Müller 8de9758fee Merge pull request #7071 from jcfischer/master
close statement in MimeType detection is executed [#7069]
2014-02-10 10:27:21 +01:00
Thomas Müller e7db48cd7f Merge pull request #7133 from owncloud/fix-implied-eval
Fix implied evals and doubled definition of variable
2014-02-10 10:08:40 +01:00
Andreas Fischer bbfd97ce03 Merge pull request #6247 from owncloud/memcached-multiple-servers
Add support for multiple memcached servers.

* owncloud/memcached-multiple-servers:
  Readd support for memcached_server config variable.
  Add support for multiple memcached servers.
2014-02-08 14:21:19 +01:00
Joas Schilling b330d07b51 Fix more documentation failes
Issue #7111
2014-02-08 11:47:55 +01:00
Robin Appelman 8ad3fc89be Merge branch 'master' into quota-space-root 2014-02-07 23:29:26 +01:00
Joas Schilling 828985dc60 Make google drive client secret and dropbox api secret a password field
Fix issue #5794
2014-02-07 18:12:01 +01:00
Bjoern Schiessle 91254c304d name users after test 2014-02-07 18:07:38 +01:00
Morris Jobke 13fa0e2a9d Fix implied evals and doubled definition of variable
fixes #7119
fixes #7120
fixes #7121
fixes #7122
2014-02-07 17:47:42 +01:00
Thomas Tanghus 2ff0d3a255 Test if $url is already prefixed by '/' 2014-02-07 17:39:19 +01:00
Joas Schilling dbec143f09 Change MySQL to MySQL/MariaDB in the frontend
Fix issue #6269
2014-02-07 17:03:43 +01:00
Bjoern Schiessle dc53c83e7b getData() always needs to return an array 2014-02-07 16:38:15 +01:00
Joas Schilling 145d9a09ab Do not select input for all text input fields
Fix issue #6920
2014-02-07 16:31:29 +01:00
Vincent Petry 60cba9962d Merge pull request #7112 from owncloud/enc_fix_size_for_shared_files
replace 'size' with 'unencrypted_size' if encryption is enabled
2014-02-07 14:49:22 +01:00
Robin Appelman 4cdf83e6d2 Remove the Test_AppConfig_Object tests as they no longer make sense with caching 2014-02-07 14:03:57 +01:00
Robin Appelman cd3ef0bb9d Add caching to appconfig 2014-02-07 14:03:39 +01:00
Thomas Müller f0afbffaef Merge pull request #6997 from owncloud/fix_l10n_warnings
change order of issubdirectory() calls to avoid error messages for non-apps
2014-02-07 13:47:33 +01:00
Robin Appelman b537d90e58 use the 'new' server container for appconfig 2014-02-07 13:45:59 +01:00
Joas Schilling af7366cd30 Only add files to file list when uploading to current directory
Fix Issue #6683
2014-02-07 13:06:50 +01:00
Bjoern Schiessle a8943ad022 replace 'size' with 'unencrypted_size' if encryption is enabled 2014-02-07 12:53:13 +01:00
Jörn Friedrich Dreyer 81031984a6 remove duplicate param lines for OCP\User::getUsers() 2014-02-07 12:12:16 +01:00
Thomas Müller b9e724d4ae Update README.md 2014-02-07 00:40:57 +01:00
Thomas Müller 88087b21c7 Update README.md 2014-02-07 00:40:08 +01:00
Vincent Petry 788c8540aa Added isLocal() method to storage, used for xsendfile
Added isLocal() method to Storage to find out whether the storage is
local or not.
This method is used for the x-sendfile logic to find out whether to add
the headers.
2014-02-06 20:53:15 +01:00
Vincent Petry be47e156a5 Merge pull request #6952 from MartialGeek/add_freebox_support
New user agent added for the Freebox.
2014-02-06 18:12:32 +01:00
Vincent Petry 5ab12a8b85 Merge pull request #6445 from owncloud/fix_5956
fix issue with logging non utf8 chars
2014-02-06 17:47:13 +01:00
Jörn Friedrich Dreyer 2a6a9a8cef polish documentation based on scrutinizer patches 2014-02-06 17:02:21 +01:00
Thomas Müller 0d94da7e9e Merge pull request #7099 from owncloud/fix-autoconfig-master
fixing autoconfig handling
2014-02-06 14:35:31 +01:00
Vincent Petry aff1cafaca Merge pull request #7089 from owncloud/sharing-searchbymime
Fixed searchByMime in shared cache
2014-02-06 14:15:00 +01:00
Thomas Müller 79fc4f3126 Within OC:init() the minimum set of apps is loaded - which is filesystem, authentication and logging 2014-02-06 11:34:27 +01:00
Morris Jobke 8f7b99d2e5 Merge pull request #7105 from NCTU-NBA/pr-7098
Fix #7098
2014-02-06 11:02:06 +01:00
Thomas Müller 0db5fead8e remove some more global variable $RUNTIME_NOAPPS 2014-02-06 10:04:18 +01:00
Thomas Müller 21207c6a73 remove superfluous $RUNTIME_APPTYPES 2014-02-06 09:50:11 +01:00
Thomas Müller afbe50d09c remove global variable $RUNTIME_NOAPPS - it's just superfluous 2014-02-06 09:44:13 +01:00
Pellaeon Lin 946fccc0dd Remove unused template variable assignment of files_sharing/template/public.php 2014-02-06 12:26:36 +08:00
Pellaeon Lin 8c56e21ced Move template variable assignment to correct place 2014-02-06 12:06:16 +08:00
Thomas Müller e2625ae7aa fixing autoconfig handling 2014-02-05 18:23:40 +01:00
Thomas Müller e2a28e5d1d Merge pull request #7091 from owncloud/jenkins-catchsetuperrors
Catch setup errors during autotest
2014-02-05 17:51:33 +01:00
Jan-Christoph Borchardt 61aa6ead83 Merge pull request #6490 from owncloud/theming-for-appstemplate
do not show 'Add app' and 'More apps' for themed ownCloud
2014-02-05 16:49:07 +01:00
Jan-Christoph Borchardt b0692af29a Merge pull request #7064 from owncloud/files-scrolltopafterupdate
Scroll to the top after switching dir
2014-02-05 16:13:55 +01:00
Vincent Petry 20935f4e24 Catch setup errors during autotest 2014-02-05 15:34:08 +01:00
Björn Schießle 697b25f165 Merge pull request #7032 from owncloud/enc_fix_delete
Encryption replace delete proxy with pre/post hooks and add tests
2014-02-05 14:26:52 +01:00
Robin Appelman 1e79369338 merge master into storagestatistics-reuse 2014-02-05 13:36:55 +01:00
Vincent Petry fa5ddc3e18 Fixed searchByMime in shared cache
- searchByMime now correctly returns files recursively search through
  all the dirs
- added unit test for searchByMime
2014-02-05 13:29:06 +01:00
Thomas Müller 9d9f360b77 Load authentication apps to get users from all backends - fixes #7019 2014-02-05 12:54:31 +01:00
Vincent Petry 3d88b10f20 Merge pull request #7067 from owncloud/core-sessionheartbeatconfig
Core sessionheartbeatconfig
2014-02-05 10:03:36 +01:00
Thomas Müller ced80c6f27 Merge pull request #6969 from owncloud/tests-morecoverage
Fixed unit test scripts + coverage
2014-02-04 12:21:13 -08:00
Thomas Müller 6d3b61f388 Merge pull request #7011 from owncloud/jshint
Added .jshintrc
2014-02-04 12:11:32 -08:00
Thomas Müller 45ab9810c5 fixing typos 2014-02-04 20:58:06 +01:00
Vincent Petry fe2a63ffd4 Scroll to the top after switching dir
Fixes #7061
2014-02-04 18:59:43 +01:00
Jan-Christoph Borchardt 0609f30d1c Merge pull request #6235 from NCTU-NBA/pr-exceed_upload_limit_msg
Change misleading message when file size exceeds upload limit
2014-02-04 08:04:19 -08:00
Jens-Christian Fischer 11f46e121c close statement in MimeType detection is executed [#7069]
close statement was never executed due to it being after a return
statement.
2014-02-04 17:03:52 +01:00
Vincent Petry bd6734291c Merge pull request #6081 from owncloud/partfilewebdavfix
Allow getting info or renaming part files through WebDAV
2014-02-04 07:48:37 -08:00
Robin Appelman f830ad0e47 Don't create new thumbnails on the write hook 2014-02-04 16:28:41 +01:00
Robin Appelman 3afdcd85e7 Add unit test for quote wrapper size root 2014-02-04 16:05:12 +01:00
Morris Jobke 3c80071807 Merge pull request #4795 from owncloud/setup
Move core setup code to controller class
2014-02-04 06:04:21 -08:00
icewind1991 a27529709b Merge pull request #6647 from owncloud/memcache-public
Add Memcache to the public api
2014-02-04 05:38:53 -08:00
Vincent Petry e266e50699 Merge pull request #7065 from owncloud/errorHandler_tests
add test for the password remove method
2014-02-04 05:36:17 -08:00
Vincent Petry e75f7e58e9 Added unit tests for session_keepalive / heartbeat 2014-02-04 13:56:41 +01:00
Vincent Petry 912da8d277 Added session_keepalive setting
When session_keepalive is true (default) the heartbeat will be send as
often as the half of the session timeout value.
2014-02-04 13:56:10 +01:00
Georg Ehrke d55ef442cd properly check if pdf and svg modules are installed 2014-02-04 12:59:14 +01:00
Bjoern Schiessle 36838b2837 add test for password remove method 2014-02-04 11:18:04 +01:00
Jan-Christoph Borchardt 49f0f9f2f6 Merge pull request #7057 from owncloud/pictures-icon
better picture icon, fix https://github.com/owncloud/apps/issues/1401
2014-02-03 15:57:41 -08:00
Jan-Christoph Borchardt 3692260174 Merge pull request #7055 from owncloud/ellipsize-modified-date
ellipsize long modified dates to make room for showing delete button
2014-02-03 15:57:00 -08:00
Jan-Christoph Borchardt cfcd71f3e4 better picture icon, fix https://github.com/owncloud/apps/issues/1401 2014-02-03 18:47:25 +01:00
Jan-Christoph Borchardt b56dbbe0e5 fix misalignment of modified dates, shift to right 2014-02-03 17:26:49 +01:00
Jan-Christoph Borchardt 6d7d3c16d0 ellipsize long modified dates to make room for showing delete button, fix #7040 2014-02-03 17:24:44 +01:00
Björn Schießle 9a0d7c5be4 Merge pull request #7014 from owncloud/fix_ocs_share_api
remove needless element tag from the ocs share api
2014-02-03 08:02:54 -08:00
Björn Schießle c0aeaf9ec0 Merge pull request #7013 from owncloud/dont_write_passwords_to_log
wrap stat() call in a try/catch block
2014-02-03 07:58:44 -08:00
Robin Appelman 0ae4022fb4 Also clean up the filecache table when deleting a storage entry 2014-02-03 16:36:21 +01:00
Robin Appelman 8d6a3a00b4 Revert "Use Cache->clear to cleanup the filecache for removed users"
This reverts commit 5a5b6f187e.
2014-02-03 16:29:04 +01:00
Bjoern Schiessle 97921d0c25 add function to extract filename from sharekey name + tests 2014-02-03 13:39:05 +01:00
Bjoern Schiessle cf5277b558 also load error handler if debugging is enabled 2014-02-03 12:08:28 +01:00
Bjoern Schiessle 44b637470c remove passwords in URLs from all log messages 2014-02-03 12:07:56 +01:00
Bjoern Schiessle fe5f512272 added tests for the delete hooks if the trash bin is disabled 2014-02-01 20:08:23 +01:00
Morris Jobke 5844d682a7 Use === instead of ==, add missing whitespace and CSS class 2014-02-01 15:02:36 +01:00
Chris LeBlanc 652f60419f Removed '/'. Fixes #7035.
Not sure if that '/' is necessary but it broke things on my installation.
2014-02-01 00:56:55 -06:00
Bjoern Schiessle bef58f5361 don't expect OC_FilesystemView, this is depreciated 2014-01-31 20:39:52 +01:00
Bjoern Schiessle 4d1086c35f better error detection and don't use glob() 2014-01-31 20:39:11 +01:00
Bjoern Schiessle 5610842e56 move unlink proxy to a hook which handles pre and post conditions 2014-01-31 20:38:35 +01:00
icewind1991 cf6538abde Merge pull request #7025 from owncloud/prevent-double-app-load
Mark an app as loaded before we start loading it
2014-01-31 08:47:19 -08:00
Bart Visscher f1c60c7f8b Remove unused functions from OC_Helper
init_var and init_radio  where only used in the installation template
2014-01-31 17:33:15 +01:00
Bart Visscher d8ec7e2701 DRY for database type radiolist 2014-01-31 17:31:19 +01:00
Bart Visscher 12a900de25 Do setup default value handling in the controller not the template 2014-01-31 16:57:49 +01:00
Bart Visscher bca725dc32 Merge branch 'master' into setup
Conflicts:
	core/setup.php
2014-01-31 16:43:12 +01:00
Georg Ehrke 1f30bffba3 Merge pull request #7017 from owncloud/trashpreview
Fixed image preview in trashbin subdirs
2014-01-31 07:29:08 -08:00
Robin Appelman 0d9fe770f3 Mark an app as loaded before we start loading it 2014-01-31 15:12:21 +01:00
Morris Jobke 1a24bf4625 Merge pull request #5151 from owncloud/file-actions
Slightly better looking file actions.
2014-01-31 01:30:36 -08:00
raghunayyar 5ccb395ec6 Makes Rename Icon Width 44px for touch sourfaces. 2014-01-31 12:33:00 +05:30
Bart Visscher b57299f727 Merge branch 'master' into db-convert-tool
Conflicts:
	3rdparty
2014-01-30 18:16:55 +01:00
Vincent Petry c5767b67b1 Fixed image preview in trashbin subdirs 2014-01-30 17:03:13 +01:00
Vincent Petry d49c7ad4fb Fixed double file encoding for previews 2014-01-30 16:34:37 +01:00
Georg Ehrke f7c291e276 remove empty line 2014-01-30 16:32:45 +01:00
Georg Ehrke c5742520e1 don't urldecode get var, php does this automatically 2014-01-30 16:32:45 +01:00
Pellaeon Lin 099b71c712 Merge branch 'master' into pr-exceed_upload_limit_msg
Conflicts:
	apps/files/templates/index.php
	apps/files_sharing/templates/public.php
2014-01-30 22:50:20 +08:00
Vincent Petry ba1b9df8a9 Fixed file name validation unit test + added newline
- fixed file name validation unit test
- added "\n" as forbidden character in isFileNameValid()
2014-01-30 13:40:01 +01:00
Vincent Petry d36a2ff9ee Added .jshintrc
- Also fixes a few JSHint warnings in files app
- Added "global" comment on top of files app to suppress warning and
  also inform devs about what globals are use
2014-01-30 13:40:01 +01:00
Bjoern Schiessle f9d9a62e58 remove needless element tag 2014-01-30 13:34:41 +01:00
Vincent Petry 63cca35baa Added core unit tests for basename and dirname
Note that it doesn't work 100% like the PHP functions so the tests
have TODO comments to fix those core functions eventually.
2014-01-30 13:22:16 +01:00
Vincent Petry f7ac9f8069 Fixed unit test scripts + coverage
Tried to add more apps (others break).
"preprocessors" is now populated automatically based on the tested apps.
2014-01-30 11:56:14 +01:00
Vincent Petry bc598f1919 Updated unit tests for rename action
- rename action is now checked inside of ".nametext" element
- added test to ensure that display() correctly resets all actions
  including the rename one
2014-01-30 10:07:08 +01:00
raghunayyar 85e67be0aa Rename action now appears as pencil icon 2014-01-30 10:07:08 +01:00
Raghu Nayyar 299a8285bd Merge pull request #6278 from nickvergessen/issue/6263
[issue/6263] layout.user.php code is not valid markup
2014-01-29 10:42:17 -08:00
Jan-Christoph Borchardt 271088a7a2 Merge pull request #6777 from owncloud/mobile-style
Mobile style for public links: files, folders, picture sets
2014-01-29 09:17:02 -08:00
Jan-Christoph Borchardt edea7781b7 make header scroll up for single shares, more view of content on small screens 2014-01-29 17:20:55 +01:00
Tigran Mkrtchyan 8cc9727520 mount: make location of mount.json configurable
do not share users data with config files

Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
2014-01-29 17:14:23 +01:00
Thomas Müller 7655728ddf - adding class to header div: share-folder or share-file
- for supported previews are shown with a size of 500px; icons with a size of 128px
2014-01-29 16:52:30 +01:00
Morris Jobke afa00318bc Merge pull request #6900 from owncloud/files-errormessagewhentargetfoldermissing
Added error message for when target folder was removed
2014-01-29 07:48:50 -08:00
Robin Appelman 4e2b52a376 merge master into fileinfo 2014-01-29 16:33:27 +01:00
Jan-Christoph Borchardt f5f918b8bf Merge pull request #6903 from owncloud/fix-ms-office-icons
Add/fix Microsoft Office file icons.
2014-01-29 07:31:25 -08:00
Morris Jobke c65fac092d Merge pull request #6995 from jbtbnl/master
Add white color variant of checkmark icon
2014-01-29 06:32:34 -08:00
Jan-Christoph Borchardt 5a869732d1 adjust file type icon placement for when no preview can be generated 2014-01-29 15:28:57 +01:00
Bjoern Schiessle 229f13adc0 change order of issubdirectory() calls to avoid error messages for non-apps 2014-01-29 14:40:59 +01:00
Pellaeon Lin 929c930b0a Use $storageInfo['free'] 2014-01-29 21:24:31 +08:00
jbtbnl f798ad9a20 Add white color variant of checkmark icon 2014-01-29 13:47:37 +01:00
Vincent Petry 58c7042e70 Added error message for when target folder was removed
Whent trying to upload/rename/create files in a folder that was removed
or rename, the correct error message is now shown.

In the case of upload of multiple files, the upload is cancelled.

This situation can happen if the target folder was renamed or removed
from another browser window or client.
2014-01-29 12:46:11 +01:00
Björn Schießle 609d5f2458 Merge pull request #6987 from owncloud/share_api_and_encryption
[ocs share api] public upload is also possible with encryption enabled, since OC6
2014-01-29 02:50:25 -08:00
Jan-Christoph Borchardt d310df505c permanently show download action on mobile, only icon 2014-01-29 11:43:34 +01:00
Vincent Petry a2b79ead2d Merge pull request #6990 from owncloud/files-fixrenamewarnings
Fix warnings in logs when renaming over the web UI
2014-01-29 02:21:30 -08:00
Jan-Christoph Borchardt 8f81f007cd fix horizontal scrollbar appearing when footer is too long, footer wraps now 2014-01-29 11:06:19 +01:00
Martial Saunois 0f1c587e6b The regexp of the Freebox user agent is now more strict.
A new unit test has been added in consequence.
2014-01-29 10:58:34 +01:00
Jan-Christoph Borchardt 13ed59c1cf merge master into mobile-style 2014-01-29 10:55:44 +01:00
Vincent Petry e6f93fc841 Fix warnings in logs when renaming over the web UI
The determineIcon() method was expecting attributes to be set which
caused warnings about undefined indices in the error log.

This fix pre-initializes the array with 'directory' and
'isPreviewAvailable' to make them disappear.
2014-01-29 10:43:13 +01:00
Morris Jobke cf2c061f1f Merge pull request #6929 from owncloud/sharing-fixfiledownloadlink
Sharing fixfiledownloadlink
2014-01-29 00:39:14 -08:00
Martial Saunois 8507efc427 Unit tests added for the new Freebox user agent. 2014-01-28 21:08:27 +01:00
Bjoern Schiessle cd4e044f66 public upload is also possible with encryption enabled, since OC6 2014-01-28 17:28:20 +01:00
Thomas Müller 75c8d74c94 Merge pull request #6979 from owncloud/share_api_error_codes
[ocs share api] use error code 403 if sharing is not permitted
2014-01-28 07:28:07 -08:00
Bjoern Schiessle 7f83f2a8f2 use more accurate error codes 2014-01-28 13:31:43 +01:00
VicDeo 0a77d41178 Merge pull request #6965 from owncloud/unused-free-space
Remove unused $freeSpace
2014-01-27 10:27:51 -08:00
Robin Appelman b590f019f6 Remove unused $freeSpace 2014-01-27 16:51:32 +01:00
Thomas Müller ab9ddda8f2 Merge pull request #6907 from owncloud/webdav-logexceptions
Added exception logger plugin for sabre connector
2014-01-27 07:48:40 -08:00
Robin Appelman 20c2aaab00 Actually rename the variable 2014-01-27 16:26:54 +01:00
Robin Appelman c8207312c7 Fix phpdoc 2014-01-27 16:00:10 +01:00
Robin Appelman 3c1ab66eda Reuse the calculated free_space in buildFileStorageStatistics 2014-01-27 15:56:57 +01:00
Robin Appelman a521949baf Allow passing a root folder to get the used space from in the quota wrapper 2014-01-27 15:41:56 +01:00
Morris Jobke 25305a535b Merge pull request #6958 from owncloud/localised_date
use localised date in notification mails
2014-01-27 04:54:30 -08:00
Morris Jobke d182b4f59f Merge pull request #6927 from owncloud/enc_dont_reload_page_on_decrypt
remove the form, it isn't needed here
2014-01-27 04:30:06 -08:00
Morris Jobke b4d11df843 Merge pull request #6930 from jcfischer/master
Add 'mail_from_address' configuration
2014-01-27 04:27:35 -08:00
Morris Jobke 6ee1250d27 Merge pull request #6933 from seberm/master
Add check for apc.enabled option
2014-01-27 04:25:31 -08:00
Morris Jobke 0a1708ba11 Merge pull request #6912 from owncloud/replace-webroot-in-css
Remove %webroot% from CSS
2014-01-27 04:11:15 -08:00
Bjoern Schiessle 2bb13a8db9 use localised date in notification mails 2014-01-27 12:47:54 +01:00
Vincent Petry 11ef12a106 Added exception logger plugin for sabre connector
Whenever an exception occurs in the sabre connector code or code called
by it, it will be logged.

This plugin approach is needed because Sabre already catches exceptions
to return them to the client in the XML response, so they don't appear
logged in the web server log.

This will make it much easier to debug syncing issues.
2014-01-27 11:40:17 +01:00
Jan-Christoph Borchardt 46745895ae Merge pull request #5153 from owncloud/core-em-to-px
Cleans up Core apps for relative(em) to absolute(px) styles.
2014-01-27 02:29:47 -08:00
Jan-Christoph Borchardt 6fbc73e673 Merge pull request #5152 from owncloud/files-em-to-px
Converts em to px values for styles in Files.
2014-01-27 02:28:01 -08:00
Björn Schießle 1d3da8b0ed Merge pull request #6916 from owncloud/encryption_update_filecache
[encryption] update file cache after the file was written
2014-01-27 01:37:52 -08:00
Martial Saunois c2ed8d5aa1 New user agent added for the Freebox.
The Freebox is the multimedia device of a french Internet provider: Free. This device provides a seedbox which uses the user agent "Mozilla/5.0". In the "Content-Disposition" header, if the "filename" key is used with the "filename*=UTF-8''" value, the seedbox does not take care about the header and saves the file name with the origin URL. This patch brings the support for the Freebox users.
2014-01-26 18:46:09 +01:00
raghunayyar 2a0e8329f9 Fixes settings.css and converts more styles. 2014-01-26 03:02:52 +05:30
raghunayyar 932e8f9f58 Fixes width of the dropdown menus as per computed styles. 2014-01-26 02:59:28 +05:30
Jan-Christoph Borchardt d94c9bc8da Merge pull request #6939 from owncloud/disable-password-autocomplete
prevent autofill for password change settings, prevent leak of existing password
2014-01-25 07:54:55 -08:00
Jan-Christoph Borchardt 150d3856a0 prevent autofill for password change settings, prevent leak of existing password, fix #6552 2014-01-24 18:58:56 +01:00
Jan-Christoph Borchardt c767ebcc03 fix multiselect bar being too short on big displays 2014-01-24 18:20:52 +01:00
Vincent Petry 3bea9b8ddd Merge pull request #6905 from owncloud/add_expiredate_to_linkshare
add expire date to link share if possible
2014-01-24 07:44:33 -08:00
Thomas Tanghus 5f610a1cbc Add missing slash in URLGenerator::getAbsoluteURL(). Refs. #6840 2014-01-24 16:40:32 +01:00
Jens-Christian Fischer 3ca85cd841 updated config.sample.php with mail_from_address parameter 2014-01-24 16:24:52 +01:00
Morris Jobke dff2675efa Merge pull request #6923 from owncloud/files-maxuploadfieldstylefix
Fixed max upload size input field style
2014-01-24 07:05:50 -08:00
Björn Schießle 6875e3d9c7 Merge pull request #6921 from owncloud/trash_mimetype_size
increase size of mimetype column
2014-01-24 07:05:18 -08:00
Robin Appelman 1ab7ca0a19 Fix some phpdoc errors and rename interface 2014-01-24 16:01:19 +01:00
Bjoern Schiessle 83878b9a7d only update file cache with the unenecrypted size when the file was written 2014-01-24 16:01:00 +01:00
Robin Appelman fc5f20112e Add isReadable, isUpdateable, isDeletable, isShareable 2014-01-24 15:54:40 +01:00
Pellaeon Lin 19675c2c9d Fix variable name 2014-01-24 22:54:16 +08:00
Morris Jobke 1fe60e435e Merge pull request #6184 from owncloud/6051-ux-files-Move-File-Spinner
#6051 [ux][files] Move File Spinner
2014-01-24 06:53:53 -08:00
Otto Sabart 2f8ebd03b0 Add check for apc.enabled option
Sometimes it's not possible to disable APC entirely and some of
apc_functions are disabled. Only thing which is possible is
to disable apc.enable option.
2014-01-24 15:52:28 +01:00
Vincent Petry 9f003a3546 Merge pull request #5954 from owncloud/extstorage-stream-sftp
[Ext storage] Now using SFTP stream wrapper from phpseclib
2014-01-24 06:20:23 -08:00
Jens-Christian Fischer 0f6c607171 added function documentation 2014-01-24 14:22:42 +01:00
Jens-Christian Fischer 506393090b Add 'mail_from_address' configuration
In environments where there are rules for the email addresses, the "from
address" that owncloud uses has to be configurable.

This patch adds a new configuration variable 'mail_from_address'.
If it is configured, owncloud will use this as the sender of *all*
emails. (OwnCloud uses 'sharing-noreply' and 'password-noreply' by
default). By using the 'mail_from_address' configuration, only this
email address will be used.
2014-01-24 14:04:37 +01:00
Vincent Petry c6695bbd76 Fixed download URL in public page
- Refactored download URL building to make it overridable
- Added download URL override in public page
- Added JS unit tests for download URL
- Added OC.redirect() method to facilitate unit testing
2014-01-24 13:38:39 +01:00
Vincent Petry 0671c58e36 Fixed filelist unit tests hidden params
Also added dummy table
2014-01-24 13:19:44 +01:00
Vincent Petry 41b6d4b702 Added OC.buidQueryString() utility function
Makes it possible to create query strings by passing a JavaScript hash
map and automatically encodes the keys and values.
2014-01-24 12:44:31 +01:00
Bjoern Schiessle 6bb27ea76b disable button and input field during decryption 2014-01-24 12:15:06 +01:00
Bjoern Schiessle 2a3cb7ac5b remove the form, it isn't needed here 2014-01-24 11:41:24 +01:00
Bjoern Schiessle 77de47858b add expire date to link share if possible 2014-01-24 10:46:08 +01:00
Thomas Müller 9fa788c452 Merge pull request #6736 from owncloud/tests-jsunittests
Added Javascript unit tests
2014-01-23 12:43:05 -08:00
Thomas Müller 269f24cf96 remove css files from rewrite rule - there is no need to rewrite css any more 2014-01-23 21:28:19 +01:00
Vincent Petry 4734146580 Fixed max upload size input field style
Added "type=text" makes it look like nice like all other fields
2014-01-23 20:50:09 +01:00
Thomas Müller 617aa3cf29 Instead of 'No preview available for ...' we simple display the mieme-type icon 2014-01-23 20:15:10 +01:00
Vincent Petry 5ad28f4d1f Allow getting info or renaming part files through WebDAV
When mounting an ownCloud (backend OC) inside another ownCloud (frontend
OC), the frontend OC will use WebDAV to upload file, which will create
part files. These part files need to be accessible for the frontend OC
to rename them to the actual file name.

This fix leaves the file cache untouched but gives direct access to part
file info when requested.

This means that part file can be accessed only when their path and name
are known. These won't appear in file listtings.

Fixes #6068
2014-01-23 18:42:56 +01:00
Bjoern Schiessle 28b6434f46 increase size of mimetype column 2014-01-23 18:28:59 +01:00
Jan-Christoph Borchardt 5956277ed4 Merge pull request #6234 from owncloud/change-email-by-enter
change mail address by pressing enter - fixes #6179
2014-01-23 08:03:22 -08:00
Jan-Christoph Borchardt 799e744ad7 remove background and width from multiselect bar, fix Download button not showing on mobile 2014-01-23 15:35:30 +01:00
Vincent Petry bf95532fb6 Removed unused writeBack method 2014-01-23 15:05:05 +01:00
Jan-Christoph Borchardt f0c9e8205f remove %webroot from files_sharing app 2014-01-23 14:04:13 +01:00
Morris Jobke 4b7dfd34f8 fix conflicts and add missing closing tag 2014-01-23 13:51:51 +01:00
Jan-Christoph Borchardt 809fb8482d remove %webroot% from files app 2014-01-23 13:11:08 +01:00
Jan-Christoph Borchardt 25e9b7a742 add icons.css file, first step to get rid of %webroot% 2014-01-23 12:55:39 +01:00
Vincent Petry 421f24868a Now using SFTP stream wrapper from phpseclib
- Upgraded phpseclib to master version (post 0.3.5)
- Now using fopen() on sftp URL for both read and write
- Fixes #4063
2014-01-23 12:43:12 +01:00
Björn Schießle 0daabe5b6a Merge pull request #6898 from owncloud/encryption_infinite_loop
[encryption] infinite loop on sharing
2014-01-23 01:09:34 -08:00
Andreas Fischer 96f194c0f6 Add icons for mdb and accdb files. 2014-01-23 03:06:14 +01:00
Andreas Fischer 47ea7704ca Fix icons for xml,ppt,dot,dotx files. 2014-01-23 02:46:05 +01:00
Andreas Fischer 689516ebd7 Remove duplicate mimetypes while keeping previous behaviour. 2014-01-23 02:23:20 +01:00
Andreas Fischer 6241655df4 Bring mimetype list into alphabetical order. 2014-01-23 02:15:42 +01:00
Thomas Müller ade726ad32 focus link text only on click in the input field - closes #6817 2014-01-23 01:08:42 +01:00
Thomas Müller f950ce82ae Merge branch 'master' into mobile-style
Conflicts:
	apps/files/js/files.js
	apps/files_sharing/css/public.css
	apps/files_sharing/js/public.js
	apps/files_sharing/templates/public.php
2014-01-23 00:39:11 +01:00
Bjoern Schiessle b489d6b0af fix infinite loop if folder and subfolder has the same name 2014-01-22 17:15:01 +01:00
Bjoern Schiessle eaed786eed add path relative to the files folder of the currently logged in user to the output of getFolderContent() 2014-01-22 17:11:37 +01:00
Robin Appelman 02aa44d055 Merge branch 'master' into memcache-public 2014-01-22 13:19:49 +01:00
Robin Appelman b578a3359e revert accidental 3rdparty commit 2014-01-22 13:19:39 +01:00
Robin Appelman 5a5b6f187e Use Cache->clear to cleanup the filecache for removed users 2014-01-22 13:00:45 +01:00
Nicolai Ehemann 99ad4e8000 switched zip file creation to ZipStreamer to create zip files directly in memory 2014-01-22 12:49:52 +01:00
Vincent Petry 0067b6c0c1 Added boldening of entries for readability 2014-01-22 12:04:24 +01:00
Vincent Petry 87c94d71ab Added explicit quota + encryption questions 2014-01-22 11:58:59 +01:00
Vincent Petry 1ba14ff848 Moved steps to reproduce to the top
This prevents people to put their steps into the "Expected" section.
It is better to first read the steps to find out how users reached the
issue, then see what was expected and actually happened.
2014-01-22 11:58:09 +01:00
Nicolai Ehemann 791772abea refactored/cleaned up lib/files.php
cleaned up get() logic
fixed get() to only send headers if requested (xsendfile could get in the way)
do no longer readfile() when already using mod_xsendfile or similar
2014-01-22 11:53:03 +01:00
Björn Schießle 4474421ada Merge pull request #6890 from owncloud/version_fix_array_order
[files_versions] fix array order
2014-01-22 02:52:30 -08:00
Morris Jobke cf6e79cda8 Merge pull request #6719 from tripflex/fix_pubup_progbar
Fix public upload progress bar
2014-01-22 02:28:28 -08:00
Bjoern Schiessle a567f74d86 fix array order 2014-01-22 11:13:15 +01:00
Bjoern Schiessle 8d36ddcf03 code clean-up 2014-01-22 11:10:32 +01:00
Bjoern Schiessle 0b89a45f11 fix size calculation of getAllVersions() 2014-01-22 11:10:23 +01:00
Robin Appelman 374e3475c9 Also remove the user's home storage from the storage table when deleting a user 2014-01-21 23:58:48 +01:00
Vincent Petry 9851727b0d Merge pull request #6856 from owncloud/fixing-gallery-password-protected-access-master
adding password protection check to getShareByToken()
2014-01-21 11:08:58 -08:00
Thomas Müller 9bab05fd45 Merge branch 'master' into fixing-gallery-password-protected-access-master 2014-01-21 19:36:20 +01:00
Thomas Müller 3b7fea25a3 Merge pull request #6863 from owncloud/versioning_expire_function_tests
Versioning expire function tests
2014-01-21 08:39:50 -08:00
Vincent Petry 91e66eeee1 Merge pull request #6868 from owncloud/enc-fixrandomfailunittest
Replaced time() with uniqid() to make sure the file name is unique
2014-01-21 08:35:41 -08:00
Jörn Friedrich Dreyer 0dd54a1250 Merge pull request #6844 from owncloud/fix-css-loading-master
Revert "use getAppWebPath() in here as well"
2014-01-21 08:31:22 -08:00
Jan-Christoph Borchardt f46e660737 do not check 'remember' log in by default 2014-01-21 17:02:59 +01:00
Thomas Müller 3a17220c9f Merge pull request #6858 from owncloud/fix-setupfs-only-for-existing-users-master
OC_Util::setupFS($user) will create a data dir for the given string - no...
2014-01-21 07:36:30 -08:00
Vincent Petry f09c19c316 Replaced time() with uniqid() to make sure the file name is unique
The cache isn't cleared properly because unlink() doesn't remove the
cache entry which caused side-effects when reusing the same file name
(which randomly happens when time() returns the same value)

This fix first makes sure the unit tests don't fail any more.
The unlink() case with the cache will be investigated separately.
2014-01-21 16:31:58 +01:00
Bjoern Schiessle 85269641db add first unit test for the versioning app 2014-01-21 16:22:08 +01:00
Bjoern Schiessle 9efd07fbab isolate getExpireList function to make it testable 2014-01-21 16:22:08 +01:00
Thomas Müller c57c9eae76 Merge branch 'master' into fixing-gallery-password-protected-access-master 2014-01-21 16:01:24 +01:00
Thomas Müller 262f221d11 Merge branch 'master' into fix-setupfs-only-for-existing-users-master 2014-01-21 15:35:32 +01:00
Thomas Müller 98415d68a5 Merge pull request #6864 from owncloud/protect-versions-preview-master
don't use the user id within the versions preview call as it could be us...
2014-01-21 06:16:22 -08:00
Thomas Müller 37e278f2a9 don't use the user id within the versions preview call as it could be used to access previews of another user 2014-01-21 13:50:56 +01:00
Thomas Müller 2e7fed1b9b Merge pull request #6861 from owncloud/neutral_download_zip_default_name
use 'download.zip' as default name for zip downloads instead of 'owncloud.zip'
2014-01-21 04:19:26 -08:00
Thomas Müller c9194f761f Merge pull request #6857 from owncloud/fix_user_ldap_sql_on_oracle
user workaround to compare CLOB column with CHAR value
2014-01-21 04:14:28 -08:00
Jörn Friedrich Dreyer 267e1f3c40 use 'download.zip' as default name for zip downloads instead of 'owncloud.zip' 2014-01-21 12:41:10 +01:00
Thomas Müller a3ea5aa2ac fixing comment + adding unit test for checkPasswordProtectedShare 2014-01-21 12:07:08 +01:00
Jörn Friedrich Dreyer 21832bc890 user workarount to compare CLOB column with CHAR value 2014-01-21 11:56:34 +01:00
Thomas Müller 23a4d0d44e OC_Util::setupFS($user) will create a data dir for the given string - no matter if the user really exists - OCP\JSON::checkUserExists($owner); introduces a ready to use check which will bail out with an JSON error 2014-01-21 11:32:30 +01:00
Thomas Müller 6746ad0a73 in case no share is found for the given token we can return right away 2014-01-21 10:55:10 +01:00
Thomas Müller 9fd4cb1b66 adding password protection check to getShareByToken() 2014-01-21 10:42:47 +01:00
Thomas Müller f29bd1cb0b adding code coverage support 2014-01-21 00:57:18 +01:00
Thomas Müller 0f794b6889 Merge pull request #6820 from owncloud/phpunit-test-config
Load a separate config (if present) when running unit tests
2014-01-20 12:14:09 -08:00
icewind1991 92d8db6f19 Merge pull request #6849 from owncloud/checkupdate-reuse
Reuse the data retrieved from the cache in checkUpdate
2014-01-20 10:37:18 -08:00
Vincent Petry ee30977383 Merge pull request #6851 from owncloud/files-fixtrashandversionrootsizecalc
When reading the size of "files" mountpoints need to be excluded
2014-01-20 09:28:49 -08:00
Myles McNamara 9555305565 change publicUploadButtonMock to public_upload
Changed jQuery selector for public preview to public_upload to correctly show preview
2014-01-20 11:58:01 -05:00
Jörn Friedrich Dreyer cdb7f40412 Merge pull request #6842 from owncloud/fix-quotes-again-master
Quote column names on adding description
2014-01-20 08:52:21 -08:00
Thomas Müller 4ec6debe2b remove unused variable 2014-01-20 17:27:03 +01:00
Vincent Petry ca57a849ff When reading the size of "files" mountpoints need to be excluded
The versions and trashbin app are now passing "includeMountPoints=false"
to "getFileInfo()" to make sure that the calculated total size doesn't
include mount points like Shared or external storage.

This is because the default call (legacy) used to return the size of
mount points as well.

Fixes #6731
2014-01-20 17:11:33 +01:00
Robin Appelman 3d6d8d1bb6 Reuse the data retrieved from the cache in checkUpdate 2014-01-20 15:21:21 +01:00
Vincent Petry 62dd58aa19 Merge pull request #6838 from owncloud/core-quotawrapperfailedfopenfix
Fixed quota wrapper to not wrap failed fopen streams
2014-01-20 05:29:27 -08:00
Robin Appelman 3971b12768 undo 3rdparty change 2014-01-20 14:20:01 +01:00
Robin Appelman 94504d7265 undo 3rdparty change 2014-01-20 14:18:10 +01:00
Robin Appelman 164915a3f8 Move test config folder to tests/config 2014-01-20 13:41:52 +01:00
Morris Jobke f88360eba3 Merge pull request #6827 from rnveach/fix_6730
Fix 6730
2014-01-20 01:44:34 -08:00
Thomas Müller 99e068761a adding a comment to the database schema 2014-01-20 10:17:31 +01:00
Thomas Müller 221e656e91 Revert "use getAppWebPath() in here as well"
This reverts commit 6254f0a403.
2014-01-20 10:10:34 +01:00
Thomas Müller 8e64909e99 Updating 3rdparty once more .... 2014-01-20 09:25:30 +01:00
Thomas Müller 39be83ca8b Merge pull request #6676 from aseques/check_internet_proxy
Fix internet detection to use OC_Util::getUrlContent
2014-01-19 12:08:55 -08:00
Vincent Petry 1af7dab535 Fixed quota wrapper to not wrap failed fopen streams
When calling fopen() on some storage types, these return false instead
of throwing an exception.

This fix makes sure that in case the stream wasn't opened (for example
when a file doesn't exist any more) the stream isn't wrapped.

Also added 'rb' as another case that doesn't need to be wrapped.

Fixes #6832
2014-01-19 18:51:36 +01:00
Vincent Petry f354717c4c Merge pull request #6819 from owncloud/files-ispreviewenabledwarningfix
Fixed isPreviewAvailable warnings in log
2014-01-19 04:48:12 -08:00
Morris Jobke 80dead5a9f fix double call of changeEmailAddress() 2014-01-18 22:59:49 +01:00
kondou fea1cc82e8 Keep the EOF-Newline 2014-01-18 17:51:41 +01:00
Morris Jobke 903b330ccc Merge pull request #6721 from tsumi/patch-1
Added SVG fallback to apps settings popup
2014-01-18 08:34:45 -08:00
Morris Jobke 3a2e03a7f0 Merge pull request #6784 from owncloud/fix-activation-of-unknown-apps
Fix activation of unknown apps
2014-01-18 08:13:57 -08:00
Morris Jobke 419d2d27e8 Merge pull request #6818 from owncloud/add_documentation_to_appinfo
Allow app developers to add documentation links to the appinfo
2014-01-18 08:09:07 -08:00
Nicolai Ehemann 66aa9b4e27 lib/files.php: make use of === instead of == 2014-01-18 15:16:17 +01:00
Morris Jobke ce0cbbd7bc remove comment & add space 2014-01-18 14:22:56 +01:00
raghunayyar 9edbd142a2 Removes Bogus Styles. 2014-01-18 00:46:06 +05:30
rnveach a41440436c added trigger to redo selection text on a directory change 2014-01-17 11:49:00 -05:00
rnveach 90a41ef26a fixed selector string and removed all checkbox if it was selected 2014-01-17 11:46:44 -05:00
Bjoern Schiessle 80d871ab1e added website field 2014-01-17 16:35:48 +01:00
Morris Jobke f0a5007e9a fix input element closing tag 2014-01-17 16:32:01 +01:00
Bjoern Schiessle e2de3b8337 distinguish app links from doc links 2014-01-17 16:08:32 +01:00
Jan-Christoph Borchardt b291fb9cd7 make sure there's enough room for the file actions 2014-01-17 15:47:26 +01:00
Bjoern Schiessle bf0471a92e show link to app documentation 2014-01-17 14:56:25 +01:00
Bjoern Schiessle 1df6bf997a add link to documentation 2014-01-17 14:56:15 +01:00
Bart Visscher 21426b7ff6 Fixed doctrine code 2014-01-17 14:54:13 +01:00
Robin Appelman 5cb08bb9cb Merge branch 'master' into fileinfo
Conflicts:
	tests/lib/files/cache/cache.php
2014-01-17 14:47:29 +01:00
Jan-Christoph Borchardt 3e803b5e36 restrict zooming on mobile devices for the publicly accessible, optimized pages 2014-01-17 14:41:05 +01:00
Robin Appelman 6b4c3df087 Load a separate config (if present) when running unit tests 2014-01-17 14:40:48 +01:00
Thomas Müller db353e14cc Merge pull request #6812 from owncloud/tests-fixcachesyntaxforoldphp
Fix array access syntax for older PHP
2014-01-17 05:39:08 -08:00
Robin Appelman 299bb4d99d remove more is_array from encryption 2014-01-17 14:38:14 +01:00
Vincent Petry f4c198b907 Fixed isPreviewAvailable warnings in log
isPreviewAvailable wasn't always set as the files formatting code is
slightly different than the one from the files app.

Fixes #6423
2014-01-17 14:22:05 +01:00
Robin Appelman 642d8e370e Dont use php5.4 only features 2014-01-17 13:32:38 +01:00
Jan-Christoph Borchardt 1d380a2011 optimize size of toggle icons 2014-01-17 13:28:25 +01:00
Vincent Petry 21d32d8a9e Merge pull request #6810 from kofemann/for-upstream
webdav: return SPACE_UNKNOWN if server do not support quota
2014-01-17 04:09:53 -08:00
Robin Appelman ec7c339930 Don't use is_array on FileInfo 2014-01-17 12:56:17 +01:00
Vincent Petry 4d4bbbda3a Merge pull request #6807 from owncloud/enc_updated_description
updated description of the files encryption app
2014-01-17 03:54:09 -08:00
Jan-Christoph Borchardt ccadab96a6 add icons for file list and picture view toggles 2014-01-17 12:51:13 +01:00
Vincent Petry 23e6578601 Fix array access syntax for older PHP
There was a syntax error when running tests in PHP 5.3.10.
2014-01-17 12:31:22 +01:00
Thomas Müller 817b49af58 don't enable files_external tests 2014-01-17 12:07:27 +01:00
Tigran Mkrtchyan a78dc11732 webdav: return SPACE_UNKNOWN if server do not support quota
Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
2014-01-17 11:45:26 +01:00
Bjoern Schiessle 6b69c52037 updated description of the files encryption app 2014-01-17 11:08:49 +01:00
Konstantin.Popov 9d355f2124 remove fix for IE9 nav bar width 2014-01-17 13:41:51 +04:00
Pellaeon Lin 4726a2021b Add $freeSpace and $uploadLimit to files_sharing 2014-01-17 17:10:42 +08:00
raghunayyar 4f593f99b6 Removes Bogus classes from previous commits. 2014-01-16 23:35:30 +05:30
Vincent Petry 350214c609 Added Javascript unit tests
- added karma utility to run jasmine unit tests
- added Sinon library (for stubs/mocks/fakeserver)
- added a few unit tests for core and files
- added autotest-js.sh script
2014-01-16 17:12:29 +01:00
raghunayyar 12e5d0f68d Fixes typos, adds ; wherever not present. 2014-01-16 21:06:14 +05:30
raghunayyar b7b83377c5 Fixes header going down in trash bin app. 2014-01-16 21:00:57 +05:30
Jan-Christoph Borchardt d463edaf09 on mobile, show single shared image at full width without margin 2014-01-16 15:56:18 +01:00
Jan-Christoph Borchardt 5cdab5fff3 show publicly shared image on full width, without margin 2014-01-16 15:32:23 +01:00
Jan-Christoph Borchardt c0590676a0 fix public share download button width 2014-01-16 15:28:39 +01:00
Morris Jobke 16033c8123 Merge pull request #6264 from owncloud/files-draggabledestroy
Fix to not destroy draggable when no draggable was set
2014-01-16 05:52:43 -08:00
Robin Appelman 504645cf00 Add bindParam to statement wrapper 2014-01-16 14:07:16 +01:00
Bjoern Schiessle d36da7e43a use appstoreenabled config switch 2014-01-16 12:58:17 +01:00
Pellaeon Lin 6ec50e4b0c Comments to clarify 2014-01-16 19:48:46 +08:00
Björn Schießle 45709937af Merge pull request #6786 from wakeup/master
Fix untranslated text when deleting user
2014-01-16 03:22:55 -08:00
Björn Schießle 32e941a2bc Merge pull request #6644 from ben-denham/unshare-all-fix
\OCP\Share::unshareAll() fix
2014-01-16 03:13:26 -08:00
Vincent Petry 2233aa2a04 Fixed files row height in Firefox/KDE
Firefox is using native checkboxes and in KDE the checkboxes have a
bigger height which caused the row height to increase and be misaligned
with the date column.

This fix makes the checkbox absolute to prevent it to influence the row
height.
2014-01-16 12:05:05 +01:00
Pellaeon Lin cd6ab29313 Use t() 's native method 2014-01-16 17:51:00 +08:00
raghunayyar fd49d3c5c5 Fixes typo in versions.css 2014-01-16 14:45:23 +05:30
raghunayyar 775e08e0ee Merge branch 'master' into core-em-to-px
Conflicts:
	apps/files_sharing/css/public.css
	apps/user_ldap/css/settings.css
	core/css/multiselect.css
	core/css/share.css
2014-01-16 14:42:37 +05:30
raghunayyar f975fd5499 Fixes Trashbin and Files Style Conflicts, more em to px conversions post rebase 2014-01-16 14:23:39 +05:30
Myles McNamara 62040fe2d2 change em to px 2014-01-15 17:06:48 -05:00
Volkan Gezer 97b0840bbe Fix untranslated text when deleting user
This should fix issue #6728
2014-01-15 18:40:04 +01:00
Thomas Müller 5730e05a14 properly handle app activation for unit testing 2014-01-15 17:12:42 +01:00
Thomas Müller 7f68497b39 error handling in case a requested app doesn't exists 2014-01-15 17:11:29 +01:00
Vincent Petry bd643c47f3 Merge pull request #6223 from owncloud/extstorage-grantaccessasyncfix
Fixed Dropbox/Google storage async save call
2014-01-15 07:41:01 -08:00
Björn Schießle 5163e648f8 Merge pull request #6780 from owncloud/trash_bin_copy_recursively
copy files to owners trash recursively
2014-01-15 06:57:33 -08:00
Jan-Christoph Borchardt f0a3c2a0f4 Merge pull request #6779 from owncloud/sharing-breadcrumb-folder-name
Show the name of the shared folder in the breadcrumb when viewing a publicly shared folder
2014-01-15 06:56:59 -08:00
Jan-Christoph Borchardt 3e7cf4110d tweak color and position of username in public share 2014-01-15 15:49:42 +01:00
Jan-Christoph Borchardt 5f95356592 remove unused log icon 2014-01-15 15:48:42 +01:00
Jan-Christoph Borchardt db837bf696 improvements to public files mobile view 2014-01-15 15:48:42 +01:00
Thomas Müller 50ae2ab14c add download button on single file share page 2014-01-15 15:31:27 +01:00
Thomas Müller b3a6683784 remove unused js code and css rules 2014-01-15 15:22:40 +01:00
Thomas Müller ce231c406d no new menu on public upload 2014-01-15 15:07:52 +01:00
Thomas Müller 6c76b4ba12 fixing preview generation 2014-01-15 15:07:24 +01:00
Thomas Müller 807b885a0e reuse file upload as used within files app - remove public upload button 2014-01-15 14:36:18 +01:00
Bjoern Schiessle 592ae16603 remove old code 2014-01-15 14:35:17 +01:00
Bjoern Schiessle f4179a3f5a don't try to encrypt/decrypt cache chunks or files in the trash bin 2014-01-15 14:29:33 +01:00
Bjoern Schiessle f11f65c6a5 copy files to owner trash recursively 2014-01-15 14:27:23 +01:00
Robin Appelman d279ddd9a2 Show the name of the shared folder in the breadcrumb when viewing a publicly shared folder 2014-01-15 13:36:14 +01:00
Robin Appelman 729210daa0 Merge branch 'master' into memcache-public
Conflicts:
	apps/user_ldap/lib/connection.php
2014-01-15 13:02:15 +01:00
icewind1991 d1f3f121d6 Merge pull request #6774 from owncloud/versions_update_cache
call getFileInfo to enforce a file cache entry for the new version
2014-01-15 03:57:22 -08:00
Thomas Müller b6dcc2e59c Merge pull request #3234 from owncloud/mjob-password-strength
Indicate password strength
2014-01-15 03:35:41 -08:00
Thomas Müller d4519125db Merge pull request #6744 from owncloud/fix_ocs_response_messages
keep response message
2014-01-15 03:17:24 -08:00
Bjoern Schiessle 76fa7bab63 call getFileInfo to enforce a file cache entry for the new version, fix #6286 2014-01-15 11:37:47 +01:00
Morris Jobke 5c1a9f35f1 Indicate password strength using strengthify
* uses zxcvbn
 * outsourced to separate jquery plugin
 * async loading
 * hide strength meter if input is empty
 * feedback if user enters weakest password
 * fade in and out
 * show tipsy with strength
 * Opera 12, IE8-10, FF 23, Chromium 29
2014-01-15 11:10:12 +01:00
Vincent Petry 34559ef114 Merge pull request #6768 from owncloud/scanner-use-storage-mtime
Use storage_mtime when determining if we can reuse cached data while scanning
2014-01-15 01:31:33 -08:00
raghunayyar d8eac2b9bc Merge branch 'master' into files-em-to-px
Conflicts:
	apps/files/css/files.css
2014-01-15 14:59:50 +05:30
tsumi f41255f652 Useless else removed
As suggested by @PVince81 : https://github.com/owncloud/core/pull/6721#issuecomment-32289922
2014-01-15 09:39:21 +01:00
Pellaeon Lin dbbbfee7de Fix namespace 2014-01-15 12:36:27 +08:00
Jan-Christoph Borchardt 072ef7f010 remove min-width rule to fix mobile views 2014-01-14 22:14:46 +01:00
Jan-Christoph Borchardt 2bdd014f83 first mobile style rules, hide extra columns in files view and scroll header 2014-01-14 22:14:06 +01:00
Robin Appelman 16b898ddb8 update another test 2014-01-14 20:19:05 +01:00
Vincent Petry 8135828b2e Fix to not destroy draggable when no draggable was set
When a dir has no delete permission, the draggable isn't initialized on
files. This fix makes sure we don't try to destroy a draggable when it
wasn't inited in the first place.

Fixes #6254
2014-01-14 19:17:23 +01:00
Bjoern Schiessle fc54335aff extended test to also check the status messages 2014-01-14 17:11:04 +01:00
Arthur Schiwon 25fecb4f25 typo, grammar 2014-01-14 16:33:18 +01:00
Arthur Schiwon 097b6b8be9 LDAP: only read config from database, if configID is given. Not what we want to do when on-the-fly-testing settings from the admin page 2014-01-14 16:33:09 +01:00
Arthur Schiwon bb6bad6b3c remove unused variables 2014-01-14 16:33:02 +01:00
Arthur Schiwon e4b7c6ef10 LDAP: fix TLS detection 2014-01-14 16:32:55 +01:00
Robin Appelman c01949ec0e Merge branch 'master' into fileinfo 2014-01-14 16:31:08 +01:00
Vincent Petry c3a0b0d7f3 Merge pull request #6704 from owncloud/encryptedfoldersizecalc
Fix calculated folder size to use unencrypted size
2014-01-14 07:20:16 -08:00
Robin Appelman 7e4c80fd60 use different value for mtime and storage_mtime in test 2014-01-14 15:13:21 +01:00
Robin Appelman 4113042c8f remove duplicate test class 2014-01-14 15:11:41 +01:00
Vincent Petry ab21c25e38 Merge pull request #6759 from owncloud/extstorage-smbtimezonefix
Fixed timezone issue with SMB storage
2014-01-14 06:03:24 -08:00
Björn Schießle a2a5ed3f4f Merge pull request #6767 from owncloud/sharing_error_messages
it is not an urgent error... a DEBUG message is enough at this point
2014-01-14 06:02:48 -08:00
Robin Appelman 203d5d01ca Use storage_mtime when determining if we can reuse cached data while scanning 2014-01-14 13:54:07 +01:00
Bjoern Schiessle fa7f53e89d it is not an urgent error... a DEBUG message is enough at this point 2014-01-14 13:38:41 +01:00
Thomas Müller 3c0e4a3bc6 Merge pull request #6752 from owncloud/silence-test-listener
no warnings within unlinkDir() within the TestCleanupListener
2014-01-13 15:47:39 -08:00
Andreas Fischer cb071a9f35 Merge pull request #6755 from owncloud/remove-ru_RU-master
remove ru_RU - it has bee removed from transifex

* owncloud/remove-ru_RU-master:
  remove ru_RU - it has bee removed from transifex
2014-01-14 00:44:34 +01:00
Vincent Petry 1eb5ebd58c Fixed timezone issue with SMB storage
Now forcing smbclient to also run on UTC
2014-01-14 00:37:57 +01:00
Bjoern Schiessle d1b47021f1 don't unshare on delete 2014-01-13 16:49:16 +01:00
Thomas Müller 92969052d7 remove ru_RU - it has bee removed from transifex 2014-01-13 16:41:10 +01:00
Vincent Petry 5e04b7f284 Merge pull request #6422 from ccerrillo/fixing-6301-external-mount-webdav-blank-files
Fixing Issue #6301 on master branch
2014-01-13 07:09:01 -08:00
Robin Appelman e706cf6c06 add Support for passing a FileInfo instance to View->putFileInfo 2014-01-13 15:57:49 +01:00
Frank Karlitschek 82c840b3e6 Merge pull request #6734 from st3so/redirectfix
fixing typo in redirection query string
2014-01-13 06:55:52 -08:00
Thomas Müller 70650a004a no warnings within unlinkDir() within the TestCleanupListener 2014-01-13 15:32:11 +01:00
Robin Appelman 82762bb462 remove ArrayAccess, JsonSerializable from the public part of FileInfo 2014-01-13 15:13:45 +01:00
Robin Appelman 39d2c18793 Extends phpdoc for \OCP\File\FileInfo 2014-01-13 14:42:14 +01:00
Robin Appelman 617acbd6f9 Add a FileInfo class which holds all info of a file and return that from getFileInfo, getDirectoryContent and search 2014-01-13 14:28:49 +01:00
Thomas Müller fcf6653e64 Merge pull request #6694 from owncloud/fix-email-template-l10n
fix email template l10n, emphasize filename
2014-01-13 04:34:28 -08:00
Bjoern Schiessle 6845860470 keep response message 2014-01-13 12:27:05 +01:00
st3so a2cae551f3 fixing typo in redirection query string 2014-01-12 15:49:32 +01:00
Lukas Reschke 85e00ad35a Merge pull request #6713 from owncloud/files-filenameescapingfixes
Fixed various file name escaping issues in core apps
2014-01-12 03:45:30 -08:00
Bart Visscher 2638fd4767 Postgresql needs the sequences adjusted after the inserts 2014-01-11 12:25:35 +01:00
Bart Visscher af3bedf985 Add option to remove all the tables from the destination database 2014-01-11 12:23:28 +01:00
Bart Visscher 1b7eb4dc6c Quote column names on insert 2014-01-11 12:22:23 +01:00
Georg Ehrke 6f21da12e8 encode imagePath and fix documentation of loadFromFile 2014-01-11 12:07:28 +01:00
tsumi 7c1649fc24 Added SVG fallback to apps settings popup
This fix issue of calendar app with IE8, see issue report for details:
https://github.com/owncloud/calendar/issues/291
2014-01-10 21:19:30 +01:00
Myles McNamara 97be32e2e8 modify js to move upload wrapper, modify css to match core values 2014-01-10 14:07:20 -05:00
Myles McNamara 9ebffd6635 remove extra upload controls 2014-01-10 14:03:55 -05:00
Myles McNamara 0802b662be fix upload button layout 2014-01-10 12:20:31 -05:00
Vincent Petry 1042733634 Fixed various file name escaping issues in core apps
- Refactored file tr lookup into FileList.findFileEl that uses
  filterAttr to avoid escaping issues in jQuery selectors
- Fixed versions and sharing app to properly escape file names in
  attributes
2014-01-10 15:02:26 +01:00
Joas Schilling 17c00f34d3 Add alt attribute for img elements 2014-01-10 10:19:08 +01:00
Joas Schilling d95cab632b Extend margin to avoid displaying a scrollbar 2014-01-10 10:17:19 +01:00
Joas Schilling 3ae17d0785 Fix unallowed child elements 2014-01-10 10:17:19 +01:00
Joan 2abea96462 Disabled internet checking as mentioned when in proxy mode 2014-01-10 09:33:35 +01:00
ben-denham 30f77f53d5 updated the unit test for OCP\Share::unshareAll() to verify that shares by all users are removed for an item. 2014-01-10 14:08:29 +13:00
Andreas Fischer acd81f6c69 Readd support for memcached_server config variable. 2014-01-10 00:57:40 +01:00
Andreas Fischer 320353c237 Add support for multiple memcached servers. 2014-01-10 00:57:34 +01:00
Vincent Petry 4faba49f0a Fix calculated folder size to use unencrypted size
The encrypted size was used when calculating folder sizes.
This fix now also sums up the unencrypted size and shows that one when
available.
2014-01-09 17:47:50 +01:00
Vincent Petry b24c21b00f Merge pull request #6687 from owncloud/sharing-fixpartfilehandling
Removed special handling of part files in shared storage rename
2014-01-09 06:16:43 -08:00
Robin Appelman 5d456c7cc2 Merge branch 'master' into memcache-public 2014-01-09 13:54:58 +01:00
Robin Appelman d50c7391d8 Use $server->getMemCacheFactory() in ldap connection 2014-01-09 13:54:50 +01:00
Thomas Müller e0dbc1b67e Merge pull request #6693 from owncloud/fixing-apache-login
Fixing apache login
2014-01-09 03:32:17 -08:00
Jan-Christoph Borchardt 76a7ae77a8 fix email template l10n, emphasize filename 2014-01-09 10:54:23 +01:00
Thomas Müller c3829dfa61 rename user-id to loginname to stay consistent 2014-01-09 10:29:21 +01:00
Thomas Müller 22bd69f75c set login name within apache auth backend 2014-01-09 10:28:24 +01:00
Thomas Müller 9b7c3a5c66 fixing PHPDoc and use cameCase names 2014-01-09 10:27:47 +01:00
blizzz d8b8abb429 Merge pull request #6681 from owncloud/userreport
add command line option to get user number statistics
2014-01-08 10:41:39 -08:00
Arthur Schiwon 4585b4ea3f Infowarning about 32bit 2014-01-08 19:41:10 +01:00
Vincent Petry 8eaa39f4e2 Removed special handling of part files in shared storage rename
This fixes the issue introduced by the transfer id which itself wasn't
taken into account by the shortcut code for part file in the shared
storage class.
2014-01-08 18:43:20 +01:00
Jan-Christoph Borchardt 0e7283ef39 Merge pull request #6686 from owncloud/fixes-6685-master
Fix ownCloud for php5.3.x
2014-01-08 07:33:12 -08:00
Thomas Müller e35bca1c26 Fix ownCloud for php5.3.x 2014-01-08 16:07:01 +01:00
Robin Appelman 5a2a0426a6 Also update the OCP\IServerContainer 2014-01-08 15:51:40 +01:00
Robin Appelman be7837402d get the memorycache factory from OCP\Server instead of a cache instance
this allows apps to specify a prefix to use
2014-01-08 15:18:12 +01:00
Thomas Müller 0bc0a60a93 Merge pull request #6680 from owncloud/core-preventunlinkstorageroot
Prevent deleting storage root
2014-01-08 05:32:36 -08:00
Arthur Schiwon d7cb5ab080 add tests for user counting 2014-01-08 13:26:48 +01:00
Arthur Schiwon cb6a3e2617 if backends have the same class name, sum their users up instead of overwriting 2014-01-08 13:24:28 +01:00
Vincent Petry f642ad3961 Prevent deleting storage root
Storage mount points are not deletable, so make sure that the unlink
operation and its hooks aren't run in such cases.

Note that some storages might recursively delete their contents when
calling unlink on their root. This fix prevents that as well.
2014-01-08 13:17:36 +01:00
Thomas Müller bb443ae937 Merge pull request #6515 from owncloud/autotest-enforcephpunitversion
Enforce required phpunit version
2014-01-08 03:30:05 -08:00
Arthur Schiwon 677d83d45f LDAP: add tests for countUsers 2014-01-08 12:24:29 +01:00
Arthur Schiwon 53498bc876 remove unnecessary line 2014-01-08 12:20:56 +01:00
Arthur Schiwon b669e1a3c1 LDAP: implement userCount action. This required to (finally) clean up and refactor the search method, which will have a positive performance impact on paged search. 2014-01-08 12:07:57 +01:00
Vincent Petry 5f11bdfe08 Merge pull request #6675 from owncloud/disable-mod_pagespeed
turn off mod_pagespeed
2014-01-08 02:52:03 -08:00
Thomas Müller a8d20e0919 Merge pull request #5238 from owncloud/externalstorage-owncloudbackend
Added ownCloud backend for external storage
2014-01-08 01:49:15 -08:00
Thomas Müller 4c93b00990 Merge branch 'master' into disable-mod_pagespeed 2014-01-08 10:19:16 +01:00
Thomas Müller eac9c45fed Merge pull request #6677 from owncloud/fixing-3rdparty-submodule
Fix submodule 3rdparty - translation sync broke that
2014-01-08 01:16:38 -08:00
Vincent Petry 1614ad42b3 Merge pull request #6673 from owncloud/master-quota-insufficientstorageforfilesfix
Now also preventing to override "files" dir size with -1
2014-01-08 00:55:11 -08:00
Thomas Müller b1dfc514e2 Fix submodule 3rdparty - translation sync broke that 2014-01-08 09:42:37 +01:00
Thomas Müller 5eef107344 turn off mod_pagespeed 2014-01-08 07:56:08 +01:00
Jenkins for ownCloud 6be2dee5bc [tx-robot] updated from transifex 2014-01-08 01:55:41 -05:00
Jörn Friedrich Dreyer f356894aa3 Merge pull request #6594 from owncloud/kill-index.php-from-url
Kill index.php from url
2014-01-07 22:28:58 -08:00
Thomas Müller a7d0ab96c1 Merge pull request #6565 from owncloud/enable-ldap-unit-tests-master-2
enable ldap tests
2014-01-07 22:27:47 -08:00
eduardo 428d2b6e0f Remove unused spaces 2014-01-08 00:16:37 -02:00
eduardo 938ece1a3f Remove name from code 2014-01-08 00:15:08 -02:00
Arthur Schiwon bc1235d325 Add command line tool to show numbers of users and user directories 2014-01-07 23:06:37 +01:00
Arthur Schiwon 1e1ced7772 Introduce user count action to user management 2014-01-07 23:05:37 +01:00
Vincent Petry 5be4af9f51 Now also preventing to override "files" dir size with -1
Fixes #6526
2014-01-07 22:34:01 +01:00
Thomas Müller b6474506eb Merge pull request #6660 from owncloud/fixing-disabled-function-checks
Fixing disabled function checks
2014-01-07 11:10:45 -08:00
Thomas Müller 2d5427efa9 Merge pull request #6290 from owncloud/files-androidcontentdisposition
Files androidcontentdisposition
2014-01-07 11:06:20 -08:00
Thomas Müller 09d7882571 trimming all array elements 2014-01-07 19:47:01 +01:00
Thomas Müller f2fbfbc665 Merge pull request #6642 from owncloud/update-SabreDAV
Update sabre dav to 1.7.9
2014-01-07 08:04:13 -08:00
Thomas Müller 3abe4c3e88 Merge pull request #6663 from owncloud/fix_empty_mimetypes
remove duplicate exe mimetype, add correct msi mimetype
2014-01-07 07:31:12 -08:00
Thomas Müller e0bd7e145c Remove @ in order to get proper error handling 2014-01-07 16:24:05 +01:00
Jörn Friedrich Dreyer 9404a8f40c remove duplicate exe mimetype, add correct msi mimetype 2014-01-07 15:51:08 +01:00
Thomas Müller 9d869ab596 we shall explode on ',' only 2014-01-07 14:53:02 +01:00
Thomas Müller 07a84aa5eb reuse existing helper function OC_Helper::is_function_enabled 2014-01-07 14:52:18 +01:00
Thomas Müller 970eed2867 Merge pull request #6530 from owncloud/prevent-corruption-on-parallel-upload-master
Adding a random postfix to the part file.
2014-01-07 03:25:26 -08:00
Thomas Müller ed469a7d2c in order to work properly with encryption ocTransferId is added to the file path - questionable usage of magic string 2014-01-07 11:53:33 +01:00
Jenkins for ownCloud d2f2645a6a [tx-robot] updated from transifex 2014-01-07 01:56:11 -05:00
tomneedham 5c3c379f35 Merge branch 'fix-5388-master' into migration_unit_tests 2014-01-07 00:40:36 +00:00
tomneedham 528ff25ede Add WIP unit test for migration 2014-01-07 00:38:27 +00:00
Robin Appelman 4d65a80892 Remove the static dependency on OC_Util from Memcache 2014-01-06 13:11:38 +01:00
Robin Appelman cd147bb37a Use APCIterator for Memcache\APC::clear() 2014-01-06 12:58:43 +01:00
Robin Appelman 1df1b55b66 expose memory cache in public api 2014-01-06 12:55:56 +01:00
Jenkins for ownCloud 0e843b9d7d [tx-robot] updated from transifex 2014-01-06 01:55:59 -05:00
ben-denham baccc8f584 Unshare all will now delete all shares for the item, instead of only for a single owner. 2014-01-06 11:14:43 +13:00
Thomas Müller fc79662eca reference 3rdparty branch with SabreDAV 1.7.9 installed using composer 2014-01-05 21:49:50 +01:00
Thomas Müller 214aecac78 require composer's autoload.php if present 2014-01-05 21:49:08 +01:00
Morris Jobke ce3df44699 Merge pull request #6031 from s0taka/master
No decimal points for Kilobyte and Byte #5371.
2014-01-05 11:52:10 -08:00
eduardo 569851fa0e Add tabs to conformance with owncloud code standards 2014-01-05 12:38:54 -02:00
Thomas Müller e2d739fa21 Merge pull request #6580 from monreal/master
Silence output of 'which' command used in smbclient detection
2014-01-05 04:32:30 -08:00
Jenkins for ownCloud e4616199df [tx-robot] updated from transifex 2014-01-05 01:55:53 -05:00
eduardo d258ade35e Fix PostgreSQL port configuration on install 2014-01-04 19:23:25 -02:00
tomneedham 1824ae1222 Merge branch 'master' into fix-5388-master 2014-01-04 13:46:08 +00:00
Jenkins for ownCloud aaa48576ee [tx-robot] updated from transifex 2014-01-04 01:55:57 -05:00
icewind1991 f016a3ead3 Merge pull request #6610 from owncloud/apcu-clear
Fix APCIterator syntax in \OC\Memcache\APCu::clear
2014-01-03 05:30:49 -08:00
Thomas Müller 1ce45713bd Merge pull request #6605 from owncloud/free_space_disabled
Return SPACE_UNKNOWN if disk_free_space is disabled
2014-01-02 08:19:52 -08:00
Thomas Müller 27d7fff580 Merge pull request #6609 from owncloud/avatar-test-user
Make OC_Avatar unit tests independent of currently loggedin user
2014-01-02 07:50:29 -08:00
Robin Appelman 83f968ace2 Fix APCIterator syntax in \OC\Memcache\APCU::clear
see http://www.php.net/manual/en/apciterator.construct.php
2014-01-02 16:12:56 +01:00
Robin Appelman 6f6c3d1e44 Make OC_Avatar unit tests independent of currently loggedin user 2014-01-02 16:08:08 +01:00
icewind1991 14e0b1b6d1 Merge pull request #6513 from owncloud/user-no-change-displayname
Re-add the config options to remove the ability for users to change their displayname
2014-01-02 05:04:27 -08:00
Robin Appelman 25370fcb82 Return SPACE_UNKNOWN if disk_free_space is disabled when getting the free space on a local storage 2014-01-02 13:19:10 +01:00
Jenkins for ownCloud 095f9b8ee0 [tx-robot] updated from transifex 2014-01-02 01:56:21 -05:00
Thomas Müller 25a9311e94 Merge pull request #6601 from AdamWill/pimple-include
don't specify path to 3rdparty directory when registering Pimple autoloader
2014-01-01 15:25:58 -08:00
Thomas Müller ac3f83ca0d Merge pull request #6598 from lolozere/master
Add support mimetype
2014-01-01 15:25:28 -08:00
Adam Williamson 9b4a827e0b don't specify path to 3rdparty directory when registering Pimple autoloader
The core 3rdparty directory is in the include_path from lib/base.php anyway, so this is unnecessary, and causes problems for downstream distributors who unbundle Pimple.
2014-01-01 09:52:19 -08:00
lolozere d5382ac05d Add support mimetype
Add support mimetype for extension .sh, .bash and .sh-lib
2014-01-01 14:09:02 +01:00
Niklas Sombert 4c179850ab Revert "Added support for extra backends (see pull request #5043)"
This reverts commit 2d75914f2a, reversing
changes made to 760fa9ea30.
2014-01-01 13:43:23 +01:00
Niklas Sombert 2d75914f2a Added support for extra backends (see pull request #5043)
Somebody had forgotten "OC_User::setupBackends();"...
2014-01-01 11:53:27 +01:00
Thomas Müller 6254f0a403 use getAppWebPath() in here as well 2013-12-31 15:12:17 +01:00
Thomas Müller ae5671d281 new config parameter 'front_controller_active' which will instruct the url generator to generate urls without index.php 2013-12-31 14:36:02 +01:00
Thomas Müller 988710b0fc avoid conflict with physical file config.js 2013-12-31 14:34:28 +01:00
Jenkins for ownCloud 760fa9ea30 [tx-robot] updated from transifex 2013-12-31 01:55:42 -05:00
Jenkins for ownCloud 9ea9638490 [tx-robot] updated from transifex 2013-12-30 01:55:38 -05:00
Jenkins for ownCloud e345f3f511 [tx-robot] updated from transifex 2013-12-29 01:55:36 -05:00
Jenkins for ownCloud 71c829f92a [tx-robot] updated from transifex 2013-12-28 01:55:35 -05:00
Michael Monreal f52a9e5e42 Silence output of 'which' command used in smbclient detection 2013-12-27 18:10:47 +01:00
Jenkins for ownCloud 64a001edab [tx-robot] updated from transifex 2013-12-27 01:55:35 -05:00
Jenkins for ownCloud 7b2f4b08ac [tx-robot] updated from transifex 2013-12-26 01:55:34 -05:00
Jenkins for ownCloud dbfe313a63 [tx-robot] updated from transifex 2013-12-25 01:55:35 -05:00
Thomas Müller 97031ba45c Merge pull request #6520 from owncloud/tests-testcleanuplistener
Added test cleanup listener to detect untidy tests
2013-12-24 14:27:39 -08:00
Thomas Müller efdeba7416 Merge pull request #6449 from owncloud/core-appsorderfix
Fixed apps loading order
2013-12-24 14:26:11 -08:00
Thomas Müller a87a18d56c Merge pull request #6561 from syncloud/master
Made admin password field required on client side
2013-12-24 14:25:01 -08:00
Thomas Müller dcded92c3e enable ldap tests 2013-12-24 22:21:50 +01:00
Bart Visscher 4e1a3f212f Review points 2013-12-24 13:44:35 +01:00
Bart Visscher 202e26647e Inject config object 2013-12-24 13:36:32 +01:00
Thomas Müller 6523960de9 Merge pull request #6554 from owncloud/fix_5982
fix preview for reshared file
2013-12-24 04:03:20 -08:00
Jenkins for ownCloud dbbd99db09 [tx-robot] updated from transifex 2013-12-24 01:55:40 -05:00
Frank Karlitschek 7b428f6009 Merge pull request #6460 from owncloud/remove-numRows
Remove OC_DB_StatementWrapper::numRows()
2013-12-23 03:38:56 -08:00
Vladimir Sapronov cef39243f8 Made password field required on client side
Fix for case described in https://github.com/syncloud/owncloud-setup/issues/19
2013-12-22 17:43:50 -05:00
Georg Ehrke c90e3e4f5b fix preview for reshared file 2013-12-22 20:27:38 +01:00
Jenkins for ownCloud f60ecfc7fd [tx-robot] updated from transifex 2013-12-22 01:56:05 -05:00
Andreas Fischer 4bc2a22317 Remove all uses of numRows(). 2013-12-21 19:56:14 +01:00
Andreas Fischer 63a2bea7ec Remove OC_DB_StatementWrapper::numRows().
Using this method will result in an unneccesary extra SQL query (which also may
return an incorrect result because the underlying table changed in the
meantime).

In general:

If you are performing an UPDATE, DELETE or equivalent query,
OC_DB_StatementWrapper::execute() will already give you the number of
"affected rows" via \Doctrine\DBAL\Driver\Statement::rowCount(). This will
not work for SELECT queries, however.

If you want to know whether a table contains any rows matching your condition,
use "SELECT id FROM ... WHERE ... LIMIT 1".

If you want to know whether a table contains any rows matching your condition
and you also need the data, use "SELECT ... FROM ... WHERE ...", then use
one of the fetch() methods.

If you want to count the number of rows matching your condition, use use
"SELECT COUNT(...) AS number_of_rows FROM ... WHERE ...", then use one of the
fetch() methods.
2013-12-21 19:36:14 +01:00
nhirokinet c2e2c59ca7 Update user.php to fix duplicate session-duplicate 2013-12-22 01:31:04 +09:00
Jenkins for ownCloud cd26631a6d [tx-robot] updated from transifex 2013-12-21 01:56:13 -05:00
Vincent Petry c6377e9125 Fixed apps loading order
On SQLite the app order can be arbitrary and cause strange bugs.
On MySQL, the app order seems to be always alphabetical.

This fix enforces alphabetical order to make sure that all environments
behave the same and to reduce bugs related to app loading order.

Fixes #6442
2013-12-20 17:16:57 +01:00
Robin Appelman 0ed1b64673 Pass config object in testGetHomeNotSupported 2013-12-20 13:57:22 +01:00
Thomas Müller 1c0b8ed214 Adding a random postfix to the part file. 2013-12-20 13:48:46 +01:00
Bart Visscher ac85dea267 Fix migration import of user files 2013-12-20 12:22:49 +01:00
Bart Visscher 34fcf1e9d0 Wrap the import/export db in a wrapper to make it compatible with the old style 2013-12-20 12:09:19 +01:00
Frank Karlitschek dc45141f4a Merge pull request #6262 from nickvergessen/issue/4375
correctly mark app management active
2013-12-20 02:27:52 -08:00
Jenkins for ownCloud 371a476eb5 [tx-robot] updated from transifex 2013-12-20 01:57:49 -05:00
Vincent Petry 1c340444a4 Added test cleanup listener to detect untidy tests
After each test suite, detects whether there are stray datafiles, hooks
or proxies, then show a warning and clear them.
2013-12-19 20:18:09 +01:00
Björn Schießle 6a3e38266f Merge pull request #6507 from owncloud/enc_fix_getUser
[encryption] fix getUser Helper
2013-12-19 11:09:41 -08:00
Bjoern Schiessle 517a55a437 tests added 2013-12-19 19:43:57 +01:00
NARUKAWA Hiroki 068688063e Security Update: session fixation
Previous version is vulnerable to session fixation attack in some situations, guessing non-apache-module-php5 environment. Regeneration of session id should be done here.
2013-12-20 03:38:51 +09:00
Björn Schießle f0da7b20c1 Merge pull request #6517 from owncloud/fix_6510
[encryption] fix rename of shared files
2013-12-19 10:19:09 -08:00
Bjoern Schiessle 552d0a6feb check if the old owner and the old path is available 2013-12-19 18:40:40 +01:00
Vincent Petry 09bd5bd517 Added isUserAgent() method to request
- added isUserAgent() method to OC_Request which makes it possible to
  test it
- OC_Response::setContentDisposition now uses OC_Request::isUserAgent()
2013-12-19 18:40:22 +01:00
Andreas Fischer 526e873073 Merge pull request #6219 from leo-b/fix_router_deprecation
Symfonys addCollection() with multiple arguments is deprecated

* leo-b/fix_router_deprecation:
  Symfonys addCollection() with multiple arguments is deprecated, fix deprecation warning
2013-12-19 17:38:37 +01:00
Bjoern Schiessle 165542f27d fix rename of shared files 2013-12-19 17:29:38 +01:00
Vincent Petry 06dec2632f Merge pull request #6512 from owncloud/master-failingoracletests
Removed numRows usage from encryption app
2013-12-19 08:22:44 -08:00
Vincent Petry 51e1bd5d04 Enforce required phpunit version
This will prevent frustration and confusion when unit tests fail because
the wrong phpunit version was used
2013-12-19 16:47:17 +01:00
Björn Schießle 079f1a6f41 Merge pull request #6495 from owncloud/enc_fseek_fallback
Added fseek fallback to the encryption app
2013-12-19 07:09:07 -08:00
Bjoern Schiessle fe7fb66ef8 we can also have a path user/cache/... 2013-12-19 15:58:10 +01:00
Robin Appelman 321d961353 Merge branch 'master' into user-no-change-displayname 2013-12-19 15:57:04 +01:00
Vincent Petry 963ee31efb Removed numRows usage from encryption app
numRows on Oracle always seem to return 0.

This fix removes numRows usage from the encryption and sharing app.

This fixes unit tests and potentially the encryption app itself
(migration status) when running on Oracle
2013-12-19 15:51:24 +01:00
Thomas Müller ae3df84e20 Merge pull request #6491 from owncloud/fix-warning-array_walk_recursive-json
only walk an array
2013-12-19 03:25:58 -08:00
icewind1991 3ea01e2152 Merge pull request #6492 from owncloud/appconfig-cache
Fetch all appconfig values for an app at once and cache the results
2013-12-19 03:25:20 -08:00
Thomas Müller 9b18a4fd87 Merge pull request #4378 from owncloud/fixing-3417-master
Don't use xcache in case admin auth is enabled
2013-12-19 03:24:37 -08:00
Vincent Petry 684e331b5b Merge pull request #6503 from owncloud/finally-kill-mdb2-master
Finally kill mdb2 master
2013-12-19 02:56:46 -08:00
Frank Karlitschek 748d90592a Merge pull request #6502 from owncloud/core-extramimetypes
Added missing mime types
2013-12-18 23:41:36 -08:00
Jenkins for ownCloud 37cdbc3be0 [tx-robot] updated from transifex 2013-12-19 01:57:03 -05:00
Thomas Müller aa17a896ac fix return statement 2013-12-19 00:33:29 +01:00
Thomas Müller 5eae75eeca kill MDB2 in PHPDoc 2013-12-19 00:32:46 +01:00
Thomas Müller 6c2a425686 Updating to latest master of 3rdparty - once more :-( 2013-12-19 00:26:41 +01:00
Thomas Müller 62fdc2b0dc Merge pull request #6476 from ogasser/dbal_precision_scale
DB: Support DECIMAL(precision,scale) syntax in XML
2013-12-18 15:15:26 -08:00
Oliver Gasser cacb66480b Add unit tests for decimal type usage 2013-12-18 23:40:11 +01:00
Vincent Petry b109d411d8 Added missing mime types
This is mostly to fix acceptance tests that have a .cc file.

Also fixed typo in python mime type.
2013-12-18 22:40:58 +01:00
Bjoern Schiessle df0c1fe7f3 add test for the stream wrapper to read encrypted files from the system folder /tmp 2013-12-18 17:07:35 +01:00
Bjoern Schiessle f9ec3a7124 test for isEncryptedPath() 2013-12-18 16:39:34 +01:00
Andreas Fischer 38f4ecaeac Merge remote-tracking branch 'owncloud/master' into fixing-3417-master
* owncloud/master: (30 commits)
  Added entry with ext storage info
  [tx-robot] updated from transifex
  [tx-robot] updated from transifex
  clarifying license
  remove unused method tail()
  reliable detect encrypted files
  [tx-robot] updated from transifex
  remove duplicated code
  add missing quotes + field declarations
  Do not use xcache variable cache if cache size is 0.
  always show home breadcrumb in files view
  Use DEBUG instead of ERROR when favourites not found. Fix #6419
  update file cache for target file
  only remove encryption keys if a real file gets deleted, skip this method if a file outside of /data/user/files was deleted
  Fixed JS plural function to be per app
  call set password hook because it doesn't get triggered during test execution and fix paths
  Do not use L10n when logging exceptions
  Also add default to the \OCP\IConfig interface
  add default parameter for AllConfig->get*Value()
  always show 'Deleted Files' breadcrumb
  ...

Conflicts:
	lib/private/memcache/xcache.php
2013-12-18 15:44:46 +01:00
Bjoern Schiessle 4f8ae789ae extend the encryption stream wrapper to handle local files and add a fall back for file size calculation if the storage doesn't support fseek 2013-12-18 15:43:50 +01:00
Simon Könnecke 8fdc4585f7 spaces to tabs 2013-12-18 15:43:45 +01:00
Bjoern Schiessle d9668977cd implement ftell stream wrapper and fix return value from fseek stream wrapper 2013-12-18 15:41:40 +01:00
Robin Appelman 2e195dbdae dont re-read the config values for an app when a non existing key is fetched 2013-12-18 15:28:32 +01:00
Thomas Müller 6c707323f2 only walk an array 2013-12-18 15:25:28 +01:00
Robin Appelman 47245e7417 Add index on oc_appconfig for appid 2013-12-18 15:13:27 +01:00
Robin Appelman 5a646477a5 Fetch all appconfig values for an app at once and cache the results 2013-12-18 15:10:12 +01:00
Thomas Müller 277ae28171 Merge pull request #6295 from owncloud/files-fromlinkerrormessagefixes
Fixed download file from URL error messages
2013-12-18 06:03:50 -08:00
Jan-Christoph Borchardt 3c21fd5bfc do not show 'Add app' and 'More apps' for themed ownCloud 2013-12-18 14:59:57 +01:00
Thomas Müller a90342b781 Merge pull request #6461 from owncloud/check-xcache-varsize
Do not use xcache variable cache if cache size is 0.
2013-12-18 05:36:40 -08:00
Thomas Müller 930a46e8e2 Merge pull request #6469 from owncloud/enc_cleanup
remove duplicated code
2013-12-18 05:21:42 -08:00
Thomas Müller 9c5a620c4f Merge pull request #6256 from owncloud/session-preserver-thirdparty
preserve 3rd party values in  in the Session destructor
2013-12-18 05:20:06 -08:00
Frank Karlitschek 3b4d49546b Merge pull request #6485 from owncloud/extstorage-issuetemplate
Added entry with ext storage info
2013-12-18 04:32:49 -08:00
Vincent Petry 001b49601f Added entry with ext storage info 2013-12-18 13:31:15 +01:00
Robin Appelman e7a5c90cab Replace static usage of OC_Config and OC_Preferences with the injected \OC\ConfigAll 2013-12-18 13:03:19 +01:00
Robin Appelman a6c1b3ece3 fix the config option to remove the ability for users to set their displayname 2013-12-18 13:03:19 +01:00
Thomas Müller f57c38df77 Merge pull request #6431 from owncloud/core-pluraltranslationsfix
Added plural translation fallback
2013-12-18 03:11:18 -08:00
Jenkins for ownCloud 5f4b32c33a [tx-robot] updated from transifex 2013-12-18 01:55:49 -05:00
Oliver Gasser f0962c99dc Increment number of columns by one 2013-12-18 00:37:09 +01:00
Jan-Christoph Borchardt ee2ecbe543 Merge pull request #6366 from owncloud/fix-6335
Bump the footer down 20px to avoid overlap.
2013-12-17 14:59:24 -08:00
Oliver Gasser cb9e87eced Typo fixed 2013-12-17 23:46:36 +01:00
Oliver Gasser 5fcbe5350c Add decimal(precision,scale) column to unit tests 2013-12-17 23:08:05 +01:00
Oliver Gasser 3b0d0e2b1f DB: Support DECIMAL(precision,scale) syntax in XML
Add support for specifying the precision and scale of a decimal data
type to the XML description language.

See owncloud/core#6475
2013-12-17 22:46:45 +01:00
Jenkins for ownCloud 6488ff2c75 [tx-robot] updated from transifex 2013-12-17 16:43:17 -05:00
Björn Schießle 22a6bf9e5a Merge pull request #6474 from owncloud/enc_detect_encrypted_files
reliable detect encrypted files
2013-12-17 09:12:02 -08:00
Frank Karlitschek 0b9f4130b0 clarifying license 2013-12-17 17:32:01 +01:00
Bjoern Schiessle 9a94c07553 remove unused method tail() 2013-12-17 16:19:00 +01:00
Bjoern Schiessle c955381d56 fall back to getLocalFile if storage doesn't support fseek 2013-12-17 16:18:05 +01:00
Bjoern Schiessle 69b89454a4 reliable detect encrypted files 2013-12-17 15:53:25 +01:00
Frank Karlitschek 1d0af242b9 Merge pull request #6436 from owncloud/allconfig-defaults
Add default parameter to OC\AllConfig/OCP\IConfig's getValue's
2013-12-17 05:09:58 -08:00
Jenkins for ownCloud a99dd3183c [tx-robot] updated from transifex 2013-12-17 06:46:52 -05:00
Bjoern Schiessle 83417d69be remove duplicated code 2013-12-17 11:28:05 +01:00
Thomas Müller 5a1194520e Merge pull request #6345 from owncloud/mysql-set-names-utf8-tests
DB tests: Test whether we can insert and read UTF8 data.
2013-12-17 01:54:30 -08:00
Carlos Cerrillo c06844c374 Fix ``createCertificateBundle` and `getCertificates`` methods
from ```OC_Mount_config``` to use ```OC_User::getHome``` to get the
path
2013-12-17 10:13:14 +01:00
Thomas Müller ab4136f432 add missing quotes + field declarations 2013-12-17 10:05:20 +01:00
Thomas Müller 275d666d26 Merge pull request #6438 from owncloud/core-logexceptionfix
Do not use L10n when logging exceptions
2013-12-17 00:53:03 -08:00
Carlos Cerrillo b245e2e3d8 Fixing tab/space coding style
Only set SSL things when ```$this->secure``` is ```true```
2013-12-17 09:38:43 +01:00
Frank Karlitschek 753525c57f Merge pull request #6386 from owncloud/trash_always_show_deleted_files_breadcrumb
always show 'Deleted Files' breadcrumb
2013-12-17 00:25:06 -08:00
Andreas Fischer dfeb04a574 Do not use xcache variable cache if cache size is 0.
This is possible because it is possible to only use xcache as an opcode cache
but not a variable cache.
2013-12-17 02:40:16 +01:00
Bart Visscher 8f0c56c1b2 Merge branch 'master' into fix-5388-master 2013-12-16 22:38:22 +01:00
Björn Schießle 4ae148cebd Merge pull request #6183 from owncloud/enc_tests
enable more encryption tests
2013-12-16 08:46:52 -08:00
Bjoern Schiessle 3e17fbe30d always show home breadcrumb in files view 2013-12-16 17:40:35 +01:00
Thomas Tanghus 28a28611fb Merge pull request #6448 from owncloud/silence_favourites
Use DEBUG instead of ERROR when favourites not found.
2013-12-16 08:30:08 -08:00
Thomas Tanghus a3fbad43c1 Use DEBUG instead of ERROR when favourites not found. Fix #6419 2013-12-16 17:07:22 +01:00
Bjoern Schiessle 95892c8be9 update file cache for target file 2013-12-16 16:05:24 +01:00
Bjoern Schiessle cdd816c930 only remove encryption keys if a real file gets deleted, skip this method if a file outside of /data/user/files was deleted 2013-12-16 16:05:24 +01:00
Vincent Petry d8d11e3976 Fixed JS plural function to be per app
Some apps might not define the same "nplural" value.
To avoid conflicts, the plural function is now generated per app.

Fixes #6427
2013-12-16 16:00:23 +01:00
Bjoern Schiessle 6d489e0474 call set password hook because it doesn't get triggered during test execution and fix paths 2013-12-16 16:00:16 +01:00
Georg Ehrke 059c3c8708 fix issue with logging non utf8 chars 2013-12-16 15:38:55 +01:00
Vincent Petry 2a1d6d3106 Do not use L10n when logging exceptions
In some specific situations, the L10N bundle isn't loadable yet (for
example when there is an issue with the app_config table). In such case,
we still want to be able to log the real exception.

This fixes errors that say "OC_L10N_String::__toString must not throw
exceptions"
2013-12-16 15:11:13 +01:00
icewind1991 fed63dff06 Merge pull request #6315 from owncloud/ingroup-cache
cache the result from inGroup
2013-12-16 06:01:00 -08:00
Robin Appelman e2efad6ae7 Also add default to the \OCP\IConfig interface 2013-12-16 14:33:03 +01:00
Robin Appelman 59f02066b6 add default parameter for AllConfig->get*Value() 2013-12-16 14:30:01 +01:00
Carlos Cerrillo 7c264c88fe Fixing Issue #6301 on master branch
Added private var $certPath to store the user root cert

Move logic to determine the $certPath path to the constructor and modify to get the path from OC_User::getHome()

Add curl options to use the certificate to avoid certificate errors with self-signed certicates in the downdload/upload method so we don't get blank files
2013-12-15 17:22:52 +01:00
Andreas Fischer c205d8d1c9 Merge remote-tracking branch 'owncloud/master' into fixing-3417-master
* owncloud/master: (1989 commits)
  [tx-robot] updated from transifex
  dont try to register background jobs if we haven't upgraded yet
  adjust test
  coding style
  coding style
  On webdav sesssions, loginname was compared to username which does not need to match necessarily
  rely only on php DateTime to parse the db datetime string
  LDAP: fix method behind save button on advancend and expert tabs, fixes at least Home Folder setinng
  Fix webroot for update page
  Update 3rdparty ref
  update 3rdparty
  toggle select all checkbox
  remove unneeded ; in comment
  LDAP: the browser shall not autofill userdn and password, usually login credentials are inserted. fixes #6283
  Add test for having utf8 filenames in the cache
  fix fallback overwriting result of getHome
  [tx-robot] updated from transifex
  fix smbclient directory listing parser
  cache the home folder of a User
  Send "SET NAMES utf8" to MySQL for PHP below 5.3.6
  ...

Conflicts:
	lib/util.php
2013-12-14 18:32:48 +01:00
Jenkins for ownCloud 77b68505c2 [tx-robot] updated from transifex 2013-12-13 14:44:31 -05:00
Vincent Petry 769256cb39 Merge pull request #6321 from sevoku/master
fix smbclient directory listing parser
2013-12-13 09:13:06 -08:00
Vincent Petry a84fe4790f Merge pull request #6392 from owncloud/no-backgroundjobs-during-upgrade
dont try to register background jobs if we haven't upgraded yet
2013-12-13 09:06:53 -08:00
Robin Appelman 4c45c6f418 dont try to register background jobs if we haven't upgraded yet 2013-12-13 17:15:18 +01:00
Arthur Schiwon c0edb639ed adjust test 2013-12-13 16:58:23 +01:00
Arthur Schiwon f26ba5846d coding style 2013-12-13 16:58:16 +01:00
Arthur Schiwon dcfda5c2a9 coding style 2013-12-13 16:58:09 +01:00
Arthur Schiwon 91d6a6dd7c On webdav sesssions, loginname was compared to username which does not need to match necessarily 2013-12-13 16:58:03 +01:00
Jörn Friedrich Dreyer 6408125edc rely only on php DateTime to parse the db datetime string 2013-12-13 16:38:05 +01:00
Arthur Schiwon 1292793c4b LDAP: fix method behind save button on advancend and expert tabs, fixes at least Home Folder setinng 2013-12-13 16:29:42 +01:00
Vincent Petry ad998c1fb5 Merge pull request #6390 from owncloud/migration-fixwebroot
Fix webroot for update page
2013-12-13 05:35:29 -08:00
Vincent Petry df1a404466 Fix webroot for update page
On the update page, config.js was missing which caused oc_webroot to not
be available. That would trigger the faulty oc_webroot fallback that
didn't take URLs like "/owncloud/index.php/files/apps" into account.

This fix adds config.js in the update page and also a fix for the
oc_webroot fallback, in case it is used elsewhere.
2013-12-13 12:56:48 +01:00
Bjoern Schiessle 3831b8b1be always show 'Deleted Files' breadcrumb 2013-12-13 12:17:10 +01:00
Thomas Müller 7b30ffbf23 Merge pull request #6318 from owncloud/gethome-cache
cache the home folder of a User
2013-12-13 01:30:43 -08:00
Thomas Müller 600655b0f9 Merge pull request #6347 from owncloud/cache-test-utf8
Add test for having utf8 filenames in the cache
2013-12-13 01:27:13 -08:00
Thomas Müller 9842890ed7 Update 3rdparty ref 2013-12-13 00:05:00 +01:00
ringmaster e2197c7108 Bump the footer down 20px to avoid overlap.
Fixes #6335.
2013-12-12 13:06:57 -05:00
Vincent Petry 27d9af36db Merge pull request #6356 from owncloud/fix_6353
[trashbin] toggle select all checkbox
2013-12-12 09:03:11 -08:00
Jörn Friedrich Dreyer fc13b9802e update 3rdparty 2013-12-12 17:56:16 +01:00
Owen Winkler b47e4378d2 Merge pull request #6302 from owncloud/mysql-set-names-utf8
Send "SET NAMES utf8" to MySQL for PHP below 5.3.6
2013-12-12 08:46:43 -08:00
Bjoern Schiessle 79719d9ae5 toggle select all checkbox 2013-12-12 17:33:04 +01:00
Andreas Fischer 95dd58bfc0 Use old school query style that actually works. 2013-12-12 15:24:35 +01:00
Robin Appelman 46b72cbff0 remove unneeded ; in comment 2013-12-12 15:14:44 +01:00
Arthur Schiwon 5ba9344b0e LDAP: the browser shall not autofill userdn and password, usually login credentials are inserted. fixes #6283 2013-12-12 14:15:39 +01:00
Robin Appelman 8a86837eac remove unneeded ; in comment 2013-12-12 13:59:00 +01:00
Robin Appelman 30e0b474f8 Add test for having utf8 filenames in the cache 2013-12-12 13:43:55 +01:00
Andreas Fischer f8d3b7cb6f DB tests: Test whether we can insert and read UTF8 data. 2013-12-12 13:19:08 +01:00
Robin Appelman f23b7a262f fix fallback overwriting result of getHome 2013-12-12 12:57:25 +01:00
Vincent Petry 335b2f40a6 Fixed download file from URL error messages
- L10N now converted to string to make them work with json_encode
- Added specific error message when server doesn't allow fopen on URLs
- Fixed client side to correctly show error message in a notification
- Added OCP\JSON::encode() method to encode JSON with support for the
  OC_L10N_String values
2013-12-12 10:38:12 +01:00
Jenkins for ownCloud 7b20212c0a [tx-robot] updated from transifex 2013-12-11 13:32:13 -05:00
Vsevolod Kukol a8f814fe2d fix smbclient directory listing parser 2013-12-11 17:21:34 +01:00
Robin Appelman 3d29992378 user Group->users as assosiative array 2013-12-11 16:25:41 +01:00
Robin Appelman 366d75e947 cache the home folder of a User 2013-12-11 16:22:26 +01:00
Robin Appelman b126374780 cache the result from inGroup 2013-12-11 15:47:36 +01:00
Robin Appelman 5c7a08aab4 check if a $_SESSION entry exists before we try to remove it 2013-12-11 12:59:48 +01:00
Vincent Petry 050f87c9e4 Merge pull request #6270 from owncloud/sharing-mixeduppermissionsfix
Fixed sharing results to include the correct permissions
2013-12-11 02:59:22 -08:00
root 2b127a6ac5 fix indentation
use identity test where appropriate
use camelcase variable names
_getGroupsByMember is a private function
2013-12-11 10:43:48 +01:00
tomneedham 7afe6b3493 Merge branch 'master' into fix-5388-master 2013-12-11 09:12:47 +00:00
Pellaeon Lin 5ddd85ff9c Contextual upload error message 2013-12-11 15:40:58 +08:00
Pellaeon Lin 4b081be956 #max_upload is needed after all 2013-12-11 12:21:39 +08:00
Pellaeon Lin 0aa38165a4 Update #free_space on getstoragestats AJAX call 2013-12-11 12:18:18 +08:00
Andreas Fischer cdd182ce35 Send "SET NAMES utf8" to MySQL for PHP below 5.3.6 2013-12-11 00:19:51 +01:00
Thomas Müller 28180485d9 Merge pull request #6244 from owncloud/memcached-connectivity-tests
Only run memcached tests if server is available.
2013-12-10 12:14:36 -08:00
root a18cff4479 remove debug output 2013-12-10 19:02:01 +01:00
root e1d80b3356 Merge remote branch 'upstream/master' into ldap_nested_groups 2013-12-10 18:57:04 +01:00
root 4fb16804d6 move nested group checkbox to directory settings 2013-12-10 18:47:59 +01:00
Vincent Petry 22abc53e3b Merge pull request #5968 from owncloud/legacy-popup-fixes
fix the legacy popup to make calendar settings look nicer
2013-12-10 05:37:52 -08:00
Vincent Petry 82bf1f9c8c Added workaround for Android content disposition
Fixes #5807
2013-12-10 12:42:41 +01:00
Vincent Petry 409b510889 Moved content disposition code+workarounds to OCP\Response
Added new OC\Response API called setContentDispositionHeader() that
contains the needed workarounds for UTF8 and IE.

Refactored download code to use the new API.

Removed unused trashbin download file.
2013-12-10 12:42:26 +01:00
Vincent Petry e9255e5d57 Added unit test for sharing permissions 2013-12-10 11:19:09 +01:00
Vincent Petry 89eb3759a8 Fixed sharing results to include the correct permissions
Passing $includeCollections would return more than one entry which gives
mixed up file permissions.

Added a method getFile() that doesn't set $includeCollections to make
sure we only get one result which is the file itself.

Fixes #6265
2013-12-09 18:14:58 +01:00
Morris Jobke bc23f46198 fix typo 2013-12-09 16:05:10 +01:00
Joas Schilling 009e25788f correctly mark app management active 2013-12-09 15:53:31 +01:00
Andreas Fischer 3084a52a97 Merge pull request #6246 from owncloud/memcached-config-sample
Document memcached settings in config.sample.php

* owncloud/memcached-config-sample:
  Document memcached settings in config.sample.php
2013-12-09 14:35:00 +01:00
Andreas Fischer 67310b60f7 Ensure memcached extension is there before attempting to create an instance. 2013-12-09 14:33:26 +01:00
Jenkins for ownCloud 6aab1ebf44 [tx-robot] updated from transifex 2013-12-09 06:40:22 -05:00
Robin Appelman a36bf5c2b5 preserve 3rd party values in in the Session destructor 2013-12-09 12:38:27 +01:00
Jan-Christoph Borchardt e574158bd8 fix shadow size and arrow position 2013-12-09 12:21:37 +01:00
blizzz bc3650e48c Merge pull request #6231 from owncloud/fix-plural-l10n
fix plural translation - fixes #6226
2013-12-09 01:41:06 -08:00
Andreas Fischer 5db73c05fb Document memcached settings in config.sample.php 2013-12-09 01:20:10 +01:00
Andreas Fischer a67c737848 Only run memcached tests if server is available. 2013-12-09 01:02:42 +01:00
Pellaeon Lin 64bf0fa47f Display different messages for uploadLimit and freeSpace 2013-12-08 23:17:35 +08:00
Pellaeon Lin fc607e6bce Separate PHP upload limit and free space 2013-12-08 22:59:46 +08:00
root 86809be638 combineFilterWithAnd recently moved to Access 2013-12-08 15:49:25 +01:00
Pellaeon Lin 69f2bde324 Change misleading message when file size exceeds upload limit 2013-12-08 15:41:20 +08:00
Jenkins for ownCloud 079d20a80e [tx-robot] updated from transifex 2013-12-07 22:28:29 -05:00
Morris Jobke 44a55056e7 change mail address by pressing enter - fixes #6179 2013-12-07 17:33:27 +01:00
Morris Jobke 823c85e65f Merge pull request #6202 from owncloud/fix_6032_alt
Add overlay noscript message to fix #6032
2013-12-07 08:04:29 -08:00
Morris Jobke 3444c15b86 fix IE8 transparent background 2013-12-07 17:03:53 +01:00
Bart Visscher 731e83c35a Save the new database config 2013-12-07 15:14:54 +01:00
Bart Visscher 22edc42f54 Add UTF8 charset to connection params 2013-12-07 15:09:36 +01:00
Bart Visscher e4c31b362e Add command for converting sqlite database to server based one 2013-12-07 14:44:23 +01:00
Morris Jobke 67957294c2 fix wrong test data in l10n 2013-12-07 13:29:14 +01:00
Morris Jobke 4c4c9096c4 fix plural translation - fixes #6226 2013-12-07 11:38:01 +01:00
blizzz 6a747106db Merge pull request #6150 from owncloud/backgroundjob-log-exception
Remove background jobs that are giving errors
2013-12-06 11:56:53 -08:00
Vincent Petry 123bc9921a Merge pull request #6201 from owncloud/backgroundscan-reuse-etag
reuse etags when doing a background scan
2013-12-06 10:13:14 -08:00
Björn Schießle 575a68074f Merge pull request #6220 from owncloud/debug_oracle_errors
cherry-picks from #5884, just for debugging purpose
2013-12-06 10:00:04 -08:00
Robin Appelman 9eca2471b3 Merge branch 'master' into backgroundscan-reuse-etag 2013-12-06 18:27:46 +01:00
Robin Appelman e888bdda30 get rid of failing test that don't cause additional downloads 2013-12-06 18:26:38 +01:00
Bart Visscher 4c8bc61753 XSendfile and encryption don't work together
The file on disk is encrypted, and not readable on client systems
2013-12-06 17:59:59 +01:00
blizzz b5939324b0 Merge pull request #6218 from leo-b/fix_ldap_setOption_returncode
correctly propagate the return value of ldap_set_option
2013-12-06 08:54:29 -08:00
Vincent Petry e13be94e56 Fixed Dropbox/Google storage async save call
When clicking "Grant access", the settings for Dropbox/Google were saved
through a call that gets cancelled when redirecting to the grant page
(for example in Firefox)

This fix makes sure the "save settings" call finished before redirecting
to the grant page.

Fixes #6176
2013-12-06 17:25:09 +01:00
Björn Schießle 36c286f879 Merge pull request #6222 from owncloud/enc_reset_enc_file_size
set unencrypted_size to 0 after decryption
2013-12-06 08:06:22 -08:00
Bart Visscher 40f148cc6c Don't try to encrypt a file when the temp file isn't created 2013-12-06 17:01:13 +01:00
root 48e426b589 add support for nested groups 2013-12-06 16:46:52 +01:00
Bjoern Schiessle 9ff231590c set unencrypted_size to 0 after decryption... so that the unencrypted_size gets re-calculated if encryption was enabled again 2013-12-06 16:11:41 +01:00
Bart Visscher 6aa9daf4e6 Users of getFolderContent are mostly interested in the unecrypted file size 2013-12-06 15:51:49 +01:00
Vincent Petry db0b291f63 Merge pull request #6213 from owncloud/fix-full-name-edit
Fix full name edit for repetitive edit
2013-12-06 06:46:34 -08:00
Björn Schießle b18c8e5c53 Merge pull request #6206 from owncloud/sharing_etag_propagation_on_expire
Sharing etag propagation on expire
2013-12-06 05:41:08 -08:00
Morris Jobke ae38ed51fe Merge pull request #6211 from owncloud/fix-5865
Multiselect too slow patched
2013-12-06 04:59:24 -08:00
Morris Jobke ac77218d57 parent().parent() -> closest() 2013-12-06 13:53:01 +01:00
Robin Appelman cf9b7e343a extend test case for etag preservation 2013-12-06 13:00:58 +01:00
Bjoern Schiessle e447d978d3 it is not possible to unshare files 2013-12-06 12:35:47 +01:00
Bjoern Schiessle 9371944e43 fix typo 2013-12-06 12:20:42 +01:00
Bjoern Schiessle 58c0117c3d only create new key on password change if a recovery key exists or if the user don't have any private/public keys 2013-12-06 12:20:31 +01:00
Bjoern Schiessle 8082ef2073 show change password form if key couldn't be decrypted 2013-12-06 12:20:22 +01:00
Bjoern Schiessle 85467b973a add method to check if users private/public key exists 2013-12-06 12:20:14 +01:00
root 54e47b4180 correctly propagate the return value of ldap_set_option
otherwise LDAP_OPT_REFERRALS won't be set to 0 and in turn
active directory paging will stop working
(Operations error on ldap_control_paged_result_response)
2013-12-06 12:04:17 +01:00
Jenkins for ownCloud 4dd84b3627 [tx-robot] updated from transifex 2013-12-05 22:24:39 -05:00
Morris Jobke 008bfc6793 Fix full name edit for repetive edit
fixes #6212

fixes the data attributes after edit
fixes markup to successfully re-edit display name
2013-12-05 23:44:59 +01:00
ringmaster 1dc9998920 Remove reference to ownCloud. 2013-12-05 17:01:51 -05:00
unknown 853373348c Slide duration set to 200ms for multiselect (same duration as user menu) 2013-12-05 15:46:13 -05:00
Morris Jobke ec0aa6bb65 Revert "Merge pull request #6210 from owncloud/fix-5865"
This reverts commit f12363d90b, reversing
changes made to eba35d28cd.
2013-12-05 21:03:17 +01:00
Morris Jobke 9c4bbf9ad7 Revert "Revert "Fix user's displayName being overwritten by (old) cookie""
This reverts commit eba35d28cd.
2013-12-05 20:53:11 +01:00
pdessauw f12363d90b Merge pull request #6210 from owncloud/fix-5865
#5865 Multiselect animation is too slow patch
2013-12-05 11:19:06 -08:00
unknown fd3aae6691 Changed duration of slideDown, slideUp and fadeOut to 200ms 2013-12-05 13:15:52 -05:00
ringmaster e7748613ef Link to enable-javascript.com 2013-12-05 12:06:20 -05:00
Bjoern Schiessle 3f7aac1a79 add a optional parameter to skip check for expired files, this is necessary to find out to whom a file was shared after it was expired. 2013-12-05 17:29:15 +01:00
Bjoern Schiessle ace1d40ed6 get owner from share item, if we expire a share while the user updates his /Shared folder than the owner is different from the currently logged in user 2013-12-05 17:25:01 +01:00
Morris Jobke eba35d28cd Revert "Fix user's displayName being overwritten by (old) cookie"
This reverts commit 2a7380cc21.
2013-12-05 16:12:46 +01:00
ringmaster 1687ec0cd2 Make noscript message translatable 2013-12-05 09:52:13 -05:00
ringmaster 38745e4bd1 Move message up 10% 2013-12-05 09:48:20 -05:00
Morris Jobke cec17fd3e2 Merge pull request #6199 from nicokaiser/fix-5306-master
Fix user's displayName being overwritten by (old) cookie. #3694
2013-12-05 06:32:20 -08:00
Morris Jobke f2f44bd092 Merge pull request #6196 from owncloud/installation-error-css
fix appearance of error message - .errors is outdated
2013-12-05 06:25:48 -08:00
Robin Appelman 01ab15a2b0 reuse etags when doing a background scan 2013-12-05 15:23:34 +01:00
ringmaster bdab0409c4 Add overlay noscript message to fix #6032 2013-12-05 09:19:46 -05:00
Nico Kaiser 2a7380cc21 Fix user's displayName being overwritten by (old) cookie 2013-12-05 14:18:32 +01:00
Robin Appelman 2ff1bdaba3 add test case for removing background jobs that are throwing exceptions 2013-12-05 13:29:35 +01:00
Morris Jobke 1620015531 fix appearance of error message - .errors is outdated 2013-12-05 11:23:30 +01:00
Frank Karlitschek 125dff8997 master is ownCloud 7 pre alpha now 2013-12-05 10:35:19 +01:00
Jenkins for ownCloud 7e702f294f [tx-robot] updated from transifex 2013-12-04 18:14:17 -05:00
zombiehugs 8fb4ab097d Fixed indention.
As per @kabum request, indention on line 694 has been fixed.
2013-12-04 12:30:06 -06:00
Arthur Schiwon 3480766a78 LDAP Wizard: don't generate filter when not allowed 2013-12-04 18:59:30 +01:00
Arthur Schiwon 60b1191c88 some equals are more equal than other equals 2013-12-04 18:59:12 +01:00
Arthur Schiwon 01af3bdb05 LDAP Wizard: return correct var 2013-12-04 18:58:52 +01:00
Arthur Schiwon 06577f1fe2 LDAP Wizard: make sure auto-detected suggestions are really applied initially. Also make initial filter compilation and user counting robust against race conditions. 2013-12-04 18:58:29 +01:00
Arthur Schiwon cc725674e0 LDAP: on testing configuration, set active property to true, otherwise inactive connections cannot be tested properly 2013-12-04 18:58:09 +01:00
Arthur Schiwon a10d1977b5 LDAP: set default value for login filter to empty, otherwise the wizard signals completed configuration too early when it might be not correct, i.e. login won't work 2013-12-04 18:57:54 +01:00
Arthur Schiwon 9808dee149 LDAP Wizard: don't send ldap_tls change back to the interface as the element was removed, for it is detected fully automatically. Resolves an JS error and thus an ever-spinning spinner 2013-12-04 18:57:32 +01:00
zombiehugs be0197a29a #6051 [ux][files] Move File Spinner
Added spinner to file icon when moving to new folder or out of folder.

Commit is related to #6051
2013-12-04 11:27:24 -06:00
Alexander Bergolth 301d469813 Symfonys addCollection() with multiple arguments is deprecated, fix deprecation warning 2013-12-04 18:01:51 +01:00
Arthur Schiwon 430f85cc59 LDAP Wizard: avoid a manually deactivated LDAP configuration is enabled by just opening the admin page 2013-12-04 17:57:47 +01:00
Arthur Schiwon 1c6568cf68 LDAP: make unsetting checkboxes from Advanced tab work again, fixes #6143 2013-12-04 17:57:40 +01:00
Bjoern Schiessle b919a65432 enable more tests 2013-12-04 17:43:38 +01:00
Björn Schießle 737b9a990f Merge pull request #6181 from owncloud/auto_expire_trash
config switch to disable auto expire for the trash bin
2013-12-04 07:44:02 -08:00
Robin Appelman 3fa11bd426 Dont use exceptions for the backgroundjob test cases 2013-12-04 16:28:27 +01:00
Bjoern Schiessle 6b7fdda4f5 config switch to disable auto expire for the trash bin 2013-12-04 16:11:40 +01:00
Morris Jobke 36bc6b871f Revert "Adjust files_encryption requirements to the new core requirement (PHP 5.3.8)."
This reverts commit efbf18652c.
2013-12-04 13:27:38 +01:00
Morris Jobke d73875b2b4 Merge pull request #6169 from owncloud/php_version_warning
PHP version warning
2013-12-04 01:49:54 -08:00
Frank Karlitschek 61296ed7bb lower required php version to 5.3.3 2013-12-04 10:25:22 +01:00
Frank Karlitschek 8fdbb98899 Merge pull request #6168 from owncloud/extstorage-testtestmethod
Added unit test for the test() method of ext storage
2013-12-03 11:00:49 -08:00
Thomas Müller 16eb7c15d2 Merge pull request #6076 from owncloud/fix-6073-master
Correct property name. It's just 'tableprefix', without the 'db' prefix.
2013-12-03 08:21:45 -08:00
Vincent Petry 72f80c972f Merge pull request #5946 from owncloud/public-page-details
Public page details
2013-12-03 07:26:00 -08:00
Thomas Müller ab21e1b16e Merge pull request #5931 from owncloud/fix-time-field-properly
fix time input field properly, details
2013-12-03 07:23:04 -08:00
Vincent Petry 7f4436eafe Merge pull request #6153 from owncloud/extstorage-s3
Fixed Amazon S3 ext storage config UI
2013-12-03 06:51:25 -08:00
zombiehugs 519f63ee97 Revert "[fix] Center Share Dropdown & Versions Dropdown"
This reverts commit 1dbbfcf3dc.
2013-12-03 08:23:13 -06:00
zombiehugs 1dbbfcf3dc [fix] Center Share Dropdown & Versions Dropdown
Center Share Dropdown & Versions Dropdown
2013-12-03 08:14:06 -06:00
Frank Karlitschek 4430eded81 request a bit more data for bug reports 2013-12-03 15:06:36 +01:00
Vincent Petry 6cf9844e9c Added unit test for the test() method
This is to make sure that method isn't broken
2013-12-03 14:35:53 +01:00
Morris Jobke b3a96c081b fix public page - gallery view issues 2013-12-03 13:46:58 +01:00
Vincent Petry 3b7905364f Fixed test function for S3
Fixes #5752
2013-12-03 12:26:08 +01:00
Vincent Petry 76b1fcbf27 Fixed Amazon S3 ext storage config UI
Optional parameters are now really optional

Fixes #5861
2013-12-03 12:26:08 +01:00
Vincent Petry d6121464a0 Fixed placeholder after page reload
The placeholder somehow had too many characters stripping from it...
2013-12-03 12:26:08 +01:00
Morris Jobke 62827376b8 fix trashbin and pbulic page controls 2013-12-03 10:59:22 +01:00
Morris Jobke a6f10a59fc fix and cleanup CSS for public page 2013-12-03 10:54:18 +01:00
Jan-Christoph Borchardt 5e9ac2f20f change different shades of grey for public share page to white 2013-12-03 10:54:18 +01:00
Jan-Christoph Borchardt 7867604e22 remove app specific code 2013-12-03 10:54:18 +01:00
Jan-Christoph Borchardt d673dd066a fix details for buttons in header and controls bar 2013-12-03 10:54:18 +01:00
Jan-Christoph Borchardt c44f534c2b account for shift of controls bar due to app navigation, do not shift on public page 2013-12-03 10:54:16 +01:00
Frank Karlitschek b83e891456 Merge pull request #5929 from owncloud/code_check_on
switch code checker on by default. apps are not allowed to access
2013-12-03 01:14:35 -08:00
Thomas Müller a999350f69 Merge pull request #6158 from owncloud/rmdir-check
check if a directory exists before we try to remove it
2013-12-02 15:14:41 -08:00
Jenkins for ownCloud 83ec234f53 [tx-robot] updated from transifex 2013-12-02 17:28:29 -05:00
Robin Appelman 64bfcbee0a check if a directory exists before we try to remove it 2013-12-02 22:44:28 +01:00
Björn Schießle 9d100b5f94 Merge pull request #6151 from owncloud/trash_fix_select
trash, make it possible to select folders
2013-12-02 13:22:28 -08:00
Bjoern Schiessle ee66db447f make it possible to select folders 2013-12-02 16:30:03 +01:00
Robin Appelman 4f4ad72460 remove background jobs if they are failing 2013-12-02 13:43:26 +01:00
Robin Appelman 35bb6f7e3a Catch exceptions from background jobs and log them 2013-12-02 13:41:47 +01:00
Vincent Petry a81d4175ba Merge pull request #6148 from owncloud/fix_trash_restore
Fix restore anbd delete operations in trash bin
2013-12-02 04:33:37 -08:00
Bjoern Schiessle fac2f2a626 check explicitely all possible dir values 2013-12-02 12:13:32 +01:00
Bjoern Schiessle edc4447d6a set delete all to true if a complete folder was deleted 2013-12-02 11:59:09 +01:00
Bjoern Schiessle 8ce3ea3e2c fix delete files from trash bin 2013-12-02 11:50:55 +01:00
Thomas Mueller 87e795a693 fixing PHPDoc and spelling 2013-12-02 08:42:28 +01:00
Bjoern Schiessle 71589e65d2 fix restore from files in sub-folders 2013-11-29 16:43:50 +01:00
Andreas Fischer 93b0bd0a9e Use getLastError() everywhere. 2013-11-28 12:05:46 +01:00
Andreas Fischer 904573d0d0 Add getLastError() 2013-11-28 12:04:28 +01:00
Andreas Fischer 955127231a No function as oci_last_error. It's oci_error. 2013-11-28 11:37:29 +01:00
Andreas Fischer fcf332abbf There is no property such as dbusername. It's 'dbuser'. 2013-11-28 11:33:49 +01:00
Andreas Fischer b90f88f939 Correct property name. It's 'dbpassword', with the 'db' prefix. 2013-11-28 11:33:43 +01:00
Andreas Fischer 005c98e46c Correct property name. It's just 'tableprefix', without the 'db' prefix. 2013-11-28 11:23:45 +01:00
Simon Könnecke 243f3f0c4c No decimal points for Kilobyte and Byte #5371. 2013-11-25 12:26:03 +01:00
Thomas Mueller 37b07fe6a9 Merge branch 'master' into fix-5388-master 2013-11-24 23:27:44 +01:00
Thomas Müller 14332681fc ref 3rdparty branch without MDB2 code 2013-11-22 17:18:06 +01:00
Thomas Müller 26e9e68a39 Merge branch 'master' into fix-5388-master 2013-11-22 17:14:15 +01:00
Bart Visscher 9adff4f7f5 Change OC_Migrate from MDB2 to Doctrine 2013-11-22 15:53:56 +01:00
Jan-Christoph Borchardt 5cb8fd2bad fix the legacy popup to make calendar settings look nicer 2013-11-20 16:29:00 +01:00
Jan-Christoph Borchardt 59e75d4326 fix time input field properly, details 2013-11-18 19:44:56 +01:00
Frank Karlitschek 7504fc0aef switch code checker on by default. apps are not allowed to access some of the internal classes where we have a public api for now 2013-11-18 18:42:06 +01:00
Thomas Müller d4c0ac7790 introduce auto completion on share email - integrated with the contactsmanager api 2013-11-14 09:38:55 +01:00
Jörn Friedrich Dreyer 9ae829497a cleanup and actually execute the query 2013-11-01 15:45:33 +01:00
Jörn Friedrich Dreyer 72ca0a482b use doctrine to construct concat expression 2013-11-01 15:40:21 +01:00
Jörn Friedrich Dreyer 51ec68a623 Concatenate string in SQL instead of PHP 2013-11-01 15:40:21 +01:00
Jake Wilson 5144def99b Moved Core Theme Logos to CSS
In order to make it easier for a user/developer to replace logos in the core theme, I removed the hardcoded `logo.svg` and `logo-wide.svg` from the html, and replaced them with `div`s that use css background-image instead.

This has multiple advantages:
1. The user can now use any filename they want for the logo.  They are no longer forced to use logo.svg or logo-wide.svg.
2. The user can now easily use a JPG, PNG or GIF logo instead of SVG (SVG's are awesome, but used by an unfortunately small percentage of web developers at the current time.  Most probably don't even know how to make an SVG…).
3. The user doesn't have to resort to hacking the core theme template files in order to use a different filename or file type.
4. Greatly simplifies documentation instructions for how to change the logos (http://owncloud.org/theming/).

Signed-off-by: Jake Wilson <jakew@huebnerpetersen.com>
2013-10-10 12:29:13 -06:00
Vincent Petry b1f1357957 Added ownCloud backend for external storage
To make it possible to use the short ownCloud URL (without specifying
webdav.php or remote.php), a new backend is available for ownCloud.

The user must specify the host + context path in the "Url" field (which
is mapped to the "host" parameter) and the subdir to mount in the "Root"
field.

This is to prevent confusion because some users forget to append
webdav.php or remote.php to the WebDAV URL.

Fixes #4923
2013-10-09 17:30:22 +02:00
Morris Jobke 09d2ba017e fix undefined $htaccessWorking 2013-10-07 00:36:42 +02:00
raghunayyar 4687d2dd0b All Core Styles from em->px, apart from styles.css 2013-10-07 00:01:29 +05:30
raghunayyar cf84154ee0 Cleans up Core apps for relative(em) to absolute(px) styles. 2013-10-06 23:38:24 +05:30
raghunayyar 39906cefbf Converts em to px values for styles in Files. 2013-10-06 23:28:22 +05:30
Bart Visscher a90ea2c069 Merge remote-tracking branch 'origin/master' into setup 2013-10-02 18:23:59 +02:00
Bart Visscher 5db98aadd3 Copyright and small fix 2013-10-02 18:23:47 +02:00
Bart Visscher b35b22977c Move legacy file to correct location 2013-10-02 09:15:31 +02:00
Bart Visscher 46b5202f4a Merge branch 'master' into convert-oc_appconfig 2013-10-02 07:42:06 +02:00
elchi 81db59cda0 Added support for extra backends
Somebody had forgotten "OC_User::setupBackends();"...
2013-09-30 20:26:00 +02:00
Thomas Müller 071b8033cb fixing typo on $htaccessWorking - testing own code before pushing is appreciated 2013-09-24 00:44:55 +02:00
Bart Visscher 6619d8273a Enable appconfig asserts 2013-09-19 18:14:28 +02:00
Bart Visscher 2f79e94a35 Style fixes 2013-09-19 18:14:28 +02:00
Bart Visscher ca88cf93ae check for valid appinfo in installer 2013-09-19 18:14:27 +02:00
Bart Visscher c546874159 Convert OC_Appconfig to object interface
Implemented unittest for OC\AppConfig
2013-09-19 18:14:27 +02:00
Bart Visscher a3705ce188 Merge branch 'master' into setup
Conflicts:
	lib/util.php
2013-09-12 22:45:11 +02:00
Bart Visscher 65aab3dc8c Check for failure in creating htaccessWorking testfile 2013-09-10 22:05:20 +02:00
Bart Visscher 8ae612f693 Move core setup code to controller class 2013-09-10 20:19:42 +02:00
Andreas Fischer d73285c186 Do not mention php.ini, it may be defined in xcache.ini or so. 2013-08-15 03:41:33 +02:00
Andreas Fischer 7fa53eae7f Make it clear that log message is about the XCache opcode cache. 2013-08-15 03:40:57 +02:00
Andreas Fischer 9770f52da6 xCache -> XCache 2013-08-15 03:40:02 +02:00
Andreas Fischer 49cfd08f08 Add link to XCache API in class documentation. 2013-08-15 03:37:59 +02:00
Andreas Fischer 341d9caf79 xcache_unset_by_prefix() returns feedback, return it. 2013-08-15 03:36:42 +02:00
Andreas Fischer 799106db81 Clear xCache OpCode cache instead of variable cache in clearOpcodeCache(). 2013-08-15 03:35:52 +02:00
Andreas Fischer 8d762f659a Allow usage of xCache variable cache if xcache_unset_by_prefix() is present. 2013-08-15 03:34:43 +02:00
Andreas Fischer fb2761a203 Do not define xcache_unset_by_prefix() if it does not exist.
The defined function is not compatible with the function provided by xcache
because it does not honor the prefix parameter. Thus defining it like this is
a bad idea.
2013-08-15 03:31:42 +02:00
Thomas Müller c84171cec0 don't use xcache in case admin auth is enabled in php.ini - this can cause issues 2013-08-09 22:14:28 +02:00
Thomas Müller 507e48ee56 don't call xcache_clear_cache on clearOpcodeCache() in case admin auth is enabled for xcache in php.ini 2013-08-09 22:13:31 +02:00
Florian Scholz b1fd9b3907 - add slash if webroot is an empty string
- added comment
2013-06-25 10:45:37 +02:00
Florian Scholz efea868704 - removed slash-adding for logout-header-redirect 2013-06-17 14:21:53 +02:00
3498 changed files with 407358 additions and 161331 deletions
+7
View File
@@ -2,6 +2,7 @@
/data
/owncloud
/config/config.php
/config/*.config.php
/config/mount.php
/apps/inc.php
@@ -85,9 +86,15 @@ nbproject
# Node Modules
/build/node_modules/
# nodejs
/build/lib/
/npm-debug.log
# Tests - auto-generated files
/data-autotest
/tests/coverage*
/tests/karma-coverage
/tests/autoconfig*
/tests/autotest*
/tests/data/lorem-copy.txt
+1 -1
View File
@@ -1,3 +1,3 @@
[submodule "3rdparty"]
path = 3rdparty
url = git://github.com/owncloud/3rdparty.git
url = https://github.com/owncloud/3rdparty.git
Executable → Regular
+6 -9
View File
@@ -6,8 +6,6 @@ RequestHeader set XAuthorization %{XAUTHORIZATION}e env=XAUTHORIZATION
</IfModule>
</IfModule>
</IfModule>
ErrorDocument 403 /core/templates/403.php
ErrorDocument 404 /core/templates/404.php
<IfModule mod_php5.c>
php_value upload_max_filesize 513M
php_value post_max_size 513M
@@ -20,13 +18,12 @@ php_value mbstring.func_overload 0
<IfModule mod_rewrite.c>
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 ^apps/calendar/caldav.php remote.php/caldav/ [QSA,L]
RewriteRule ^apps/contacts/carddav.php remote.php/carddav/ [QSA,L]
RewriteRule ^apps/([^/]*)/(.*\.(php))$ index.php?app=$1&getfile=$2 [QSA,L]
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 ^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]
</IfModule>
<IfModule mod_mime.c>
+52
View File
@@ -0,0 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectCodeStyleSettingsManager">
<option name="PER_PROJECT_SETTINGS">
<value>
<PHPCodeStyleSettings>
<option name="PHPDOC_BLANK_LINE_BEFORE_TAGS" value="true" />
<option name="LOWER_CASE_BOOLEAN_CONST" value="true" />
<option name="LOWER_CASE_NULL_CONST" value="true" />
</PHPCodeStyleSettings>
<XML>
<option name="XML_KEEP_BLANK_LINES" value="1" />
<option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
</XML>
<codeStyleSettings language="CSS">
<indentOptions>
<option name="USE_TAB_CHARACTER" value="true" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="HTML">
<indentOptions>
<option name="USE_TAB_CHARACTER" value="true" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="JavaScript">
<option name="SPACE_BEFORE_METHOD_PARENTHESES" value="true" />
<indentOptions>
<option name="USE_TAB_CHARACTER" value="true" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="PHP">
<option name="CLASS_BRACE_STYLE" value="1" />
<option name="METHOD_BRACE_STYLE" value="1" />
<option name="DOWHILE_BRACE_FORCE" value="3" />
<option name="WHILE_BRACE_FORCE" value="3" />
<option name="FOR_BRACE_FORCE" value="3" />
<indentOptions>
<option name="USE_TAB_CHARACTER" value="true" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="XML">
<indentOptions>
<option name="USE_TAB_CHARACTER" value="true" />
</indentOptions>
</codeStyleSettings>
</value>
</option>
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
<option name="PREFERRED_PROJECT_CODE_STYLE" value="Default (1)" />
</component>
</project>
+33
View File
@@ -0,0 +1,33 @@
{
"camelcase": true,
"eqeqeq": true,
"immed": true,
"latedef": false,
"noarg": true,
"nonbsp": true,
"undef": true,
"unused": true,
"trailing": true,
"maxparams": 5,
"curly": true,
"jquery": true,
"maxlen": 120,
"indent": 4,
"browser": true,
"globals": {
"console": true,
"it": true,
"xit": true,
"expect": true,
"describe": true,
"beforeEach": true,
"afterEach": true,
"sinon": true,
"fakeServer": true,
"_": true,
"OC": true,
"OCA": true,
"t": true,
"n": true
}
}
+27
View File
@@ -0,0 +1,27 @@
filter:
excluded_paths:
- '3rdparty/*'
- 'apps/*/3rdparty/*'
- 'l10n/*'
- 'core/l10n/*'
- 'apps/*/l10n/*'
- 'lib/l10n/*'
- 'core/js/tests/lib/*.js'
- 'core/js/tests/specs/*.js'
- 'core/js/jquery-1.10.0.js'
- 'core/js/jquery-1.10.0.min.js'
- 'core/js/jquery-migrate-1.2.1.js'
- 'core/js/jquery-migrate-1.2.1.min.js'
- 'core/js/jquery-showpassword.js'
- 'core/js/jquery-tipsy.js'
- 'core/js/jquery-ui-1.10.0.custom.js'
- 'core/js/jquery.inview.js'
- 'core/js/placeholders.js'
- 'core/js/underscore.js'
- 'core/js/jquery.multiselect.js'
imports:
- javascript
- php
+1 -1
View File
@@ -32,7 +32,7 @@ If you have questions about how to install or use ownCloud, please direct these
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]: https://mail.kde.org/mailman/listinfo/owncloud
[mailinglist]: http://mailman.owncloud.org/mailman/listinfo/owncloud
[forum]: http://forum.owncloud.org/
[irc]: http://webchat.freenode.net/?channels=owncloud&uio=d4
+7 -5
View File
@@ -4,17 +4,19 @@
A personal cloud which runs on your own server.
### Build Status on [Jenkins CI](https://ci.owncloud.org/)
Git master: [![Build Status](https://ci.owncloud.org/buildStatus/icon?job=ownCloud-Server%28master%29)](https://ci.owncloud.org/job/ownCloud-Server%28master%29/)
Git master: [![Build Status](https://ci.owncloud.org/job/server-master-linux/badge/icon)](https://ci.owncloud.org/job/server-master-linux/)
Quality: [![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/owncloud/core/badges/quality-score.png?s=ce2f5ded03d4ac628e9ee5c767243fa7412e644f)](https://scrutinizer-ci.com/g/owncloud/core/)
### Installation instructions
http://doc.owncloud.org/server/5.0/developer_manual/app/gettingstarted.html
http://doc.owncloud.org/server/7.0/developer_manual/app/index.html
### Contribution Guidelines
http://owncloud.org/dev/contribute/
http://owncloud.org/contribute/
### Get in touch
* [Forum](http://forum.owncloud.org)
* [Mailing list](https://mail.kde.org/mailman/listinfo/owncloud)
* [Mailing list](http://mailman.owncloud.org/mailman/listinfo)
* [IRC channel](https://webchat.freenode.net/?channels=owncloud)
* [Twitter](https://twitter.com/ownClouders)
@@ -23,4 +25,4 @@ Please submit translations via Transifex:
https://www.transifex.com/projects/p/owncloud/
For more detailed information about translations:
http://owncloud.org/dev/translation/
http://doc.owncloud.org/server/7.0/developer_manual/core/translation.html
-12
View File
@@ -34,17 +34,7 @@ if($_POST && OC_Util::isCallRegistered()) {
$maxUploadFilesize = OCP\Util::humanFileSize($setMaxSize);
}
}
if(isset($_POST['maxZipInputSize'])) {
$maxZipInputSize=$_POST['maxZipInputSize'];
OCP\Config::setSystemValue('maxZipInputSize', OCP\Util::computerFileSize($maxZipInputSize));
}
if(isset($_POST['submitFilesAdminSettings'])) {
OCP\Config::setSystemValue('allowZipDownload', isset($_POST['allowZipDownload']));
}
}
$maxZipInputSizeDefault = OCP\Util::computerFileSize('800 MB');
$maxZipInputSize = OCP\Util::humanFileSize(OCP\Config::getSystemValue('maxZipInputSize', $maxZipInputSizeDefault));
$allowZipDownload = intval(OCP\Config::getSystemValue('allowZipDownload', true));
OCP\App::setActiveNavigationEntry( "files_administration" );
@@ -56,6 +46,4 @@ $tmpl->assign( 'uploadMaxFilesize', $maxUploadFilesize);
// max possible makes only sense on a 32 bit system
$tmpl->assign( 'displayMaxPossibleUploadSize', PHP_INT_SIZE===4);
$tmpl->assign( 'maxPossibleUploadSize', OCP\Util::humanFileSize(PHP_INT_MAX));
$tmpl->assign( 'allowZipDownload', $allowZipDownload);
$tmpl->assign( 'maxZipInputSize', $maxZipInputSize);
return $tmpl->fetchPage();
+18 -6
View File
@@ -1,23 +1,35 @@
<?php
// Init owncloud
OCP\JSON::checkLoggedIn();
OCP\JSON::callCheck();
\OC::$session->close();
// Get data
$dir = stripslashes($_POST["dir"]);
$files = isset($_POST["file"]) ? $_POST["file"] : $_POST["files"];
$allFiles = isset($_POST["allfiles"]) ? $_POST["allfiles"] : false;
$files = json_decode($files);
// delete all files in dir ?
if ($allFiles === 'true') {
$files = array();
$fileList = \OC\Files\Filesystem::getDirectoryContent($dir);
foreach ($fileList as $fileInfo) {
$files[] = $fileInfo['name'];
}
} else {
$files = isset($_POST["file"]) ? $_POST["file"] : $_POST["files"];
$files = json_decode($files);
}
$filesWithError = '';
$success = true;
//Now delete
foreach ($files as $file) {
if (($dir === '' && $file === 'Shared') || !\OC\Files\Filesystem::unlink($dir . '/' . $file)) {
if (\OC\Files\Filesystem::file_exists($dir . '/' . $file) &&
!(\OC\Files\Filesystem::isDeletable($dir . '/' . $file) &&
\OC\Files\Filesystem::unlink($dir . '/' . $file))
) {
$filesWithError .= $file . "\n";
$success = false;
}
+1 -6
View File
@@ -21,14 +21,9 @@
*
*/
// only need filesystem apps
$RUNTIME_APPTYPES=array('filesystem');
// Init owncloud
// Check if we are a user
OCP\User::checkLoggedIn();
\OC::$session->close();
$files = $_GET["files"];
$dir = $_GET["dir"];
+1 -3
View File
@@ -1,8 +1,5 @@
<?php
// only need filesystem apps
$RUNTIME_APPTYPES = array('filesystem');
$dir = '/';
if (isset($_GET['dir'])) {
@@ -10,6 +7,7 @@ if (isset($_GET['dir'])) {
}
OCP\JSON::checkLoggedIn();
\OC::$session->close();
// send back json
OCP\JSON::success(array('data' => \OCA\Files\Helper::buildFileStorageStatistics($dir)));
+51 -40
View File
@@ -1,47 +1,58 @@
<?php
// only need filesystem apps
$RUNTIME_APPTYPES=array('filesystem');
// Init owncloud
OCP\JSON::checkLoggedIn();
\OC::$session->close();
$l = OC_L10N::get('files');
// Load the files
$dir = isset( $_GET['dir'] ) ? $_GET['dir'] : '';
$dir = isset($_GET['dir']) ? (string)$_GET['dir'] : '';
$dir = \OC\Files\Filesystem::normalizePath($dir);
if (!\OC\Files\Filesystem::is_dir($dir . '/')) {
header("HTTP/1.0 404 Not Found");
exit();
try {
$dirInfo = \OC\Files\Filesystem::getFileInfo($dir);
if (!$dirInfo || !$dirInfo->getType() === 'dir') {
header("HTTP/1.0 404 Not Found");
exit();
}
$data = array();
$baseUrl = OCP\Util::linkTo('files', 'index.php') . '?dir=';
$permissions = $dirInfo->getPermissions();
$sortAttribute = isset($_GET['sort']) ? $_GET['sort'] : 'name';
$sortDirection = isset($_GET['sortdirection']) ? ($_GET['sortdirection'] === 'desc') : false;
// make filelist
$files = \OCA\Files\Helper::getFiles($dir, $sortAttribute, $sortDirection);
$data['directory'] = $dir;
$data['files'] = \OCA\Files\Helper::formatFileInfos($files);
$data['permissions'] = $permissions;
OCP\JSON::success(array('data' => $data));
} catch (\OCP\Files\StorageNotAvailableException $e) {
\OCP\Util::logException('files', $e);
OCP\JSON::error(array(
'data' => array(
'exception' => '\OCP\Files\StorageNotAvailableException',
'message' => $l->t('Storage not available')
)
));
} catch (\OCP\Files\StorageInvalidException $e) {
\OCP\Util::logException('files', $e);
OCP\JSON::error(array(
'data' => array(
'exception' => '\OCP\Files\StorageInvalidException',
'message' => $l->t('Storage invalid')
)
));
} catch (\Exception $e) {
\OCP\Util::logException('files', $e);
OCP\JSON::error(array(
'data' => array(
'exception' => '\Exception',
'message' => $l->t('Unknown error')
)
));
}
$doBreadcrumb = isset($_GET['breadcrumb']);
$data = array();
$baseUrl = OCP\Util::linkTo('files', 'index.php') . '?dir=';
$permissions = \OCA\Files\Helper::getDirPermissions($dir);
// Make breadcrumb
if($doBreadcrumb) {
$breadcrumb = \OCA\Files\Helper::makeBreadcrumb($dir);
$breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '');
$breadcrumbNav->assign('breadcrumb', $breadcrumb, false);
$breadcrumbNav->assign('baseURL', $baseUrl);
$data['breadcrumb'] = $breadcrumbNav->fetchPage();
}
// make filelist
$files = \OCA\Files\Helper::getFiles($dir);
$list = new OCP\Template("files", "part.list", "");
$list->assign('files', $files, false);
$list->assign('baseURL', $baseUrl, false);
$list->assign('downloadURL', OCP\Util::linkToRoute('download', array('file' => '/')));
$list->assign('isPublic', false);
$data['files'] = $list->fetchPage();
$data['permissions'] = $permissions;
OCP\JSON::success(array('data' => $data));
+1
View File
@@ -1,3 +1,4 @@
<?php
\OC::$session->close();
print OC_Helper::mimetypeIcon($_GET['mime']);
+11 -7
View File
@@ -1,10 +1,8 @@
<?php
// Init owncloud
OCP\JSON::checkLoggedIn();
OCP\JSON::callCheck();
\OC::$session->close();
// Get data
$dir = stripslashes($_POST["dir"]);
@@ -21,10 +19,16 @@ if(\OC\Files\Filesystem::file_exists($target . '/' . $file)) {
if ($target != '' || strtolower($file) != 'shared') {
$targetFile = \OC\Files\Filesystem::normalizePath($target . '/' . $file);
$sourceFile = \OC\Files\Filesystem::normalizePath($dir . '/' . $file);
if(\OC\Files\Filesystem::rename($sourceFile, $targetFile)) {
OCP\JSON::success(array("data" => array( "dir" => $dir, "files" => $file )));
} else {
OCP\JSON::error(array("data" => array( "message" => $l->t("Could not move %s", array($file)) )));
try {
if(\OC\Files\Filesystem::rename($sourceFile, $targetFile)) {
OCP\JSON::success(array("data" => array( "dir" => $dir, "files" => $file )));
} else {
OCP\JSON::error(array("data" => array( "message" => $l->t("Could not move %s", array($file)) )));
}
} catch (\OCP\Files\NotPermittedException $e) {
OCP\JSON::error(array("data" => array( "message" => $l->t("Permission denied") )));
} catch (\Exception $e) {
OCP\JSON::error(array("data" => array( "message" => $e->getMessage())));
}
}else{
OCP\JSON::error(array("data" => array( "message" => $l->t("Could not move %s", array($file)) )));
+74 -26
View File
@@ -7,7 +7,8 @@ if(!OC_User::isLoggedIn()) {
exit;
}
session_write_close();
\OC::$session->close();
// Get the params
$dir = isset( $_REQUEST['dir'] ) ? '/'.trim($_REQUEST['dir'], '/\\') : '';
$filename = isset( $_REQUEST['filename'] ) ? trim($_REQUEST['filename'], '/\\') : '';
@@ -50,16 +51,31 @@ $l10n = \OC_L10n::get('files');
$result = array(
'success' => false,
'data' => NULL
);
);
$trimmedFileName = trim($filename);
if(trim($filename) === '') {
$result['data'] = array('message' => $l10n->t('File name cannot be empty.'));
if($trimmedFileName === '') {
$result['data'] = array('message' => (string)$l10n->t('File name cannot be empty.'));
OCP\JSON::error($result);
exit();
}
if($trimmedFileName === '.' || $trimmedFileName === '..') {
$result['data'] = array('message' => (string)$l10n->t('"%s" is an invalid file name.', $trimmedFileName));
OCP\JSON::error($result);
exit();
}
if(strpos($filename, '/') !== false) {
$result['data'] = array('message' => $l10n->t('File name must not contain "/". Please choose a different name.'));
if(!OCP\Util::isValidFileName($filename)) {
$result['data'] = array('message' => (string)$l10n->t("Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed."));
OCP\JSON::error($result);
exit();
}
if (!\OC\Files\Filesystem::file_exists($dir . '/')) {
$result['data'] = array('message' => (string)$l10n->t(
'The target folder has been moved or deleted.'),
'code' => 'targetnotfound'
);
OCP\JSON::error($result);
exit();
}
@@ -68,7 +84,7 @@ if(strpos($filename, '/') !== false) {
$target = $dir.'/'.$filename;
if (\OC\Files\Filesystem::file_exists($target)) {
$result['data'] = array('message' => $l10n->t(
$result['data'] = array('message' => (string)$l10n->t(
'The name %s is already used in the folder %s. Please choose a different name.',
array($filename, $dir))
);
@@ -77,21 +93,62 @@ if (\OC\Files\Filesystem::file_exists($target)) {
}
if($source) {
if(substr($source, 0, 8)!='https://' and substr($source, 0, 7)!='http://') {
OCP\JSON::error(array('data' => array( 'message' => $l10n->t('Not a valid source') )));
$httpHelper = \OC::$server->getHTTPHelper();
if(!$httpHelper->isHTTPURL($source)) {
OCP\JSON::error(array('data' => array('message' => $l10n->t('Not a valid source'))));
exit();
}
$ctx = stream_context_create(null, array('notification' =>'progress'));
$sourceStream=fopen($source, 'rb', false, $ctx);
$result=\OC\Files\Filesystem::file_put_contents($target, $sourceStream);
if (!ini_get('allow_url_fopen')) {
$eventSource->send('error', array('message' => $l10n->t('Server is not allowed to open URLs, please check the server configuration')));
$eventSource->close();
exit();
}
$source = $httpHelper->getFinalLocationOfURL($source);
$ctx = stream_context_create(\OC::$server->getHTTPHelper()->getDefaultContextArray(), array('notification' =>'progress'));
$sourceStream=@fopen($source, 'rb', false, $ctx);
$result = 0;
if (is_resource($sourceStream)) {
$meta = stream_get_meta_data($sourceStream);
if (isset($meta['wrapper_data']) && is_array($meta['wrapper_data'])) {
//check stream size
$storageStats = \OCA\Files\Helper::buildFileStorageStatistics($dir);
$freeSpace = $storageStats['freeSpace'];
foreach($meta['wrapper_data'] as $header) {
if (strpos($header, ':') === false){
continue;
}
list($name, $value) = explode(':', $header);
if ('content-length' === strtolower(trim($name))) {
$length = (int) trim($value);
if ($length > $freeSpace) {
$delta = $length - $freeSpace;
$humanDelta = OCP\Util::humanFileSize($delta);
$eventSource->send('error', array('message' => (string)$l10n->t('The file exceeds your quota by %s', array($humanDelta))));
$eventSource->close();
fclose($sourceStream);
exit();
}
}
}
}
$result=\OC\Files\Filesystem::file_put_contents($target, $sourceStream);
}
if($result) {
$meta = \OC\Files\Filesystem::getFileInfo($target);
$mime=$meta['mimetype'];
$id = $meta['fileid'];
$eventSource->send('success', array('mime'=>$mime, 'size'=>\OC\Files\Filesystem::filesize($target), 'id' => $id, 'etag' => $meta['etag']));
$data = \OCA\Files\Helper::formatFileInfo($meta);
$eventSource->send('success', $data);
} else {
$eventSource->send('error', $l10n->t('Error while downloading %s to %s', array($source, $target)));
$eventSource->send('error', array('message' => $l10n->t('Error while downloading %s to %s', array($source, $target))));
}
if (is_resource($sourceStream)) {
fclose($sourceStream);
}
$eventSource->close();
exit();
@@ -111,16 +168,7 @@ if($source) {
if($success) {
$meta = \OC\Files\Filesystem::getFileInfo($target);
$id = $meta['fileid'];
$mime = $meta['mimetype'];
$size = $meta['size'];
OCP\JSON::success(array('data' => array(
'id' => $id,
'mime' => $mime,
'size' => $size,
'content' => $content,
'etag' => $meta['etag'],
)));
OCP\JSON::success(array('data' => \OCA\Files\Helper::formatFileInfo($meta)));
exit();
}
}
+14 -4
View File
@@ -5,6 +5,7 @@
OCP\JSON::checkLoggedIn();
OCP\JSON::callCheck();
\OC::$session->close();
// Get the params
$dir = isset( $_POST['dir'] ) ? stripslashes($_POST['dir']) : '';
@@ -23,8 +24,17 @@ if(trim($foldername) === '') {
exit();
}
if(strpos($foldername, '/') !== false) {
$result['data'] = array('message' => $l10n->t('Folder name must not contain "/". Please choose a different name.'));
if(!OCP\Util::isValidFileName($foldername)) {
$result['data'] = array('message' => (string)$l10n->t("Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed."));
OCP\JSON::error($result);
exit();
}
if (!\OC\Files\Filesystem::file_exists($dir . '/')) {
$result['data'] = array('message' => (string)$l10n->t(
'The target folder has been moved or deleted.'),
'code' => 'targetnotfound'
);
OCP\JSON::error($result);
exit();
}
@@ -48,8 +58,8 @@ if(\OC\Files\Filesystem::mkdir($target)) {
$path = '/'.$foldername;
}
$meta = \OC\Files\Filesystem::getFileInfo($path);
$id = $meta['fileid'];
OCP\JSON::success(array('data' => array('id' => $id)));
$meta['type'] = 'dir'; // missing ?!
OCP\JSON::success(array('data' => \OCA\Files\Helper::formatFileInfo($meta)));
exit();
}
-60
View File
@@ -1,60 +0,0 @@
<?php
// only need filesystem apps
$RUNTIME_APPTYPES=array('filesystem');
OCP\JSON::checkLoggedIn();
// Load the files
$dir = isset( $_GET['dir'] ) ? $_GET['dir'] : '';
$mimetypes = isset($_GET['mimetypes']) ? json_decode($_GET['mimetypes'], true) : '';
// Clean up duplicates from array and deal with non-array requests
if (is_array($mimetypes)) {
$mimetypes = array_unique($mimetypes);
} elseif (is_null($mimetypes)) {
$mimetypes = array($_GET['mimetypes']);
}
// make filelist
$files = array();
// If a type other than directory is requested first load them.
if($mimetypes && !in_array('httpd/unix-directory', $mimetypes)) {
foreach( \OC\Files\Filesystem::getDirectoryContent( $dir, 'httpd/unix-directory' ) as $file ) {
$file['directory'] = $dir;
$file['isPreviewAvailable'] = \OC::$server->getPreviewManager()->isMimeSupported($file['mimetype']);
$file["date"] = OCP\Util::formatDate($file["mtime"]);
$file['mimetype_icon'] = \OCA\Files\Helper::determineIcon($file);
$files[] = $file;
}
}
if (is_array($mimetypes) && count($mimetypes)) {
foreach ($mimetypes as $mimetype) {
foreach( \OC\Files\Filesystem::getDirectoryContent( $dir, $mimetype ) as $file ) {
$file['directory'] = $dir;
$file['isPreviewAvailable'] = \OC::$server->getPreviewManager()->isMimeSupported($file['mimetype']);
$file["date"] = OCP\Util::formatDate($file["mtime"]);
$file['mimetype_icon'] = \OCA\Files\Helper::determineIcon($file);
$files[] = $file;
}
}
} else {
foreach( \OC\Files\Filesystem::getDirectoryContent( $dir ) as $file ) {
$file['directory'] = $dir;
$file['isPreviewAvailable'] = \OC::$server->getPreviewManager()->isMimeSupported($file['mimetype']);
$file["date"] = OCP\Util::formatDate($file["mtime"]);
$file['mimetype_icon'] = \OCA\Files\Helper::determineIcon($file);
$files[] = $file;
}
}
// Sort by name
usort($files, function ($a, $b) {
if ($a['name'] === $b['name']) {
return 0;
}
return ($a['name'] < $b['name']) ? -1 : 1;
});
OC_JSON::success(array('data' => $files));
+1
View File
@@ -23,6 +23,7 @@
OCP\JSON::checkLoggedIn();
OCP\JSON::callCheck();
\OC::$session->close();
$files = new \OCA\Files\App(
\OC\Files\Filesystem::getView(),
+1 -1
View File
@@ -1,6 +1,6 @@
<?php
set_time_limit(0); //scanning can take ages
session_write_close();
\OC::$session->close();
$force = (isset($_GET['force']) and ($_GET['force'] === 'true'));
$dir = isset($_GET['dir']) ? $_GET['dir'] : '';
-44
View File
@@ -1,44 +0,0 @@
<?php
set_time_limit(0); //scanning can take ages
session_write_close();
$user = OC_User::getUser();
$eventSource = new OC_EventSource();
$listener = new UpgradeListener($eventSource);
$legacy = new \OC\Files\Cache\Legacy($user);
if ($legacy->hasItems()) {
OC_Hook::connect('\OC\Files\Cache\Upgrade', 'migrate_path', $listener, 'upgradePath');
OC_DB::beginTransaction();
$upgrade = new \OC\Files\Cache\Upgrade($legacy);
$count = $legacy->getCount();
$eventSource->send('total', $count);
$upgrade->upgradePath('/' . $user . '/files');
OC_DB::commit();
}
\OC\Files\Cache\Upgrade::upgradeDone($user);
$eventSource->send('done', true);
$eventSource->close();
class UpgradeListener {
/**
* @var OC_EventSource $eventSource
*/
private $eventSource;
private $count = 0;
private $lastSend = 0;
public function __construct($eventSource) {
$this->eventSource = $eventSource;
}
public function upgradePath($path) {
$this->count++;
if ($this->count > ($this->lastSend + 5)) {
$this->lastSend = $this->count;
$this->eventSource->send('count', $this->count);
}
}
}
+58 -40
View File
@@ -8,6 +8,7 @@ OCP\JSON::setContentTypeHeader('text/plain');
// If no token is sent along, rely on login only
$allowedPermissions = OCP\PERMISSION_ALL;
$errorCode = null;
$l = OC_L10N::get('files');
if (empty($_POST['dirToken'])) {
@@ -19,9 +20,15 @@ if (empty($_POST['dirToken'])) {
die();
}
} else {
// TODO: ideally this code should be in files_sharing/ajax/upload.php
// and the upload/file transfer code needs to be refactored into a utility method
// that could be used there
\OC_User::setIncognitoMode(true);
// return only read permissions for public upload
$allowedPermissions = OCP\PERMISSION_READ;
$public_directory = !empty($_POST['subdir']) ? $_POST['subdir'] : '/';
$publicDirectory = !empty($_POST['subdir']) ? $_POST['subdir'] : '/';
$linkItem = OCP\Share::getShareByToken($_POST['dirToken']);
if ($linkItem === false) {
@@ -42,21 +49,31 @@ if (empty($_POST['dirToken'])) {
// The token defines the target directory (security reasons)
$path = \OC\Files\Filesystem::getPath($linkItem['file_source']);
if($path === null) {
OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('Unable to set upload directory.')))));
die();
}
$dir = sprintf(
"/%s/%s",
$path,
$public_directory
$publicDirectory
);
if (!$dir || empty($dir) || $dir === false) {
OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('Unable to set upload directory.')))));
die();
}
$dir = rtrim($dir, '/');
}
}
OCP\JSON::callCheck();
if (!\OCP\App::isEnabled('files_encryption')) {
// encryption app need to create keys later, so can't close too early
\OC::$session->close();
}
// get array with current storage stats (e.g. max file size)
@@ -80,7 +97,7 @@ foreach ($_FILES['files']['error'] as $error) {
UPLOAD_ERR_CANT_WRITE => $l->t('Failed to write to disk'),
);
$errorMessage = $errors[$error];
\OCP\Util::writeLog('files', "Upload error: $error - $errorMessage", \OCP\Util::ERROR);
\OC::$server->getLogger()->alert("Upload error: $error - $errorMessage", array('app' => 'files'));
OCP\JSON::error(array('data' => array_merge(array('message' => $errorMessage), $storageStats)));
exit();
}
@@ -107,20 +124,30 @@ $result = array();
if (strpos($dir, '..') === false) {
$fileCount = count($files['name']);
for ($i = 0; $i < $fileCount; $i++) {
// target directory for when uploading folders
$relativePath = '';
if(!empty($_POST['file_directory'])) {
$relativePath = '/'.$_POST['file_directory'];
}
// $path needs to be normalized - this failed within drag'n'drop upload to a sub-folder
if (isset($_POST['resolution']) && $_POST['resolution']==='autorename') {
// append a number in brackets like 'filename (2).ext'
$target = OCP\Files::buildNotExistingFileName(stripslashes($dir), $files['name'][$i]);
$target = OCP\Files::buildNotExistingFileName(stripslashes($dir . $relativePath), $files['name'][$i]);
} else {
$target = \OC\Files\Filesystem::normalizePath(stripslashes($dir).'/'.$files['name'][$i]);
$target = \OC\Files\Filesystem::normalizePath(stripslashes($dir . $relativePath).'/'.$files['name'][$i]);
}
$directory = \OC\Files\Filesystem::normalizePath(stripslashes($dir));
if (isset($public_directory)) {
// If we are uploading from the public app,
// we want to send the relative path in the ajax request.
$directory = $public_directory;
// relative dir to return to the client
if (isset($publicDirectory)) {
// path relative to the public root
$returnedDir = $publicDirectory . $relativePath;
} else {
// full path
$returnedDir = $dir . $relativePath;
}
$returnedDir = \OC\Files\Filesystem::normalizePath($returnedDir);
if ( ! \OC\Files\Filesystem::file_exists($target)
|| (isset($_POST['resolution']) && $_POST['resolution']==='replace')
@@ -135,21 +162,17 @@ if (strpos($dir, '..') === false) {
$meta = \OC\Files\Filesystem::getFileInfo($target);
if ($meta === false) {
$error = $l->t('Upload failed. Could not get file info.');
$error = $l->t('The target folder has been moved or deleted.');
$errorCode = 'targetnotfound';
} else {
$result[] = array('status' => 'success',
'mime' => $meta['mimetype'],
'mtime' => $meta['mtime'],
'size' => $meta['size'],
'id' => $meta['fileid'],
'name' => basename($target),
'etag' => $meta['etag'],
'originalname' => $files['tmp_name'][$i],
'uploadMaxFilesize' => $maxUploadFileSize,
'maxHumanFilesize' => $maxHumanFileSize,
'permissions' => $meta['permissions'] & $allowedPermissions,
'directory' => $directory,
);
$data = \OCA\Files\Helper::formatFileInfo($meta);
$data['status'] = 'success';
$data['originalname'] = $files['tmp_name'][$i];
$data['uploadMaxFilesize'] = $maxUploadFileSize;
$data['maxHumanFilesize'] = $maxHumanFileSize;
$data['permissions'] = $meta['permissions'] & $allowedPermissions;
$data['directory'] = $returnedDir;
$result[] = $data;
}
} else {
@@ -158,26 +181,22 @@ if (strpos($dir, '..') === false) {
} catch(Exception $ex) {
$error = $ex->getMessage();
}
} else {
// file already exists
$meta = \OC\Files\Filesystem::getFileInfo($target);
if ($meta === false) {
$error = $l->t('Upload failed. Could not get file info.');
} else {
$result[] = array('status' => 'existserror',
'mime' => $meta['mimetype'],
'mtime' => $meta['mtime'],
'size' => $meta['size'],
'id' => $meta['fileid'],
'name' => basename($target),
'etag' => $meta['etag'],
'originalname' => $files['tmp_name'][$i],
'uploadMaxFilesize' => $maxUploadFileSize,
'maxHumanFilesize' => $maxHumanFileSize,
'permissions' => $meta['permissions'] & $allowedPermissions,
'directory' => $directory,
);
$data = \OCA\Files\Helper::formatFileInfo($meta);
$data['permissions'] = $data['permissions'] & $allowedPermissions;
$data['status'] = 'existserror';
$data['originalname'] = $files['tmp_name'][$i];
$data['uploadMaxFilesize'] = $maxUploadFileSize;
$data['maxHumanFilesize'] = $maxHumanFileSize;
$data['permissions'] = $meta['permissions'] & $allowedPermissions;
$data['directory'] = $returnedDir;
$result[] = $data;
}
}
}
@@ -187,7 +206,6 @@ if (strpos($dir, '..') === false) {
if ($error === false) {
OCP\JSON::encodedPrint($result);
exit();
} else {
OCP\JSON::error(array(array('data' => array_merge(array('message' => $error), $storageStats))));
OCP\JSON::error(array(array('data' => array_merge(array('message' => $error, 'code' => $errorCode), $storageStats))));
}
+11 -10
View File
@@ -10,19 +10,20 @@ OCP\App::addNavigationEntry(array("id" => "files_index",
"icon" => OCP\Util::imagePath("core", "places/files.svg"),
"name" => $l->t("Files")));
OC_Search::registerProvider('OC_Search_Provider_File');
// cache hooks must be connected before all other apps.
// since 'files' is always loaded first the hooks need to be connected here
\OC_Hook::connect('OC_Filesystem', 'post_write', '\OC\Files\Cache\Updater', 'writeHook');
\OC_Hook::connect('OC_Filesystem', 'post_touch', '\OC\Files\Cache\Updater', 'touchHook');
\OC_Hook::connect('OC_Filesystem', 'post_delete', '\OC\Files\Cache\Updater', 'deleteHook');
\OC_Hook::connect('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Updater', 'renameHook');
\OCP\BackgroundJob::addRegularTask('\OC\Files\Cache\BackgroundWatcher', 'checkNext');
\OC::$server->getSearch()->registerProvider('OC\Search\Provider\File');
$templateManager = OC_Helper::getFileTemplateManager();
$templateManager->registerTemplate('text/html', 'core/templates/filetemplates/template.html');
$templateManager->registerTemplate('application/vnd.oasis.opendocument.presentation', 'core/templates/filetemplates/template.odp');
$templateManager->registerTemplate('application/vnd.oasis.opendocument.text', 'core/templates/filetemplates/template.odt');
$templateManager->registerTemplate('application/vnd.oasis.opendocument.spreadsheet', 'core/templates/filetemplates/template.ods');
\OCA\Files\App::getNavigationManager()->add(
array(
"id" => 'files',
"appname" => 'files',
"script" => 'list.php',
"order" => 0,
"name" => $l->t('All files')
)
);
+5 -2
View File
@@ -4,8 +4,8 @@
<name>Files</name>
<description>File Management</description>
<licence>AGPL</licence>
<author>Robin Appelman</author>
<require>4.93</require>
<author>Robin Appelman, Vincent Petry</author>
<requiremin>4.93</requiremin>
<shipped>true</shipped>
<standalone/>
<default_enable/>
@@ -17,4 +17,7 @@
<webdav>appinfo/remote.php</webdav>
<filesync>appinfo/filesync.php</filesync>
</remote>
<documentation>
<user>user-files</user>
</documentation>
</info>
+17 -15
View File
@@ -22,37 +22,39 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*
*/
// load needed apps
$RUNTIME_APPTYPES = array('filesystem', 'authentication', 'logging');
OC_App::loadApps($RUNTIME_APPTYPES);
OC_Util::obEnd();
// Backends
$authBackend = new OC_Connector_Sabre_Auth();
$lockBackend = new OC_Connector_Sabre_Locks();
$requestBackend = new OC_Connector_Sabre_Request();
// Create ownCloud Dir
$rootDir = new OC_Connector_Sabre_Directory('');
$objectTree = new \OC\Connector\Sabre\ObjectTree($rootDir);
// Fire up server
$objectTree = new \OC\Connector\Sabre\ObjectTree();
$server = new OC_Connector_Sabre_Server($objectTree);
$server->httpRequest = $requestBackend;
$server->setBaseUri($baseuri);
// Load plugins
$defaults = new OC_Defaults();
$server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend, $defaults->getName()));
$server->addPlugin(new Sabre_DAV_Locks_Plugin($lockBackend));
$server->addPlugin(new Sabre_DAV_Browser_Plugin(false)); // Show something in the Browser, but no upload
$server->addPlugin(new \Sabre\DAV\Auth\Plugin($authBackend, $defaults->getName()));
$server->addPlugin(new \Sabre\DAV\Locks\Plugin($lockBackend));
$server->addPlugin(new \Sabre\DAV\Browser\Plugin(false, false)); // Show something in the Browser, but no upload
$server->addPlugin(new OC_Connector_Sabre_FilesPlugin());
$server->addPlugin(new OC_Connector_Sabre_AbortedUploadDetectionPlugin());
$server->addPlugin(new OC_Connector_Sabre_QuotaPlugin());
$server->addPlugin(new OC_Connector_Sabre_MaintenancePlugin());
$server->addPlugin(new OC_Connector_Sabre_ExceptionLoggerPlugin('webdav'));
// wait with registering these until auth is handled and the filesystem is setup
$server->subscribeEvent('beforeMethod', function () use ($server, $objectTree) {
$view = \OC\Files\Filesystem::getView();
$rootInfo = $view->getFileInfo('');
// Create ownCloud Dir
$mountManager = \OC\Files\Filesystem::getMountManager();
$rootDir = new OC_Connector_Sabre_Directory($view, $rootInfo);
$objectTree->init($rootDir, $view, $mountManager);
$server->addPlugin(new OC_Connector_Sabre_QuotaPlugin($view));
}, 30); // priority 30: after auth (10) and acl(20), before lock(50) and handling the request
// And off we go!
$server->exec();
+5 -43
View File
@@ -1,46 +1,8 @@
<?php
// fix webdav properties,add namespace in front of the property, update for OC4.5
$installedVersion=OCP\Config::getAppValue('files', 'installed_version');
if (version_compare($installedVersion, '1.1.6', '<')) {
$concat = OC_DB::getConnection()->getDatabasePlatform()->
getConcatExpression( '\'{DAV:}\'', '`propertyname`' );
$query = OC_DB::prepare('
UPDATE `*PREFIX*properties`
SET `propertyname` = ' . $concat . '
WHERE `propertyname` NOT LIKE \'{%\'
');
$query->execute();
}
//update from OC 3
//try to remove remaining files.
//Give a warning if not possible
$filesToRemove = array(
'ajax',
'appinfo',
'css',
'js',
'l10n',
'templates',
'admin.php',
'download.php',
'index.php',
'settings.php'
);
foreach($filesToRemove as $file) {
$filepath = OC::$SERVERROOT . '/files/' . $file;
if(!file_exists($filepath)) {
continue;
}
$success = OCP\Files::rmdirr($filepath);
if($success === false) {
//probably not sufficient privileges, give up and give a message.
OCP\Util::writeLog('files', 'Could not clean /files/ directory.'
.' Please remove everything except webdav.php from ' . OC::$SERVERROOT . '/files/', OCP\Util::ERROR);
break;
}
// this drops the keys below, because they aren't needed anymore
// core related
if (version_compare(\OCP\Config::getSystemValue('version', '0.0.0'), '7.0.0', '<')) {
\OCP\Config::deleteSystemValue('allowZipDownload');
\OCP\Config::deleteSystemValue('maxZipInputSize');
}
+1 -1
View File
@@ -1 +1 @@
1.1.7
1.1.9
+28 -15
View File
@@ -9,6 +9,7 @@
namespace OCA\Files\Command;
use OC\ForbiddenException;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
@@ -32,43 +33,55 @@ class Scan extends Command {
->setName('files:scan')
->setDescription('rescan filesystem')
->addArgument(
'user_id',
InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
'will rescan all files of the given user(s)'
)
'user_id',
InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
'will rescan all files of the given user(s)'
)
->addOption(
'all',
null,
InputOption::VALUE_NONE,
'will rescan all files of all known users'
)
;
'all',
null,
InputOption::VALUE_NONE,
'will rescan all files of all known users'
);
}
protected function scanFiles($user, OutputInterface $output) {
$scanner = new \OC\Files\Utils\Scanner($user);
$scanner->listen('\OC\Files\Utils\Scanner', 'scanFile', function($path) use ($output) {
$scanner->listen('\OC\Files\Utils\Scanner', 'scanFile', function ($path) use ($output) {
$output->writeln("Scanning <info>$path</info>");
});
$scanner->listen('\OC\Files\Utils\Scanner', 'scanFolder', function($path) use ($output) {
$scanner->listen('\OC\Files\Utils\Scanner', 'scanFolder', function ($path) use ($output) {
$output->writeln("Scanning <info>$path</info>");
});
$scanner->scan('');
try {
$scanner->scan('');
} catch (ForbiddenException $e) {
$output->writeln("<error>Home storage for user $user not writable</error>");
$output->writeln("Make sure you're running the scan command only as the user the web server runs as");
}
}
protected function execute(InputInterface $input, OutputInterface $output) {
\OC_App::loadApps('authentication');
if ($input->getOption('all')) {
$users = $this->userManager->search('');
} else {
$users = $input->getArgument('user_id');
}
if (count($users) === 0) {
$output->writeln("<error>Please specify the user id to scan or \"--all\" to scan for all users</error>");
return;
}
foreach ($users as $user) {
if (is_object($user)) {
$user = $user->getUID();
}
$this->scanFiles($user, $output);
if ($this->userManager->userExists($user)) {
$this->scanFiles($user, $output);
} else {
$output->writeln("<error>Unknown user $user</error>");
}
}
}
}
+231 -68
View File
@@ -3,10 +3,11 @@
See the COPYING-README file. */
/* FILE MENU */
.actions { padding:.3em; height:2em; width: 100%; }
.actions { padding:5px; height:32px; display: inline-block; float: left; }
.actions input, .actions button, .actions .button { margin:0; float:left; }
.actions .button a { color: #555; }
.actions .button a:hover, .actions .button a:active { color: #333; }
.actions.hidden { display: none; }
#new {
z-index: 1010;
@@ -20,7 +21,7 @@
padding: 10px;
font-weight: normal;
}
#new>a {
#new > a {
padding: 14px 10px;
position: relative;
top: 7px;
@@ -30,25 +31,35 @@
border-bottom-right-radius: 0;
border-bottom: none;
}
#new>ul {
#new > ul {
display: none;
position: fixed;
min-width: 7em;
min-width: 112px;
z-index: 10;
padding: .5em;
padding: 8px;
padding-bottom: 0;
margin-top: 14px;
margin-left: -1px;
text-align:left;
text-align: left;
background: #f8f8f8;
border: 1px solid #ddd;
border-radius: 5px;
border-top-left-radius: 0;
box-shadow:0 2px 7px rgba(170,170,170,.4);
box-shadow: 0 2px 7px rgba(170,170,170,.4);
}
#new > ul > li {
height: 36px;
margin: 5px;
padding-left: 42px;
padding-bottom: 2px;
background-position: left center;
cursor: pointer;
}
#new > ul > li > p {
cursor: pointer;
padding-top: 7px;
padding-bottom: 7px;
}
#new>ul>li { height:36px; margin:.3em; padding-left:3em; padding-bottom:0.1em;
background-repeat:no-repeat; cursor:pointer; }
#new>ul>li>p { cursor:pointer; padding-top: 7px; padding-bottom: 7px;}
#new .error, #fileList .error {
color: #e9322d;
@@ -65,15 +76,29 @@
top: 44px;
width: 100%;
}
/* make sure there's enough room for the file actions */
#body-user #filestable {
min-width: 750px;
min-width: 688px; /* 768 (mobile break) - 80 (nav width) */
}
#body-user #controls {
min-width: 600px;
min-width: 688px; /* 768 (mobile break) - 80 (nav width) */
}
#filestable tbody tr { background-color:#fff; height:2.5em; }
#filestable tbody tr { background-color:#fff; height:51px; }
/* fit app list view heights */
.app-files #app-content>.viewcontainer {
min-height: 100%;
}
/* move Deleted Files to bottom of sidebar */
.nav-trashbin {
position: absolute !important;
bottom: 0;
}
#filestable tbody tr { background-color:#fff; height:40px; }
#filestable tbody tr:hover, tbody tr:active {
background-color: rgb(240,240,240);
}
@@ -84,18 +109,70 @@
background-color: rgb(240,240,240);
}
tbody a { color:#000; }
span.extension, span.uploading, td.date { color:#999; }
span.extension { text-transform:lowercase; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; filter:alpha(opacity=70); opacity:.7; -webkit-transition:opacity 300ms; -moz-transition:opacity 300ms; -o-transition:opacity 300ms; transition:opacity 300ms; }
tr:hover span.extension { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; color:#777; }
table tr.mouseOver td { background-color:#eee; }
table th { height:2em; padding:0 .5em; color:#999; }
table th .name {
position: absolute;
left: 55px;
top: 15px;
span.extension, span.uploading, td.date {
color: #999;
}
span.extension {
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
filter: alpha(opacity=70);
opacity: .7;
-webkit-transition: opacity 300ms;
-moz-transition: opacity 300ms;
-o-transition: opacity 300ms;
transition: opacity 300ms;
vertical-align: top;
}
tr:hover span.extension {
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
filter: alpha(opacity=100);
opacity: 1;
color: #777;
}
table tr.mouseOver td {
background-color: #eee;
}
table th, table th a {
color: #999;
}
table.multiselect th a {
color: #000;
}
table th .columntitle {
display: block;
padding: 15px;
height: 50px;
box-sizing: border-box;
-moz-box-sizing: border-box;
vertical-align: middle;
}
table th .columntitle.name {
padding-left: 5px;
padding-right: 80px;
margin-left: 50px;
}
table th .sort-indicator {
width: 10px;
height: 8px;
margin-left: 5px;
display: inline-block;
vertical-align: text-bottom;
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)";
filter: alpha(opacity=30);
opacity: .3;
}
.sort-indicator.hidden {
visibility: hidden;
}
table th:hover .sort-indicator.hidden {
visibility: visible;
}
table th, table td { border-bottom:1px solid #ddd; text-align:left; font-weight:normal; }
table td {
padding: 0 15px;
border-bottom: 1px solid #eee;
font-style: normal;
background-position: 8px center;
@@ -111,15 +188,16 @@ table th#headerName {
height: 50px;
}
table th#headerSize, table td.filesize {
min-width: 3em;
padding: 0 1em;
text-align: right;
}
table th#headerDate, table td.date {
table th#headerDate, table td.date,
table th.column-last, table td.column-last {
-moz-box-sizing: border-box;
box-sizing: border-box;
position: relative;
min-width: 11em;
/* this can not be just width, both need to be set … table styling */
min-width: 176px;
max-width: 176px;
}
/* Multiselect bar */
@@ -132,11 +210,12 @@ table.multiselect thead {
z-index: 10;
-moz-box-sizing: border-box;
box-sizing: border-box;
left: 0;
padding-left: 80px;
width: 100%;
left: 250px; /* sidebar */
}
table thead th {
background-color: #fff;
}
table.multiselect thead th {
background-color: rgba(220,220,220,.8);
color: #000;
@@ -147,47 +226,102 @@ table.multiselect #headerName {
position: relative;
width: 9999px; /* when we use 100%, the styling breaks on mobile … table styling */
}
table td.selection, table th.selection, table td.fileaction { width:2em; text-align:center; }
table td.selection, table th.selection, table td.fileaction { width:32px; text-align:center; }
table td.filename a.name {
position:relative; /* Firefox needs to explicitly have this default set … */
-moz-box-sizing: border-box;
box-sizing: border-box;
display: block;
height: 50px;
vertical-align: middle;
line-height: 50px;
padding: 0;
}
table tr[data-type="dir"] td.filename a.name span.nametext {font-weight:bold; }
table td.filename input.filename {
width: 80%;
font-size: 14px;
margin-top: 8px;
margin-left: 2px;
width: 70%;
margin-top: 6px;
margin-left: 7px;
cursor: text;
}
table td.filename a, table td.login, table td.logout, table td.download, table td.upload, table td.create, table td.delete { padding:.2em .5em .5em .3em; }
table td.filename .nametext, .uploadtext, .modified { float:left; padding:.3em 0; }
table td.filename a, table td.login, table td.logout, table td.download, table td.upload, table td.create, table td.delete { padding:3px 8px 8px 3px; }
table td.filename .nametext, .uploadtext, .modified, .column-last>span:first-child { float:left; padding:15px 0; }
#modified {
position: absolute;
top: 15px;
}
.modified {
.modified, .column-last>span:first-child {
position: relative;
overflow: hidden;
text-overflow: ellipsis;
width: 90%;
}
/* ellipsize long modified dates to make room for showing delete button */
#fileList tr:hover .modified, #fileList tr:hover .column-last>span:first-child,
#fileList tr:focus .modified, #fileList tr:focus .column-last>span:first-child {
width: 75%;
}
/* TODO fix usability bug (accidental file/folder selection) */
table td.filename .nametext {
position: absolute;
top: 16px;
left: 55px;
padding: 0;
overflow: hidden;
text-overflow: ellipsis;
max-width: 800px;
height: 100%;
}
table td.filename .nametext .innernametext {
text-overflow: ellipsis;
overflow: hidden;
position: relative;
display: inline-block;
}
@media only screen and (min-width: 1366px) {
table td.filename .nametext .innernametext {
max-width: 760px;
}
table tr:hover td.filename .nametext .innernametext {
max-width: 480px;
}
}
@media only screen and (min-width: 1200px) and (max-width: 1366px) {
table td.filename .nametext .innernametext {
max-width: 600px;
}
table tr:hover td.filename .nametext .innernametext {
max-width: 320px;
}
}
@media only screen and (min-width: 1000px) and (max-width: 1200px) {
table td.filename .nametext .innernametext {
max-width: 400px;
}
table tr:hover td.filename .nametext .innernametext {
max-width: 120px;
}
}
@media only screen and (min-width: 768px) and (max-width: 1000px) {
table td.filename .nametext .innernametext {
max-width: 320px;
}
table tr:hover td.filename .nametext .innernametext {
max-width: 40px;
}
}
/* for smaller resolutions - see mobile.css */
table td.filename .uploadtext {
font-weight: normal;
margin-left: 8px;
}
table td.filename .uploadtext { font-weight:normal; margin-left:.5em; }
table td.filename form { font-size:.85em; margin-left:3em; margin-right:3em; }
.ie8 input[type="checkbox"]{
padding: 0;
@@ -199,6 +333,7 @@ table td.filename form { font-size:.85em; margin-left:3em; margin-right:3em; }
filter: alpha(opacity=0);
opacity: 0;
float: left;
top: 0;
margin: 32px 0 4px 32px; /* bigger clickable area doesnt work in FF width:2.8em; height:2.4em;*/
}
/* Show checkbox when hovering, checked, or selected */
@@ -216,27 +351,33 @@ table td.filename form { font-size:.85em; margin-left:3em; margin-right:3em; }
/* Use label to have bigger clickable size for checkbox */
#fileList tr td.filename>input[type="checkbox"] + label,
#select_all + label {
.select-all + label {
height: 50px;
position: absolute;
position: relative;
width: 50px;
z-index: 5;
}
#fileList tr td.filename>input[type="checkbox"]{
position: relative;
z-index: 4;
}
#fileList tr td.filename>input[type="checkbox"] + label {
left: 0;
}
#select_all + label {
top: 0;
}
#select_all {
.select-all + label {
top: 0;
}
.select-all {
position: absolute;
top: 18px;
left: 18px;
}
#fileList tr td.filename {
position:relative; width:100%;
position: relative;
width: 100%;
padding-left: 0;
-webkit-transition:background-image 500ms; -moz-transition:background-image 500ms; -o-transition:background-image 500ms; transition:background-image 500ms;
}
@@ -251,45 +392,67 @@ table td.filename form { font-size:.85em; margin-left:3em; margin-right:3em; }
/* File actions */
.fileactions {
position: absolute;
top: 14px;
right: 0;
font-size: 11px;
}
#fileList img.move2trash { display:inline; margin:-.5em 0; padding:1em .5em 1em .5em !important; float:right; }
#fileList img.move2trash { display:inline; margin:-8px 0; padding:16px 8px 16px 8px !important; float:right; }
#fileList a.action.delete {
position: absolute;
right: 0;
padding: 9px 14px 19px !important;
padding: 17px 14px;
}
#fileList .action.action-share-notification span, #fileList a {
cursor: default !important;
}
a.action>img {
max-height:16px;
max-width:16px;
vertical-align:text-bottom;
margin-bottom: -1px;
}
a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; }
/* Actions for selected files */
.selectedActions {
display: none;
position: absolute;
top: -1px;
top: 0;
right: 0;
padding: 15px 8px;
}
.selectedActions a {
display: inline;
padding: 17px 5px;
font-size: 11px;
line-height: 50px;
padding: 18px 5px;
}
.selectedActions a.delete-selected {
padding-right: 15px;
}
.selectedActions a.hidden {
display: none;
}
.selectedActions a img {
position:relative;
top:.3em;
vertical-align: text-bottom;
margin-bottom: -1px;
}
#fileList a.action {
display: inline;
margin: -.5em 0;
padding: 18px 8px !important;
padding: 18px 8px;
line-height: 50px;
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
filter: alpha(opacity=0);
opacity: 0;
display:none;
}
#fileList a.action[data-action="Rename"] {
padding: 16px 14px 17px !important;
position: relative;
top: -21px;
}
#fileList tr:hover a.action, #fileList a.action.permanent {
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
filter: alpha(opacity=50);
@@ -315,12 +478,12 @@ a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; }
}
.summary td {
padding-top: 8px;
padding-bottom: 8px;
padding-top: 20px;
padding-bottom: 150px;
border-bottom: none;
}
.summary .info {
margin-left: 55px;
margin-left: 40px;
}
#scanning-message{ top:40%; left:40%; position:absolute; display:none; }
@@ -346,7 +509,7 @@ table.dragshadow td.size {
}
.mask {
z-index: 50;
position: fixed;
position: absolute;
top: 0;
left: 0;
right: 0;
+85
View File
@@ -0,0 +1,85 @@
@media only screen and (max-width: 768px) {
/* dont require a minimum width for files table */
#body-user #filestable {
min-width: initial !important;
}
/* do not show Deleted Files on mobile, not optimized yet and button too long */
#controls #trash {
display: none;
}
/* hide size and date columns */
table th#headerSize,
table td.filesize,
table th#headerDate,
table td.date {
display: none;
}
/* remove padding to let border bottom fill the whole width*/
table td {
padding: 0;
}
/* and accordingly fix left margin of file list summary on mobile */
.summary .info {
margin-left: 55px;
}
/* remove shift for multiselect bar to account for missing navigation */
table.multiselect thead {
padding-left: 0;
}
/* restrict length of displayed filename to prevent overflow */
table td.filename .nametext {
width: 100%;
}
/* always show actions on mobile, not only on hover */
#fileList a.action {
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=20)" !important;
filter: alpha(opacity=20) !important;
opacity: .2 !important;
display: inline !important;
}
/* show share action of shared items darker to distinguish from non-shared */
#fileList a.action.permanent {
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)" !important;
filter: alpha(opacity=70) !important;
opacity: .7 !important;
}
/* do not show Rename or Versions on mobile */
#fileList .action.action-rename,
#fileList .action.action-versions {
display: none !important;
}
/* some padding for better clickability */
#fileList a.action img {
padding: 0 6px 0 12px;
}
/* hide text of the actions on mobile */
#fileList a.action span {
display: none;
}
/* ellipsis on file names */
table td.filename .nametext .innernametext {
max-width: 50%;
}
/* proper notification area for multi line messages */
#notification-container {
display: -webkit-box;
display: -moz-box;
display: -ms-flexbox;
display: -webkit-flex;
display: flex;
}
/* shorten elements for mobile */
#uploadprogressbar {
width: 50px;
}
}
+33 -6
View File
@@ -5,7 +5,7 @@
height: 36px;
width: 39px;
padding: 0 !important; /* override default control bar button padding */
margin-left: .2em;
margin-left: 3px;
overflow: hidden;
vertical-align: top;
}
@@ -30,30 +30,33 @@
height: 44px;
margin: -5px -3px;
padding: 0;
font-size: 1em;
font-size: 16px;
-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0;
z-index: 20;
cursor: pointer;
overflow: hidden;
}
#uploadprogresswrapper {
#uploadprogresswrapper, #uploadprogresswrapper * {
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
#uploadprogresswrapper {
display: inline-block;
vertical-align: top;
height: 36px;
box-sizing: border-box;
margin-left: 3px;
}
#uploadprogresswrapper > input[type='button'] {
height: 36px;
margin-left: 3px;
}
#uploadprogressbar {
position:relative;
float: left;
margin-left: 12px;
width: 130px;
width: 200px;
height: 36px;
display:inline-block;
}
@@ -134,3 +137,27 @@
.oc-dialog .oc-dialog-buttonrow .cancel {
float:left;
}
.highlightUploaded {
-webkit-animation: highlightAnimation 2s 1;
-moz-animation: highlightAnimation 2s 1;
-o-animation: highlightAnimation 2s 1;
animation: highlightAnimation 2s 1;
}
@-webkit-keyframes highlightAnimation {
0% { background-color: rgba(255, 255, 140, 1); }
100% { background-color: rgba(0, 0, 0, 0); }
}
@-moz-keyframes highlightAnimation {
0% { background-color: rgba(255, 255, 140, 1); }
100% { background-color: rgba(0, 0, 0, 0); }
}
@-o-keyframes highlightAnimation {
0% { background-color: rgba(255, 255, 140, 1); }
100% { background-color: rgba(0, 0, 0, 0); }
}
@keyframes highlightAnimation {
0% { background-color: rgba(255, 255, 140, 1); }
100% { background-color: rgba(0, 0, 0, 0); }
}
+2 -5
View File
@@ -24,9 +24,6 @@
// Check if we are a user
OCP\User::checkLoggedIn();
// don't block php session during download
session_write_close();
$filename = $_GET["file"];
if(!\OC\Files\Filesystem::file_exists($filename)) {
@@ -37,12 +34,12 @@ if(!\OC\Files\Filesystem::file_exists($filename)) {
exit;
}
$ftype=\OC\Files\Filesystem::getMimeType( $filename );
$ftype=\OC_Helper::getSecureMimeType(\OC\Files\Filesystem::getMimeType( $filename ));
header('Content-Type:'.$ftype);
OCP\Response::setContentDispositionHeader(basename($filename), 'attachment');
OCP\Response::disableCaching();
header('Content-Length: '.\OC\Files\Filesystem::filesize($filename));
OCP\Response::setContentLengthHeader(\OC\Files\Filesystem::filesize($filename));
OC_Util::obEnd();
\OC\Files\Filesystem::readfile( $filename );
+76 -102
View File
@@ -27,127 +27,101 @@ OCP\User::checkLoggedIn();
// Load the files we need
OCP\Util::addStyle('files', 'files');
OCP\Util::addStyle('files', 'upload');
OCP\Util::addStyle('files', 'mobile');
OCP\Util::addscript('files', 'app');
OCP\Util::addscript('files', 'file-upload');
OCP\Util::addscript('files', 'jquery.iframe-transport');
OCP\Util::addscript('files', 'jquery.fileupload');
OCP\Util::addscript('files', 'jquery-visibility');
OCP\Util::addscript('files', 'filesummary');
OCP\Util::addscript('files', 'breadcrumb');
OCP\Util::addscript('files', 'filelist');
OCP\App::setActiveNavigationEntry('files_index');
// Load the files
$dir = isset($_GET['dir']) ? stripslashes($_GET['dir']) : '';
$dir = \OC\Files\Filesystem::normalizePath($dir);
// Redirect if directory does not exist
if (!\OC\Files\Filesystem::is_dir($dir . '/')) {
header('Location: ' . OCP\Util::getScriptName() . '');
exit();
}
$isIE8 = false;
preg_match('/MSIE (.*?);/', $_SERVER['HTTP_USER_AGENT'], $matches);
if (count($matches) > 0 && $matches[1] <= 8){
if (count($matches) > 0 && $matches[1] <= 9) {
$isIE8 = true;
}
// if IE8 and "?dir=path" was specified, reformat the URL to use a hash like "#?dir=path"
if ($isIE8 && isset($_GET['dir'])){
if ($dir === ''){
$dir = '/';
// if IE8 and "?dir=path&view=someview" was specified, reformat the URL to use a hash like "#?dir=path&view=someview"
if ($isIE8 && (isset($_GET['dir']) || isset($_GET['view']))) {
$hash = '#?';
$dir = isset($_GET['dir']) ? $_GET['dir'] : '/';
$view = isset($_GET['view']) ? $_GET['view'] : 'files';
$hash = '#?dir=' . \OCP\Util::encodePath($dir);
if ($view !== 'files') {
$hash .= '&view=' . urlencode($view);
}
header('Location: ' . OCP\Util::linkTo('files', 'index.php') . '#?dir=' . \OCP\Util::encodePath($dir));
header('Location: ' . OCP\Util::linkTo('files', 'index.php') . $hash);
exit();
}
$ajaxLoad = false;
$files = array();
$user = OC_User::getUser();
if (\OC\Files\Cache\Upgrade::needUpgrade($user)) { //dont load anything if we need to upgrade the cache
$needUpgrade = true;
$freeSpace = 0;
} else {
if ($isIE8){
// after the redirect above, the URL will have a format
// like "files#?dir=path" which means that no path was given
// (dir is not set). In that specific case, we don't return any
// files because the client will take care of switching the dir
// to the one from the hash, then ajax-load the initial file list
$files = array();
$ajaxLoad = true;
}
else{
$files = \OCA\Files\Helper::getFiles($dir);
}
$freeSpace = \OC\Files\Filesystem::free_space($dir);
$needUpgrade = false;
$config = \OC::$server->getConfig();
// mostly for the home storage's free space
$dirInfo = \OC\Files\Filesystem::getFileInfo('/', false);
$storageInfo=OC_Helper::getStorageInfo('/', $dirInfo);
// if the encryption app is disabled, than everything is fine (INIT_SUCCESSFUL status code)
$encryptionInitStatus = 2;
if (OC_App::isEnabled('files_encryption')) {
$session = new \OCA\Encryption\Session(new \OC\Files\View('/'));
$encryptionInitStatus = $session->getInitialized();
}
// Make breadcrumb
$breadcrumb = \OCA\Files\Helper::makeBreadcrumb($dir);
$nav = new OCP\Template('files', 'appnavigation', '');
// make breadcrumb und filelist markup
$list = new OCP\Template('files', 'part.list', '');
$list->assign('files', $files);
$list->assign('baseURL', OCP\Util::linkTo('files', 'index.php') . '?dir=');
$list->assign('downloadURL', OCP\Util::linkToRoute('download', array('file' => '/')));
$list->assign('isPublic', false);
$breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '');
$breadcrumbNav->assign('breadcrumb', $breadcrumb);
$breadcrumbNav->assign('baseURL', OCP\Util::linkTo('files', 'index.php') . '?dir=');
$permissions = \OCA\Files\Helper::getDirPermissions($dir);
if ($needUpgrade) {
OCP\Util::addscript('files', 'upgrade');
$tmpl = new OCP\Template('files', 'upgrade', 'user');
$tmpl->printPage();
} else {
// information about storage capacities
$storageInfo=OC_Helper::getStorageInfo($dir);
$maxUploadFilesize=OCP\Util::maxUploadFilesize($dir);
$publicUploadEnabled = \OC_Appconfig::getValue('core', 'shareapi_allow_public_upload', 'yes');
// if the encryption app is disabled, than everything is fine (INIT_SUCCESSFUL status code)
$encryptionInitStatus = 2;
if (OC_App::isEnabled('files_encryption')) {
$session = new \OCA\Encryption\Session(new \OC\Files\View('/'));
$encryptionInitStatus = $session->getInitialized();
}
$trashEnabled = \OCP\App::isEnabled('files_trashbin');
$trashEmpty = true;
if ($trashEnabled) {
$trashEmpty = \OCA\Files_Trashbin\Trashbin::isEmpty($user);
}
$isCreatable = \OC\Files\Filesystem::isCreatable($dir . '/');
$fileHeader = (!isset($files) or count($files) > 0);
$emptyContent = ($isCreatable and !$fileHeader) or $ajaxLoad;
OCP\Util::addscript('files', 'fileactions');
OCP\Util::addscript('files', 'files');
OCP\Util::addscript('files', 'keyboardshortcuts');
$tmpl = new OCP\Template('files', 'index', 'user');
$tmpl->assign('fileList', $list->fetchPage());
$tmpl->assign('breadcrumb', $breadcrumbNav->fetchPage());
$tmpl->assign('dir', $dir);
$tmpl->assign('isCreatable', $isCreatable);
$tmpl->assign('permissions', $permissions);
$tmpl->assign('files', $files);
$tmpl->assign('trash', $trashEnabled);
$tmpl->assign('trashEmpty', $trashEmpty);
$tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
$tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
$tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
$tmpl->assign('usedSpacePercent', (int)$storageInfo['relative']);
$tmpl->assign('isPublic', false);
$tmpl->assign('publicUploadEnabled', $publicUploadEnabled);
$tmpl->assign("encryptedFiles", \OCP\Util::encryptedFiles());
$tmpl->assign("mailNotificationEnabled", \OC_Appconfig::getValue('core', 'shareapi_allow_mail_notification', 'yes'));
$tmpl->assign("allowShareWithLink", \OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes'));
$tmpl->assign("encryptionInitStatus", $encryptionInitStatus);
$tmpl->assign('disableSharing', false);
$tmpl->assign('ajaxLoad', $ajaxLoad);
$tmpl->assign('emptyContent', $emptyContent);
$tmpl->assign('fileHeader', $fileHeader);
$tmpl->printPage();
function sortNavigationItems($item1, $item2) {
return $item1['order'] - $item2['order'];
}
$navItems = \OCA\Files\App::getNavigationManager()->getAll();
usort($navItems, 'sortNavigationItems');
$nav->assign('navigationItems', $navItems);
$contentItems = array();
function renderScript($appName, $scriptName) {
$content = '';
$appPath = OC_App::getAppPath($appName);
$scriptPath = $appPath . '/' . $scriptName;
if (file_exists($scriptPath)) {
// TODO: sanitize path / script name ?
ob_start();
include $scriptPath;
$content = ob_get_contents();
@ob_end_clean();
}
return $content;
}
// render the container content for every navigation item
foreach ($navItems as $item) {
$content = '';
if (isset($item['script'])) {
$content = renderScript($item['appname'], $item['script']);
}
$contentItem = array();
$contentItem['id'] = $item['id'];
$contentItem['content'] = $content;
$contentItems[] = $contentItem;
}
OCP\Util::addscript('files', 'fileactions');
OCP\Util::addscript('files', 'files');
OCP\Util::addscript('files', 'navigation');
OCP\Util::addscript('files', 'keyboardshortcuts');
$tmpl = new OCP\Template('files', 'index', 'user');
$tmpl->assign('usedSpacePercent', (int)$storageInfo['relative']);
$tmpl->assign('isPublic', false);
$tmpl->assign("encryptedFiles", \OCP\Util::encryptedFiles());
$tmpl->assign("mailNotificationEnabled", $config->getAppValue('core', 'shareapi_allow_mail_notification', 'no'));
$tmpl->assign("allowShareWithLink", $config->getAppValue('core', 'shareapi_allow_links', 'yes'));
$tmpl->assign("encryptionInitStatus", $encryptionInitStatus);
$tmpl->assign('appNavigation', $nav);
$tmpl->assign('appContents', $contentItems);
$tmpl->printPage();
+21 -16
View File
@@ -1,23 +1,28 @@
function switchPublicFolder()
{
/*
* Copyright (c) 2014
*
* This file is licensed under the Affero General Public License version 3
* or later.
*
* See the COPYING-README file.
*
*/
function switchPublicFolder() {
var publicEnable = $('#publicEnable').is(':checked');
var sharingaimGroup = $('input:radio[name=sharingaim]'); //find all radiobuttons of that group
// find all radiobuttons of that group
var sharingaimGroup = $('input:radio[name=sharingaim]');
$.each(sharingaimGroup, function(index, sharingaimItem) {
sharingaimItem.disabled = !publicEnable; //set all buttons to the correct state
// set all buttons to the correct state
sharingaimItem.disabled = !publicEnable;
});
}
$(document).ready(function(){
switchPublicFolder(); // Execute the function after loading DOM tree
$('#publicEnable').click(function(){
switchPublicFolder(); // To get rid of onClick()
});
$('#allowZipDownload').bind('change', function() {
if($('#allowZipDownload').attr('checked')) {
$('#maxZipInputSize').removeAttr('disabled');
} else {
$('#maxZipInputSize').attr('disabled', 'disabled');
}
$(document).ready(function() {
// Execute the function after loading DOM tree
switchPublicFolder();
$('#publicEnable').click(function() {
// To get rid of onClick()
switchPublicFolder();
});
});
+204
View File
@@ -0,0 +1,204 @@
/*
* Copyright (c) 2014
*
* @author Vincent Petry
* @copyright 2014 Vincent Petry <pvince81@owncloud.com>
*
* This file is licensed under the Affero General Public License version 3
* or later.
*
* See the COPYING-README file.
*
*/
/* global dragOptions, folderDropOptions */
(function() {
if (!OCA.Files) {
OCA.Files = {};
}
var App = {
navigation: null,
initialize: function() {
this.navigation = new OCA.Files.Navigation($('#app-navigation'));
var urlParams = OC.Util.History.parseUrlQuery();
var fileActions = new OCA.Files.FileActions();
// default actions
fileActions.registerDefaultActions();
// legacy actions
fileActions.merge(window.FileActions);
// regular actions
fileActions.merge(OCA.Files.fileActions);
this._onActionsUpdated = _.bind(this._onActionsUpdated, this);
OCA.Files.fileActions.on('setDefault.app-files', this._onActionsUpdated);
OCA.Files.fileActions.on('registerAction.app-files', this._onActionsUpdated);
window.FileActions.on('setDefault.app-files', this._onActionsUpdated);
window.FileActions.on('registerAction.app-files', this._onActionsUpdated);
this.files = OCA.Files.Files;
// TODO: ideally these should be in a separate class / app (the embedded "all files" app)
this.fileList = new OCA.Files.FileList(
$('#app-content-files'), {
scrollContainer: $('#app-content'),
dragOptions: dragOptions,
folderDropOptions: folderDropOptions,
fileActions: fileActions,
allowLegacyActions: true,
scrollTo: urlParams.scrollto
}
);
this.files.initialize();
// for backward compatibility, the global FileList will
// refer to the one of the "files" view
window.FileList = this.fileList;
this._setupEvents();
// trigger URL change event handlers
this._onPopState(urlParams);
},
/**
* Destroy the app
*/
destroy: function() {
this.navigation = null;
this.fileList.destroy();
this.fileList = null;
this.files = null;
OCA.Files.fileActions.off('setDefault.app-files', this._onActionsUpdated);
OCA.Files.fileActions.off('registerAction.app-files', this._onActionsUpdated);
window.FileActions.off('setDefault.app-files', this._onActionsUpdated);
window.FileActions.off('registerAction.app-files', this._onActionsUpdated);
},
_onActionsUpdated: function(ev, newAction) {
// forward new action to the file list
if (ev.action) {
this.fileList.fileActions.registerAction(ev.action);
} else if (ev.defaultAction) {
this.fileList.fileActions.setDefault(
ev.defaultAction.mime,
ev.defaultAction.name
);
}
},
/**
* Returns the container of the currently visible app.
*
* @return app container
*/
getCurrentAppContainer: function() {
return this.navigation.getActiveContainer();
},
/**
* Sets the currently active view
* @param viewId view id
*/
setActiveView: function(viewId, options) {
this.navigation.setActiveItem(viewId, options);
},
/**
* Returns the view id of the currently active view
* @return view id
*/
getActiveView: function() {
return this.navigation.getActiveItem();
},
/**
* Setup events based on URL changes
*/
_setupEvents: function() {
OC.Util.History.addOnPopStateHandler(_.bind(this._onPopState, this));
// detect when app changed their current directory
$('#app-content').delegate('>div', 'changeDirectory', _.bind(this._onDirectoryChanged, this));
$('#app-content').delegate('>div', 'changeViewerMode', _.bind(this._onChangeViewerMode, this));
$('#app-navigation').on('itemChanged', _.bind(this._onNavigationChanged, this));
},
/**
* Event handler for when the current navigation item has changed
*/
_onNavigationChanged: function(e) {
var params;
if (e && e.itemId) {
params = {
view: e.itemId,
dir: '/'
};
this._changeUrl(params.view, params.dir);
this.navigation.getActiveContainer().trigger(new $.Event('urlChanged', params));
}
},
/**
* Event handler for when an app notified that its directory changed
*/
_onDirectoryChanged: function(e) {
if (e.dir) {
this._changeUrl(this.navigation.getActiveItem(), e.dir);
}
},
/**
* Event handler for when an app notifies that it needs space
* for viewer mode.
*/
_onChangeViewerMode: function(e) {
var state = !!e.viewerModeEnabled;
$('#app-navigation').toggleClass('hidden', state);
$('.app-files').toggleClass('viewer-mode no-sidebar', state);
},
/**
* Event handler for when the URL changed
*/
_onPopState: function(params) {
params = _.extend({
dir: '/',
view: 'files'
}, params);
var lastId = this.navigation.getActiveItem();
if (!this.navigation.itemExists(params.view)) {
params.view = 'files';
}
this.navigation.setActiveItem(params.view, {silent: true});
if (lastId !== this.navigation.getActiveItem()) {
this.navigation.getActiveContainer().trigger(new $.Event('show'));
}
this.navigation.getActiveContainer().trigger(new $.Event('urlChanged', params));
},
/**
* Change the URL to point to the given dir and view
*/
_changeUrl: function(view, dir) {
var params = {dir: dir};
if (view !== 'files') {
params.view = view;
}
OC.Util.History.pushState(params);
}
};
OCA.Files.App = App;
})();
$(document).ready(function() {
// wait for other apps/extensions to register their event handlers and file actions
// in the "ready" clause
_.defer(function() {
OCA.Files.App.initialize();
});
});
+245
View File
@@ -0,0 +1,245 @@
/**
* ownCloud
*
* @author Vincent Petry
* @copyright 2014 Vincent Petry <pvince81@owncloud.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
* License as published by the Free Software Foundation; either
* version 3 of the License, or any later version.
*
* This library 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 along with this library. If not, see <http://www.gnu.org/licenses/>.
*
*/
/* global OC */
(function() {
/**
* Creates an breadcrumb element in the given container
*/
var BreadCrumb = function(options){
this.$el = $('<div class="breadcrumb"></div>');
options = options || {};
if (options.onClick) {
this.onClick = options.onClick;
}
if (options.onDrop) {
this.onDrop = options.onDrop;
}
if (options.getCrumbUrl) {
this.getCrumbUrl = options.getCrumbUrl;
}
};
BreadCrumb.prototype = {
$el: null,
dir: null,
/**
* Total width of all breadcrumbs
*/
totalWidth: 0,
breadcrumbs: [],
onClick: null,
onDrop: null,
/**
* Sets the directory to be displayed as breadcrumb.
* This will re-render the breadcrumb.
* @param dir path to be displayed as breadcrumb
*/
setDirectory: function(dir) {
dir = dir || '/';
if (dir !== this.dir) {
this.dir = dir;
this.render();
}
},
/**
* Returns the full URL to the given directory
* @param part crumb data as map
* @param index crumb index
* @return full URL
*/
getCrumbUrl: function(part, index) {
return '#';
},
/**
* Renders the breadcrumb elements
*/
render: function() {
var parts = this._makeCrumbs(this.dir || '/');
var $crumb;
this.$el.empty();
this.breadcrumbs = [];
for (var i = 0; i < parts.length; i++) {
var part = parts[i];
var $image;
var $link = $('<a></a>').attr('href', this.getCrumbUrl(part, i));
$link.text(part.name);
$crumb = $('<div class="crumb svg"></div>');
$crumb.append($link);
$crumb.attr('data-dir', part.dir);
if (part.img) {
$image = $('<img class="svg"></img>');
$image.attr('src', part.img);
$link.append($image);
}
this.breadcrumbs.push($crumb);
this.$el.append($crumb);
if (this.onClick) {
$crumb.on('click', this.onClick);
}
}
$crumb.addClass('last');
// in case svg is not supported by the browser we need to execute the fallback mechanism
if (!OC.Util.hasSVGSupport()) {
OC.Util.replaceSVG(this.$el);
}
// setup drag and drop
if (this.onDrop) {
this.$el.find('.crumb:not(.last)').droppable({
drop: this.onDrop,
tolerance: 'pointer'
});
}
this._updateTotalWidth();
},
/**
* Makes a breadcrumb structure based on the given path
* @param dir path to split into a breadcrumb structure
* @return array of map {dir: path, name: displayName}
*/
_makeCrumbs: function(dir) {
var crumbs = [];
var pathToHere = '';
// trim leading and trailing slashes
dir = dir.replace(/^\/+|\/+$/g, '');
var parts = dir.split('/');
if (dir === '') {
parts = [];
}
// root part
crumbs.push({
dir: '/',
name: '',
img: OC.imagePath('core', 'places/home.svg')
});
for (var i = 0; i < parts.length; i++) {
var part = parts[i];
pathToHere = pathToHere + '/' + part;
crumbs.push({
dir: pathToHere,
name: part
});
}
return crumbs;
},
/**
* Calculate the total breadcrumb width when
* all crumbs are expanded
*/
_updateTotalWidth: function () {
this.totalWidth = 0;
for (var i = 0; i < this.breadcrumbs.length; i++ ) {
var $crumb = $(this.breadcrumbs[i]);
$crumb.data('real-width', $crumb.width());
this.totalWidth += $crumb.width();
}
this._resize();
},
/**
* Show/hide breadcrumbs to fit the given width
*/
setMaxWidth: function (availableWidth) {
if (this.availableWidth !== availableWidth) {
this.availableWidth = availableWidth;
this._resize();
}
},
_resize: function() {
var i, $crumb, $ellipsisCrumb;
if (!this.availableWidth) {
this.availableWidth = this.$el.width();
}
if (this.breadcrumbs.length <= 1) {
return;
}
// reset crumbs
this.$el.find('.crumb.ellipsized').remove();
// unhide all
this.$el.find('.crumb.hidden').removeClass('hidden');
if (this.totalWidth <= this.availableWidth) {
// no need to compute breadcrumbs, there is enough space
return;
}
// running width, considering the hidden crumbs
var currentTotalWidth = $(this.breadcrumbs[0]).data('real-width');
var firstHidden = true;
// insert ellipsis after root part (root part is always visible)
$ellipsisCrumb = $('<div class="crumb ellipsized svg"><span class="ellipsis">...</span></div>');
$(this.breadcrumbs[0]).after($ellipsisCrumb);
currentTotalWidth += $ellipsisCrumb.width();
i = this.breadcrumbs.length - 1;
// find the first section that would cause the overflow
// then hide everything in front of that
//
// this ensures that the last crumb section stays visible
// for most of the cases and is always the last one to be
// hidden when the screen becomes very narrow
while (i > 0) {
$crumb = $(this.breadcrumbs[i]);
// if the current breadcrumb would cause overflow
if (!firstHidden || currentTotalWidth + $crumb.data('real-width') > this.availableWidth) {
// hide it
$crumb.addClass('hidden');
if (firstHidden) {
// set the path of this one as title for the ellipsis
this.$el.find('.crumb.ellipsized')
.attr('title', $crumb.attr('data-dir'))
.tipsy();
}
// and all the previous ones (going backwards)
firstHidden = false;
} else {
// add to total width
currentTotalWidth += $crumb.data('real-width');
}
i--;
}
if (!OC.Util.hasSVGSupport()) {
OC.Util.replaceSVG(this.$el);
}
}
};
OCA.Files.BreadCrumb = BreadCrumb;
})();
File diff suppressed because it is too large Load Diff
+375 -193
View File
@@ -1,214 +1,396 @@
var FileActions = {
actions: {},
defaults: {},
icons: {},
currentFile: null,
register: function (mime, name, permissions, icon, action) {
if (!FileActions.actions[mime]) {
FileActions.actions[mime] = {};
}
if (!FileActions.actions[mime][name]) {
FileActions.actions[mime][name] = {};
}
FileActions.actions[mime][name]['action'] = action;
FileActions.actions[mime][name]['permissions'] = permissions;
FileActions.icons[name] = icon;
},
setDefault: function (mime, name) {
FileActions.defaults[mime] = name;
},
get: function (mime, type, permissions) {
var actions = {};
if (FileActions.actions.all) {
actions = $.extend(actions, FileActions.actions.all);
}
if (type) {//type is 'dir' or 'file'
if (FileActions.actions[type]) {
actions = $.extend(actions, FileActions.actions[type]);
}
}
if (mime) {
var mimePart = mime.substr(0, mime.indexOf('/'));
if (FileActions.actions[mimePart]) {
actions = $.extend(actions, FileActions.actions[mimePart]);
}
if (FileActions.actions[mime]) {
actions = $.extend(actions, FileActions.actions[mime]);
}
}
var filteredActions = {};
$.each(actions, function (name, action) {
if (action.permissions & permissions) {
filteredActions[name] = action.action;
}
});
return filteredActions;
},
getDefault: function (mime, type, permissions) {
if (mime) {
var mimePart = mime.substr(0, mime.indexOf('/'));
}
var name = false;
if (mime && FileActions.defaults[mime]) {
name = FileActions.defaults[mime];
} else if (mime && FileActions.defaults[mimePart]) {
name = FileActions.defaults[mimePart];
} else if (type && FileActions.defaults[type]) {
name = FileActions.defaults[type];
} else {
name = FileActions.defaults.all;
}
var actions = this.get(mime, type, permissions);
return actions[name];
},
/*
* Copyright (c) 2014
*
* This file is licensed under the Affero General Public License version 3
* or later.
*
* See the COPYING-README file.
*
*/
/* global trashBinApp */
(function() {
/**
* Display file actions for the given element
* @param parent "td" element of the file for which to display actions
* @param triggerEvent if true, triggers the fileActionsReady on the file
* list afterwards (false by default)
* Construct a new FileActions instance
*/
display: function (parent, triggerEvent) {
FileActions.currentFile = parent;
var actions = FileActions.get(FileActions.getCurrentMimeType(), FileActions.getCurrentType(), FileActions.getCurrentPermissions());
var file = FileActions.getCurrentFile();
if (FileList.findFileEl(file).data('renaming')) {
return;
}
var FileActions = function() {
this.initialize();
}
FileActions.prototype = {
actions: {},
defaults: {},
icons: {},
currentFile: null,
// recreate fileactions
parent.children('a.name').find('.fileactions').remove();
parent.children('a.name').append('<span class="fileactions" />');
var defaultAction = FileActions.getDefault(FileActions.getCurrentMimeType(), FileActions.getCurrentType(), FileActions.getCurrentPermissions());
/**
* Dummy jquery element, for events
*/
$el: null,
var actionHandler = function (event) {
event.stopPropagation();
event.preventDefault();
/**
* List of handlers to be notified whenever a register() or
* setDefault() was called.
*/
_updateListeners: {},
FileActions.currentFile = event.data.elem;
var file = FileActions.getCurrentFile();
initialize: function() {
this.clear();
// abusing jquery for events until we get a real event lib
this.$el = $('<div class="dummy-fileactions hidden"></div>');
$('body').append(this.$el);
},
event.data.actionFunc(file);
};
/**
* Adds an event handler
*
* @param {String} eventName event name
* @param Function callback
*/
on: function(eventName, callback) {
this.$el.on(eventName, callback);
},
var addAction = function (name, action) {
// NOTE: Temporary fix to prevent rename action in root of Shared directory
if (name === 'Rename' && $('#dir').val() === '/Shared') {
return true;
/**
* Removes an event handler
*
* @param {String} eventName event name
* @param Function callback
*/
off: function(eventName, callback) {
this.$el.off(eventName, callback);
},
/**
* Notifies the event handlers
*
* @param {String} eventName event name
* @param {Object} data data
*/
_notifyUpdateListeners: function(eventName, data) {
this.$el.trigger(new $.Event(eventName, data));
},
/**
* Merges the actions from the given fileActions into
* this instance.
*
* @param fileActions instance of OCA.Files.FileActions
*/
merge: function(fileActions) {
var self = this;
// merge first level to avoid unintended overwriting
_.each(fileActions.actions, function(sourceMimeData, mime) {
var targetMimeData = self.actions[mime];
if (!targetMimeData) {
targetMimeData = {};
}
self.actions[mime] = _.extend(targetMimeData, sourceMimeData);
});
this.defaults = _.extend(this.defaults, fileActions.defaults);
this.icons = _.extend(this.icons, fileActions.icons);
},
/**
* @deprecated use #registerAction() instead
*/
register: function(mime, name, permissions, icon, action, displayName) {
return this.registerAction({
name: name,
mime: mime,
permissions: permissions,
icon: icon,
actionHandler: action,
displayName: displayName
});
},
/**
* Register action
*
* @param {Object} action action object
* @param {String} action.name identifier of the action
* @param {String} action.displayName display name of the action, defaults
* to the name given in action.name
* @param {String} action.mime mime type
* @param {int} action.permissions permissions
* @param {(Function|String)} action.icon icon
* @param {Function} action.actionHandler function that performs the action
*/
registerAction: function (action) {
var mime = action.mime;
var name = action.name;
if (!this.actions[mime]) {
this.actions[mime] = {};
}
this.actions[mime][name] = {
action: action.actionHandler,
permissions: action.permissions,
displayName: action.displayName || t('files', name)
};
this.icons[name] = action.icon;
this._notifyUpdateListeners('registerAction', {action: action});
},
clear: function() {
this.actions = {};
this.defaults = {};
this.icons = {};
this.currentFile = null;
this._updateListeners = [];
},
setDefault: function (mime, name) {
this.defaults[mime] = name;
this._notifyUpdateListeners('setDefault', {defaultAction: {mime: mime, name: name}});
},
get: function (mime, type, permissions) {
var actions = this.getActions(mime, type, permissions);
var filteredActions = {};
$.each(actions, function (name, action) {
filteredActions[name] = action.action;
});
return filteredActions;
},
getActions: function (mime, type, permissions) {
var actions = {};
if (this.actions.all) {
actions = $.extend(actions, this.actions.all);
}
if (type) {//type is 'dir' or 'file'
if (this.actions[type]) {
actions = $.extend(actions, this.actions[type]);
}
}
if (mime) {
var mimePart = mime.substr(0, mime.indexOf('/'));
if (this.actions[mimePart]) {
actions = $.extend(actions, this.actions[mimePart]);
}
if (this.actions[mime]) {
actions = $.extend(actions, this.actions[mime]);
}
}
var filteredActions = {};
$.each(actions, function (name, action) {
if (action.permissions & permissions) {
filteredActions[name] = action;
}
});
return filteredActions;
},
getDefault: function (mime, type, permissions) {
var mimePart;
if (mime) {
mimePart = mime.substr(0, mime.indexOf('/'));
}
var name = false;
if (mime && this.defaults[mime]) {
name = this.defaults[mime];
} else if (mime && this.defaults[mimePart]) {
name = this.defaults[mimePart];
} else if (type && this.defaults[type]) {
name = this.defaults[type];
} else {
name = this.defaults.all;
}
var actions = this.get(mime, type, permissions);
return actions[name];
},
/**
* Display file actions for the given element
* @param parent "td" element of the file for which to display actions
* @param triggerEvent if true, triggers the fileActionsReady on the file
* list afterwards (false by default)
* @param fileList OCA.Files.FileList instance on which the action is
* done, defaults to OCA.Files.App.fileList
*/
display: function (parent, triggerEvent, fileList) {
if (!fileList) {
console.warn('FileActions.display() MUST be called with a OCA.Files.FileList instance');
return;
}
this.currentFile = parent;
var $tr = parent.closest('tr');
var self = this;
var actions = this.getActions(this.getCurrentMimeType(), this.getCurrentType(), this.getCurrentPermissions());
var file = this.getCurrentFile();
var nameLinks;
if ($tr.data('renaming')) {
return;
}
if ((name === 'Download' || action !== defaultAction) && name !== 'Delete') {
var img = FileActions.icons[name];
// recreate fileactions
nameLinks = parent.children('a.name');
nameLinks.find('.fileactions, .nametext .action').remove();
nameLinks.append('<span class="fileactions" />');
var defaultAction = this.getDefault(this.getCurrentMimeType(), this.getCurrentType(), this.getCurrentPermissions());
var actionHandler = function (event) {
event.stopPropagation();
event.preventDefault();
self.currentFile = event.data.elem;
// also set on global object for legacy apps
window.FileActions.currentFile = self.currentFile;
var file = self.getCurrentFile();
var $tr = $(this).closest('tr');
event.data.actionFunc(file, {
$file: $tr,
fileList: fileList,
fileActions: self,
dir: $tr.attr('data-path') || fileList.getCurrentDirectory()
});
};
var addAction = function (name, action, displayName) {
if ((name === 'Download' || action !== defaultAction) && name !== 'Delete') {
var img = self.icons[name],
actionText = displayName,
actionContainer = 'a.name>span.fileactions';
if (name === 'Rename') {
// rename has only an icon which appears behind
// the file name
actionText = '';
actionContainer = 'a.name span.nametext';
}
if (img.call) {
img = img(file);
}
var html = '<a href="#" class="action action-' + name.toLowerCase() + '" data-action="' + name + '">';
if (img) {
html += '<img class ="svg" src="' + img + '" />';
}
html += '<span> ' + actionText + '</span></a>';
var element = $(html);
element.data('action', name);
element.on('click', {a: null, elem: parent, actionFunc: actions[name].action}, actionHandler);
parent.find(actionContainer).append(element);
}
};
$.each(actions, function (name, action) {
if (name !== 'Share') {
displayName = action.displayName;
ah = action.action;
addAction(name, ah, displayName);
}
});
if(actions.Share){
displayName = t('files', 'Share');
addAction('Share', actions.Share, displayName);
}
// remove the existing delete action
parent.parent().children().last().find('.action.delete').remove();
if (actions['Delete']) {
var img = self.icons['Delete'];
var html;
var mountType = $tr.attr('data-mounttype');
var deleteTitle = t('files', 'Delete');
if (mountType === 'external-root') {
deleteTitle = t('files', 'Disconnect storage');
} else if (mountType === 'shared-root') {
deleteTitle = t('files', 'Unshare');
} else if (fileList.id === 'trashbin') {
deleteTitle = t('files', 'Delete permanently');
}
if (img.call) {
img = img(file);
}
var html = '<a href="#" class="action" data-action="' + name + '">';
if (img) {
html += '<img class ="svg" src="' + img + '" />';
}
html += '<span> ' + t('files', name) + '</span></a>';
html = '<a href="#" original-title="' + escapeHTML(deleteTitle) + '" class="action delete delete-icon" />';
var element = $(html);
element.data('action', name);
//alert(element);
element.on('click', {a: null, elem: parent, actionFunc: actions[name]}, actionHandler);
parent.find('a.name>span.fileactions').append(element);
element.data('action', actions['Delete']);
element.on('click', {a: null, elem: parent, actionFunc: actions['Delete'].action}, actionHandler);
parent.parent().children().last().append(element);
}
};
$.each(actions, function (name, action) {
if (name !== 'Share') {
addAction(name, action);
if (triggerEvent){
fileList.$fileList.trigger(jQuery.Event("fileActionsReady", {fileList: fileList, $files: $tr}));
}
});
if(actions.Share && !($('#dir').val() === '/' && file === 'Shared')){
// t('files', 'Share')
addAction('Share', actions.Share);
},
getCurrentFile: function () {
return this.currentFile.parent().attr('data-file');
},
getCurrentMimeType: function () {
return this.currentFile.parent().attr('data-mime');
},
getCurrentType: function () {
return this.currentFile.parent().attr('data-type');
},
getCurrentPermissions: function () {
return this.currentFile.parent().data('permissions');
},
/**
* Register the actions that are used by default for the files app.
*/
registerDefaultActions: function() {
this.register('all', 'Delete', OC.PERMISSION_DELETE, function () {
return OC.imagePath('core', 'actions/delete');
}, function (filename, context) {
context.fileList.do_delete(filename, context.dir);
$('.tipsy').remove();
});
// t('files', 'Rename')
this.register('all', 'Rename', OC.PERMISSION_UPDATE, function () {
return OC.imagePath('core', 'actions/rename');
}, function (filename, context) {
context.fileList.rename(filename);
});
this.register('dir', 'Open', OC.PERMISSION_READ, '', function (filename, context) {
var dir = context.$file.attr('data-path') || context.fileList.getCurrentDirectory();
if (dir !== '/') {
dir = dir + '/';
}
context.fileList.changeDirectory(dir + filename);
});
this.setDefault('dir', 'Open');
this.register('all', 'Download', OC.PERMISSION_READ, function () {
return OC.imagePath('core', 'actions/download');
}, function (filename, context) {
var dir = context.dir || context.fileList.getCurrentDirectory();
var url = context.fileList.getDownloadUrl(filename, dir);
if (url) {
OC.redirect(url);
}
});
}
};
// remove the existing delete action
parent.parent().children().last().find('.action.delete').remove();
if (actions['Delete']) {
var img = FileActions.icons['Delete'];
if (img.call) {
img = img(file);
}
if (typeof trashBinApp !== 'undefined' && trashBinApp) {
var html = '<a href="#" original-title="' + t('files', 'Delete permanently') + '" class="action delete delete-icon" />';
} else {
var html = '<a href="#" class="action delete delete-icon" />';
}
var element = $(html);
element.data('action', actions['Delete']);
element.on('click', {a: null, elem: parent, actionFunc: actions['Delete']}, actionHandler);
parent.parent().children().last().append(element);
}
OCA.Files.FileActions = FileActions;
if (triggerEvent){
$('#fileList').trigger(jQuery.Event("fileActionsReady"));
}
},
getCurrentFile: function () {
return FileActions.currentFile.parent().attr('data-file');
},
getCurrentMimeType: function () {
return FileActions.currentFile.parent().attr('data-mime');
},
getCurrentType: function () {
return FileActions.currentFile.parent().attr('data-type');
},
getCurrentPermissions: function () {
return FileActions.currentFile.parent().data('permissions');
}
};
// global file actions to be used by all lists
OCA.Files.fileActions = new OCA.Files.FileActions();
OCA.Files.legacyFileActions = new OCA.Files.FileActions();
$(document).ready(function () {
var hasDownloadAction = false;
var downloadScope;
if ($('#allowZipDownload').val() == 1) {
downloadScope = 'all';
} else {
downloadScope = 'file';
}
// for backward compatibility
//
// legacy apps are expecting a stateful global FileActions object to register
// their actions on. Since legacy apps are very likely to break with other
// FileList views than the main one ("All files"), actions registered
// through window.FileActions will be limited to the main file list.
window.FileActions = OCA.Files.legacyFileActions;
window.FileActions.register = function (mime, name, permissions, icon, action, displayName) {
console.warn('FileActions.register() is deprecated, please use OCA.Files.fileActions.register() instead', arguments);
OCA.Files.FileActions.prototype.register.call(
window.FileActions, mime, name, permissions, icon, action, displayName
);
};
window.FileActions.display = function (parent, triggerEvent, fileList) {
fileList = fileList || OCA.Files.App.fileList;
console.warn('FileActions.display() is deprecated, please use OCA.Files.fileActions.register() which automatically redisplays actions', mime, name);
OCA.Files.FileActions.prototype.display.call(window.FileActions, parent, triggerEvent, fileList);
};
})();
hasDownloadAction = FileActions.actions[downloadScope] && FileActions.actions[downloadScope].Download;
// do not override download action if it exists (might have been registered by an app already)
if ((typeof disableDownloadActions == 'undefined' || !disableDownloadActions) && !hasDownloadAction) {
FileActions.register(downloadScope, 'Download', OC.PERMISSION_READ, function () {
return OC.imagePath('core', 'actions/download');
}, function (filename) {
window.location = OC.filePath('files', 'ajax', 'download.php') + '?files=' + encodeURIComponent(filename) + '&dir=' + encodeURIComponent($('#dir').val());
});
}
$('#fileList tr').each(function () {
FileActions.display($(this).children('td.filename'));
});
$('#fileList').trigger(jQuery.Event("fileActionsReady"));
});
FileActions.register('all', 'Delete', OC.PERMISSION_DELETE, function () {
return OC.imagePath('core', 'actions/delete');
}, function (filename) {
FileList.do_delete(filename);
$('.tipsy').remove();
});
// t('files', 'Rename')
FileActions.register('all', 'Rename', OC.PERMISSION_UPDATE, function () {
return OC.imagePath('core', 'actions/rename');
}, function (filename) {
FileList.rename(filename);
});
FileActions.register('dir', 'Open', OC.PERMISSION_READ, '', function (filename) {
var dir = $('#dir').val() || '/';
if (dir !== '/') {
dir = dir + '/';
}
FileList.changeDirectory(dir + filename);
});
FileActions.setDefault('dir', 'Open');
+1944 -1003
View File
File diff suppressed because it is too large Load Diff
+333 -673
View File
File diff suppressed because it is too large Load Diff
+195
View File
@@ -0,0 +1,195 @@
/**
* ownCloud
*
* @author Vincent Petry
* @copyright 2014 Vincent Petry <pvince81@owncloud.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
* License as published by the Free Software Foundation; either
* version 3 of the License, or any later version.
*
* This library 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 along with this library. If not, see <http://www.gnu.org/licenses/>.
*
*/
/* global OC, n, t */
(function() {
/**
* The FileSummary class encapsulates the file summary values and
* the logic to render it in the given container
* @param $tr table row element
* $param summary optional initial summary value
*/
var FileSummary = function($tr) {
this.$el = $tr;
this.clear();
this.render();
};
FileSummary.prototype = {
summary: {
totalFiles: 0,
totalDirs: 0,
totalSize: 0
},
/**
* Adds file
* @param file file to add
* @param update whether to update the display
*/
add: function(file, update) {
if (file.type === 'dir' || file.mime === 'httpd/unix-directory') {
this.summary.totalDirs++;
}
else {
this.summary.totalFiles++;
}
this.summary.totalSize += parseInt(file.size, 10) || 0;
if (!!update) {
this.update();
}
},
/**
* Removes file
* @param file file to remove
* @param update whether to update the display
*/
remove: function(file, update) {
if (file.type === 'dir' || file.mime === 'httpd/unix-directory') {
this.summary.totalDirs--;
}
else {
this.summary.totalFiles--;
}
this.summary.totalSize -= parseInt(file.size, 10) || 0;
if (!!update) {
this.update();
}
},
/**
* Returns the total of files and directories
*/
getTotal: function() {
return this.summary.totalDirs + this.summary.totalFiles;
},
/**
* Recalculates the summary based on the given files array
* @param files array of files
*/
calculate: function(files) {
var file;
var summary = {
totalDirs: 0,
totalFiles: 0,
totalSize: 0
};
for (var i = 0; i < files.length; i++) {
file = files[i];
if (file.type === 'dir' || file.mime === 'httpd/unix-directory') {
summary.totalDirs++;
}
else {
summary.totalFiles++;
}
summary.totalSize += parseInt(file.size, 10) || 0;
}
this.setSummary(summary);
},
/**
* Clears the summary
*/
clear: function() {
this.calculate([]);
},
/**
* Sets the current summary values
* @param summary map
*/
setSummary: function(summary) {
this.summary = summary;
this.update();
},
/**
* Renders the file summary element
*/
update: function() {
if (!this.$el) {
return;
}
if (!this.summary.totalFiles && !this.summary.totalDirs) {
this.$el.addClass('hidden');
return;
}
// There's a summary and data -> Update the summary
this.$el.removeClass('hidden');
var $dirInfo = this.$el.find('.dirinfo');
var $fileInfo = this.$el.find('.fileinfo');
var $connector = this.$el.find('.connector');
// Substitute old content with new translations
$dirInfo.html(n('files', '%n folder', '%n folders', this.summary.totalDirs));
$fileInfo.html(n('files', '%n file', '%n files', this.summary.totalFiles));
this.$el.find('.filesize').html(OC.Util.humanFileSize(this.summary.totalSize));
// Show only what's necessary (may be hidden)
if (this.summary.totalDirs === 0) {
$dirInfo.addClass('hidden');
$connector.addClass('hidden');
} else {
$dirInfo.removeClass('hidden');
}
if (this.summary.totalFiles === 0) {
$fileInfo.addClass('hidden');
$connector.addClass('hidden');
} else {
$fileInfo.removeClass('hidden');
}
if (this.summary.totalDirs > 0 && this.summary.totalFiles > 0) {
$connector.removeClass('hidden');
}
},
render: function() {
if (!this.$el) {
return;
}
// TODO: ideally this should be separate to a template or something
var summary = this.summary;
var directoryInfo = n('files', '%n folder', '%n folders', summary.totalDirs);
var fileInfo = n('files', '%n file', '%n files', summary.totalFiles);
var infoVars = {
dirs: '<span class="dirinfo">'+directoryInfo+'</span><span class="connector">',
files: '</span><span class="fileinfo">'+fileInfo+'</span>'
};
// don't show the filesize column, if filesize is NaN (e.g. in trashbin)
var fileSize = '';
if (!isNaN(summary.totalSize)) {
fileSize = '<td class="filesize">' + OC.Util.humanFileSize(summary.totalSize) + '</td>';
}
var info = t('files', '{dirs} and {files}', infoVars);
var $summary = $('<td><span class="info">'+info+'</span></td>'+fileSize+'<td class="date"></td>');
if (!this.summary.totalFiles && !this.summary.totalDirs) {
this.$el.addClass('hidden');
}
this.$el.append($summary);
}
};
OCA.Files.FileSummary = FileSummary;
})();
+1 -2
View File
@@ -12,7 +12,6 @@
* enter: open file/folder
* delete/backspace: delete file/folder
*****************************/
var Files = Files || {};
(function(Files) {
var keys = [];
var keyCodes = {
@@ -167,4 +166,4 @@ var Files = Files || {};
removeA(keys, event.keyCode);
});
};
})(Files);
})((OCA.Files && OCA.Files.Files) || {});
+122
View File
@@ -0,0 +1,122 @@
/*
* Copyright (c) 2014
*
* @author Vincent Petry
* @copyright 2014 Vincent Petry <pvince81@owncloud.com>
*
* This file is licensed under the Affero General Public License version 3
* or later.
*
* See the COPYING-README file.
*
*/
(function() {
var Navigation = function($el) {
this.initialize($el);
};
Navigation.prototype = {
/**
* Currently selected item in the list
*/
_activeItem: null,
/**
* Currently selected container
*/
$currentContent: null,
/**
* Initializes the navigation from the given container
* @param $el element containing the navigation
*/
initialize: function($el) {
this.$el = $el;
this._activeItem = null;
this.$currentContent = null;
this._setupEvents();
},
/**
* Setup UI events
*/
_setupEvents: function() {
this.$el.on('click', 'li a', _.bind(this._onClickItem, this));
},
/**
* Returns the container of the currently active app.
*
* @return app container
*/
getActiveContainer: function() {
return this.$currentContent;
},
/**
* Returns the currently active item
*
* @return item ID
*/
getActiveItem: function() {
return this._activeItem;
},
/**
* Switch the currently selected item, mark it as selected and
* make the content container visible, if any.
*
* @param string itemId id of the navigation item to select
* @param array options "silent" to not trigger event
*/
setActiveItem: function(itemId, options) {
var oldItemId = this._activeItem;
if (itemId === this._activeItem) {
if (!options || !options.silent) {
this.$el.trigger(
new $.Event('itemChanged', {itemId: itemId, previousItemId: oldItemId})
);
}
return;
}
this.$el.find('li').removeClass('active');
if (this.$currentContent) {
this.$currentContent.addClass('hidden');
this.$currentContent.trigger(jQuery.Event('hide'));
}
this._activeItem = itemId;
this.$el.find('li[data-id=' + itemId + ']').addClass('active');
this.$currentContent = $('#app-content-' + itemId);
this.$currentContent.removeClass('hidden');
if (!options || !options.silent) {
this.$currentContent.trigger(jQuery.Event('show'));
this.$el.trigger(
new $.Event('itemChanged', {itemId: itemId, previousItemId: oldItemId})
);
}
},
/**
* Returns whether a given item exists
*/
itemExists: function(itemId) {
return this.$el.find('li[data-id=' + itemId + ']').length;
},
/**
* Event handler for when clicking on an item.
*/
_onClickItem: function(ev) {
var $target = $(ev.target);
var itemId = $target.closest('li').attr('data-id');
this.setActiveItem(itemId);
return false;
}
};
OCA.Files.Navigation = Navigation;
})();
-17
View File
@@ -1,17 +0,0 @@
$(document).ready(function () {
var eventSource, total, bar = $('#progressbar');
console.log('start');
bar.progressbar({value: 0});
eventSource = new OC.EventSource(OC.filePath('files', 'ajax', 'upgrade.php'));
eventSource.listen('total', function (count) {
total = count;
console.log(count + ' files needed to be migrated');
});
eventSource.listen('count', function (count) {
bar.progressbar({value: (count / total) * 100});
console.log(count);
});
eventSource.listen('done', function () {
document.location.reload();
});
});
+11
View File
@@ -1,3 +1,14 @@
/*
* Copyright (c) 2014
*
* This file is licensed under the Affero General Public License version 3
* or later.
*
* See the COPYING-README file.
*
*/
/* global OC */
function Upload(fileSelector) {
if ($.support.xhrFileUpload) {
return new XHRUpload(fileSelector.target.files);
+1
View File
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
"Share" => "Deel",
"_%n folder_::_%n folders_" => array("",""),
"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("","")
+7
View File
@@ -0,0 +1,7 @@
<?php
$TRANSLATIONS = array(
"_%n folder_::_%n folders_" => array("",""),
"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("","")
);
$PLURAL_FORMS = "nplurals=2; plural=n > 1;";
+7
View File
@@ -0,0 +1,7 @@
<?php
$TRANSLATIONS = array(
"_%n folder_::_%n folders_" => array("",""),
"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("","")
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
+17 -28
View File
@@ -3,6 +3,7 @@ $TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "فشل في نقل الملف %s - يوجد ملف بنفس هذا الاسم",
"Could not move %s" => "فشل في نقل %s",
"File name cannot be empty." => "اسم الملف لا يجوز أن يكون فارغا",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "اسم غير صحيح , الرموز '\\', '/', '<', '>', ':', '\"', '|', '?' و \"*\" غير مسموح استخدامها",
"Unable to set upload directory." => "غير قادر على تحميل المجلد",
"Invalid Token" => "علامة غير صالحة",
"No file was uploaded. Unknown error" => "لم يتم رفع أي ملف , خطأ غير معروف",
@@ -14,63 +15,51 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "المجلد المؤقت غير موجود",
"Failed to write to disk" => "خطأ في الكتابة على القرص الصلب",
"Not enough storage available" => "لا يوجد مساحة تخزينية كافية",
"Upload failed. Could not get file info." => "فشلت عملية الرفع. تعذر الحصول على معلومات الملف.",
"Upload failed. Could not find uploaded file" => "*فشلت علمية الرفع. تعذر إيجاد الملف الذي تم رفعه.\n*فشلت علمية التحميل. تعذر إيجاد الملف الذي تم تحميله.",
"Upload failed. Could not get file info." => "فشلت عملية الرفع. تعذر الحصول على معلومات الملف.",
"Invalid directory." => "مسار غير صحيح.",
"Files" => "الملفات",
"Unable to upload {filename} as it is a directory or has 0 bytes" => "تعذر رفع الملف {filename} إما لأنه مجلد أو لان حجم الملف 0 بايت",
"Not enough space available" => "لا توجد مساحة كافية",
"Upload cancelled." => "تم إلغاء عملية رفع الملفات .",
"Could not get result from server." => "تعذر الحصول على نتيجة من الخادم",
"File upload is in progress. Leaving the page now will cancel the upload." => "عملية رفع الملفات قيد التنفيذ. اغلاق الصفحة سوف يلغي عملية رفع الملفات.",
"{new_name} already exists" => "{new_name} موجود مسبقا",
"Share" => "شارك",
"Delete permanently" => "حذف بشكل دائم",
"Delete" => "إلغاء",
"Rename" => "إعادة تسميه",
"Pending" => "قيد الانتظار",
"replaced {new_name} with {old_name}" => "استبدل {new_name} بـ {old_name}",
"undo" => "تراجع",
"_%n folder_::_%n folders_" => array("لا يوجد مجلدات %n","1 مجلد %n","2 مجلد %n","عدد قليل من مجلدات %n","عدد كبير من مجلدات %n","مجلدات %n"),
"_%n file_::_%n files_" => array("لا يوجد ملفات %n","ملف %n","2 ملف %n","قليل من ملفات %n","الكثير من ملفات %n"," ملفات %n"),
"{dirs} and {files}" => "{dirs} و {files}",
"_Uploading %n file_::_Uploading %n files_" => array("لا يوجد ملفات %n لتحميلها","تحميل 1 ملف %n","تحميل 2 ملف %n","يتم تحميل عدد قليل من ملفات %n","يتم تحميل عدد كبير من ملفات %n","يتم تحميل ملفات %n"),
"'.' is an invalid file name." => "\".\" اسم ملف غير صحيح.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "اسم غير صحيح , الرموز '\\', '/', '<', '>', ':', '\"', '|', '?' و \"*\" غير مسموح استخدامها",
"Your storage is full, files can not be updated or synced anymore!" => "مساحتك التخزينية ممتلئة, لا يمكم تحديث ملفاتك أو مزامنتها بعد الآن !",
"Your storage is almost full ({usedSpacePercent}%)" => "مساحتك التخزينية امتلأت تقريبا ",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "تم تمكين تشفير البرامج لكن لم يتم تهيئة المفاتيح لذا يرجى تسجيل الخروج ثم تسجيل الدخول مرة آخرى.",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "المفتاح الخاص بتشفير التطبيقات غير صالح. يرجى تحديث كلمة السر الخاصة بالمفتاح الخاص من الإعدادت الشخصية حتى تتمكن من الوصول للملفات المشفرة.",
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "تم تعطيل التشفير لكن ملفاتك لا تزال مشفرة. فضلا اذهب إلى الإعدادات الشخصية لإزالة التشفير عن ملفاتك.",
"Your download is being prepared. This might take some time if the files are big." => "جاري تجهيز عملية التحميل. قد تستغرق بعض الوقت اذا كان حجم الملفات كبير.",
"Pending" => "قيد الانتظار",
"Error moving file" => "حدث خطأ أثناء نقل الملف",
"Error" => "خطأ",
"Name" => "اسم",
"Size" => "حجم",
"Modified" => "معدل",
"_%n folder_::_%n folders_" => array("لا يوجد مجلدات %n","1 مجلد %n","2 مجلد %n","عدد قليل من مجلدات %n","عدد كبير من مجلدات %n","مجلدات %n"),
"_%n file_::_%n files_" => array("لا يوجد ملفات %n","ملف %n","2 ملف %n","قليل من ملفات %n","الكثير من ملفات %n"," ملفات %n"),
"_Uploading %n file_::_Uploading %n files_" => array("لا يوجد ملفات %n لتحميلها","تحميل 1 ملف %n","تحميل 2 ملف %n","يتم تحميل عدد قليل من ملفات %n","يتم تحميل عدد كبير من ملفات %n","يتم تحميل ملفات %n"),
"Your storage is full, files can not be updated or synced anymore!" => "مساحتك التخزينية ممتلئة, لا يمكم تحديث ملفاتك أو مزامنتها بعد الآن !",
"Your storage is almost full ({usedSpacePercent}%)" => "مساحتك التخزينية امتلأت تقريبا ",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "تم تمكين تشفير البرامج لكن لم يتم تهيئة المفاتيح لذا يرجى تسجيل الخروج ثم تسجيل الدخول مرة آخرى.",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "المفتاح الخاص بتشفير التطبيقات غير صالح. يرجى تحديث كلمة السر الخاصة بالمفتاح الخاص من الإعدادت الشخصية حتى تتمكن من الوصول للملفات المشفرة.",
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "تم تعطيل التشفير لكن ملفاتك لا تزال مشفرة. فضلا اذهب إلى الإعدادات الشخصية لإزالة التشفير عن ملفاتك.",
"{dirs} and {files}" => "{dirs} و {files}",
"%s could not be renamed" => "%s لا يمكن إعادة تسميته. ",
"Upload" => "رفع",
"File handling" => "التعامل مع الملف",
"Maximum upload size" => "الحد الأقصى لحجم الملفات التي يمكن رفعها",
"max. possible: " => "الحد الأقصى المسموح به",
"Needed for multi-file and folder downloads." => "اجباري للسماح بالتحميل المتعدد للمجلدات والملفات",
"Enable ZIP-download" => "تفعيل خاصية تحميل ملفات ZIP",
"0 is unlimited" => "0 = غير محدود",
"Maximum input size for ZIP files" => "الحد الأقصى المسموح به لملفات ZIP",
"Save" => "حفظ",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "استخدم هذا العنوان لـ <a href=\"%s\" target=\"_blank\">الدخول الى ملفاتك عن طريق WebDAV</a>",
"New" => "جديد",
"Text file" => "ملف",
"New folder" => "مجلد جديد",
"Folder" => "مجلد",
"From link" => "من رابط",
"Deleted files" => "حذف الملفات",
"Cancel upload" => "إلغاء رفع الملفات",
"Nothing in here. Upload something!" => "لا يوجد شيء هنا. إرفع بعض الملفات!",
"Download" => "تحميل",
"Unshare" => "إلغاء مشاركة",
"Delete" => "إلغاء",
"Upload too large" => "حجم الترفيع أعلى من المسموح",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "حجم الملفات التي تريد ترفيعها أعلى من المسموح على الخادم.",
"Files are being scanned, please wait." => "يرجى الانتظار , جاري فحص الملفات .",
"Current scanning" => "الفحص الحالي",
"Upgrading filesystem cache..." => "تحديث ذاكرة التخزين المؤقت(الكاش) الخاصة بملفات النظام ..."
"Files are being scanned, please wait." => "يرجى الانتظار , جاري فحص الملفات ."
);
$PLURAL_FORMS = "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;";
+89
View File
@@ -0,0 +1,89 @@
<?php
$TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "Nun pudo movese %s - Yá existe un ficheru con esi nome.",
"Could not move %s" => "Nun pudo movese %s",
"File name cannot be empty." => "El nome de ficheru nun pue quedar baleru.",
"\"%s\" is an invalid file name." => "\"%s\" ye un nome de ficheru inválidu.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome inválidu, los caráuteres \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" nun tán permitíos.",
"The target folder has been moved or deleted." => "La carpeta oxetivu movióse o desanicióse.",
"The name %s is already used in the folder %s. Please choose a different name." => "El nome %s yá ta n'usu na carpeta %s. Por favor, escueyi un nome diferente.",
"Not a valid source" => "Nun ye una fonte válida",
"Server is not allowed to open URLs, please check the server configuration" => "Nun se-y permite al sirvidor abrir URLs, por favor comprueba la configuración del sirvidor",
"Error while downloading %s to %s" => "Fallu cuando se descargaba %s a %s",
"Error when creating the file" => "Fallu cuando se creaba'l ficheru",
"Folder name cannot be empty." => "El nome la carpeta nun pue tar baleru.",
"Error when creating the folder" => "Fallu cuando se creaba la carpeta",
"Unable to set upload directory." => "Nun pue afitase la carpeta de xubida.",
"Invalid Token" => "Token inválidu",
"No file was uploaded. Unknown error" => "Nun se xubió dengún ficheru. Fallu desconocíu",
"There is no error, the file uploaded with success" => "Nun hai dengún fallu, el ficheru xubióse ensin problemes",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "El ficheru xubíu perpasa la direutiva \"upload_max_filesize\" del ficheru php.ini",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "El ficheru xubíu perpasa la direutiva \"MAX_FILE_SIZE\" especificada nel formulariu HTML",
"The uploaded file was only partially uploaded" => "El ficheru xubióse de mou parcial",
"No file was uploaded" => "Nun se xubió dengún ficheru",
"Missing a temporary folder" => "Falta una carpeta temporal",
"Failed to write to disk" => "Fallu al escribir al discu",
"Not enough storage available" => "Nun hai abondu espaciu disponible",
"Upload failed. Could not find uploaded file" => "Xubida fallida. Nun pudo atopase'l ficheru xubíu.",
"Upload failed. Could not get file info." => "Falló la xubida. Nun se pudo obtener la información del ficheru.",
"Invalid directory." => "Direutoriu non válidu.",
"Files" => "Ficheros",
"All files" => "Tolos ficheros",
"Unable to upload {filename} as it is a directory or has 0 bytes" => "Nun pudo xubise {filename}, paez que ye un directoriu o tien 0 bytes",
"Total file size {size1} exceeds upload limit {size2}" => "El tamañu de ficheru total {size1} perpasa la llende de xuba {size2}",
"Not enough free space, you are uploading {size1} but only {size2} is left" => "Nun hai abondu espaciu llibre, tas xubiendo {size1} pero namái falta {size2}",
"Upload cancelled." => "Xuba encaboxada.",
"Could not get result from server." => "Nun pudo obtenese'l resultáu del sirvidor.",
"File upload is in progress. Leaving the page now will cancel the upload." => "La xuba del ficheru ta en progresu. Si dexes agora la páxina, va encaboxase la xuba.",
"URL cannot be empty" => "La URL nun pue tar balera",
"{new_name} already exists" => "{new_name} yá existe",
"Could not create file" => "Nun pudo crease'l ficheru",
"Could not create folder" => "Nun pudo crease la carpeta",
"Error fetching URL" => "Fallu obteniendo URL",
"Share" => "Compartir",
"Delete permanently" => "Desaniciar dafechu",
"Delete" => "Desaniciar",
"Rename" => "Renomar",
"Your download is being prepared. This might take some time if the files are big." => "Ta preparándose la to descarga. Esto podría llevar dalgún tiempu si los ficheros son grandes.",
"Pending" => "Pendiente",
"Error moving file." => "Fallu moviendo'l ficheru.",
"Error moving file" => "Fallu moviendo'l ficheru",
"Error" => "Fallu",
"Could not rename file" => "Nun pudo renomase'l ficheru",
"Error deleting file." => "Fallu desaniciando'l ficheru.",
"Name" => "Nome",
"Size" => "Tamañu",
"Modified" => "Modificáu",
"_%n folder_::_%n folders_" => array("%n carpeta","%n carpetes"),
"_%n file_::_%n files_" => array("%n ficheru","%n ficheros"),
"_Uploading %n file_::_Uploading %n files_" => array("Xubiendo %n ficheru","Xubiendo %n ficheros"),
"\"{name}\" is an invalid file name." => "\"{name}\" ye un nome de ficheru inválidu.",
"Your storage is full, files can not be updated or synced anymore!" => "L'almacenamientu ta completu, ¡yá nun se pueden anovar o sincronizar ficheros!",
"Your storage is almost full ({usedSpacePercent}%)" => "L'almacenamientu ta casi completu ({usedSpacePercent}%)",
"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",
"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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Deshabilitose'l cifráu pero los tos ficheros tovía tán cifraos. Por favor, vete a los axustes personales pa descrifrar los tos ficheros.",
"{dirs} and {files}" => "{dirs} y {files}",
"%s could not be renamed" => "Nun se puede renomar %s ",
"Upload (max. %s)" => "Xuba (máx. %s)",
"File handling" => "Alministración de ficheros",
"Maximum upload size" => "Tamañu máximu de xubida",
"max. possible: " => "máx. posible:",
"Save" => "Guardar",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Usa esta direición pa <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">acceder a los ficheros a traviés de WebDAV</a>",
"New" => "Nuevu",
"New text file" => "Ficheru de testu nuevu",
"Text file" => "Ficheru de testu",
"New folder" => "Nueva carpeta",
"Folder" => "Carpeta",
"From link" => "Dende enllaz",
"You dont have permission to upload or create files here" => "Nun tienes permisu pa xubir o crear ficheros equí",
"Nothing in here. Upload something!" => "Nun hai nada equí. ¡Xubi daqué!",
"Download" => "Descargar",
"Upload too large" => "La xuba ye abondo grande",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los ficheros que tas intentando xubir perpasen el tamañu máximu pa les xubíes de ficheros nesti servidor.",
"Files are being scanned, please wait." => "Tan escaniándose los ficheros, espera por favor.",
"Currently scanning" => "Anguaño escaneando"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
+7
View File
@@ -0,0 +1,7 @@
<?php
$TRANSLATIONS = array(
"_%n folder_::_%n folders_" => array("",""),
"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("","")
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
+1
View File
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
"Error" => "Памылка",
"_%n folder_::_%n folders_" => array("","","",""),
"_%n file_::_%n files_" => array("","","",""),
"_Uploading %n file_::_Uploading %n files_" => array("","","","")
+6 -8
View File
@@ -11,27 +11,25 @@ $TRANSLATIONS = array(
"Upload cancelled." => "Качването е спряно.",
"Share" => "Споделяне",
"Delete permanently" => "Изтриване завинаги",
"Delete" => "Изтриване",
"Rename" => "Преименуване",
"Pending" => "Чакащо",
"undo" => "възтановяване",
"_%n folder_::_%n folders_" => array("",""),
"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("",""),
"Error" => "Грешка",
"Name" => "Име",
"Size" => "Размер",
"Modified" => "Променено",
"Upload" => "Качване",
"_%n folder_::_%n folders_" => array("",""),
"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("",""),
"Maximum upload size" => "Максимален размер за качване",
"0 is unlimited" => "Ползвайте 0 за без ограничения",
"Save" => "Запис",
"WebDAV" => "WebDAV",
"New" => "Ново",
"Text file" => "Текстов файл",
"New folder" => "Нова папка",
"Folder" => "Папка",
"Cancel upload" => "Спри качването",
"Nothing in here. Upload something!" => "Няма нищо тук. Качете нещо.",
"Download" => "Изтегляне",
"Delete" => "Изтриване",
"Upload too large" => "Файлът който сте избрали за качване е прекалено голям",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файловете които се опитвате да качите са по-големи от позволеното за сървъра.",
"Files are being scanned, please wait." => "Файловете се претърсват, изчакайте."
+7 -18
View File
@@ -3,6 +3,7 @@ $TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "%s কে স্থানান্তর করা সম্ভব হলো না - এই নামের ফাইল বিদ্যমান",
"Could not move %s" => "%s কে স্থানান্তর করা সম্ভব হলো না",
"File name cannot be empty." => "ফাইলের নামটি ফাঁকা রাখা যাবে না।",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "নামটি সঠিক নয়, '\\', '/', '<', '>', ':', '\"', '|', '?' এবং '*' অনুমোদিত নয়।",
"No file was uploaded. Unknown error" => "কোন ফাইল আপলোড করা হয় নি। সমস্যার কারণটি অজ্ঞাত।",
"There is no error, the file uploaded with success" => "কোন সমস্যা হয় নি, ফাইল আপলোড সুসম্পন্ন হয়েছে।",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "আপলোড করা ফাইলটি php.ini তে বর্ণিত upload_max_filesize নির্দেশিত আয়তন অতিক্রম করছেঃ",
@@ -13,45 +14,33 @@ $TRANSLATIONS = array(
"Failed to write to disk" => "ডিস্কে লিখতে ব্যর্থ",
"Invalid directory." => "ভুল ডিরেক্টরি",
"Files" => "ফাইল",
"Not enough space available" => "যথেষ্ঠ পরিমাণ স্থান নেই",
"Upload cancelled." => "আপলোড বাতিল করা হয়েছে।",
"File upload is in progress. Leaving the page now will cancel the upload." => "ফাইল আপলোড চলমান। এই পৃষ্ঠা পরিত্যাগ করলে আপলোড বাতিল করা হবে।",
"{new_name} already exists" => "{new_name} টি বিদ্যমান",
"Share" => "ভাগাভাগি কর",
"Delete" => "মুছে",
"Rename" => "পূনঃনামকরণ",
"Pending" => "মুলতুবি",
"replaced {new_name} with {old_name}" => "{new_name} কে {old_name} নামে প্রতিস্থাপন করা হয়েছে",
"undo" => "ক্রিয়া প্রত্যাহার",
"_%n folder_::_%n folders_" => array("",""),
"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("",""),
"'.' is an invalid file name." => "টি একটি অননুমোদিত নাম।",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "নামটি সঠিক নয়, '\\', '/', '<', '>', ':', '\"', '|', '?' এবং '*' অনুমোদিত নয়।",
"Error" => "সমস্যা",
"Name" => "রাম",
"Size" => "আকার",
"Modified" => "পরিবর্তিত",
"Upload" => "আপলোড",
"_%n folder_::_%n folders_" => array("",""),
"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("",""),
"File handling" => "ফাইল হ্যার্ডলিং",
"Maximum upload size" => "আপলোডের সর্বোচ্চ আকার",
"max. possible: " => "অনুমোদিত সর্বোচ্চ আকার",
"Needed for multi-file and folder downloads." => "একাধিক ফাইল এবং ফোল্ডার ডাউনলোড করার জন্য আবশ্যক।",
"Enable ZIP-download" => "ZIP ডাউনলোড সক্রিয় কর",
"0 is unlimited" => " এর অর্থ অসীম",
"Maximum input size for ZIP files" => "ZIP ফাইলের ইনপুটের সর্বোচ্চ আকার",
"Save" => "সংরক্ষণ",
"WebDAV" => "WebDAV",
"New" => "নতুন",
"Text file" => "টেক্সট ফাইল",
"Folder" => "ফোল্ডার",
"From link" => " লিংক থেকে",
"Cancel upload" => "আপলোড বাতিল কর",
"Nothing in here. Upload something!" => "এখানে কিছুই নেই। কিছু আপলোড করুন !",
"Download" => "ডাউনলোড",
"Unshare" => "ভাগাভাগি বাতিল ",
"Delete" => "মুছে",
"Upload too large" => "আপলোডের আকারটি অনেক বড়",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "আপনি এই সার্ভারে আপলোড করার জন্য অনুমোদিত ফাইলের সর্বোচ্চ আকারের চেয়ে বৃহদাকার ফাইল আপলোড করার চেষ্টা করছেন ",
"Files are being scanned, please wait." => "ফাইলগুলো স্ক্যান করা হচ্ছে, দয়া করে অপেক্ষা করুন।",
"Current scanning" => "বর্তমান স্ক্যানিং"
"Files are being scanned, please wait." => "ফাইলগুলো স্ক্যান করা হচ্ছে, দয়া করে অপেক্ষা করুন।"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
+7
View File
@@ -0,0 +1,7 @@
<?php
$TRANSLATIONS = array(
"_%n folder_::_%n folders_" => array("",""),
"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("","")
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
+3 -2
View File
@@ -1,12 +1,13 @@
<?php
$TRANSLATIONS = array(
"Share" => "Podijeli",
"Name" => "Ime",
"Size" => "Veličina",
"_%n folder_::_%n folders_" => array("","",""),
"_%n file_::_%n files_" => array("","",""),
"_Uploading %n file_::_Uploading %n files_" => array("","",""),
"Name" => "Ime",
"Size" => "Veličina",
"Save" => "Spasi",
"New folder" => "Nova fascikla",
"Folder" => "Fasikla"
);
$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
+26 -28
View File
@@ -3,13 +3,15 @@ $TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "No s'ha pogut moure %s - Ja hi ha un fitxer amb aquest nom",
"Could not move %s" => " No s'ha pogut moure %s",
"File name cannot be empty." => "El nom del fitxer no pot ser buit.",
"File name must not contain \"/\". Please choose a different name." => "El nom de fitxer no pot contenir \"/\". Indiqueu un nom diferent.",
"\"%s\" is an invalid file name." => "\"%s\" no es un fitxer vàlid.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "El nóm no és vàlid, '\\', '/', '<', '>', ':', '\"', '|', '?' i '*' no estan permesos.",
"The target folder has been moved or deleted." => "La carpeta de destí s'ha mogut o eliminat.",
"The name %s is already used in the folder %s. Please choose a different name." => "El nom %s ja s'usa en la carpeta %s. Indiqueu un nom diferent.",
"Not a valid source" => "No és un origen vàlid",
"Server is not allowed to open URLs, please check the server configuration" => "El servidor no té autorització per obrir URLs, comproveu la configuració del servidor",
"Error while downloading %s to %s" => "S'ha produït un error en baixar %s a %s",
"Error when creating the file" => "S'ha produït un error en crear el fitxer",
"Folder name cannot be empty." => "El nom de la carpeta no pot ser buit.",
"Folder name must not contain \"/\". Please choose a different name." => "El nom de la carpeta no pot contenir \"/\". Indiqueu un nom diferent.",
"Error when creating the folder" => "S'ha produït un error en crear la carpeta",
"Unable to set upload directory." => "No es pot establir la carpeta de pujada.",
"Invalid Token" => "Testimoni no vàlid",
@@ -22,70 +24,66 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Falta un fitxer temporal",
"Failed to write to disk" => "Ha fallat en escriure al disc",
"Not enough storage available" => "No hi ha prou espai disponible",
"Upload failed. Could not get file info." => "La pujada ha fallat. No s'ha pogut obtenir informació del fitxer.",
"Upload failed. Could not find uploaded file" => "La pujada ha fallat. El fitxer pujat no s'ha trobat.",
"Upload failed. Could not get file info." => "La pujada ha fallat. No s'ha pogut obtenir informació del fitxer.",
"Invalid directory." => "Directori no vàlid.",
"Files" => "Fitxers",
"All files" => "Tots els fitxers",
"Unable to upload {filename} as it is a directory or has 0 bytes" => "No es pot pujar {filename} perquè és una carpeta o té 0 bytes",
"Not enough space available" => "No hi ha prou espai disponible",
"Total file size {size1} exceeds upload limit {size2}" => "Mida total del fitxer {size1} excedeix el límit de pujada {size2}",
"Not enough free space, you are uploading {size1} but only {size2} is left" => "No hi ha prou espai lliure, està carregant {size1} però només pot {size2}",
"Upload cancelled." => "La pujada s'ha cancel·lat.",
"Could not get result from server." => "No hi ha resposta del servidor.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Hi ha una pujada en curs. Si abandoneu la pàgina la pujada es cancel·larà.",
"URL cannot be empty" => "L'URL no pot ser buit",
"In the home folder 'Shared' is a reserved filename" => "A la carpeta inici 'Compartit' és un nom de fitxer reservat",
"{new_name} already exists" => "{new_name} ja existeix",
"Could not create file" => "No s'ha pogut crear el fitxer",
"Could not create folder" => "No s'ha pogut crear la carpeta",
"Error fetching URL" => "Error en obtenir la URL",
"Share" => "Comparteix",
"Delete permanently" => "Esborra permanentment",
"Delete" => "Esborra",
"Rename" => "Reanomena",
"Your download is being prepared. This might take some time if the files are big." => "S'està preparant la baixada. Pot trigar una estona si els fitxers són grans.",
"Pending" => "Pendent",
"Error moving file." => "Error en moure el fitxer.",
"Error moving file" => "Error en moure el fitxer",
"Error" => "Error",
"Could not rename file" => "No es pot canviar el nom de fitxer",
"replaced {new_name} with {old_name}" => "s'ha substituït {old_name} per {new_name}",
"undo" => "desfés",
"Error deleting file." => "Error en esborrar el fitxer.",
"Name" => "Nom",
"Size" => "Mida",
"Modified" => "Modificat",
"_%n folder_::_%n folders_" => array("%n carpeta","%n carpetes"),
"_%n file_::_%n files_" => array("%n fitxer","%n fitxers"),
"{dirs} and {files}" => "{dirs} i {files}",
"_Uploading %n file_::_Uploading %n files_" => array("Pujant %n fitxer","Pujant %n fitxers"),
"'.' is an invalid file name." => "'.' és un nom no vàlid per un fitxer.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "El nóm no és vàlid, '\\', '/', '<', '>', ':', '\"', '|', '?' i '*' no estan permesos.",
"\"{name}\" is an invalid file name." => "\"{name}\" no es un fitxer vàlid.",
"Your storage is full, files can not be updated or synced anymore!" => "El vostre espai d'emmagatzemament és ple, els fitxers ja no es poden actualitzar o sincronitzar!",
"Your storage is almost full ({usedSpacePercent}%)" => "El vostre espai d'emmagatzemament és gairebé ple ({usedSpacePercent}%)",
"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.",
"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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "L'encriptació s'ha desactivat però els vostres fitxers segueixen encriptats. Aneu a la vostra configuració personal per desencriptar els vostres fitxers.",
"Your download is being prepared. This might take some time if the files are big." => "S'està preparant la baixada. Pot trigar una estona si els fitxers són grans.",
"Error moving file" => "Error en moure el fitxer",
"Error" => "Error",
"Name" => "Nom",
"Size" => "Mida",
"Modified" => "Modificat",
"Invalid folder name. Usage of 'Shared' is reserved." => "Nom de carpeta no vàlid. L'ús de 'Shared' és reservat",
"{dirs} and {files}" => "{dirs} i {files}",
"%s could not be renamed" => "%s no es pot canviar el nom",
"Upload" => "Puja",
"Upload (max. %s)" => "Pujada (màx. %s)",
"File handling" => "Gestió de fitxers",
"Maximum upload size" => "Mida màxima de pujada",
"max. possible: " => "màxim possible:",
"Needed for multi-file and folder downloads." => "Necessari per fitxers múltiples i baixada de carpetes",
"Enable ZIP-download" => "Activa la baixada ZIP",
"0 is unlimited" => "0 és sense límit",
"Maximum input size for ZIP files" => "Mida màxima d'entrada per fitxers ZIP",
"Save" => "Desa",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Useu aquesta adreça per <a href=\"%s\" target=\"_blank\">accedir als fitxers via WebDAV</a>",
"New" => "Nou",
"New text file" => "Nou fitxer de text",
"Text file" => "Fitxer de text",
"New folder" => "Carpeta nova",
"Folder" => "Carpeta",
"From link" => "Des d'enllaç",
"Deleted files" => "Fitxers esborrats",
"Cancel upload" => "Cancel·la la pujada",
"You dont have permission to upload or create files here" => "No teniu permisos per a pujar o crear els fitxers aquí",
"Nothing in here. Upload something!" => "Res per aquí. Pugeu alguna cosa!",
"Download" => "Baixa",
"Unshare" => "Deixa de compartir",
"Delete" => "Esborra",
"Upload too large" => "La pujada és massa gran",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Els fitxers que esteu intentant pujar excedeixen la mida màxima de pujada del servidor",
"Files are being scanned, please wait." => "S'estan escanejant els fitxers, espereu",
"Current scanning" => "Actualment escanejant",
"Upgrading filesystem cache..." => "Actualitzant la memòria de cau del sistema de fitxers..."
"Currently scanning" => "Actualment escanejant"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
+7
View File
@@ -0,0 +1,7 @@
<?php
$TRANSLATIONS = array(
"_%n folder_::_%n folders_" => array("",""),
"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("","")
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
+25 -28
View File
@@ -3,13 +3,15 @@ $TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "Nelze přesunout %s - již existuje soubor se stejným názvem",
"Could not move %s" => "Nelze přesunout %s",
"File name cannot be empty." => "Název souboru nemůže být prázdný řetězec.",
"File name must not contain \"/\". Please choose a different name." => "Název souboru nesmí obsahovat \"/\". Vyberte prosím jiné jméno.",
"\"%s\" is an invalid file name." => "\"%s\" je neplatným názvem souboru.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Neplatný název, znaky '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nejsou povoleny.",
"The target folder has been moved or deleted." => "Cílová složka byla přesunuta nebo smazána.",
"The name %s is already used in the folder %s. Please choose a different name." => "Název %s ve složce %s již existuje. Vyberte prosím jiné jméno.",
"Not a valid source" => "Neplatný zdroj",
"Server is not allowed to open URLs, please check the server configuration" => "Server není oprávněn otevírat adresy URL. Ověřte, prosím, konfiguraci serveru.",
"Error while downloading %s to %s" => "Chyba při stahování %s do %s",
"Error when creating the file" => "Chyba při vytváření souboru",
"Folder name cannot be empty." => "Název složky nemůže být prázdný.",
"Folder name must not contain \"/\". Please choose a different name." => "Název složky nesmí obsahovat \"/\". Zvolte prosím jiný.",
"Error when creating the folder" => "Chyba při vytváření složky",
"Unable to set upload directory." => "Nelze nastavit adresář pro nahrané soubory.",
"Invalid Token" => "Neplatný token",
@@ -22,71 +24,66 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Chybí adresář pro dočasné soubory",
"Failed to write to disk" => "Zápis na disk selhal",
"Not enough storage available" => "Nedostatek dostupného úložného prostoru",
"Upload failed. Could not get file info." => "Nahrávání selhalo. Nepodařilo se získat informace o souboru.",
"Upload failed. Could not find uploaded file" => "Nahrávání selhalo. Nepodařilo se nalézt nahraný soubor.",
"Upload failed. Could not get file info." => "Nahrávání selhalo. Nepodařilo se získat informace o souboru.",
"Invalid directory." => "Neplatný adresář",
"Files" => "Soubory",
"All files" => "Všechny soubory",
"Unable to upload {filename} as it is a directory or has 0 bytes" => "Nelze nahrát soubor {filename}, protože je to buď adresář nebo má velikost 0 bytů",
"Not enough space available" => "Nedostatek volného místa",
"Total file size {size1} exceeds upload limit {size2}" => "Celková velikost souboru {size1} překračuje povolenou velikost pro nahrávání {size2}",
"Not enough free space, you are uploading {size1} but only {size2} is left" => "Není dostatek místa pro uložení, velikost souboru je {size1}, zbývá pouze {size2}",
"Upload cancelled." => "Odesílání zrušeno.",
"Could not get result from server." => "Nepodařilo se získat výsledek ze serveru.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Probíhá odesílání souboru. Opuštění stránky způsobí zrušení nahrávání.",
"URL cannot be empty" => "URL nemůže zůstat prázdná",
"In the home folder 'Shared' is a reserved filename" => "V osobní složce je název 'Shared' rezervovaný",
"{new_name} already exists" => "{new_name} již existuje",
"Could not create file" => "Nepodařilo se vytvořit soubor",
"Could not create folder" => "Nepodařilo se vytvořit složku",
"Error fetching URL" => "Chyba při načítání URL",
"Share" => "Sdílet",
"Delete permanently" => "Trvale odstranit",
"Delete" => "Smazat",
"Rename" => "Přejmenovat",
"Your download is being prepared. This might take some time if the files are big." => "Vaše soubory ke stažení se připravují. Pokud jsou velké, může to chvíli trvat.",
"Pending" => "Nevyřízené",
"Error moving file." => "Chyba při přesunu souboru.",
"Error moving file" => "Chyba při přesunu souboru",
"Error" => "Chyba",
"Could not rename file" => "Nepodařilo se přejmenovat soubor",
"replaced {new_name} with {old_name}" => "nahrazeno {new_name} s {old_name}",
"undo" => "vrátit zpět",
"Error deleting file." => "Chyba při mazání souboru.",
"Name" => "Název",
"Size" => "Velikost",
"Modified" => "Upraveno",
"_%n folder_::_%n folders_" => array("%n složka","%n složky","%n složek"),
"_%n file_::_%n files_" => array("%n soubor","%n soubory","%n souborů"),
"{dirs} and {files}" => "{dirs} a {files}",
"_Uploading %n file_::_Uploading %n files_" => array("Nahrávám %n soubor","Nahrávám %n soubory","Nahrávám %n souborů"),
"'.' is an invalid file name." => "'.' je neplatným názvem souboru.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Neplatný název, znaky '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nejsou povoleny.",
"\"{name}\" is an invalid file name." => "\"{name}\" je neplatným názvem souboru.",
"Your storage is full, files can not be updated or synced anymore!" => "Vaše úložiště je plné, nelze aktualizovat ani synchronizovat soubory.",
"Your storage is almost full ({usedSpacePercent}%)" => "Vaše úložiště je téměř plné ({usedSpacePercent}%)",
"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",
"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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Šifrování bylo vypnuto, vaše soubory jsou však stále zašifrované. Běžte prosím do osobního nastavení, kde soubory odšifrujete.",
"Your download is being prepared. This might take some time if the files are big." => "Vaše soubory ke stažení se připravují. Pokud jsou velké, může to chvíli trvat.",
"Error moving file" => "Chyba při přesunu souboru",
"Error" => "Chyba",
"Name" => "Název",
"Size" => "Velikost",
"Modified" => "Upraveno",
"Invalid folder name. Usage of 'Shared' is reserved." => "Neplatný název složky. Použití 'Shared' je rezervováno.",
"{dirs} and {files}" => "{dirs} a {files}",
"%s could not be renamed" => "%s nemůže být přejmenován",
"Upload" => "Odeslat",
"Upload (max. %s)" => "Nahrát (max. %s)",
"File handling" => "Zacházení se soubory",
"Maximum upload size" => "Maximální velikost pro odesílání",
"max. possible: " => "největší možná: ",
"Needed for multi-file and folder downloads." => "Potřebné pro více-souborové stahování a stahování složek.",
"Enable ZIP-download" => "Povolit ZIP-stahování",
"0 is unlimited" => "0 znamená bez omezení",
"Maximum input size for ZIP files" => "Maximální velikost vstupu pro ZIP soubory",
"Save" => "Uložit",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Použijte <a href=\"%s\" target=\"_blank\">tuto adresu pro přístup k vašim souborům přes WebDAV</a>",
"New" => "Nový",
"New text file" => "Nový textový soubor",
"Text file" => "Textový soubor",
"New folder" => "Nová složka",
"Folder" => "Složka",
"From link" => "Z odkazu",
"Deleted files" => "Odstraněné soubory",
"Cancel upload" => "Zrušit odesílání",
"You dont have permission to upload or create files here" => "Nemáte oprávnění zde nahrávat či vytvářet soubory",
"Nothing in here. Upload something!" => "Žádný obsah. Nahrajte něco.",
"Download" => "Stáhnout",
"Unshare" => "Zrušit sdílení",
"Delete" => "Smazat",
"Upload too large" => "Odesílaný soubor je příliš velký",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Soubory, které se snažíte odeslat, překračují limit velikosti odesílání na tomto serveru.",
"Files are being scanned, please wait." => "Soubory se prohledávají, prosím čekejte.",
"Current scanning" => "Aktuální prohledává",
"Upgrading filesystem cache..." => "Aktualizuji mezipaměť souborového systému..."
"Currently scanning" => "Prohledává se"
);
$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
+9 -23
View File
@@ -3,6 +3,7 @@ $TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "Methwyd symud %s - Mae ffeil gyda'r enw hwn eisoes yn bodoli",
"Could not move %s" => "Methwyd symud %s",
"File name cannot be empty." => "Does dim hawl cael enw ffeil gwag.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Enw annilys, ni chaniateir, '\\', '/', '<', '>', ':', '\"', '|', '?' na '*'.",
"No file was uploaded. Unknown error" => "Ni lwythwyd ffeil i fyny. Gwall anhysbys.",
"There is no error, the file uploaded with success" => "Does dim gwall, llwythodd y ffeil i fyny'n llwyddiannus",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Mae'r ffeil lwythwyd i fyny'n fwy na chyfarwyddeb upload_max_filesize yn php.ini:",
@@ -14,51 +15,36 @@ $TRANSLATIONS = array(
"Not enough storage available" => "Dim digon o le storio ar gael",
"Invalid directory." => "Cyfeiriadur annilys.",
"Files" => "Ffeiliau",
"Not enough space available" => "Dim digon o le ar gael",
"Upload cancelled." => "Diddymwyd llwytho i fyny.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Mae ffeiliau'n cael eu llwytho i fyny. Bydd gadael y dudalen hon nawr yn diddymu'r broses.",
"{new_name} already exists" => "{new_name} yn bodoli'n barod",
"Share" => "Rhannu",
"Delete permanently" => "Dileu'n barhaol",
"Delete" => "Dileu",
"Rename" => "Ailenwi",
"Pending" => "I ddod",
"replaced {new_name} with {old_name}" => "newidiwyd {new_name} yn lle {old_name}",
"undo" => "dadwneud",
"_%n folder_::_%n folders_" => array("","","",""),
"_%n file_::_%n files_" => array("","","",""),
"_Uploading %n file_::_Uploading %n files_" => array("","","",""),
"'.' is an invalid file name." => "Mae '.' yn enw ffeil annilys.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Enw annilys, ni chaniateir, '\\', '/', '<', '>', ':', '\"', '|', '?' na '*'.",
"Your storage is full, files can not be updated or synced anymore!" => "Mae eich storfa'n llawn, ni ellir diweddaru a chydweddu ffeiliau mwyach!",
"Your storage is almost full ({usedSpacePercent}%)" => "Mae eich storfa bron a bod yn llawn ({usedSpacePercent}%)",
"Your download is being prepared. This might take some time if the files are big." => "Wrthi'n paratoi i lwytho i lawr. Gall gymryd peth amser os yw'r ffeiliau'n fawr.",
"Pending" => "I ddod",
"Error" => "Gwall",
"Name" => "Enw",
"Size" => "Maint",
"Modified" => "Addaswyd",
"Upload" => "Llwytho i fyny",
"_%n folder_::_%n folders_" => array("","","",""),
"_%n file_::_%n files_" => array("","","",""),
"_Uploading %n file_::_Uploading %n files_" => array("","","",""),
"Your storage is full, files can not be updated or synced anymore!" => "Mae eich storfa'n llawn, ni ellir diweddaru a chydweddu ffeiliau mwyach!",
"Your storage is almost full ({usedSpacePercent}%)" => "Mae eich storfa bron a bod yn llawn ({usedSpacePercent}%)",
"File handling" => "Trafod ffeiliau",
"Maximum upload size" => "Maint mwyaf llwytho i fyny",
"max. possible: " => "mwyaf. posib:",
"Needed for multi-file and folder downloads." => "Angen ar gyfer llwytho mwy nag un ffeil neu blygell i lawr yr un pryd.",
"Enable ZIP-download" => "Galluogi llwytho i lawr ZIP",
"0 is unlimited" => "0 yn ddiderfyn",
"Maximum input size for ZIP files" => "Maint mewnbynnu mwyaf ffeiliau ZIP",
"Save" => "Cadw",
"New" => "Newydd",
"Text file" => "Ffeil destun",
"Folder" => "Plygell",
"From link" => "Dolen o",
"Deleted files" => "Ffeiliau ddilewyd",
"Cancel upload" => "Diddymu llwytho i fyny",
"Nothing in here. Upload something!" => "Does dim byd fan hyn. Llwythwch rhywbeth i fyny!",
"Download" => "Llwytho i lawr",
"Unshare" => "Dad-rannu",
"Delete" => "Dileu",
"Upload too large" => "Maint llwytho i fyny'n rhy fawr",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Mae'r ffeiliau rydych yn ceisio llwytho i fyny'n fwy na maint mwyaf llwytho ffeiliau i fyny ar y gweinydd hwn.",
"Files are being scanned, please wait." => "Arhoswch, mae ffeiliau'n cael eu sganio.",
"Current scanning" => "Sganio cyfredol",
"Upgrading filesystem cache..." => "Uwchraddio storfa system ffeiliau..."
"Files are being scanned, please wait." => "Arhoswch, mae ffeiliau'n cael eu sganio."
);
$PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
+40 -25
View File
@@ -3,6 +3,16 @@ $TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "Kunne ikke flytte %s - der findes allerede en fil med dette navn",
"Could not move %s" => "Kunne ikke flytte %s",
"File name cannot be empty." => "Filnavnet kan ikke stå tomt.",
"\"%s\" is an invalid file name." => "\"%s\" er et ugyldigt filnavn.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldigt navn, '\\', '/', '<', '>', ':' | '?', '\"', '', og '*' er ikke tilladt.",
"The target folder has been moved or deleted." => "Mappen er blevet slettet eller fjernet.",
"The name %s is already used in the folder %s. Please choose a different name." => "Navnet %s er allerede i brug i mappen %s. Vælg venligst et andet navn.",
"Not a valid source" => "Ikke en gyldig kilde",
"Server is not allowed to open URLs, please check the server configuration" => "Server har ikke tilladelse til at åbne URL'er. Kontroller venligst serverens indstillinger",
"Error while downloading %s to %s" => "Fejl ved hentning af %s til %s",
"Error when creating the file" => "Fejl ved oprettelse af fil",
"Folder name cannot be empty." => "Mappenavnet kan ikke være tomt.",
"Error when creating the folder" => "Fejl ved oprettelse af mappen",
"Unable to set upload directory." => "Ude af stand til at vælge upload mappe.",
"Invalid Token" => "Ugyldig Token ",
"No file was uploaded. Unknown error" => "Ingen fil blev uploadet. Ukendt fejl.",
@@ -14,61 +24,66 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Manglende midlertidig mappe.",
"Failed to write to disk" => "Fejl ved skrivning til disk.",
"Not enough storage available" => "Der er ikke nok plads til rådlighed",
"Upload failed. Could not get file info." => "Upload fejlede. Kunne ikke hente filinformation.",
"Upload failed. Could not find uploaded file" => "Upload fejlede. Kunne ikke finde den uploadede fil.",
"Upload failed. Could not get file info." => "Upload fejlede. Kunne ikke hente filinformation.",
"Invalid directory." => "Ugyldig mappe.",
"Files" => "Filer",
"All files" => "Alle filer",
"Unable to upload {filename} as it is a directory or has 0 bytes" => "Kan ikke upload {filename} da det er enten en mappe eller indholder 0 bytes.",
"Not enough space available" => "ikke nok tilgængelig ledig plads ",
"Total file size {size1} exceeds upload limit {size2}" => "Den totale filstørrelse {size1} er større end uploadgrænsen {size2}",
"Not enough free space, you are uploading {size1} but only {size2} is left" => "Der er ikke tilstrækkeligt friplads. Du uplaoder {size1} men der er kun {size2} tilbage",
"Upload cancelled." => "Upload afbrudt.",
"Could not get result from server." => "Kunne ikke hente resultat fra server.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret.",
"URL cannot be empty" => "URL kan ikke være tom",
"{new_name} already exists" => "{new_name} eksisterer allerede",
"Could not create file" => "Kunne ikke oprette fil",
"Could not create folder" => "Kunne ikke oprette mappe",
"Error fetching URL" => "Fejl ved URL",
"Share" => "Del",
"Delete permanently" => "Slet permanent",
"Delete" => "Slet",
"Rename" => "Omdøb",
"Pending" => "Afventer",
"replaced {new_name} with {old_name}" => "erstattede {new_name} med {old_name}",
"undo" => "fortryd",
"_%n folder_::_%n folders_" => array("%n mappe","%n mapper"),
"_%n file_::_%n files_" => array("%n fil","%n filer"),
"{dirs} and {files}" => "{dirs} og {files}",
"_Uploading %n file_::_Uploading %n files_" => array("Uploader %n fil","Uploader %n filer"),
"'.' is an invalid file name." => "'.' er et ugyldigt filnavn.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldigt navn, '\\', '/', '<', '>', ':' | '?', '\"', '', og '*' er ikke tilladt.",
"Your storage is full, files can not be updated or synced anymore!" => "Din opbevaringsplads er fyldt op, filer kan ikke opdateres eller synkroniseres længere!",
"Your storage is almost full ({usedSpacePercent}%)" => "Din opbevaringsplads er næsten fyldt op ({usedSpacePercent}%)",
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Krypteringen blev deaktiveret, men dine filer er stadig krypteret. Gå venligst til dine personlige indstillinger for at dekryptere dine filer. ",
"Your download is being prepared. This might take some time if the files are big." => "Dit download forberedes. Dette kan tage lidt tid ved større filer.",
"Pending" => "Afventer",
"Error moving file." => "Fejl ved flytning af fil",
"Error moving file" => "Fejl ved flytning af fil",
"Error" => "Fejl",
"Could not rename file" => "Kunne ikke omdøbe filen",
"Error deleting file." => "Fejl ved sletnign af fil.",
"Name" => "Navn",
"Size" => "Størrelse",
"Modified" => "Ændret",
"_%n folder_::_%n folders_" => array("%n mappe","%n mapper"),
"_%n file_::_%n files_" => array("%n fil","%n filer"),
"_Uploading %n file_::_Uploading %n files_" => array("Uploader %n fil","Uploader %n filer"),
"\"{name}\" is an invalid file name." => "'{name}' er et ugyldigt filnavn.",
"Your storage is full, files can not be updated or synced anymore!" => "Din opbevaringsplads er fyldt op, filer kan ikke opdateres eller synkroniseres længere!",
"Your storage is almost full ({usedSpacePercent}%)" => "Din opbevaringsplads er næsten fyldt op ({usedSpacePercent}%)",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Krypteringsprogrammet er aktiveret, men din nøgle er ikke igangsat. Log venligst ud og ind igen.",
"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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Krypteringen blev deaktiveret, men dine filer er stadig krypteret. Gå venligst til dine personlige indstillinger for at dekryptere dine filer. ",
"{dirs} and {files}" => "{dirs} og {files}",
"%s could not be renamed" => "%s kunne ikke omdøbes",
"Upload" => "Upload",
"Upload (max. %s)" => "Upload (max. %s)",
"File handling" => "Filhåndtering",
"Maximum upload size" => "Maksimal upload-størrelse",
"max. possible: " => "max. mulige: ",
"Needed for multi-file and folder downloads." => "Nødvendigt for at kunne downloade mapper og flere filer ad gangen.",
"Enable ZIP-download" => "Tillad ZIP-download",
"0 is unlimited" => "0 er ubegrænset",
"Maximum input size for ZIP files" => "Maksimal størrelse på ZIP filer",
"Save" => "Gem",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Brug denne adresse for at <a href=\"%s\" target=\"_blank\">tilgå dine filer via WebDAV</a>",
"New" => "Ny",
"New text file" => "Ny tekstfil",
"Text file" => "Tekstfil",
"New folder" => "Ny Mappe",
"Folder" => "Mappe",
"From link" => "Fra link",
"Deleted files" => "Slettede filer",
"Cancel upload" => "Fortryd upload",
"You dont have permission to upload or create files here" => "Du har ikke tilladelse til at uploade eller oprette filer her",
"Nothing in here. Upload something!" => "Her er tomt. Upload noget!",
"Download" => "Download",
"Unshare" => "Fjern deling",
"Delete" => "Slet",
"Upload too large" => "Upload er for stor",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server.",
"Files are being scanned, please wait." => "Filerne bliver indlæst, vent venligst.",
"Current scanning" => "Indlæser",
"Upgrading filesystem cache..." => "Opgraderer filsystems cachen..."
"Currently scanning" => "Indlæser"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
+25 -28
View File
@@ -3,13 +3,15 @@ $TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "Konnte %s nicht verschieben. Eine Datei mit diesem Namen existiert bereits",
"Could not move %s" => "Konnte %s nicht verschieben",
"File name cannot be empty." => "Der Dateiname darf nicht leer sein.",
"File name must not contain \"/\". Please choose a different name." => "Der Dateiname darf kein \"/\" enthalten. Bitte wähle einen anderen Namen.",
"\"%s\" is an invalid file name." => "\"%s\" ist kein gültiger Dateiname.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig.",
"The target folder has been moved or deleted." => "Der Zielordner wurde verschoben oder gelöscht.",
"The name %s is already used in the folder %s. Please choose a different name." => "Der Name %s wird bereits im Ordner %s benutzt. Bitte wähle einen anderen Namen.",
"Not a valid source" => "Keine gültige Quelle",
"Server is not allowed to open URLs, please check the server configuration" => "Dem Server ist das Öffnen von URLs nicht erlaubt, bitte die Serverkonfiguration prüfen",
"Error while downloading %s to %s" => "Fehler beim Herunterladen von %s nach %s",
"Error when creating the file" => "Fehler beim Erstellen der Datei",
"Folder name cannot be empty." => "Der Ordner-Name darf nicht leer sein.",
"Folder name must not contain \"/\". Please choose a different name." => "Der Ordner-Name darf kein \"/\" enthalten. Bitte wähle einen anderen Namen.",
"Error when creating the folder" => "Fehler beim Erstellen des Ordners",
"Unable to set upload directory." => "Das Upload-Verzeichnis konnte nicht gesetzt werden.",
"Invalid Token" => "Ungültiges Merkmal",
@@ -22,71 +24,66 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Kein temporärer Ordner vorhanden",
"Failed to write to disk" => "Fehler beim Schreiben auf die Festplatte",
"Not enough storage available" => "Nicht genug Speicher vorhanden.",
"Upload failed. Could not get file info." => "Hochladen fehlgeschlagen. Dateiinformationen konnten nicht abgerufen werden.",
"Upload failed. Could not find uploaded file" => "Hochladen fehlgeschlagen. Hochgeladene Datei konnte nicht gefunden werden.",
"Upload failed. Could not get file info." => "Hochladen fehlgeschlagen. Dateiinformationen konnten nicht abgerufen werden.",
"Invalid directory." => "Ungültiges Verzeichnis.",
"Files" => "Dateien",
"All files" => "Alle Dateien",
"Unable to upload {filename} as it is a directory or has 0 bytes" => "Die Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist",
"Not enough space available" => "Nicht genug Speicherplatz verfügbar",
"Total file size {size1} exceeds upload limit {size2}" => "Die Gesamt-Größe {size1} überschreitet die Upload-Begrenzung {size2}",
"Not enough free space, you are uploading {size1} but only {size2} is left" => "Nicht genügend freier Speicherplatz, du möchtest {size1} hochladen, es sind jedoch nur noch {size2} verfügbar.",
"Upload cancelled." => "Upload abgebrochen.",
"Could not get result from server." => "Ergebnis konnte nicht vom Server abgerufen werden.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen.",
"URL cannot be empty" => "Die URL darf nicht leer sein",
"In the home folder 'Shared' is a reserved filename" => "Das Benutzerverzeichnis 'Shared' ist ein reservierter Dateiname",
"{new_name} already exists" => "{new_name} existiert bereits",
"Could not create file" => "Die Datei konnte nicht erstellt werden",
"Could not create folder" => "Der Ordner konnte nicht erstellt werden",
"Error fetching URL" => "Fehler beim Abrufen der URL",
"Share" => "Teilen",
"Delete permanently" => "Endgültig löschen",
"Delete" => "Löschen",
"Rename" => "Umbenennen",
"Your download is being prepared. This might take some time if the files are big." => "Dein Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern.",
"Pending" => "Ausstehend",
"Error moving file." => "Fehler beim Verschieben der Datei.",
"Error moving file" => "Fehler beim Verschieben der Datei",
"Error" => "Fehler",
"Could not rename file" => "Die Datei konnte nicht umbenannt werden",
"replaced {new_name} with {old_name}" => "{old_name} ersetzt durch {new_name}",
"undo" => "rückgängig machen",
"Error deleting file." => "Fehler beim Löschen der Datei.",
"Name" => "Name",
"Size" => "Größe",
"Modified" => "Geändert",
"_%n folder_::_%n folders_" => array("%n Ordner","%n Ordner"),
"_%n file_::_%n files_" => array("%n Datei","%n Dateien"),
"{dirs} and {files}" => "{dirs} und {files}",
"_Uploading %n file_::_Uploading %n files_" => array("%n Datei wird hochgeladen","%n Dateien werden hochgeladen"),
"'.' is an invalid file name." => "'.' ist kein gültiger Dateiname.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig.",
"\"{name}\" is an invalid file name." => "\"{name}\" ist kein gültiger Dateiname.",
"Your storage is full, files can not be updated or synced anymore!" => "Dein Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!",
"Your storage is almost full ({usedSpacePercent}%)" => "Dein Speicher ist fast voll ({usedSpacePercent}%)",
"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 melden Dich nochmals ab und wieder an.",
"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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Die Verschlüsselung wurde deaktiviert, jedoch sind Deine Dateien nach wie vor verschlüsselt. Bitte gehe zu Deinen persönlichen Einstellungen, um Deine Dateien zu entschlüsseln.",
"Your download is being prepared. This might take some time if the files are big." => "Dein Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern.",
"Error moving file" => "Fehler beim Verschieben der Datei",
"Error" => "Fehler",
"Name" => "Name",
"Size" => "Größe",
"Modified" => "Geändert",
"Invalid folder name. Usage of 'Shared' is reserved." => "Ungültiger Verzeichnisname. Die Nutzung von 'Shared' ist reserviert.",
"{dirs} and {files}" => "{dirs} und {files}",
"%s could not be renamed" => "%s konnte nicht umbenannt werden",
"Upload" => "Hochladen",
"Upload (max. %s)" => "Hochladen (max. %s)",
"File handling" => "Dateibehandlung",
"Maximum upload size" => "Maximale Upload-Größe",
"max. possible: " => "maximal möglich:",
"Needed for multi-file and folder downloads." => "Für Mehrfachdatei- und Ordnerdownloads benötigt:",
"Enable ZIP-download" => "ZIP-Download aktivieren",
"0 is unlimited" => "0 bedeutet unbegrenzt",
"Maximum input size for ZIP files" => "Maximale Größe für ZIP-Dateien",
"Save" => "Speichern",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Verwenden Sie diese Adresse, um <a href=\"%s\" target=\"_blank\">via WebDAV auf Ihre Dateien zuzugreifen</a>",
"New" => "Neu",
"New text file" => "Neue Textdatei",
"Text file" => "Textdatei",
"New folder" => "Neuer Ordner",
"Folder" => "Ordner",
"From link" => "Von einem Link",
"Deleted files" => "Gelöschte Dateien",
"Cancel upload" => "Upload abbrechen",
"You dont have permission to upload or create files here" => "Du besitzt hier keine Berechtigung, um Dateien hochzuladen oder zu erstellen",
"Nothing in here. Upload something!" => "Alles leer. Lade etwas hoch!",
"Download" => "Herunterladen",
"Unshare" => "Freigabe aufheben",
"Delete" => "Löschen",
"Upload too large" => "Der Upload ist zu groß",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.",
"Files are being scanned, please wait." => "Dateien werden gescannt, bitte warten.",
"Current scanning" => "Scanne",
"Upgrading filesystem cache..." => "Dateisystem-Cache wird aktualisiert ..."
"Currently scanning" => "Durchsuchen läuft"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
+5 -1
View File
@@ -1,7 +1,11 @@
<?php
$TRANSLATIONS = array(
"Share" => "Freigeben",
"Delete" => "Löschen",
"_%n folder_::_%n folders_" => array("",""),
"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("","")
"_Uploading %n file_::_Uploading %n files_" => array("",""),
"Save" => "Speichern",
"Download" => "Herunterladen"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
+12 -24
View File
@@ -3,6 +3,7 @@ $TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "%s konnte nicht verschoben werden. Eine Datei mit diesem Namen existiert bereits.",
"Could not move %s" => "Konnte %s nicht verschieben",
"File name cannot be empty." => "Der Dateiname darf nicht leer sein.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ungültiger Name, «\\», «/», «<», «>», «:», «\"», «|», «?» und «*» sind nicht zulässig.",
"Unable to set upload directory." => "Das Upload-Verzeichnis konnte nicht gesetzt werden.",
"Invalid Token" => "Ungültiges Merkmal",
"No file was uploaded. Unknown error" => "Keine Datei hochgeladen. Unbekannter Fehler",
@@ -16,53 +17,40 @@ $TRANSLATIONS = array(
"Not enough storage available" => "Nicht genug Speicher vorhanden.",
"Invalid directory." => "Ungültiges Verzeichnis.",
"Files" => "Dateien",
"Not enough space available" => "Nicht genügend Speicherplatz verfügbar",
"Upload cancelled." => "Upload abgebrochen.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.",
"{new_name} already exists" => "{new_name} existiert bereits",
"Share" => "Teilen",
"Delete permanently" => "Endgültig löschen",
"Delete" => "Löschen",
"Rename" => "Umbenennen",
"Pending" => "Ausstehend",
"replaced {new_name} with {old_name}" => "{old_name} wurde ersetzt durch {new_name}",
"undo" => "rückgängig machen",
"_%n folder_::_%n folders_" => array("","%n Ordner"),
"_%n file_::_%n files_" => array("","%n Dateien"),
"_Uploading %n file_::_Uploading %n files_" => array("%n Datei wird hochgeladen","%n Dateien werden hochgeladen"),
"'.' is an invalid file name." => "'.' ist kein gültiger Dateiname.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ungültiger Name, «\\», «/», «<», «>», «:», «\"», «|», «?» und «*» sind nicht zulässig.",
"Your storage is full, files can not be updated or synced anymore!" => "Ihr Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!",
"Your storage is almost full ({usedSpacePercent}%)" => "Ihr Speicher ist fast voll ({usedSpacePercent}%)",
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Die Verschlüsselung wurde deaktiviert, jedoch sind Ihre Dateien nach wie vor verschlüsselt. Bitte gehen Sie zu Ihren persönlichen Einstellungen, um Ihre Dateien zu entschlüsseln.",
"Your download is being prepared. This might take some time if the files are big." => "Ihr Download wird vorbereitet. Dies kann bei grösseren Dateien etwas dauern.",
"Pending" => "Ausstehend",
"Error" => "Fehler",
"Name" => "Name",
"Size" => "Grösse",
"Modified" => "Geändert",
"_%n folder_::_%n folders_" => array("","%n Ordner"),
"_%n file_::_%n files_" => array("","%n Dateien"),
"_Uploading %n file_::_Uploading %n files_" => array("%n Datei wird hochgeladen","%n Dateien werden hochgeladen"),
"Your storage is full, files can not be updated or synced anymore!" => "Ihr Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!",
"Your storage is almost full ({usedSpacePercent}%)" => "Ihr Speicher ist fast voll ({usedSpacePercent}%)",
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Die Verschlüsselung wurde deaktiviert, jedoch sind Ihre Dateien nach wie vor verschlüsselt. Bitte gehen Sie zu Ihren persönlichen Einstellungen, um Ihre Dateien zu entschlüsseln.",
"%s could not be renamed" => "%s konnte nicht umbenannt werden",
"Upload" => "Hochladen",
"File handling" => "Dateibehandlung",
"Maximum upload size" => "Maximale Upload-Grösse",
"max. possible: " => "maximal möglich:",
"Needed for multi-file and folder downloads." => "Für Mehrfachdatei- und Ordnerdownloads benötigt:",
"Enable ZIP-download" => "ZIP-Download aktivieren",
"0 is unlimited" => "0 bedeutet unbegrenzt",
"Maximum input size for ZIP files" => "Maximale Grösse für ZIP-Dateien",
"Save" => "Speichern",
"WebDAV" => "WebDAV",
"New" => "Neu",
"Text file" => "Textdatei",
"New folder" => "Neues Verzeichnis",
"Folder" => "Ordner",
"From link" => "Von einem Link",
"Deleted files" => "Gelöschte Dateien",
"Cancel upload" => "Upload abbrechen",
"Nothing in here. Upload something!" => "Alles leer. Laden Sie etwas hoch!",
"Download" => "Herunterladen",
"Unshare" => "Freigabe aufheben",
"Delete" => "Löschen",
"Upload too large" => "Der Upload ist zu gross",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgrösse für Uploads auf diesem Server.",
"Files are being scanned, please wait." => "Dateien werden gescannt, bitte warten.",
"Current scanning" => "Scanne",
"Upgrading filesystem cache..." => "Dateisystem-Cache wird aktualisiert ..."
"Files are being scanned, please wait." => "Dateien werden gescannt, bitte warten."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
+25 -28
View File
@@ -3,13 +3,15 @@ $TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "%s konnte nicht verschoben werden. Eine Datei mit diesem Namen existiert bereits.",
"Could not move %s" => "Konnte %s nicht verschieben",
"File name cannot be empty." => "Der Dateiname darf nicht leer sein.",
"File name must not contain \"/\". Please choose a different name." => "Der Dateiname darf kein \"/\" enthalten. Bitte wählen Sie einen anderen Namen.",
"\"%s\" is an invalid file name." => "\"%s\" ist kein gültiger Dateiname.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig.",
"The target folder has been moved or deleted." => "Der Ziel-Ordner wurde verschoben oder gelöscht.",
"The name %s is already used in the folder %s. Please choose a different name." => "Der Name %s wird bereits im Ordner %s benutzt. Bitte wählen Sie einen anderen Namen.",
"Not a valid source" => "Keine gültige Quelle",
"Server is not allowed to open URLs, please check the server configuration" => "Dem Server ist das Öffnen von URLs nicht erlaubt, bitte die Serverkonfiguration prüfen",
"Error while downloading %s to %s" => "Fehler beim Herunterladen von %s nach %s",
"Error when creating the file" => "Fehler beim Erstellen der Datei",
"Folder name cannot be empty." => "Der Ordner-Name darf nicht leer sein.",
"Folder name must not contain \"/\". Please choose a different name." => "Der Ordner-Name darf kein \"/\" enthalten. Bitte wählen Sie einen anderen Namen.",
"Error when creating the folder" => "Fehler beim Erstellen des Ordners",
"Unable to set upload directory." => "Das Upload-Verzeichnis konnte nicht gesetzt werden.",
"Invalid Token" => "Ungültiges Merkmal",
@@ -22,71 +24,66 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Kein temporärer Ordner vorhanden",
"Failed to write to disk" => "Fehler beim Schreiben auf die Festplatte",
"Not enough storage available" => "Nicht genug Speicher vorhanden.",
"Upload failed. Could not get file info." => "Hochladen fehlgeschlagen. Die Dateiinformationen konnten nicht abgerufen werden.",
"Upload failed. Could not find uploaded file" => "Hochladen fehlgeschlagen. Die hochgeladene Datei konnte nicht gefunden werden.",
"Upload failed. Could not get file info." => "Hochladen fehlgeschlagen. Die Dateiinformationen konnten nicht abgerufen werden.",
"Invalid directory." => "Ungültiges Verzeichnis.",
"Files" => "Dateien",
"All files" => "Alle Dateien",
"Unable to upload {filename} as it is a directory or has 0 bytes" => "Die Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist",
"Not enough space available" => "Nicht genügend Speicherplatz verfügbar",
"Total file size {size1} exceeds upload limit {size2}" => "Die Gesamt-Größe {size1} überschreitet die Upload-Begrenzung {size2}",
"Not enough free space, you are uploading {size1} but only {size2} is left" => "Nicht genügend freier Speicherplatz, Sie möchten {size1} hochladen, es sind jedoch nur noch {size2} verfügbar.",
"Upload cancelled." => "Upload abgebrochen.",
"Could not get result from server." => "Ergebnis konnte nicht vom Server abgerufen werden.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.",
"URL cannot be empty" => "Die URL darf nicht leer sein",
"In the home folder 'Shared' is a reserved filename" => "Das Benutzerverzeichnis 'Shared' ist ein reservierter Dateiname",
"{new_name} already exists" => "{new_name} existiert bereits",
"Could not create file" => "Die Datei konnte nicht erstellt werden",
"Could not create folder" => "Der Ordner konnte nicht erstellt werden",
"Error fetching URL" => "Fehler beim Abrufen der URL",
"Share" => "Teilen",
"Delete permanently" => "Endgültig löschen",
"Delete" => "Löschen",
"Rename" => "Umbenennen",
"Your download is being prepared. This might take some time if the files are big." => "Ihr Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern.",
"Pending" => "Ausstehend",
"Error moving file." => "Fehler beim Verschieben der Datei.",
"Error moving file" => "Fehler beim Verschieben der Datei",
"Error" => "Fehler",
"Could not rename file" => "Die Datei konnte nicht umbenannt werden",
"replaced {new_name} with {old_name}" => "{old_name} wurde ersetzt durch {new_name}",
"undo" => "rückgängig machen",
"Error deleting file." => "Fehler beim Löschen der Datei.",
"Name" => "Name",
"Size" => "Größe",
"Modified" => "Geändert",
"_%n folder_::_%n folders_" => array("%n Ordner","%n Ordner"),
"_%n file_::_%n files_" => array("%n Datei","%n Dateien"),
"{dirs} and {files}" => "{dirs} und {files}",
"_Uploading %n file_::_Uploading %n files_" => array("%n Datei wird hoch geladen","%n Dateien werden hoch geladen"),
"'.' is an invalid file name." => "'.' ist kein gültiger Dateiname.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig.",
"\"{name}\" is an invalid file name." => "\"{name}\" ist kein gültiger Dateiname.",
"Your storage is full, files can not be updated or synced anymore!" => "Ihr Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!",
"Your storage is almost full ({usedSpacePercent}%)" => "Ihr Speicher ist fast voll ({usedSpacePercent}%)",
"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 melden sich nochmals ab und wieder an.",
"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 aktualisieren Sie Ihr privates Schlüssel-Passwort, um den Zugriff auf Ihre verschlüsselten Dateien wiederherzustellen.",
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Die Verschlüsselung wurde deaktiviert, jedoch sind Ihre Dateien nach wie vor verschlüsselt. Bitte gehen Sie zu Ihren persönlichen Einstellungen, um Ihre Dateien zu entschlüsseln.",
"Your download is being prepared. This might take some time if the files are big." => "Ihr Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern.",
"Error moving file" => "Fehler beim Verschieben der Datei",
"Error" => "Fehler",
"Name" => "Name",
"Size" => "Größe",
"Modified" => "Geändert",
"Invalid folder name. Usage of 'Shared' is reserved." => "Ungültiger Verzeichnisname. Die Nutzung von 'Shared' ist reserviert.",
"{dirs} and {files}" => "{dirs} und {files}",
"%s could not be renamed" => "%s konnte nicht umbenannt werden",
"Upload" => "Hochladen",
"Upload (max. %s)" => "Hochladen (max. %s)",
"File handling" => "Dateibehandlung",
"Maximum upload size" => "Maximale Upload-Größe",
"max. possible: " => "maximal möglich:",
"Needed for multi-file and folder downloads." => "Für Mehrfachdatei- und Ordnerdownloads benötigt:",
"Enable ZIP-download" => "ZIP-Download aktivieren",
"0 is unlimited" => "0 bedeutet unbegrenzt",
"Maximum input size for ZIP files" => "Maximale Größe für ZIP-Dateien",
"Save" => "Speichern",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Verwenden Sie diese Adresse, um <a href=\"%s\" target=\"_blank\">via WebDAV auf Ihre Dateien zuzugreifen</a>",
"New" => "Neu",
"New text file" => "Neue Textdatei",
"Text file" => "Textdatei",
"New folder" => "Neuer Ordner",
"Folder" => "Ordner",
"From link" => "Von einem Link",
"Deleted files" => "Gelöschte Dateien",
"Cancel upload" => "Upload abbrechen",
"You dont have permission to upload or create files here" => "Sie besitzen hier keine Berechtigung Dateien hochzuladen oder zu erstellen",
"Nothing in here. Upload something!" => "Alles leer. Laden Sie etwas hoch!",
"Download" => "Herunterladen",
"Unshare" => "Freigabe aufheben",
"Delete" => "Löschen",
"Upload too large" => "Der Upload ist zu groß",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.",
"Files are being scanned, please wait." => "Dateien werden gescannt, bitte warten.",
"Current scanning" => "Scanne",
"Upgrading filesystem cache..." => "Dateisystem-Cache wird aktualisiert ..."
"Currently scanning" => "Durchsuchen läuft"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
+43 -23
View File
@@ -3,6 +3,16 @@ $TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "Αδυναμία μετακίνησης του %s - υπάρχει ήδη αρχείο με αυτό το όνομα",
"Could not move %s" => "Αδυναμία μετακίνησης του %s",
"File name cannot be empty." => "Το όνομα αρχείου δεν μπορεί να είναι κενό.",
"\"%s\" is an invalid file name." => "Το \"%s\" είναι ένα μη έγκυρο όνομα αρχείου.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Μη έγκυρο όνομα, '\\', '/', '<', '>', ':', '\"', '|', '?' και '*' δεν επιτρέπονται.",
"The target folder has been moved or deleted." => "Ο φάκελος προορισμού έχει μετακινηθεί ή διαγραφεί.",
"The name %s is already used in the folder %s. Please choose a different name." => "Το όνομα %s χρησιμοποιείτε ήδη στον φάκελο %s. Παρακαλώ επιλέξτε ένα άλλο όνομα.",
"Not a valid source" => "Μη έγκυρη πηγή",
"Server is not allowed to open URLs, please check the server configuration" => "Ο διακομιστής δεν επιτρέπεται να ανοίγει URL, παρακαλώ ελέγξτε τις ρυθμίσεις του διακομιστή",
"Error while downloading %s to %s" => "Σφάλμα κατά τη λήψη του %s στο %s",
"Error when creating the file" => "Σφάλμα κατά τη δημιουργία του αρχείου",
"Folder name cannot be empty." => "Το όνομα φακέλου δεν μπορεί να είναι κενό.",
"Error when creating the folder" => "Σφάλμα δημιουργίας φακέλου",
"Unable to set upload directory." => "Αδυναμία ορισμού καταλόγου αποστολής.",
"Invalid Token" => "Μη έγκυρο Token",
"No file was uploaded. Unknown error" => "Δεν ανέβηκε κάποιο αρχείο. Άγνωστο σφάλμα",
@@ -14,56 +24,66 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Λείπει ο προσωρινός φάκελος",
"Failed to write to disk" => "Αποτυχία εγγραφής στο δίσκο",
"Not enough storage available" => "Μη επαρκής διαθέσιμος αποθηκευτικός χώρος",
"Upload failed. Could not find uploaded file" => "Η φόρτωση απέτυχε. Αδυναμία εύρεσης αρχείου προς φόρτωση.",
"Upload failed. Could not get file info." => "Η φόρτωση απέτυχε. Αδυναμία λήψης πληροφοριών αρχείων.",
"Invalid directory." => "Μη έγκυρος φάκελος.",
"Files" => "Αρχεία",
"Not enough space available" => "Δεν υπάρχει αρκετός διαθέσιμος χώρος",
"All files" => "Όλα τα αρχεία",
"Unable to upload {filename} as it is a directory or has 0 bytes" => "Αδυναμία φόρτωσης {filename} καθώς είναι κατάλογος αρχείων ή έχει 0 bytes",
"Total file size {size1} exceeds upload limit {size2}" => "Το συνολικό μέγεθος αρχείου {size1} υπερβαίνει το όριο μεταφόρτωσης {size2}",
"Not enough free space, you are uploading {size1} but only {size2} is left" => "Δεν υπάρχει αρκετός ελεύθερος χώρος, μεταφορτώνετε μέγεθος {size1} αλλά υπάρχει χώρος μόνο {size2}",
"Upload cancelled." => "Η αποστολή ακυρώθηκε.",
"Could not get result from server." => "Αδυναμία λήψης αποτελέσματος από το διακομιστή.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Το κλείσιμο της σελίδας θα ακυρώσει την αποστολή.",
"URL cannot be empty" => "Η URL δεν πρέπει να είναι κενή",
"{new_name} already exists" => "{new_name} υπάρχει ήδη",
"Could not create file" => "Αδυναμία δημιουργίας αρχείου",
"Could not create folder" => "Αδυναμία δημιουργίας φακέλου",
"Error fetching URL" => "Σφάλμα φόρτωσης URL",
"Share" => "Διαμοιρασμός",
"Delete permanently" => "Μόνιμη διαγραφή",
"Delete" => "Διαγραφή",
"Rename" => "Μετονομασία",
"Pending" => "Εκκρεμεί",
"replaced {new_name} with {old_name}" => "αντικαταστάθηκε το {new_name} με {old_name}",
"undo" => "αναίρεση",
"_%n folder_::_%n folders_" => array("%n φάκελος","%n φάκελοι"),
"_%n file_::_%n files_" => array("%n αρχείο","%n αρχεία"),
"_Uploading %n file_::_Uploading %n files_" => array("Ανέβασμα %n αρχείου","Ανέβασμα %n αρχείων"),
"'.' is an invalid file name." => "'.' είναι μη έγκυρο όνομα αρχείου.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Μη έγκυρο όνομα, '\\', '/', '<', '>', ':', '\"', '|', '?' και '*' δεν επιτρέπονται.",
"Your storage is full, files can not be updated or synced anymore!" => "Ο αποθηκευτικός σας χώρος είναι γεμάτος, τα αρχεία δεν μπορούν να ενημερωθούν ή να συγχρονιστούν πια!",
"Your storage is almost full ({usedSpacePercent}%)" => "Ο αποθηκευτικός χώρος είναι σχεδόν γεμάτος ({usedSpacePercent}%)",
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Η κρυπτογράφηση απενεργοποιήθηκε, αλλά τα αρχεία σας είναι ακόμα κρυπτογραφημένα. Παρακαλούμε απενεργοποιήσετε την κρυπτογράφηση αρχείων από τις προσωπικές σας ρυθμίσεις",
"Your download is being prepared. This might take some time if the files are big." => "Η λήψη προετοιμάζεται. Αυτό μπορεί να πάρει ώρα εάν τα αρχεία έχουν μεγάλο μέγεθος.",
"Pending" => "Εκκρεμεί",
"Error moving file." => "Σφάλμα κατά τη μετακίνηση του αρχείου.",
"Error moving file" => "Σφάλμα κατά τη μετακίνηση του αρχείου",
"Error" => "Σφάλμα",
"Could not rename file" => "Αδυναμία μετονομασίας αρχείου",
"Error deleting file." => "Σφάλμα διαγραφής αρχείου.",
"Name" => "Όνομα",
"Size" => "Μέγεθος",
"Modified" => "Τροποποιήθηκε",
"_%n folder_::_%n folders_" => array("%n φάκελος","%n φάκελοι"),
"_%n file_::_%n files_" => array("%n αρχείο","%n αρχεία"),
"_Uploading %n file_::_Uploading %n files_" => array("Ανέβασμα %n αρχείου","Ανέβασμα %n αρχείων"),
"\"{name}\" is an invalid file name." => "Το \"{name}\" είναι μη έγκυρο όνομα αρχείου.",
"Your storage is full, files can not be updated or synced anymore!" => "Ο αποθηκευτικός σας χώρος είναι γεμάτος, τα αρχεία δεν μπορούν να ενημερωθούν ή να συγχρονιστούν πια!",
"Your storage is almost full ({usedSpacePercent}%)" => "Ο αποθηκευτικός χώρος είναι σχεδόν γεμάτος ({usedSpacePercent}%)",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Η εφαρμογή κρυπτογράφησης είναι ενεργοποιημένη αλλά τα κλειδιά σας δεν έχουν καταγραφεί, παρακαλώ αποσυνδεθείτε και επανασυνδεθείτε.",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "Άκυρο προσωπικό κλειδί για την εφαρμογή κρυπτογράφησης. Παρακαλώ ενημερώστε τον κωδικό του προσωπικού κλειδίου σας στις προσωπικές ρυθμίσεις για να επανακτήσετε πρόσβαση στα κρυπτογραφημένα σας αρχεία.",
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Η κρυπτογράφηση απενεργοποιήθηκε, αλλά τα αρχεία σας είναι ακόμα κρυπτογραφημένα. Παρακαλούμε απενεργοποιήσετε την κρυπτογράφηση αρχείων από τις προσωπικές σας ρυθμίσεις",
"{dirs} and {files}" => "{Κατάλογοι αρχείων} και {αρχεία}",
"%s could not be renamed" => "Αδυναμία μετονομασίας του %s",
"Upload" => "Μεταφόρτωση",
"Upload (max. %s)" => "Διαμοιρασμός (max. %s)",
"File handling" => "Διαχείριση αρχείων",
"Maximum upload size" => "Μέγιστο μέγεθος αποστολής",
"max. possible: " => "μέγιστο δυνατό:",
"Needed for multi-file and folder downloads." => "Απαραίτητο για κατέβασμα πολλαπλών αρχείων και φακέλων",
"Enable ZIP-download" => "Ενεργοποίηση κατεβάσματος ZIP",
"0 is unlimited" => "0 για απεριόριστο",
"Maximum input size for ZIP files" => "Μέγιστο μέγεθος για αρχεία ZIP",
"Save" => "Αποθήκευση",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Χρησιμοποιήστε αυτήν την διεύθυνση για να αποκτήσετε <a href=\"%s\" target=\"_blank\">πρόσβαση στα αρχεία σας μέσω WebDAV</a>",
"New" => "Νέο",
"New text file" => "Νέο αρχείο κειμένου",
"Text file" => "Αρχείο κειμένου",
"New folder" => "Νέος κατάλογος",
"Folder" => "Φάκελος",
"From link" => "Από σύνδεσμο",
"Deleted files" => "Διαγραμμένα αρχεία",
"Cancel upload" => "Ακύρωση αποστολής",
"You dont have permission to upload or create files here" => "Δεν έχετε δικαιώματα φόρτωσης ή δημιουργίας αρχείων εδώ",
"Nothing in here. Upload something!" => "Δεν υπάρχει τίποτα εδώ. Ανεβάστε κάτι!",
"Download" => "Λήψη",
"Unshare" => "Σταμάτημα διαμοιρασμού",
"Delete" => "Διαγραφή",
"Upload too large" => "Πολύ μεγάλο αρχείο προς αποστολή",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος αποστολής αρχείων σε αυτόν τον διακομιστή.",
"Files are being scanned, please wait." => "Τα αρχεία σαρώνονται, παρακαλώ περιμένετε.",
"Current scanning" => "Τρέχουσα ανίχνευση",
"Upgrading filesystem cache..." => "Ενημέρωση της μνήμης cache του συστήματος αρχείων..."
"Currently scanning" => "Σάρωση σε εξέλιξη"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
+25 -28
View File
@@ -3,13 +3,15 @@ $TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "Could not move %s - File with this name already exists",
"Could not move %s" => "Could not move %s",
"File name cannot be empty." => "File name cannot be empty.",
"File name must not contain \"/\". Please choose a different name." => "File name must not contain \"/\". Please choose a different name.",
"\"%s\" is an invalid file name." => "\"%s\" is an invalid file name.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Invalid name: '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed.",
"The target folder has been moved or deleted." => "The target folder has been moved or deleted.",
"The name %s is already used in the folder %s. Please choose a different name." => "The name %s is already used in the folder %s. Please choose a different name.",
"Not a valid source" => "Not a valid source",
"Server is not allowed to open URLs, please check the server configuration" => "Server is not allowed to open URLs, please check the server configuration",
"Error while downloading %s to %s" => "Error whilst downloading %s to %s",
"Error when creating the file" => "Error when creating the file",
"Folder name cannot be empty." => "Folder name cannot be empty.",
"Folder name must not contain \"/\". Please choose a different name." => "Folder name must not contain \"/\". Please choose a different name.",
"Error when creating the folder" => "Error when creating the folder",
"Unable to set upload directory." => "Unable to set upload directory.",
"Invalid Token" => "Invalid Token",
@@ -22,71 +24,66 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Missing a temporary folder",
"Failed to write to disk" => "Failed to write to disk",
"Not enough storage available" => "Not enough storage available",
"Upload failed. Could not get file info." => "Upload failed. Could not get file info.",
"Upload failed. Could not find uploaded file" => "Upload failed. Could not find uploaded file",
"Upload failed. Could not get file info." => "Upload failed. Could not get file info.",
"Invalid directory." => "Invalid directory.",
"Files" => "Files",
"All files" => "All files",
"Unable to upload {filename} as it is a directory or has 0 bytes" => "Unable to upload {filename} as it is a directory or has 0 bytes",
"Not enough space available" => "Not enough space available",
"Total file size {size1} exceeds upload limit {size2}" => "Total file size {size1} exceeds upload limit {size2}",
"Not enough free space, you are uploading {size1} but only {size2} is left" => "Not enough free space, you are uploading {size1} but only {size2} is left",
"Upload cancelled." => "Upload cancelled.",
"Could not get result from server." => "Could not get result from server.",
"File upload is in progress. Leaving the page now will cancel the upload." => "File upload is in progress. Leaving the page now will cancel the upload.",
"URL cannot be empty" => "URL cannot be empty",
"In the home folder 'Shared' is a reserved filename" => "In the home folder 'Shared' is a reserved file name",
"{new_name} already exists" => "{new_name} already exists",
"Could not create file" => "Could not create file",
"Could not create folder" => "Could not create folder",
"Error fetching URL" => "Error fetching URL",
"Share" => "Share",
"Delete permanently" => "Delete permanently",
"Delete" => "Delete",
"Rename" => "Rename",
"Your download is being prepared. This might take some time if the files are big." => "Your download is being prepared. This might take some time if the files are big.",
"Pending" => "Pending",
"Error moving file." => "Error moving file.",
"Error moving file" => "Error moving file",
"Error" => "Error",
"Could not rename file" => "Could not rename file",
"replaced {new_name} with {old_name}" => "replaced {new_name} with {old_name}",
"undo" => "undo",
"Error deleting file." => "Error deleting file.",
"Name" => "Name",
"Size" => "Size",
"Modified" => "Modified",
"_%n folder_::_%n folders_" => array("%n folder","%n folders"),
"_%n file_::_%n files_" => array("%n file","%n files"),
"{dirs} and {files}" => "{dirs} and {files}",
"_Uploading %n file_::_Uploading %n files_" => array("Uploading %n file","Uploading %n files"),
"'.' is an invalid file name." => "'.' is an invalid file name.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Invalid name: '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed.",
"\"{name}\" is an invalid file name." => "\"{name}\" is an invalid file name.",
"Your storage is full, files can not be updated or synced anymore!" => "Your storage is full, files can not be updated or synced anymore!",
"Your storage is almost full ({usedSpacePercent}%)" => "Your storage is almost full ({usedSpacePercent}%)",
"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",
"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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files.",
"Your download is being prepared. This might take some time if the files are big." => "Your download is being prepared. This might take some time if the files are big.",
"Error moving file" => "Error moving file",
"Error" => "Error",
"Name" => "Name",
"Size" => "Size",
"Modified" => "Modified",
"Invalid folder name. Usage of 'Shared' is reserved." => "Invalid folder name. Usage of 'Shared' is reserved.",
"{dirs} and {files}" => "{dirs} and {files}",
"%s could not be renamed" => "%s could not be renamed",
"Upload" => "Upload",
"Upload (max. %s)" => "Upload (max. %s)",
"File handling" => "File handling",
"Maximum upload size" => "Maximum upload size",
"max. possible: " => "max. possible: ",
"Needed for multi-file and folder downloads." => "Needed for multi-file and folder downloads.",
"Enable ZIP-download" => "Enable ZIP-download",
"0 is unlimited" => "0 is unlimited",
"Maximum input size for ZIP files" => "Maximum input size for ZIP files",
"Save" => "Save",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>",
"New" => "New",
"New text file" => "New text file",
"Text file" => "Text file",
"New folder" => "New folder",
"Folder" => "Folder",
"From link" => "From link",
"Deleted files" => "Deleted files",
"Cancel upload" => "Cancel upload",
"You dont have permission to upload or create files here" => "You dont have permission to upload or create files here",
"Nothing in here. Upload something!" => "Nothing in here. Upload something!",
"Download" => "Download",
"Unshare" => "Unshare",
"Delete" => "Delete",
"Upload too large" => "Upload too large",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "The files you are trying to upload exceed the maximum size for file uploads on this server.",
"Files are being scanned, please wait." => "Files are being scanned, please wait.",
"Current scanning" => "Current scanning",
"Upgrading filesystem cache..." => "Upgrading filesystem cache..."
"Currently scanning" => "Currently scanning"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
+7
View File
@@ -0,0 +1,7 @@
<?php
$TRANSLATIONS = array(
"_%n folder_::_%n folders_" => array("",""),
"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("","")
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
+15 -28
View File
@@ -3,13 +3,12 @@ $TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "Ne eblis movi %s: dosiero kun ĉi tiu nomo jam ekzistas",
"Could not move %s" => "Ne eblis movi %s",
"File name cannot be empty." => "Dosiernomo devas ne malpleni.",
"File name must not contain \"/\". Please choose a different name." => "La dosieronomo ne devas enhavi “/”. Bonvolu elekti malsaman nomon.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nevalida nomo: “\\”, “/”, “<”, “>”, “:”, “\"”, “|”, “?” kaj “*” ne permesatas.",
"The name %s is already used in the folder %s. Please choose a different name." => "La nomo %s jam uziĝas en la dosierujo %s. Bonvolu elekti malsaman nomon.",
"Not a valid source" => "Nevalida fonto",
"Error while downloading %s to %s" => "Eraris elŝuto de %s al %s",
"Error when creating the file" => "Eraris la kreo de la dosiero",
"Folder name cannot be empty." => "La dosierujnomo ne povas malpleni.",
"Folder name must not contain \"/\". Please choose a different name." => "La dosiernomo ne devas enhavi “/”. Bonvolu elekti malsaman nomon.",
"Error when creating the folder" => "Eraris la kreo de la dosierujo",
"Unable to set upload directory." => "Ne povis agordiĝi la alŝuta dosierujo.",
"No file was uploaded. Unknown error" => "Neniu dosiero alŝutiĝis. Nekonata eraro.",
@@ -21,12 +20,11 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Mankas provizora dosierujo.",
"Failed to write to disk" => "Malsukcesis skribo al disko",
"Not enough storage available" => "Ne haveblas sufiĉa memoro",
"Upload failed. Could not get file info." => "La alŝuto malsukcesis. Ne povis ekhaviĝi informo pri dosiero.",
"Upload failed. Could not find uploaded file" => "La alŝuto malsukcesis. Ne troviĝis alŝutota dosiero.",
"Upload failed. Could not get file info." => "La alŝuto malsukcesis. Ne povis ekhaviĝi informo pri dosiero.",
"Invalid directory." => "Nevalida dosierujo.",
"Files" => "Dosieroj",
"Unable to upload {filename} as it is a directory or has 0 bytes" => "Ne povis alŝutiĝi {filename} ĉar ĝi estas dosierujo aŭ ĝi havas 0 duumokojn",
"Not enough space available" => "Ne haveblas sufiĉa spaco",
"Upload cancelled." => "La alŝuto nuliĝis.",
"Could not get result from server." => "Ne povis ekhaviĝi rezulto el la servilo.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Dosieralŝuto plenumiĝas. Lasi la paĝon nun nuligus la alŝuton.",
@@ -36,50 +34,39 @@ $TRANSLATIONS = array(
"Could not create folder" => "Ne povis kreiĝi dosierujo",
"Share" => "Kunhavigi",
"Delete permanently" => "Forigi por ĉiam",
"Delete" => "Forigi",
"Rename" => "Alinomigi",
"Pending" => "Traktotaj",
"Could not rename file" => "Ne povis alinomiĝi dosiero",
"replaced {new_name} with {old_name}" => "anstataŭiĝis {new_name} per {old_name}",
"undo" => "malfari",
"_%n folder_::_%n folders_" => array("%n dosierujo","%n dosierujoj"),
"_%n file_::_%n files_" => array("%n dosiero","%n dosieroj"),
"{dirs} and {files}" => "{dirs} kaj {files}",
"_Uploading %n file_::_Uploading %n files_" => array("Alŝutatas %n dosiero","Alŝutatas %n dosieroj"),
"'.' is an invalid file name." => "'.' ne estas valida dosiernomo.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nevalida nomo: “\\”, “/”, “<”, “>”, “:”, “\"”, “|”, “?” kaj “*” ne permesatas.",
"Your storage is full, files can not be updated or synced anymore!" => "Via memoro plenas, ne plu eblas ĝisdatigi aŭ sinkronigi dosierojn!",
"Your storage is almost full ({usedSpacePercent}%)" => "Via memoro preskaŭ plenas ({usedSpacePercent}%)",
"Your download is being prepared. This might take some time if the files are big." => "Via elŝuto pretiĝatas. Ĉi tio povas daŭri iom da tempo se la dosieroj grandas.",
"Pending" => "Traktotaj",
"Error moving file" => "Eraris movo de dosiero",
"Error" => "Eraro",
"Could not rename file" => "Ne povis alinomiĝi dosiero",
"Name" => "Nomo",
"Size" => "Grando",
"Modified" => "Modifita",
"_%n folder_::_%n folders_" => array("%n dosierujo","%n dosierujoj"),
"_%n file_::_%n files_" => array("%n dosiero","%n dosieroj"),
"_Uploading %n file_::_Uploading %n files_" => array("Alŝutatas %n dosiero","Alŝutatas %n dosieroj"),
"Your storage is full, files can not be updated or synced anymore!" => "Via memoro plenas, ne plu eblas ĝisdatigi aŭ sinkronigi dosierojn!",
"Your storage is almost full ({usedSpacePercent}%)" => "Via memoro preskaŭ plenas ({usedSpacePercent}%)",
"{dirs} and {files}" => "{dirs} kaj {files}",
"%s could not be renamed" => "%s ne povis alinomiĝi",
"Upload" => "Alŝuti",
"Upload (max. %s)" => "Alŝuti (maks. %s)",
"File handling" => "Dosieradministro",
"Maximum upload size" => "Maksimuma alŝutogrando",
"max. possible: " => "maks. ebla: ",
"Needed for multi-file and folder downloads." => "Necesa por elŝuto de pluraj dosieroj kaj dosierujoj.",
"Enable ZIP-download" => "Kapabligi ZIP-elŝuton",
"0 is unlimited" => "0 signifas senlime",
"Maximum input size for ZIP files" => "Maksimuma enirgrando por ZIP-dosieroj",
"Save" => "Konservi",
"WebDAV" => "WebDAV",
"New" => "Nova",
"Text file" => "Tekstodosiero",
"New folder" => "Nova dosierujo",
"Folder" => "Dosierujo",
"From link" => "El ligilo",
"Deleted files" => "Forigitaj dosieroj",
"Cancel upload" => "Nuligi alŝuton",
"You dont have permission to upload or create files here" => "Vi ne havas permeson alŝuti aŭ krei dosierojn ĉi tie",
"Nothing in here. Upload something!" => "Nenio estas ĉi tie. Alŝutu ion!",
"Download" => "Elŝuti",
"Unshare" => "Malkunhavigi",
"Delete" => "Forigi",
"Upload too large" => "Alŝuto tro larĝa",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "La dosieroj, kiujn vi provas alŝuti, transpasas la maksimuman grandon por dosieralŝutoj en ĉi tiu servilo.",
"Files are being scanned, please wait." => "Dosieroj estas skanataj, bonvolu atendi.",
"Current scanning" => "Nuna skano",
"Upgrading filesystem cache..." => "Ĝisdatiĝas dosiersistema kaŝmemoro..."
"Files are being scanned, please wait." => "Dosieroj estas skanataj, bonvolu atendi."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
+27 -30
View File
@@ -3,13 +3,15 @@ $TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "No se pudo mover %s - Ya existe un archivo con ese nombre.",
"Could not move %s" => "No se pudo mover %s",
"File name cannot be empty." => "El nombre de archivo no puede estar vacío.",
"File name must not contain \"/\". Please choose a different name." => "El nombre del archivo, NO puede contener el simbolo\"/\", por favor elija un nombre diferente.",
"\"%s\" is an invalid file name." => "\"%s\" es un nombre de archivo inválido.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nombre inválido, los caracteres \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" no están permitidos ",
"The target folder has been moved or deleted." => "La carpeta destino fue movida o eliminada.",
"The name %s is already used in the folder %s. Please choose a different name." => "El nombre %s ya está en uso por la carpeta %s. Por favor elija uno diferente.",
"Not a valid source" => "No es un origen válido",
"Not a valid source" => "No es una fuente válida",
"Server is not allowed to open URLs, please check the server configuration" => "La configuración del servidor no le permite abrir URLs, revísela.",
"Error while downloading %s to %s" => "Error mientras se descargaba %s a %s",
"Error when creating the file" => "Error al crear el archivo",
"Folder name cannot be empty." => "El nombre de la carpeta no puede estar vacío.",
"Folder name must not contain \"/\". Please choose a different name." => "El nombre de la carpeta, NO puede contener el simbolo\"/\", por favor elija un nombre diferente.",
"Error when creating the folder" => "Error al crear la carpeta.",
"Unable to set upload directory." => "Incapaz de crear directorio de subida.",
"Invalid Token" => "Token Inválido",
@@ -22,71 +24,66 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Falta la carpeta temporal",
"Failed to write to disk" => "Falló al escribir al disco",
"Not enough storage available" => "No hay suficiente espacio disponible",
"Upload failed. Could not get file info." => "Actualización fallida. No se pudo obtener información del archivo.",
"Upload failed. Could not find uploaded file" => "Actualización fallida. No se pudo encontrar el archivo subido",
"Upload failed. Could not get file info." => "Actualización fallida. No se pudo obtener información del archivo.",
"Invalid directory." => "Directorio inválido.",
"Files" => "Archivos",
"All files" => "Todos los archivos",
"Unable to upload {filename} as it is a directory or has 0 bytes" => "No ha sido posible subir {filename} porque es un directorio o tiene 0 bytes",
"Not enough space available" => "No hay suficiente espacio disponible",
"Total file size {size1} exceeds upload limit {size2}" => "El tamaño total del archivo {size1} excede el límite {size2}",
"Not enough free space, you are uploading {size1} but only {size2} is left" => "No hay suficiente espacio libre. Quiere subir {size1} pero solo quedan {size2}",
"Upload cancelled." => "Subida cancelada.",
"Could not get result from server." => "No se pudo obtener respuesta del servidor.",
"File upload is in progress. Leaving the page now will cancel the upload." => "La subida del archivo está en proceso. Si sale de la página ahora, la subida será cancelada.",
"URL cannot be empty" => "La dirección URL no puede estar vacía",
"In the home folder 'Shared' is a reserved filename" => "En la carpeta de inicio, 'Shared' es un nombre reservado",
"{new_name} already exists" => "{new_name} ya existe",
"Could not create file" => "No se pudo crear el archivo",
"Could not create folder" => "No se pudo crear la carpeta",
"Error fetching URL" => "Error al descargar URL.",
"Share" => "Compartir",
"Delete permanently" => "Eliminar permanentemente",
"Delete" => "Eliminar",
"Rename" => "Renombrar",
"Your download is being prepared. This might take some time if the files are big." => "Su descarga está siendo preparada. Esto podría tardar algo de tiempo si los archivos son grandes.",
"Pending" => "Pendiente",
"Error moving file." => "Error al mover el archivo.",
"Error moving file" => "Error moviendo archivo",
"Error" => "Error",
"Could not rename file" => "No se pudo renombrar el archivo",
"replaced {new_name} with {old_name}" => "reemplazado {new_name} con {old_name}",
"undo" => "deshacer",
"Error deleting file." => "Error borrando el archivo.",
"Error deleting file." => "Error al borrar el archivo",
"Name" => "Nombre",
"Size" => "Tamaño",
"Modified" => "Modificado",
"_%n folder_::_%n folders_" => array("%n carpeta","%n carpetas"),
"_%n file_::_%n files_" => array("%n archivo","%n archivos"),
"{dirs} and {files}" => "{dirs} y {files}",
"_Uploading %n file_::_Uploading %n files_" => array("Subiendo %n archivo","Subiendo %n archivos"),
"'.' is an invalid file name." => "'.' no es un nombre de archivo válido.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nombre inválido, los caracteres \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" no están permitidos ",
"\"{name}\" is an invalid file name." => "\"{name}\" es un nombre de archivo inválido.",
"Your storage is full, files can not be updated or synced anymore!" => "Su almacenamiento está lleno, ¡los archivos no se actualizarán ni sincronizarán más!",
"Your storage is almost full ({usedSpacePercent}%)" => "Su almacenamiento está casi lleno ({usedSpacePercent}%)",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "La app de crifrado está habilitada pero tus claves no han sido inicializadas, por favor, cierra la sesión y vuelva a iniciarla de nuevo.",
"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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "El cifrado ha sido deshabilitado pero tus archivos permanecen cifrados. Por favor, ve a tus ajustes personales para descifrar tus archivos.",
"Your download is being prepared. This might take some time if the files are big." => "Su descarga está siendo preparada. Esto podría tardar algo de tiempo si los archivos son grandes.",
"Error moving file" => "Error moviendo archivo",
"Error" => "Error",
"Name" => "Nombre",
"Size" => "Tamaño",
"Modified" => "Modificado",
"Invalid folder name. Usage of 'Shared' is reserved." => "Nombre de carpeta inválido. El uso de \"Shared\" esta reservado.",
"{dirs} and {files}" => "{dirs} y {files}",
"%s could not be renamed" => "%s no pudo ser renombrado",
"Upload" => "Subir",
"Upload (max. %s)" => "Subida (máx. %s)",
"File handling" => "Administración de archivos",
"Maximum upload size" => "Tamaño máximo de subida",
"max. possible: " => "máx. posible:",
"Needed for multi-file and folder downloads." => "Necesario para multi-archivo y descarga de carpetas",
"Enable ZIP-download" => "Habilitar descarga en ZIP",
"0 is unlimited" => "0 significa ilimitado",
"Maximum input size for ZIP files" => "Tamaño máximo para archivos ZIP de entrada",
"Save" => "Guardar",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Use esta URL <a href=\"%s\" target=\"_blank\">para acceder via WebDAV</a>",
"New" => "Nuevo",
"New text file" => "Nuevo archivo de texto",
"Text file" => "Archivo de texto",
"New folder" => "Nueva carpeta",
"Folder" => "Carpeta",
"From link" => "Desde enlace",
"Deleted files" => "Archivos eliminados",
"Cancel upload" => "Cancelar subida",
"You dont have permission to upload or create files here" => "No tienes permisos para subir o crear archivos aquí.",
"Nothing in here. Upload something!" => "No hay nada aquí. ¡Suba algo!",
"Download" => "Descargar",
"Unshare" => "Dejar de compartir",
"Delete" => "Eliminar",
"Upload too large" => "Subida demasido grande",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido en este servidor.",
"Files are being scanned, please wait." => "Los archivos están siendo escaneados, por favor espere.",
"Current scanning" => "Escaneo actual",
"Upgrading filesystem cache..." => "Actualizando caché del sistema de archivos..."
"Currently scanning" => "Escaneando en este momento"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
+36 -25
View File
@@ -3,6 +3,14 @@ $TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "No se pudo mover %s - Un archivo con este nombre ya existe",
"Could not move %s" => "No se pudo mover %s ",
"File name cannot be empty." => "El nombre del archivo no puede quedar vacío.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nombre invalido, '\\', '/', '<', '>', ':', '\"', '|', '?' y '*' no están permitidos.",
"The name %s is already used in the folder %s. Please choose a different name." => "El nombre %s está en uso en el directorio %s. Por favor elija un otro nombre.",
"Not a valid source" => "No es una fuente válida",
"Server is not allowed to open URLs, please check the server configuration" => "El servidor no está permitido abrir las URLs, por favor chequee la configuración del servidor",
"Error while downloading %s to %s" => "Error mientras se descargaba %s a %s",
"Error when creating the file" => "Error al crear el archivo",
"Folder name cannot be empty." => "El nombre del directorio no puede estar vacío.",
"Error when creating the folder" => "Error al crear el directorio",
"Unable to set upload directory." => "No fue posible crear el directorio de subida.",
"Invalid Token" => "Token Inválido",
"No file was uploaded. Unknown error" => "El archivo no fue subido. Error desconocido",
@@ -14,56 +22,59 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Falta un directorio temporal",
"Failed to write to disk" => "Error al escribir en el disco",
"Not enough storage available" => "No hay suficiente almacenamiento",
"Upload failed. Could not find uploaded file" => "Falló la carga. No se pudo encontrar el archivo subido.",
"Upload failed. Could not get file info." => "Falló la carga. No se pudo obtener la información del archivo.",
"Invalid directory." => "Directorio inválido.",
"Files" => "Archivos",
"Not enough space available" => "No hay suficiente espacio disponible",
"Unable to upload {filename} as it is a directory or has 0 bytes" => "Imposible cargar {filename} puesto que es un directoro o tiene 0 bytes.",
"Upload cancelled." => "La subida fue cancelada",
"Could not get result from server." => "No se pudo obtener resultados del servidor.",
"File upload is in progress. Leaving the page now will cancel the upload." => "La subida del archivo está en proceso. Si salís de la página ahora, la subida se cancelará.",
"URL cannot be empty" => "La URL no puede estar vacía",
"{new_name} already exists" => "{new_name} ya existe",
"Could not create file" => "No se pudo crear el archivo",
"Could not create folder" => "No se pudo crear el directorio",
"Error fetching URL" => "Error al obtener la URL",
"Share" => "Compartir",
"Delete permanently" => "Borrar permanentemente",
"Delete" => "Borrar",
"Rename" => "Cambiar nombre",
"Pending" => "Pendientes",
"replaced {new_name} with {old_name}" => "se reemplazó {new_name} con {old_name}",
"undo" => "deshacer",
"_%n folder_::_%n folders_" => array("%n carpeta","%n carpetas"),
"_%n file_::_%n files_" => array("%n archivo","%n archivos"),
"{dirs} and {files}" => "{carpetas} y {archivos}",
"_Uploading %n file_::_Uploading %n files_" => array("Subiendo %n archivo","Subiendo %n archivos"),
"'.' is an invalid file name." => "'.' es un nombre de archivo inválido.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nombre invalido, '\\', '/', '<', '>', ':', '\"', '|', '?' y '*' no están permitidos.",
"Your storage is full, files can not be updated or synced anymore!" => "El almacenamiento está lleno, los archivos no se pueden seguir actualizando ni sincronizando",
"Your storage is almost full ({usedSpacePercent}%)" => "El almacenamiento está casi lleno ({usedSpacePercent}%)",
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "El proceso de cifrado se ha desactivado, pero los archivos aún están encriptados. Por favor, vaya a la configuración personal para descifrar los archivos.",
"Your download is being prepared. This might take some time if the files are big." => "Tu descarga se está preparando. Esto puede demorar si los archivos son muy grandes.",
"Pending" => "Pendientes",
"Error moving file" => "Error moviendo el archivo",
"Error" => "Error",
"Could not rename file" => "No se pudo renombrar el archivo",
"Error deleting file." => "Error al borrar el archivo.",
"Name" => "Nombre",
"Size" => "Tamaño",
"Modified" => "Modificado",
"_%n folder_::_%n folders_" => array("%n carpeta","%n carpetas"),
"_%n file_::_%n files_" => array("%n archivo","%n archivos"),
"_Uploading %n file_::_Uploading %n files_" => array("Subiendo %n archivo","Subiendo %n archivos"),
"Your storage is full, files can not be updated or synced anymore!" => "El almacenamiento está lleno, los archivos no se pueden seguir actualizando ni sincronizando",
"Your storage is almost full ({usedSpacePercent}%)" => "El almacenamiento está casi lleno ({usedSpacePercent}%)",
"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",
"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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "El proceso de cifrado se ha desactivado, pero los archivos aún están encriptados. Por favor, vaya a la configuración personal para descifrar los archivos.",
"{dirs} and {files}" => "{carpetas} y {archivos}",
"%s could not be renamed" => "No se pudo renombrar %s",
"Upload" => "Subir",
"File handling" => "Tratamiento de archivos",
"Maximum upload size" => "Tamaño máximo de subida",
"max. possible: " => "máx. posible:",
"Needed for multi-file and folder downloads." => "Es necesario para descargas multi-archivo y de directorios.",
"Enable ZIP-download" => "Habilitar descarga en formato ZIP",
"0 is unlimited" => "0 significa ilimitado",
"Maximum input size for ZIP files" => "Tamaño máximo para archivos ZIP de entrada",
"Save" => "Guardar",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Usar esta dirección para <a href=\"%s\" target=\"_blank\">acceder a tus archivos vía WebDAV</a>",
"New" => "Nuevo",
"New text file" => "Nuevo archivo de texto",
"Text file" => "Archivo de texto",
"New folder" => "Nueva Carpeta",
"Folder" => "Carpeta",
"From link" => "Desde enlace",
"Deleted files" => "Archivos borrados",
"Cancel upload" => "Cancelar subida",
"You dont have permission to upload or create files here" => "No tienes permisos para subir o crear archivos aquí",
"Nothing in here. Upload something!" => "No hay nada. ¡Subí contenido!",
"Download" => "Descargar",
"Unshare" => "Dejar de compartir",
"Delete" => "Borrar",
"Upload too large" => "El tamaño del archivo que querés subir es demasiado grande",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los archivos que intentás subir sobrepasan el tamaño máximo ",
"Files are being scanned, please wait." => "Se están escaneando los archivos, por favor esperá.",
"Current scanning" => "Escaneo actual",
"Upgrading filesystem cache..." => "Actualizando el cache del sistema de archivos"
"Files are being scanned, please wait." => "Se están escaneando los archivos, por favor esperá."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
+7
View File
@@ -0,0 +1,7 @@
<?php
$TRANSLATIONS = array(
"_%n folder_::_%n folders_" => array("",""),
"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("","")
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
+13
View File
@@ -0,0 +1,13 @@
<?php
$TRANSLATIONS = array(
"Files" => "Archivos",
"Share" => "Compartir",
"Rename" => "Renombrar",
"Error" => "Error",
"_%n folder_::_%n folders_" => array("",""),
"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("",""),
"New folder" => "Nuevo directorio",
"Download" => "Descargar"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
+7
View File
@@ -0,0 +1,7 @@
<?php
$TRANSLATIONS = array(
"_%n folder_::_%n folders_" => array("",""),
"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("","")
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
+7
View File
@@ -0,0 +1,7 @@
<?php
$TRANSLATIONS = array(
"_%n folder_::_%n folders_" => array("",""),
"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("","")
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
+7
View File
@@ -0,0 +1,7 @@
<?php
$TRANSLATIONS = array(
"_%n folder_::_%n folders_" => array("",""),
"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("","")
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
+76 -3
View File
@@ -1,7 +1,80 @@
<?php
$TRANSLATIONS = array(
"_%n folder_::_%n folders_" => array("",""),
"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("","")
"Could not move %s - File with this name already exists" => "No se pudo mover %s - Ya existe un archivo con ese nombre.",
"Could not move %s" => "No se pudo mover %s",
"File name cannot be empty." => "El nombre de archivo no puede estar vacío.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nombre inválido, los caracteres \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" no están permitidos ",
"The name %s is already used in the folder %s. Please choose a different name." => "El nombre %s ya está en uso por la carpeta %s. Por favor elija uno diferente.",
"Not a valid source" => "No es un origen válido",
"Server is not allowed to open URLs, please check the server configuration" => "El servidor no puede acceder URLs; revise la configuración del servidor.",
"Error while downloading %s to %s" => "Error mientras se descargaba %s a %s",
"Error when creating the file" => "Error al crear el archivo",
"Folder name cannot be empty." => "El nombre de la carpeta no puede estar vacío.",
"Error when creating the folder" => "Error al crear la carpeta.",
"Unable to set upload directory." => "Incapaz de crear directorio de subida.",
"Invalid Token" => "Token Inválido",
"No file was uploaded. Unknown error" => "No se subió ningún archivo. Error desconocido",
"There is no error, the file uploaded with success" => "No hubo ningún problema, el archivo se subió con éxito",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "El archivo subido sobrepasa la directiva 'upload_max_filesize' en php.ini:",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "El archivo subido sobrepasa la directiva 'MAX_FILE_SIZE' especificada en el formulario HTML",
"The uploaded file was only partially uploaded" => "El archivo subido fue sólo subido parcialmente",
"No file was uploaded" => "No se subió ningún archivo",
"Missing a temporary folder" => "Falta la carpeta temporal",
"Failed to write to disk" => "Falló al escribir al disco",
"Not enough storage available" => "No hay suficiente espacio disponible",
"Upload failed. Could not find uploaded file" => "Actualización fallida. No se pudo encontrar el archivo subido",
"Upload failed. Could not get file info." => "Actualización fallida. No se pudo obtener información del archivo.",
"Invalid directory." => "Directorio inválido.",
"Files" => "Archivos",
"Unable to upload {filename} as it is a directory or has 0 bytes" => "No ha sido posible subir {filename} porque es un directorio o tiene 0 bytes",
"Upload cancelled." => "Subida cancelada.",
"Could not get result from server." => "No se pudo obtener respuesta del servidor.",
"File upload is in progress. Leaving the page now will cancel the upload." => "La subida del archivo está en proceso. Si sale de la página ahora, la subida será cancelada.",
"URL cannot be empty" => "La dirección URL no puede estar vacía",
"{new_name} already exists" => "{new_name} ya existe",
"Could not create file" => "No se pudo crear el archivo",
"Could not create folder" => "No se pudo crear la carpeta",
"Error fetching URL" => "Error al descargar URL.",
"Share" => "Compartir",
"Delete permanently" => "Eliminar permanentemente",
"Delete" => "Eliminar",
"Rename" => "Renombrar",
"Your download is being prepared. This might take some time if the files are big." => "Su descarga está siendo preparada. Esto podría tardar algo de tiempo si los archivos son grandes.",
"Pending" => "Pendiente",
"Error moving file" => "Error moviendo archivo",
"Error" => "Error",
"Could not rename file" => "No se pudo renombrar el archivo",
"Error deleting file." => "Error borrando el archivo.",
"Name" => "Nombre",
"Size" => "Tamaño",
"Modified" => "Modificado",
"_%n folder_::_%n folders_" => array("%n carpeta","%n carpetas"),
"_%n file_::_%n files_" => array("%n archivo","%n archivos"),
"_Uploading %n file_::_Uploading %n files_" => array("Subiendo %n archivo","Subiendo %n archivos"),
"Your storage is full, files can not be updated or synced anymore!" => "Su almacenamiento está lleno, ¡los archivos no se actualizarán ni sincronizarán más!",
"Your storage is almost full ({usedSpacePercent}%)" => "Su almacenamiento está casi lleno ({usedSpacePercent}%)",
"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.",
"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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "El cifrado ha sido deshabilitado pero tus archivos permanecen cifrados. Por favor, ve a tus ajustes personales para descifrar tus archivos.",
"{dirs} and {files}" => "{dirs} y {files}",
"%s could not be renamed" => "%s no pudo ser renombrado",
"File handling" => "Administración de archivos",
"Maximum upload size" => "Tamaño máximo de subida",
"max. possible: " => "máx. posible:",
"Save" => "Guardar",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Utilice esta dirección para <a href=\"%s\" target=\"_blank\">acceder a sus archivos vía WebDAV</a>",
"New" => "Nuevo",
"New text file" => "Nuevo archivo de texto",
"Text file" => "Archivo de texto",
"New folder" => "Nueva carpeta",
"Folder" => "Carpeta",
"From link" => "Desde enlace",
"You dont have permission to upload or create files here" => "No tienes permisos para subir o crear archivos aquí.",
"Nothing in here. Upload something!" => "No hay nada aquí. ¡Suba algo!",
"Download" => "Descargar",
"Upload too large" => "Subida demasido grande",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido en este servidor.",
"Files are being scanned, please wait." => "Los archivos están siendo escaneados, por favor espere."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
+7
View File
@@ -0,0 +1,7 @@
<?php
$TRANSLATIONS = array(
"_%n folder_::_%n folders_" => array("",""),
"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("","")
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
+7
View File
@@ -0,0 +1,7 @@
<?php
$TRANSLATIONS = array(
"_%n folder_::_%n folders_" => array("",""),
"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("","")
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
+7
View File
@@ -0,0 +1,7 @@
<?php
$TRANSLATIONS = array(
"_%n folder_::_%n folders_" => array("",""),
"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("","")
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
+7
View File
@@ -0,0 +1,7 @@
<?php
$TRANSLATIONS = array(
"_%n folder_::_%n folders_" => array("",""),
"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("","")
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
+25 -28
View File
@@ -3,13 +3,15 @@ $TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "Ei saa liigutada faili %s - samanimeline fail on juba olemas",
"Could not move %s" => "%s liigutamine ebaõnnestus",
"File name cannot be empty." => "Faili nimi ei saa olla tühi.",
"File name must not contain \"/\". Please choose a different name." => "Faili nimi ei tohi sisaldada \"/\". Palun vali mõni teine nimi.",
"\"%s\" is an invalid file name." => "\"%s\" on vigane failinimi.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Vigane nimi, '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' pole lubatud.",
"The target folder has been moved or deleted." => "Sihtkataloog on ümber tõstetud või kustutatud.",
"The name %s is already used in the folder %s. Please choose a different name." => "Nimi %s on juba kasutusel kataloogis %s. Palun vali mõni teine nimi.",
"Not a valid source" => "Pole korrektne lähteallikas",
"Server is not allowed to open URLs, please check the server configuration" => "Server ei võimalda URL-ide avamist, palun kontrolli serveri seadistust",
"Error while downloading %s to %s" => "Viga %s allalaadimisel %s",
"Error when creating the file" => "Viga faili loomisel",
"Folder name cannot be empty." => "Kataloogi nimi ei saa olla tühi.",
"Folder name must not contain \"/\". Please choose a different name." => "Kataloogi nimi ei tohi sisaldada \"/\". Palun vali mõni teine nimi.",
"Error when creating the folder" => "Viga kataloogi loomisel",
"Unable to set upload directory." => "Üleslaadimiste kausta määramine ebaõnnestus.",
"Invalid Token" => "Vigane kontrollkood",
@@ -22,71 +24,66 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Ajutiste failide kaust puudub",
"Failed to write to disk" => "Kettale kirjutamine ebaõnnestus",
"Not enough storage available" => "Saadaval pole piisavalt ruumi",
"Upload failed. Could not get file info." => "Üleslaadimine ebaõnnestus. Faili info hankimine ebaõnnestus.",
"Upload failed. Could not find uploaded file" => "Üleslaadimine ebaõnnestus. Üleslaetud faili ei leitud",
"Upload failed. Could not get file info." => "Üleslaadimine ebaõnnestus. Faili info hankimine ebaõnnestus.",
"Invalid directory." => "Vigane kaust.",
"Files" => "Failid",
"All files" => "Kõik failid",
"Unable to upload {filename} as it is a directory or has 0 bytes" => "Ei saa üles laadida {filename}, kuna see on kataloog või selle suurus on 0 baiti",
"Not enough space available" => "Pole piisavalt ruumi",
"Total file size {size1} exceeds upload limit {size2}" => "Faili suurus {size1} ületab faili üleslaadimise mahu piirangu {size2}.",
"Not enough free space, you are uploading {size1} but only {size2} is left" => "Pole piisavalt vaba ruumi. Sa laadid üles {size1}, kuid ainult {size2} on saadaval.",
"Upload cancelled." => "Üleslaadimine tühistati.",
"Could not get result from server." => "Serverist ei saadud tulemusi",
"File upload is in progress. Leaving the page now will cancel the upload." => "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise.",
"URL cannot be empty" => "URL ei saa olla tühi",
"In the home folder 'Shared' is a reserved filename" => "Kodukataloogis 'Shared' on reserveeritud failinimi",
"{new_name} already exists" => "{new_name} on juba olemas",
"Could not create file" => "Ei suuda luua faili",
"Could not create folder" => "Ei suuda luua kataloogi",
"Error fetching URL" => "Viga URL-i haaramisel",
"Share" => "Jaga",
"Delete permanently" => "Kustuta jäädavalt",
"Delete" => "Kustuta",
"Rename" => "Nimeta ümber",
"Your download is being prepared. This might take some time if the files are big." => "Valmistatakse allalaadimist. See võib võtta veidi aega, kui on tegu suurte failidega. ",
"Pending" => "Ootel",
"Error moving file." => "Viga faili liigutamisel.",
"Error moving file" => "Viga faili eemaldamisel",
"Error" => "Viga",
"Could not rename file" => "Ei suuda faili ümber nimetada",
"replaced {new_name} with {old_name}" => "asendas nime {old_name} nimega {new_name}",
"undo" => "tagasi",
"Error deleting file." => "Viga faili kustutamisel.",
"Name" => "Nimi",
"Size" => "Suurus",
"Modified" => "Muudetud",
"_%n folder_::_%n folders_" => array("%n kataloog","%n kataloogi"),
"_%n file_::_%n files_" => array("%n fail","%n faili"),
"{dirs} and {files}" => "{dirs} ja {files}",
"_Uploading %n file_::_Uploading %n files_" => array("Laadin üles %n faili","Laadin üles %n faili"),
"'.' is an invalid file name." => "'.' on vigane failinimi.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Vigane nimi, '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' pole lubatud.",
"\"{name}\" is an invalid file name." => "\"{name}\" on vigane failinimi.",
"Your storage is full, files can not be updated or synced anymore!" => "Sinu andmemaht on täis! Faile ei uuendata ega sünkroniseerita!",
"Your storage is almost full ({usedSpacePercent}%)" => "Su andmemaht on peaaegu täis ({usedSpacePercent}%)",
"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.",
"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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Krüpteering on keelatud, kuid sinu failid on endiselt krüpteeritud. Palun vaata oma personaalseid seadeid oma failide dekrüpteerimiseks.",
"Your download is being prepared. This might take some time if the files are big." => "Valmistatakse allalaadimist. See võib võtta veidi aega, kui on tegu suurte failidega. ",
"Error moving file" => "Viga faili eemaldamisel",
"Error" => "Viga",
"Name" => "Nimi",
"Size" => "Suurus",
"Modified" => "Muudetud",
"Invalid folder name. Usage of 'Shared' is reserved." => "Vigane kausta nimi. Nime 'Shared' kasutamine on reserveeritud.",
"{dirs} and {files}" => "{dirs} ja {files}",
"%s could not be renamed" => "%s ümbernimetamine ebaõnnestus",
"Upload" => "Lae üles",
"Upload (max. %s)" => "Üleslaadimine (max. %s)",
"File handling" => "Failide käsitlemine",
"Maximum upload size" => "Maksimaalne üleslaadimise suurus",
"max. possible: " => "maks. võimalik: ",
"Needed for multi-file and folder downloads." => "Vajalik mitme faili ja kausta allalaadimiste jaoks.",
"Enable ZIP-download" => "Luba ZIP-ina allalaadimine",
"0 is unlimited" => "0 tähendab piiramatut",
"Maximum input size for ZIP files" => "Maksimaalne ZIP-faili sisestatava faili suurus",
"Save" => "Salvesta",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Kasuta seda aadressi <a href=\"%s\" target=\"_blank\">oma failidele ligipääsuks WebDAV kaudu</a>",
"New" => "Uus",
"New text file" => "Uus tekstifail",
"Text file" => "Tekstifail",
"New folder" => "Uus kaust",
"Folder" => "Kaust",
"From link" => "Allikast",
"Deleted files" => "Kustutatud failid",
"Cancel upload" => "Tühista üleslaadimine",
"You dont have permission to upload or create files here" => "Sul puuduvad õigused siia failide üleslaadimiseks või tekitamiseks",
"Nothing in here. Upload something!" => "Siin pole midagi. Lae midagi üles!",
"Download" => "Lae alla",
"Unshare" => "Lõpeta jagamine",
"Delete" => "Kustuta",
"Upload too large" => "Üleslaadimine on liiga suur",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Failid, mida sa proovid üles laadida, ületab serveri poolt üleslaetavatele failidele määratud maksimaalse suuruse.",
"Files are being scanned, please wait." => "Faile skannitakse, palun oota.",
"Current scanning" => "Praegune skannimine",
"Upgrading filesystem cache..." => "Failisüsteemi puhvri uuendamine..."
"Currently scanning" => "Praegu skännimisel"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
+37 -24
View File
@@ -3,6 +3,16 @@ $TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "Ezin da %s mugitu - Izen hau duen fitxategia dagoeneko existitzen da",
"Could not move %s" => "Ezin dira fitxategiak mugitu %s",
"File name cannot be empty." => "Fitxategi izena ezin da hutsa izan.",
"\"%s\" is an invalid file name." => "\"%s\" ez da fitxategi izen baliogarria.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "IZen aliogabea, '\\', '/', '<', '>', ':', '\"', '|', '?' eta '*' ez daude baimenduta.",
"The target folder has been moved or deleted." => "Jatorrizko karpeta mugitu edo ezabatu da.",
"The name %s is already used in the folder %s. Please choose a different name." => "%s izena dagoeneko erabilita dago %s karpetan. Mesdez hautatu izen ezberdina.",
"Not a valid source" => "Ez da jatorri baliogarria",
"Server is not allowed to open URLs, please check the server configuration" => "Zerbitzaria ez dago URLak irekitzeko baimendua, mesedez egiaztatu zerbitzariaren konfigurazioa",
"Error while downloading %s to %s" => "Errorea %s %sra deskargatzerakoan",
"Error when creating the file" => "Errorea fitxategia sortzerakoan",
"Folder name cannot be empty." => "Karpeta izena ezin da hutsa izan.",
"Error when creating the folder" => "Errorea karpeta sortzerakoan",
"Unable to set upload directory." => "Ezin da igoera direktorioa ezarri.",
"Invalid Token" => "Lekuko baliogabea",
"No file was uploaded. Unknown error" => "Ez da fitxategirik igo. Errore ezezaguna",
@@ -14,63 +24,66 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Aldi bateko karpeta falta da",
"Failed to write to disk" => "Errore bat izan da diskoan idazterakoan",
"Not enough storage available" => "Ez dago behar aina leku erabilgarri,",
"Upload failed. Could not get file info." => "Igoerak huts egin du. Ezin izan da fitxategiaren informazioa eskuratu.",
"Upload failed. Could not find uploaded file" => "Igoerak huts egin du. Ezin izan da igotako fitxategia aurkitu",
"Upload failed. Could not get file info." => "Igoerak huts egin du. Ezin izan da fitxategiaren informazioa eskuratu.",
"Invalid directory." => "Baliogabeko karpeta.",
"Files" => "Fitxategiak",
"All files" => "Fitxategi guztiak",
"Unable to upload {filename} as it is a directory or has 0 bytes" => "Ezin da {filename} igo karpeta bat delako edo 0 byte dituelako",
"Not enough space available" => "Ez dago leku nahikorik.",
"Total file size {size1} exceeds upload limit {size2}" => "Fitxategiaren tamainak {size1} igotzeko muga {size2} gainditzen du",
"Not enough free space, you are uploading {size1} but only {size2} is left" => "Ez dago leku nahikorik, zu {size1} igotzen ari zara baina bakarrik {size2} libre dago",
"Upload cancelled." => "Igoera ezeztatuta",
"Could not get result from server." => "Ezin da zerbitzaritik emaitzik lortu",
"File upload is in progress. Leaving the page now will cancel the upload." => "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du.",
"URL cannot be empty" => "URLa ezin da hutsik egon",
"{new_name} already exists" => "{new_name} dagoeneko existitzen da",
"Could not create file" => "Ezin izan da fitxategia sortu",
"Could not create folder" => "Ezin izan da karpeta sortu",
"Error fetching URL" => "Errorea URLa eskuratzerakoan",
"Share" => "Elkarbanatu",
"Delete permanently" => "Ezabatu betirako",
"Delete" => "Ezabatu",
"Rename" => "Berrizendatu",
"Your download is being prepared. This might take some time if the files are big." => "Zure deskarga prestatu egin behar da. Denbora bat har lezake fitxategiak handiak badira. ",
"Pending" => "Zain",
"replaced {new_name} with {old_name}" => " {new_name}-k {old_name} ordezkatu du",
"undo" => "desegin",
"Error moving file." => "Errorea fitxategia mugitzean.",
"Error moving file" => "Errorea fitxategia mugitzean",
"Error" => "Errorea",
"Could not rename file" => "Ezin izan da fitxategia berrizendatu",
"Error deleting file." => "Errorea fitxategia ezabatzerakoan.",
"Name" => "Izena",
"Size" => "Tamaina",
"Modified" => "Aldatuta",
"_%n folder_::_%n folders_" => array("karpeta %n","%n karpeta"),
"_%n file_::_%n files_" => array("fitxategi %n","%n fitxategi"),
"{dirs} and {files}" => "{dirs} eta {files}",
"_Uploading %n file_::_Uploading %n files_" => array("Fitxategi %n igotzen","%n fitxategi igotzen"),
"'.' is an invalid file name." => "'.' ez da fitxategi izen baliogarria.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "IZen aliogabea, '\\', '/', '<', '>', ':', '\"', '|', '?' eta '*' ez daude baimenduta.",
"\"{name}\" is an invalid file name." => "\"{name}\" ez da fitxategi izen baliogarria.",
"Your storage is full, files can not be updated or synced anymore!" => "Zure biltegiratzea beterik dago, ezingo duzu aurrerantzean fitxategirik igo edo sinkronizatu!",
"Your storage is almost full ({usedSpacePercent}%)" => "Zure biltegiratzea nahiko beterik dago (%{usedSpacePercent})",
"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",
"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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Enkriptazioa desgaitua izan da baina zure fitxategiak oraindik enkriptatuta daude. Mesedez jo zure ezarpen pertsonaletara zure fitxategiak dekodifikatzeko.",
"Your download is being prepared. This might take some time if the files are big." => "Zure deskarga prestatu egin behar da. Denbora bat har lezake fitxategiak handiak badira. ",
"Error moving file" => "Errorea fitxategia mugitzean",
"Error" => "Errorea",
"Name" => "Izena",
"Size" => "Tamaina",
"Modified" => "Aldatuta",
"{dirs} and {files}" => "{dirs} eta {files}",
"%s could not be renamed" => "%s ezin da berrizendatu",
"Upload" => "Igo",
"Upload (max. %s)" => "Igo (max. %s)",
"File handling" => "Fitxategien kudeaketa",
"Maximum upload size" => "Igo daitekeen gehienezko tamaina",
"max. possible: " => "max, posiblea:",
"Needed for multi-file and folder downloads." => "Beharrezkoa fitxategi-anitz eta karpeten deskargarako.",
"Enable ZIP-download" => "Gaitu ZIP-deskarga",
"0 is unlimited" => "0 mugarik gabe esan nahi du",
"Maximum input size for ZIP files" => "ZIP fitxategien gehienezko tamaina",
"Save" => "Gorde",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "<a href=\"%s\" target=\"_blank\">helbidea erabili zure fitxategiak WebDAV bidez eskuratzeko</a>",
"New" => "Berria",
"New text file" => "Testu fitxategi berria",
"Text file" => "Testu fitxategia",
"New folder" => "Karpeta berria",
"Folder" => "Karpeta",
"From link" => "Estekatik",
"Deleted files" => "Ezabatutako fitxategiak",
"Cancel upload" => "Ezeztatu igoera",
"You dont have permission to upload or create files here" => "Ez duzu fitxategiak hona igotzeko edo hemen sortzeko baimenik",
"Nothing in here. Upload something!" => "Ez dago ezer. Igo zerbait!",
"Download" => "Deskargatu",
"Unshare" => "Ez elkarbanatu",
"Delete" => "Ezabatu",
"Upload too large" => "Igoera handiegia da",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Igotzen saiatzen ari zaren fitxategiak zerbitzari honek igotzeko onartzen duena baino handiagoak dira.",
"Files are being scanned, please wait." => "Fitxategiak eskaneatzen ari da, itxoin mezedez.",
"Current scanning" => "Orain eskaneatzen ari da",
"Upgrading filesystem cache..." => "Fitxategi sistemaren katxea eguneratzen..."
"Currently scanning" => "Eskaneatzen une honetan"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
+10
View File
@@ -0,0 +1,10 @@
<?php
$TRANSLATIONS = array(
"Delete" => "Ezabatu",
"_%n folder_::_%n folders_" => array("",""),
"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("",""),
"Save" => "Gorde",
"Download" => "Deskargatu"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
+13 -24
View File
@@ -1,8 +1,9 @@
<?php
$TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "%s نمی تواند حرکت کند - در حال حاضر پرونده با این نام وجود دارد. ",
"Could not move %s - File with this name already exists" => "%s نمی توان جابجا کرد - در حال حاضر پرونده با این نام وجود دارد. ",
"Could not move %s" => "%s نمی تواند حرکت کند ",
"File name cannot be empty." => "نام پرونده نمی تواند خالی باشد.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "نام نامعتبر ، '\\', '/', '<', '>', ':', '\"', '|', '?' و '*' مجاز نمی باشند.",
"Unable to set upload directory." => "قادر به تنظیم پوشه آپلود نمی باشد.",
"Invalid Token" => "رمز نامعتبر",
"No file was uploaded. Unknown error" => "هیچ فایلی آپلود نشد.خطای ناشناس",
@@ -16,52 +17,40 @@ $TRANSLATIONS = array(
"Not enough storage available" => "فضای کافی در دسترس نیست",
"Invalid directory." => "فهرست راهنما نامعتبر می باشد.",
"Files" => "پرونده‌ها",
"Not enough space available" => "فضای کافی در دسترس نیست",
"Upload cancelled." => "بار گذاری لغو شد",
"File upload is in progress. Leaving the page now will cancel the upload." => "آپلودکردن پرونده در حال پیشرفت است. در صورت خروج از صفحه آپلود لغو میگردد. ",
"{new_name} already exists" => "{نام _جدید} در حال حاضر وجود دارد.",
"Share" => "اشتراک‌گذاری",
"Delete permanently" => "حذف قطعی",
"Delete" => "حذف",
"Rename" => "تغییرنام",
"Pending" => "در انتظار",
"replaced {new_name} with {old_name}" => "{نام_جدید} با { نام_قدیمی} جایگزین شد.",
"undo" => "بازگشت",
"_%n folder_::_%n folders_" => array(""),
"_%n file_::_%n files_" => array(""),
"_Uploading %n file_::_Uploading %n files_" => array(""),
"'.' is an invalid file name." => "'.' یک نام پرونده نامعتبر است.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "نام نامعتبر ، '\\', '/', '<', '>', ':', '\"', '|', '?' و '*' مجاز نمی باشند.",
"Your storage is full, files can not be updated or synced anymore!" => "فضای ذخیره ی شما کاملا پر است، بیش از این فایلها بهنگام یا همگام سازی نمی توانند بشوند!",
"Your storage is almost full ({usedSpacePercent}%)" => "فضای ذخیره ی شما تقریبا پر است ({usedSpacePercent}%)",
"Your download is being prepared. This might take some time if the files are big." => "دانلود شما در حال آماده شدن است. در صورتیکه پرونده ها بزرگ باشند ممکن است مدتی طول بکشد.",
"Pending" => "در انتظار",
"Error" => "خطا",
"Name" => "نام",
"Size" => "اندازه",
"Modified" => "تاریخ",
"_%n folder_::_%n folders_" => array(""),
"_%n file_::_%n files_" => array(""),
"_Uploading %n file_::_Uploading %n files_" => array("در حال بارگذاری %n فایل"),
"Your storage is full, files can not be updated or synced anymore!" => "فضای ذخیره ی شما کاملا پر است، بیش از این فایلها بهنگام یا همگام سازی نمی توانند بشوند!",
"Your storage is almost full ({usedSpacePercent}%)" => "فضای ذخیره ی شما تقریبا پر است ({usedSpacePercent}%)",
"%s could not be renamed" => "%s نمیتواند تغییر نام دهد.",
"Upload" => "بارگزاری",
"File handling" => "اداره پرونده ها",
"Maximum upload size" => "حداکثر اندازه بارگزاری",
"max. possible: " => "حداکثرمقدارممکن:",
"Needed for multi-file and folder downloads." => "احتیاج پیدا خواهد شد برای چند پوشه و پرونده",
"Enable ZIP-download" => "فعال سازی بارگیری پرونده های فشرده",
"0 is unlimited" => "0 نامحدود است",
"Maximum input size for ZIP files" => "حداکثرمقدار برای بار گزاری پرونده های فشرده",
"Save" => "ذخیره",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "از این آدرس استفاده کنید تا <a href=\"%s\" target=\"_blank\">بتوانید به فایل‌های خود توسط WebDAV دسترسی پیدا کنید</a>",
"New" => "جدید",
"Text file" => "فایل متنی",
"New folder" => "پوشه جدید",
"Folder" => "پوشه",
"From link" => "از پیوند",
"Deleted files" => "فایل های حذف شده",
"Cancel upload" => "متوقف کردن بار گذاری",
"Nothing in here. Upload something!" => "اینجا هیچ چیز نیست.",
"Download" => "دانلود",
"Unshare" => "لغو اشتراک",
"Delete" => "حذف",
"Upload too large" => "سایز فایل برای آپلود زیاد است(م.تنظیمات در php.ini)",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "فایلها بیش از حد تعیین شده در این سرور هستند\nمترجم:با تغییر فایل php,ini میتوان این محدودیت را برطرف کرد",
"Files are being scanned, please wait." => "پرونده ها در حال بازرسی هستند لطفا صبر کنید",
"Current scanning" => "بازرسی کنونی",
"Upgrading filesystem cache..." => "بهبود فایل سیستمی ذخیره گاه..."
"Files are being scanned, please wait." => "پرونده ها در حال بازرسی هستند لطفا صبر کنید"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
+34 -30
View File
@@ -3,28 +3,35 @@ $TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "Kohteen %s siirto ei onnistunut - Tiedosto samalla nimellä on jo olemassa",
"Could not move %s" => "Kohteen %s siirto ei onnistunut",
"File name cannot be empty." => "Tiedoston nimi ei voi olla tyhjä.",
"File name must not contain \"/\". Please choose a different name." => "Tiedoston nimessä ei saa olla merkkiä \"/\". Valitse toinen nimi.",
"\"%s\" is an invalid file name." => "\"%s\" on virheellinen tiedostonimi.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Virheellinen nimi, merkit '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' eivät ole sallittuja.",
"The target folder has been moved or deleted." => "Kohdekansio on siirretty tai poistettu.",
"The name %s is already used in the folder %s. Please choose a different name." => "Nimi %s on jo käytössä kansiossa %s. Valitse toinen nimi.",
"Not a valid source" => "Virheellinen lähde",
"Server is not allowed to open URLs, please check the server configuration" => "Palvelimen ei ole lupa avata verkko-osoitteita. Tarkista palvelimen asetukset",
"Error while downloading %s to %s" => "Virhe ladatessa kohdetta %s sijaintiin %s",
"Error when creating the file" => "Virhe tiedostoa luotaessa",
"Folder name cannot be empty." => "Kansion nimi ei voi olla tyhjä.",
"Folder name must not contain \"/\". Please choose a different name." => "Kansion nimessä ei saa olla merkkiä \"/\". Valitse toinen nimi.",
"Error when creating the folder" => "Virhe kansiota luotaessa",
"Unable to set upload directory." => "Lähetyskansion asettaminen epäonnistui.",
"Invalid Token" => "Virheellinen token",
"No file was uploaded. Unknown error" => "Tiedostoa ei lähetetty. Tuntematon virhe",
"There is no error, the file uploaded with success" => "Ei virheitä, tiedosto lähetettiin onnistuneesti",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Lähetetyn tiedoston koko ylittää php.ini-tiedoston upload_max_filesize-säännön:",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Ladattavan tiedoston maksimikoko ylittää MAX_FILE_SIZE dirketiivin, joka on määritelty HTML-lomakkeessa",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Lähetettävän tiedoston enimmäiskoko ylittää HTML-lomakkeessa määritellyn MAX_FILE_SIZE-säännön",
"The uploaded file was only partially uploaded" => "Tiedoston lähetys onnistui vain osittain",
"No file was uploaded" => "Yhtäkään tiedostoa ei lähetetty",
"Missing a temporary folder" => "Tilapäiskansio puuttuu",
"Failed to write to disk" => "Levylle kirjoitus epäonnistui",
"Not enough storage available" => "Tallennustilaa ei ole riittävästi käytettävissä",
"Upload failed. Could not find uploaded file" => "Lähetys epäonnistui. Lähettävää tiedostoa ei löydetty.",
"Upload failed. Could not get file info." => "Lähetys epäonnistui. Lähettävää tiedostoa ei löydetty.",
"Invalid directory." => "Virheellinen kansio.",
"Files" => "Tiedostot",
"All files" => "Kaikki tiedostot",
"Unable to upload {filename} as it is a directory or has 0 bytes" => "Kohdetta {filename} ei voi lähettää, koska se on joko kansio tai sen koko on 0 tavua",
"Not enough space available" => "Tilaa ei ole riittävästi",
"Total file size {size1} exceeds upload limit {size2}" => "Yhteiskoko {size1} ylittää lähetysrajan {size2}",
"Not enough free space, you are uploading {size1} but only {size2} is left" => "Ei riittävästi vapaata tilaa. Lähetyksesi koko on {size1}, mutta vain {size2} on jäljellä",
"Upload cancelled." => "Lähetys peruttu.",
"Could not get result from server." => "Tuloksien saaminen palvelimelta ei onnistunut.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedoston lähetyksen.",
@@ -32,54 +39,51 @@ $TRANSLATIONS = array(
"{new_name} already exists" => "{new_name} on jo olemassa",
"Could not create file" => "Tiedoston luominen epäonnistui",
"Could not create folder" => "Kansion luominen epäonnistui",
"Error fetching URL" => "Virhe noutaessa verkko-osoitetta",
"Share" => "Jaa",
"Delete permanently" => "Poista pysyvästi",
"Delete" => "Poista",
"Rename" => "Nimeä uudelleen",
"Pending" => "Odottaa",
"Could not rename file" => "Tiedoston nimeäminen uudelleen epäonnistui",
"undo" => "kumoa",
"Error deleting file." => "Virhe tiedostoa poistaessa.",
"_%n folder_::_%n folders_" => array("%n kansio","%n kansiota"),
"_%n file_::_%n files_" => array("%n tiedosto","%n tiedostoa"),
"{dirs} and {files}" => "{dirs} ja {files}",
"_Uploading %n file_::_Uploading %n files_" => array("Lähetetään %n tiedosto","Lähetetään %n tiedostoa"),
"'.' is an invalid file name." => "'.' on virheellinen nimi tiedostolle.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Virheellinen nimi, merkit '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' eivät ole sallittuja.",
"Your storage is full, files can not be updated or synced anymore!" => "Tallennustila on loppu, tiedostoja ei voi enää päivittää tai synkronoida!",
"Your storage is almost full ({usedSpacePercent}%)" => "Tallennustila on melkein loppu ({usedSpacePercent}%)",
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Salaus poistettiin käytöstä, mutta tiedostosi ovat edelleen salattu. Siirry henkilökohtaisiin asetuksiisi avataksesi tiedostojesi salauksen.",
"Your download is being prepared. This might take some time if the files are big." => "Lataustasi valmistellaan. Tämä saattaa kestää hetken, jos tiedostot ovat suuria kooltaan.",
"Pending" => "Odottaa",
"Error moving file." => "Virhe tiedostoa siirrettäessä.",
"Error moving file" => "Virhe tiedostoa siirrettäessä",
"Error" => "Virhe",
"Could not rename file" => "Tiedoston nimeäminen uudelleen epäonnistui",
"Error deleting file." => "Virhe tiedostoa poistaessa.",
"Name" => "Nimi",
"Size" => "Koko",
"Modified" => "Muokattu",
"Invalid folder name. Usage of 'Shared' is reserved." => "Virheellinen kansion nimi. 'Shared':n käyttö on varattu.",
"%s could not be renamed" => "%s ei pysty uudelleen nimeämään",
"Upload" => "Lähetä",
"_%n folder_::_%n folders_" => array("%n kansio","%n kansiota"),
"_%n file_::_%n files_" => array("%n tiedosto","%n tiedostoa"),
"_Uploading %n file_::_Uploading %n files_" => array("Lähetetään %n tiedosto","Lähetetään %n tiedostoa"),
"\"{name}\" is an invalid file name." => "\"{name}\" on virheellinen tiedostonimi.",
"Your storage is full, files can not be updated or synced anymore!" => "Tallennustila on loppu, tiedostoja ei voi enää päivittää tai synkronoida!",
"Your storage is almost full ({usedSpacePercent}%)" => "Tallennustila on melkein loppu ({usedSpacePercent}%)",
"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.",
"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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Salaus poistettiin käytöstä, mutta tiedostosi ovat edelleen salattuina. Siirry henkilökohtaisiin asetuksiin avataksesi tiedostojesi salauksen.",
"{dirs} and {files}" => "{dirs} ja {files}",
"%s could not be renamed" => "kohteen %s nimeäminen uudelleen epäonnistui",
"Upload (max. %s)" => "Lähetys (enintään %s)",
"File handling" => "Tiedostonhallinta",
"Maximum upload size" => "Lähetettävän tiedoston suurin sallittu koko",
"max. possible: " => "suurin mahdollinen:",
"Needed for multi-file and folder downloads." => "Tarvitaan useampien tiedostojen ja kansioiden latausta varten.",
"Enable ZIP-download" => "Ota ZIP-paketin lataaminen käytöön",
"0 is unlimited" => "0 on rajoittamaton",
"Maximum input size for ZIP files" => "ZIP-tiedostojen enimmäiskoko",
"Save" => "Tallenna",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Käytä tätä osoitetta <a href=\"%s\" target=\"_blank\">käyttääksesi tiedostojasi WebDAVin kautta</a>",
"New" => "Uusi",
"New text file" => "Uusi tekstitiedosto",
"Text file" => "Tekstitiedosto",
"New folder" => "Uusi kansio",
"Folder" => "Kansio",
"From link" => "Linkistä",
"Deleted files" => "Poistetut tiedostot",
"Cancel upload" => "Peru lähetys",
"You dont have permission to upload or create files here" => "Käyttöoikeutesi eivät riitä tiedostojen lähettämiseen tai kansioiden luomiseen tähän sijaintiin",
"Nothing in here. Upload something!" => "Täällä ei ole mitään. Lähetä tänne jotakin!",
"Download" => "Lataa",
"Unshare" => "Peru jakaminen",
"Delete" => "Poista",
"Upload too large" => "Lähetettävä tiedosto on liian suuri",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Lähetettäväksi valitsemasi tiedostot ylittävät palvelimen salliman tiedostokoon rajan.",
"Files are being scanned, please wait." => "Tiedostoja tarkistetaan, odota hetki.",
"Current scanning" => "Tämänhetkinen tutkinta",
"Upgrading filesystem cache..." => "Päivitetään tiedostojärjestelmän välimuistia..."
"Currently scanning" => "Tutkitaan parhaillaan"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
+28 -31
View File
@@ -3,90 +3,87 @@ $TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "Impossible de déplacer %s - Un fichier possédant ce nom existe déjà",
"Could not move %s" => "Impossible de déplacer %s",
"File name cannot be empty." => "Le nom de fichier ne peut être vide.",
"File name must not contain \"/\". Please choose a different name." => "Le nom de fichier ne doit pas contenir \"/\". Merci de choisir un nom différent.",
"\"%s\" is an invalid file name." => "\"%s\" n'est pas un nom de fichier valide.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nom invalide, les caractères '\\', '/', '<', '>', ':', '\"', '|', '?' et '*' ne sont pas autorisés.",
"The target folder has been moved or deleted." => "Le dossier cible a été déplacé ou supprimé.",
"The name %s is already used in the folder %s. Please choose a different name." => "Le nom %s est déjà utilisé dans le dossier %s. Merci de choisir un nom différent.",
"Not a valid source" => "La source n'est pas valide",
"Server is not allowed to open URLs, please check the server configuration" => "Le serveur n'est pas autorisé à ouvrir des URL, veuillez vérifier la configuration du serveur",
"Error while downloading %s to %s" => "Erreur pendant le téléchargement de %s à %s",
"Error when creating the file" => "Erreur pendant la création du fichier",
"Folder name cannot be empty." => "Le nom de dossier ne peux pas être vide.",
"Folder name must not contain \"/\". Please choose a different name." => "Le nom de dossier ne doit pas contenir \"/\". Merci de choisir un nom différent.",
"Error when creating the folder" => "Erreur pendant la création du dossier",
"Unable to set upload directory." => "Impossible de définir le dossier pour l'upload, charger.",
"Invalid Token" => "Jeton non valide",
"No file was uploaded. Unknown error" => "Aucun fichier n'a été envoyé. Erreur inconnue",
"There is no error, the file uploaded with success" => "Aucune erreur, le fichier a été envoyé avec succès.",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Le fichier envoyé dépasse l'instruction upload_max_filesize située dans le fichier php.ini:",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Le fichier envoyé dépasse l'instruction upload_max_filesize située dans le fichier php.ini :",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Le fichier envoyé dépasse l'instruction MAX_FILE_SIZE qui est spécifiée dans le formulaire HTML.",
"The uploaded file was only partially uploaded" => "Le fichier n'a été que partiellement envoyé.",
"No file was uploaded" => "Pas de fichier envoyé.",
"Missing a temporary folder" => "Absence de dossier temporaire.",
"Failed to write to disk" => "Erreur d'écriture sur le disque",
"Not enough storage available" => "Plus assez d'espace de stockage disponible",
"Upload failed. Could not get file info." => "L'envoi a échoué. Impossible d'obtenir les informations du fichier.",
"Upload failed. Could not find uploaded file" => "L'envoi a échoué. Impossible de trouver le fichier envoyé.",
"Upload failed. Could not get file info." => "L'envoi a échoué. Impossible d'obtenir les informations du fichier.",
"Invalid directory." => "Dossier invalide.",
"Files" => "Fichiers",
"All files" => "Tous les fichiers",
"Unable to upload {filename} as it is a directory or has 0 bytes" => "Impossible d'envoyer {filename} car il s'agit d'un répertoire ou d'un fichier de taille nulle",
"Not enough space available" => "Espace disponible insuffisant",
"Total file size {size1} exceeds upload limit {size2}" => "La taille totale du fichier {size1} excède la taille maximale d'envoi {size2}",
"Not enough free space, you are uploading {size1} but only {size2} is left" => "Espace insuffisant : vous tentez d'envoyer {size1} mais seulement {size2} sont disponibles",
"Upload cancelled." => "Envoi annulé.",
"Could not get result from server." => "Ne peut recevoir les résultats du serveur.",
"File upload is in progress. Leaving the page now will cancel the upload." => "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier.",
"URL cannot be empty" => "L'URL ne peut pas être vide",
"In the home folder 'Shared' is a reserved filename" => "Dans le dossier home, 'Partagé' est un nom de fichier réservé",
"{new_name} already exists" => "{new_name} existe déjà",
"Could not create file" => "Impossible de créer le fichier",
"Could not create folder" => "Impossible de créer le dossier",
"Error fetching URL" => "Erreur d'accès à l'URL",
"Share" => "Partager",
"Delete permanently" => "Supprimer de façon définitive",
"Delete" => "Supprimer",
"Rename" => "Renommer",
"Your download is being prepared. This might take some time if the files are big." => "Votre téléchargement est cours de préparation. Ceci peut nécessiter un certain temps si les fichiers sont volumineux.",
"Pending" => "En attente",
"Error moving file." => "Erreur lors du déplacement du fichier.",
"Error moving file" => "Erreur lors du déplacement du fichier",
"Error" => "Erreur",
"Could not rename file" => "Impossible de renommer le fichier",
"replaced {new_name} with {old_name}" => "{new_name} a été remplacé par {old_name}",
"undo" => "annuler",
"Error deleting file." => "Erreur pendant la suppression du fichier.",
"Name" => "Nom",
"Size" => "Taille",
"Modified" => "Modifié",
"_%n folder_::_%n folders_" => array("%n dossier","%n dossiers"),
"_%n file_::_%n files_" => array("%n fichier","%n fichiers"),
"{dirs} and {files}" => "{dirs} et {files}",
"_Uploading %n file_::_Uploading %n files_" => array("Téléversement de %n fichier","Téléversement de %n fichiers"),
"'.' is an invalid file name." => "'.' n'est pas un nom de fichier valide.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nom invalide, les caractères '\\', '/', '<', '>', ':', '\"', '|', '?' et '*' ne sont pas autorisés.",
"\"{name}\" is an invalid file name." => "\"{name}\" n'est pas un nom de fichier valide.",
"Your storage is full, files can not be updated or synced anymore!" => "Votre espage de stockage est plein, les fichiers ne peuvent plus être téléversés ou synchronisés !",
"Your storage is almost full ({usedSpacePercent}%)" => "Votre espace de stockage est presque plein ({usedSpacePercent}%)",
"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 clés ne sont pas initialisées, veuillez vous déconnecter et ensuite vous reconnecter.",
"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 pour l'application de chiffrement est invalide ! Veuillez mettre à jour le mot de passe de votre clef privée dans vos paramètres personnels pour récupérer l'accès à vos fichiers chiffrés.",
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Le chiffrement était désactivé mais vos fichiers sont toujours chiffrés. Veuillez vous rendre sur vos Paramètres personnels pour déchiffrer vos fichiers.",
"Your download is being prepared. This might take some time if the files are big." => "Votre téléchargement est cours de préparation. Ceci peut nécessiter un certain temps si les fichiers sont volumineux.",
"Error moving file" => "Erreur lors du déplacement du fichier",
"Error" => "Erreur",
"Name" => "Nom",
"Size" => "Taille",
"Modified" => "Modifié",
"Invalid folder name. Usage of 'Shared' is reserved." => "Nom de dossier invalide. L'utilisation du mot 'Shared' est réservée.",
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Le chiffrement a été désactivé mais vos fichiers sont toujours chiffrés. Veuillez vous rendre sur vos paramètres personnels pour déchiffrer vos fichiers.",
"{dirs} and {files}" => "{dirs} et {files}",
"%s could not be renamed" => "%s ne peut être renommé",
"Upload" => "Envoyer",
"Upload (max. %s)" => "Envoi (max. %s)",
"File handling" => "Gestion des fichiers",
"Maximum upload size" => "Taille max. d'envoi",
"max. possible: " => "Max. possible :",
"Needed for multi-file and folder downloads." => "Nécessaire pour le téléchargement de plusieurs fichiers et de dossiers.",
"Enable ZIP-download" => "Activer le téléchargement ZIP",
"0 is unlimited" => "0 est illimité",
"Maximum input size for ZIP files" => "Taille maximale pour les fichiers ZIP",
"Save" => "Sauvegarder",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Utiliser cette adresse pour <a href=\"%s\" target=\"_blank\"> accéder à vos fichiers par WebDAV</a>",
"New" => "Nouveau",
"New text file" => "Nouveau fichier texte",
"Text file" => "Fichier texte",
"New folder" => "Nouveau dossier",
"Folder" => "Dossier",
"From link" => "Depuis le lien",
"Deleted files" => "Fichiers supprimés",
"Cancel upload" => "Annuler l'envoi",
"From link" => "Depuis un lien",
"You dont have permission to upload or create files here" => "Vous n'avez pas la permission de téléverser ou de créer des fichiers ici",
"Nothing in here. Upload something!" => "Il n'y a rien ici ! Envoyez donc quelque chose :)",
"Download" => "Télécharger",
"Unshare" => "Ne plus partager",
"Delete" => "Supprimer",
"Upload too large" => "Téléversement trop volumineux",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Les fichiers que vous essayez d'envoyer dépassent la taille maximale permise par ce serveur.",
"Files are being scanned, please wait." => "Les fichiers sont en cours d'analyse, veuillez patienter.",
"Current scanning" => "Analyse en cours",
"Upgrading filesystem cache..." => "Mise à niveau du cache du système de fichier"
"Currently scanning" => "Analyse en cours",
);
$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
+26 -29
View File
@@ -3,13 +3,15 @@ $TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "Non foi posíbel mover %s; Xa existe un ficheiro con ese nome.",
"Could not move %s" => "Non foi posíbel mover %s",
"File name cannot be empty." => "O nome de ficheiro non pode estar baleiro",
"File name must not contain \"/\". Please choose a different name." => "O nome do ficheiro non pode conter «/». Escolla outro nome.",
"\"%s\" is an invalid file name." => "«%s» é un nome incorrecto de ficheiro.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome incorrecto, non se permite «\\», «/», «<», «>», «:», «\"», «|», «?» e «*».",
"The target folder has been moved or deleted." => "O cartafol de destino foi movido ou eliminado.",
"The name %s is already used in the folder %s. Please choose a different name." => "Xa existe o nome %s no cartafol %s. Escolla outro nome.",
"Not a valid source" => "Esta orixe non é correcta",
"Server is not allowed to open URLs, please check the server configuration" => "O servidor non ten permisos para abrir os enderezos URL, comprobe a configuración do servidor",
"Error while downloading %s to %s" => "Produciuse un erro ao descargar %s en %s",
"Error when creating the file" => "Produciuse un erro ao crear o ficheiro",
"Folder name cannot be empty." => "O nome de cartafol non pode estar baleiro.",
"Folder name must not contain \"/\". Please choose a different name." => "O nome do cartafol non pode conter «/». Escolla outro nome.",
"Error when creating the folder" => "Produciuse un erro ao crear o cartafol",
"Unable to set upload directory." => "Non é posíbel configurar o directorio de envíos.",
"Invalid Token" => "Marca incorrecta",
@@ -22,71 +24,66 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Falta o cartafol temporal",
"Failed to write to disk" => "Produciuse un erro ao escribir no disco",
"Not enough storage available" => "Non hai espazo de almacenamento abondo",
"Upload failed. Could not get file info." => "O envío fracasou. Non foi posíbel obter información do ficheiro.",
"Upload failed. Could not find uploaded file" => "O envío fracasou. Non foi posíbel atopar o ficheiro enviado",
"Upload failed. Could not get file info." => "O envío fracasou. Non foi posíbel obter información do ficheiro.",
"Invalid directory." => "O directorio é incorrecto.",
"Files" => "Ficheiros",
"All files" => "Todos os ficheiros",
"Unable to upload {filename} as it is a directory or has 0 bytes" => "Non é posíbel enviar {filename}, xa que ou é un directorio ou ten 0 bytes",
"Not enough space available" => "O espazo dispoñíbel é insuficiente",
"Total file size {size1} exceeds upload limit {size2}" => "O tamaño total do ficheiro {size1} excede do límite de envío {size2}",
"Not enough free space, you are uploading {size1} but only {size2} is left" => "Non hai espazo libre abondo, o seu envío é de {size1} mais só dispón de {size2}",
"Upload cancelled." => "Envío cancelado.",
"Could not get result from server." => "Non foi posíbel obter o resultado do servidor.",
"File upload is in progress. Leaving the page now will cancel the upload." => "O envío do ficheiro está en proceso. Saír agora da páxina cancelará o envío.",
"URL cannot be empty" => "O URL non pode quedar en branco.",
"In the home folder 'Shared' is a reserved filename" => "«Shared» dentro do cartafol persoal é un nome reservado",
"{new_name} already exists" => "Xa existe un {new_name}",
"Could not create file" => "Non foi posíbel crear o ficheiro",
"Could not create folder" => "Non foi posíbel crear o cartafol",
"Error fetching URL" => "Produciuse un erro ao obter o URL",
"Share" => "Compartir",
"Delete permanently" => "Eliminar permanentemente",
"Delete" => "Eliminar",
"Rename" => "Renomear",
"Your download is being prepared. This might take some time if the files are big." => "Está a prepararse a súa descarga. Isto pode levar bastante tempo se os ficheiros son grandes.",
"Pending" => "Pendentes",
"Error moving file." => "Produciuse un erro ao mover o ficheiro.",
"Error moving file" => "Produciuse un erro ao mover o ficheiro",
"Error" => "Erro",
"Could not rename file" => "Non foi posíbel renomear o ficheiro",
"replaced {new_name} with {old_name}" => "substituír {new_name} por {old_name}",
"undo" => "desfacer",
"Error deleting file." => "Produciuse un erro ao eliminar o ficheiro.",
"Name" => "Nome",
"Size" => "Tamaño",
"Modified" => "Modificado",
"_%n folder_::_%n folders_" => array("%n cartafol","%n cartafoles"),
"_%n file_::_%n files_" => array("%n ficheiro","%n ficheiros"),
"{dirs} and {files}" => "{dirs} e {files}",
"_Uploading %n file_::_Uploading %n files_" => array("Cargando %n ficheiro","Cargando %n ficheiros"),
"'.' is an invalid file name." => "«.» é un nome de ficheiro incorrecto",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome incorrecto, non se permite «\\», «/», «<», «>», «:», «\"», «|», «?» e «*».",
"\"{name}\" is an invalid file name." => "«{name}» é un nome incorrecto de ficheiro.",
"Your storage is full, files can not be updated or synced anymore!" => "O seu espazo de almacenamento está cheo, non é posíbel actualizar ou sincronizar máis os ficheiros!",
"Your storage is almost full ({usedSpacePercent}%)" => "O seu espazo de almacenamento está case cheo ({usedSpacePercent}%)",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "O aplicativo de cifrado está activado, mais as chaves non foron inicializadas, saia da sesión e volva a acceder de novo",
"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 o aplicativo 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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "O cifrado foi desactivado, mais os ficheiros están cifrados. Vaia á configuración persoal para descifrar os ficheiros.",
"Your download is being prepared. This might take some time if the files are big." => "Está a prepararse a súa descarga. Isto pode levar bastante tempo se os ficheiros son grandes.",
"Error moving file" => "Produciuse un erro ao mover o ficheiro",
"Error" => "Erro",
"Name" => "Nome",
"Size" => "Tamaño",
"Modified" => "Modificado",
"Invalid folder name. Usage of 'Shared' is reserved." => "Nome de cartafol non válido. O uso de «Shared» está reservado.",
"{dirs} and {files}" => "{dirs} e {files}",
"%s could not be renamed" => "%s non pode cambiar de nome",
"Upload" => "Enviar",
"Upload (max. %s)" => "Envío (máx. %s)",
"File handling" => "Manexo de ficheiro",
"Maximum upload size" => "Tamaño máximo do envío",
"max. possible: " => "máx. posíbel: ",
"Needed for multi-file and folder downloads." => "Precísase para a descarga de varios ficheiros e cartafoles.",
"Enable ZIP-download" => "Activar a descarga ZIP",
"0 is unlimited" => "0 significa ilimitado",
"Maximum input size for ZIP files" => "Tamaño máximo de descarga para os ficheiros ZIP",
"Save" => "Gardar",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Empregue esta ligazón para <a href=\"%s\" target=\"_blank\">acceder aos seus ficheiros mediante WebDAV</a>",
"New" => "Novo",
"New text file" => "Ficheiro novo de texto",
"Text file" => "Ficheiro de texto",
"New folder" => "Novo cartafol",
"Folder" => "Cartafol",
"From link" => "Desde a ligazón",
"Deleted files" => "Ficheiros eliminados",
"Cancel upload" => "Cancelar o envío",
"You dont have permission to upload or create files here" => "Non ten permisos para enviar ou crear ficheiros aquí.",
"Nothing in here. Upload something!" => "Aquí non hai nada. Envíe algo.",
"Download" => "Descargar",
"Unshare" => "Deixar de compartir",
"Delete" => "Eliminar",
"Upload too large" => "Envío demasiado grande",
"Upload too large" => "Envío grande de máis",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiros que tenta enviar exceden do tamaño máximo permitido neste servidor",
"Files are being scanned, please wait." => "Estanse analizando os ficheiros. Agarde.",
"Current scanning" => "Análise actual",
"Upgrading filesystem cache..." => "Anovando a caché do sistema de ficheiros..."
"Currently scanning" => "Análise actual"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
+8 -18
View File
@@ -3,6 +3,7 @@ $TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "לא ניתן להעביר את %s - קובץ בשם הזה כבר קיים",
"Could not move %s" => "לא ניתן להעביר את %s",
"File name cannot be empty." => "שם קובץ אינו יכול להיות ריק",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "השם שגוי, אסור להשתמש בתווים '\\', '/', '<', '>', ':', '\"', '|', '?' ו־'*'.",
"No file was uploaded. Unknown error" => "לא הועלה קובץ. טעות בלתי מזוהה.",
"There is no error, the file uploaded with success" => "לא התרחשה שגיאה, הקובץ הועלה בהצלחה",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "הקבצים שנשלחו חורגים מהגודל שצוין בהגדרה upload_max_filesize שבקובץ php.ini:",
@@ -21,41 +22,30 @@ $TRANSLATIONS = array(
"{new_name} already exists" => "{new_name} כבר קיים",
"Share" => "שתף",
"Delete permanently" => "מחק לצמיתות",
"Delete" => "מחיקה",
"Rename" => "שינוי שם",
"Pending" => "ממתין",
"replaced {new_name} with {old_name}" => "{new_name} הוחלף ב־{old_name}",
"undo" => "ביטול",
"_%n folder_::_%n folders_" => array("",""),
"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("",""),
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "השם שגוי, אסור להשתמש בתווים '\\', '/', '<', '>', ':', '\"', '|', '?' ו־'*'.",
"Your storage is almost full ({usedSpacePercent}%)" => "שטח האחסון שלך כמעט מלא ({usedSpacePercent}%)",
"Error" => "שגיאה",
"Name" => "שם",
"Size" => "גודל",
"Modified" => "זמן שינוי",
"Upload" => "העלאה",
"_%n folder_::_%n folders_" => array("",""),
"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("",""),
"Your storage is almost full ({usedSpacePercent}%)" => "שטח האחסון שלך כמעט מלא ({usedSpacePercent}%)",
"File handling" => "טיפול בקבצים",
"Maximum upload size" => "גודל העלאה מקסימלי",
"max. possible: " => "המרבי האפשרי: ",
"Needed for multi-file and folder downloads." => "נחוץ להורדה של ריבוי קבצים או תיקיות.",
"Enable ZIP-download" => "הפעלת הורדת ZIP",
"0 is unlimited" => "0 - ללא הגבלה",
"Maximum input size for ZIP files" => "גודל הקלט המרבי לקובצי ZIP",
"Save" => "שמירה",
"WebDAV" => "WebDAV",
"New" => "חדש",
"Text file" => "קובץ טקסט",
"Folder" => "תיקייה",
"From link" => "מקישור",
"Deleted files" => "קבצים שנמחקו",
"Cancel upload" => "ביטול ההעלאה",
"Nothing in here. Upload something!" => "אין כאן שום דבר. אולי ברצונך להעלות משהו?",
"Download" => "הורדה",
"Unshare" => "הסר שיתוף",
"Delete" => "מחיקה",
"Upload too large" => "העלאה גדולה מידי",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "הקבצים שניסית להעלות חרגו מהגודל המקסימלי להעלאת קבצים על שרת זה.",
"Files are being scanned, please wait." => "הקבצים נסרקים, נא להמתין.",
"Current scanning" => "הסריקה הנוכחית"
"Files are being scanned, please wait." => "הקבצים נסרקים, נא להמתין."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
+1 -2
View File
@@ -1,11 +1,10 @@
<?php
$TRANSLATIONS = array(
"Share" => "साझा करें",
"Error" => "त्रुटि",
"_%n folder_::_%n folders_" => array("",""),
"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("",""),
"Error" => "त्रुटि",
"Upload" => "अपलोड ",
"Save" => "सहेजें"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
+7
View File
@@ -0,0 +1,7 @@
<?php
$TRANSLATIONS = array(
"_%n folder_::_%n folders_" => array("",""),
"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("","")
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
+5 -14
View File
@@ -10,36 +10,27 @@ $TRANSLATIONS = array(
"Upload cancelled." => "Slanje poništeno.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Učitavanje datoteke. Napuštanjem stranice će prekinuti učitavanje.",
"Share" => "Podijeli",
"Delete" => "Obriši",
"Rename" => "Promjeni ime",
"Pending" => "U tijeku",
"undo" => "vrati",
"_%n folder_::_%n folders_" => array("","",""),
"_%n file_::_%n files_" => array("","",""),
"_Uploading %n file_::_Uploading %n files_" => array("","",""),
"Error" => "Greška",
"Name" => "Ime",
"Size" => "Veličina",
"Modified" => "Zadnja promjena",
"Upload" => "Učitaj",
"_%n folder_::_%n folders_" => array("","",""),
"_%n file_::_%n files_" => array("","",""),
"_Uploading %n file_::_Uploading %n files_" => array("","",""),
"File handling" => "datoteka za rukovanje",
"Maximum upload size" => "Maksimalna veličina prijenosa",
"max. possible: " => "maksimalna moguća: ",
"Needed for multi-file and folder downloads." => "Potrebno za preuzimanje više datoteke i mape",
"Enable ZIP-download" => "Omogući ZIP-preuzimanje",
"0 is unlimited" => "0 je \"bez limita\"",
"Maximum input size for ZIP files" => "Maksimalna veličina za ZIP datoteke",
"Save" => "Snimi",
"New" => "novo",
"Text file" => "tekstualna datoteka",
"Folder" => "mapa",
"Cancel upload" => "Prekini upload",
"Nothing in here. Upload something!" => "Nema ničega u ovoj mapi. Pošalji nešto!",
"Download" => "Preuzimanje",
"Unshare" => "Makni djeljenje",
"Delete" => "Obriši",
"Upload too large" => "Prijenos je preobiman",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteke koje pokušavate prenijeti prelaze maksimalnu veličinu za prijenos datoteka na ovom poslužitelju.",
"Files are being scanned, please wait." => "Datoteke se skeniraju, molimo pričekajte.",
"Current scanning" => "Trenutno skeniranje"
"Files are being scanned, please wait." => "Datoteke se skeniraju, molimo pričekajte."
);
$PLURAL_FORMS = "nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;";
+26 -28
View File
@@ -3,13 +3,15 @@ $TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "%s áthelyezése nem sikerült - már létezik másik fájl ezzel a névvel",
"Could not move %s" => "Nem sikerült %s áthelyezése",
"File name cannot be empty." => "A fájlnév nem lehet semmi.",
"File name must not contain \"/\". Please choose a different name." => "Az állomány neve nem tartalmazhatja a \"/\" karaktert. Kérem válasszon másik nevet!",
"\"%s\" is an invalid file name." => "\"%s\" érvénytelen, mint fájlnév.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Érvénytelen elnevezés. Ezek a karakterek nem használhatók: '\\', '/', '<', '>', ':', '\"', '|', '?' és '*'",
"The target folder has been moved or deleted." => "A célmappa törlődött, vagy áthelyezésre került.",
"The name %s is already used in the folder %s. Please choose a different name." => "A %s név már létezik a %s mappában. Kérem válasszon másik nevet!",
"Not a valid source" => "A kiinduló állomány érvénytelen",
"Server is not allowed to open URLs, please check the server configuration" => "A kiszolgálón nincs engedélyezve URL-ek megnyitása, kérem ellenőrizze a beállításokat",
"Error while downloading %s to %s" => "Hiba történt miközben %s-t letöltöttük %s-be",
"Error when creating the file" => "Hiba történt az állomány létrehozásakor",
"Folder name cannot be empty." => "A mappa neve nem maradhat kitöltetlenül",
"Folder name must not contain \"/\". Please choose a different name." => "A mappa neve nem tartalmazhatja a \"/\" karaktert. Kérem válasszon másik nevet!",
"Error when creating the folder" => "Hiba történt a mappa létrehozásakor",
"Unable to set upload directory." => "Nem található a mappa, ahova feltölteni szeretne.",
"Invalid Token" => "Hibás mappacím",
@@ -22,70 +24,66 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Hiányzik egy ideiglenes mappa",
"Failed to write to disk" => "Nem sikerült a lemezre történő írás",
"Not enough storage available" => "Nincs elég szabad hely.",
"Upload failed. Could not get file info." => "A feltöltés nem sikerült. Az állományt leíró információk nem érhetők el.",
"Upload failed. Could not find uploaded file" => "A feltöltés nem sikerült. Nem található a feltöltendő állomány.",
"Upload failed. Could not get file info." => "A feltöltés nem sikerült. Az állományt leíró információk nem érhetők el.",
"Invalid directory." => "Érvénytelen mappa.",
"Files" => "Fájlok",
"All files" => "Az összes állomány",
"Unable to upload {filename} as it is a directory or has 0 bytes" => "A(z) {filename} állomány nem tölthető fel, mert ez vagy egy mappa, vagy pedig 0 bájtból áll.",
"Not enough space available" => "Nincs elég szabad hely",
"Total file size {size1} exceeds upload limit {size2}" => "A teljes fájlméret: {size1} meghaladja a feltöltési limitet: {size2}",
"Not enough free space, you are uploading {size1} but only {size2} is left" => "Nincs elég szabad hely. A feltöltés mérete {size1}, de csak ennyi hely van: {size2}.",
"Upload cancelled." => "A feltöltést megszakítottuk.",
"Could not get result from server." => "A kiszolgálótól nem kapható meg az eredmény.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Fájlfeltöltés van folyamatban. Az oldal elhagyása megszakítja a feltöltést.",
"URL cannot be empty" => "Az URL-cím nem maradhat kitöltetlenül",
"In the home folder 'Shared' is a reserved filename" => "A kiindulási mappában a 'Shared' egy belső használatra fenntartott név",
"{new_name} already exists" => "{new_name} már létezik",
"Could not create file" => "Az állomány nem hozható létre",
"Could not create folder" => "A mappa nem hozható létre",
"Error fetching URL" => "A megadott URL-ről nem sikerül adatokat kapni",
"Share" => "Megosztás",
"Delete permanently" => "Végleges törlés",
"Delete" => "Törlés",
"Rename" => "Átnevezés",
"Your download is being prepared. This might take some time if the files are big." => "Készül a letöltendő állomány. Ez eltarthat egy ideig, ha nagyok a fájlok.",
"Pending" => "Folyamatban",
"Error moving file." => "Hiba történt a fájl áthelyezése közben.",
"Error moving file" => "Az állomány áthelyezése nem sikerült.",
"Error" => "Hiba",
"Could not rename file" => "Az állomány nem nevezhető át",
"replaced {new_name} with {old_name}" => "{new_name} fájlt kicseréltük ezzel: {old_name}",
"undo" => "visszavonás",
"Error deleting file." => "Hiba a file törlése közben.",
"Name" => "Név",
"Size" => "Méret",
"Modified" => "Módosítva",
"_%n folder_::_%n folders_" => array("%n mappa","%n mappa"),
"_%n file_::_%n files_" => array("%n állomány","%n állomány"),
"{dirs} and {files}" => "{dirs} és {files}",
"_Uploading %n file_::_Uploading %n files_" => array("%n állomány feltöltése","%n állomány feltöltése"),
"'.' is an invalid file name." => "'.' fájlnév érvénytelen.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Érvénytelen elnevezés. Ezek a karakterek nem használhatók: '\\', '/', '<', '>', ':', '\"', '|', '?' és '*'",
"\"{name}\" is an invalid file name." => "\"{name}\" érvénytelen, mint fájlnév.",
"Your storage is full, files can not be updated or synced anymore!" => "A tároló tele van, a fájlok nem frissíthetőek vagy szinkronizálhatóak a jövőben.",
"Your storage is almost full ({usedSpacePercent}%)" => "A tároló majdnem tele van ({usedSpacePercent}%)",
"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!",
"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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "A titkosítási funkciót kikapcsolták, de az Ön állományai még mindig titkosított állapotban vannak. A személyes beállításoknál tudja a titkosítást feloldani.",
"Your download is being prepared. This might take some time if the files are big." => "Készül a letöltendő állomány. Ez eltarthat egy ideig, ha nagyok a fájlok.",
"Error moving file" => "Az állomány áthelyezése nem sikerült.",
"Error" => "Hiba",
"Name" => "Név",
"Size" => "Méret",
"Modified" => "Módosítva",
"Invalid folder name. Usage of 'Shared' is reserved." => "Érvénytelen mappanév. A 'Shared' a rendszer számára fenntartott elnevezés.",
"{dirs} and {files}" => "{dirs} és {files}",
"%s could not be renamed" => "%s átnevezése nem sikerült",
"Upload" => "Feltöltés",
"Upload (max. %s)" => "Feltöltés (max. %s)",
"File handling" => "Fájlkezelés",
"Maximum upload size" => "Maximális feltölthető fájlméret",
"max. possible: " => "max. lehetséges: ",
"Needed for multi-file and folder downloads." => "Kötegelt fájl- vagy mappaletöltéshez szükséges",
"Enable ZIP-download" => "A ZIP-letöltés engedélyezése",
"0 is unlimited" => "0 = korlátlan",
"Maximum input size for ZIP files" => "ZIP-fájlok maximális kiindulási mérete",
"Save" => "Mentés",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Ezt a címet használja, ha <a href=\"%s\" target=\"_blank\">WebDAV-on keresztül szeretné elérni a fájljait</a>",
"New" => "Új",
"New text file" => "Új szöveges file",
"Text file" => "Szövegfájl",
"New folder" => "Új mappa",
"Folder" => "Mappa",
"From link" => "Feltöltés linkről",
"Deleted files" => "Törölt fájlok",
"Cancel upload" => "A feltöltés megszakítása",
"You dont have permission to upload or create files here" => "Önnek nincs jogosultsága ahhoz, hogy ide állományokat töltsön föl, vagy itt újakat hozzon létre",
"Nothing in here. Upload something!" => "Itt nincs semmi. Töltsön fel valamit!",
"Download" => "Letöltés",
"Unshare" => "A megosztás visszavonása",
"Delete" => "Törlés",
"Upload too large" => "A feltöltés túl nagy",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "A feltöltendő állományok mérete meghaladja a kiszolgálón megengedett maximális méretet.",
"Files are being scanned, please wait." => "A fájllista ellenőrzése zajlik, kis türelmet!",
"Current scanning" => "Ellenőrzés alatt",
"Upgrading filesystem cache..." => "A fájlrendszer gyorsítótárának frissítése zajlik..."
"Currently scanning" => "Mappaellenőrzés: "
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
+2 -2
View File
@@ -1,10 +1,10 @@
<?php
$TRANSLATIONS = array(
"Delete" => "Ջնջել",
"_%n folder_::_%n folders_" => array("",""),
"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("",""),
"Save" => "Պահպանել",
"Download" => "Բեռնել",
"Delete" => "Ջնջել"
"Download" => "Բեռնել"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
+5 -5
View File
@@ -5,22 +5,22 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Manca un dossier temporari",
"Files" => "Files",
"Share" => "Compartir",
"_%n folder_::_%n folders_" => array("",""),
"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("",""),
"Delete" => "Deler",
"Error" => "Error",
"Name" => "Nomine",
"Size" => "Dimension",
"Modified" => "Modificate",
"Upload" => "Incargar",
"_%n folder_::_%n folders_" => array("",""),
"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("",""),
"Maximum upload size" => "Dimension maxime de incargamento",
"Save" => "Salveguardar",
"New" => "Nove",
"Text file" => "File de texto",
"New folder" => "Nove dossier",
"Folder" => "Dossier",
"Nothing in here. Upload something!" => "Nihil hic. Incarga alcun cosa!",
"Download" => "Discargar",
"Delete" => "Deler",
"Upload too large" => "Incargamento troppo longe"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
+37 -23
View File
@@ -3,6 +3,15 @@ $TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "Tidak dapat memindahkan %s - Berkas dengan nama ini sudah ada",
"Could not move %s" => "Tidak dapat memindahkan %s",
"File name cannot be empty." => "Nama berkas tidak boleh kosong.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nama tidak valid, karakter '\\', '/', '<', '>', ':', '\"', '|', '?' dan '*' tidak diizinkan.",
"The name %s is already used in the folder %s. Please choose a different name." => "Nama %s sudah digunakan dalam folder %s. Silakan pilih nama yang berbeda.",
"Not a valid source" => "Sumber tidak sah",
"Error while downloading %s to %s" => "Galat saat mengunduh %s ke %s",
"Error when creating the file" => "Galat saat membuat berkas",
"Folder name cannot be empty." => "Nama folder tidak bolh kosong.",
"Error when creating the folder" => "Galat saat membuat folder",
"Unable to set upload directory." => "Tidak dapat mengatur folder unggah",
"Invalid Token" => "Token tidak sah",
"No file was uploaded. Unknown error" => "Tidak ada berkas yang diunggah. Galat tidak dikenal.",
"There is no error, the file uploaded with success" => "Tidak ada galat, berkas sukses diunggah",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Berkas yang diunggah melampaui direktif upload_max_filesize pada php.ini",
@@ -12,53 +21,58 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Folder sementara tidak ada",
"Failed to write to disk" => "Gagal menulis ke disk",
"Not enough storage available" => "Ruang penyimpanan tidak mencukupi",
"Upload failed. Could not find uploaded file" => "Unggah gagal. Tidak menemukan berkas yang akan diunggah",
"Upload failed. Could not get file info." => "Unggah gagal. Tidak mendapatkan informasi berkas.",
"Invalid directory." => "Direktori tidak valid.",
"Files" => "Berkas",
"Not enough space available" => "Ruang penyimpanan tidak mencukupi",
"Unable to upload {filename} as it is a directory or has 0 bytes" => "Tidak dapat mengunggah {filename} karena ini sebuah direktori atau memiliki ukuran 0 byte",
"Upload cancelled." => "Pengunggahan dibatalkan.",
"Could not get result from server." => "Tidak mendapatkan hasil dari server.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Berkas sedang diunggah. Meninggalkan halaman ini akan membatalkan proses.",
"URL cannot be empty" => "URL tidak boleh kosong",
"{new_name} already exists" => "{new_name} sudah ada",
"Could not create file" => "Tidak dapat membuat berkas",
"Could not create folder" => "Tidak dapat membuat folder",
"Share" => "Bagikan",
"Delete permanently" => "Hapus secara permanen",
"Delete" => "Hapus",
"Rename" => "Ubah nama",
"Pending" => "Menunggu",
"replaced {new_name} with {old_name}" => "mengganti {new_name} dengan {old_name}",
"undo" => "urungkan",
"_%n folder_::_%n folders_" => array(""),
"_%n file_::_%n files_" => array(""),
"_Uploading %n file_::_Uploading %n files_" => array(""),
"'.' is an invalid file name." => "'.' bukan nama berkas yang valid.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nama tidak valid, karakter '\\', '/', '<', '>', ':', '\"', '|', '?' dan '*' tidak diizinkan.",
"Your storage is full, files can not be updated or synced anymore!" => "Ruang penyimpanan Anda penuh, berkas tidak dapat diperbarui atau disinkronkan lagi!",
"Your storage is almost full ({usedSpacePercent}%)" => "Ruang penyimpanan hampir penuh ({usedSpacePercent}%)",
"Your download is being prepared. This might take some time if the files are big." => "Unduhan Anda sedang disiapkan. Prosesnya dapat berlangsung agak lama jika ukuran berkasnya besar.",
"Pending" => "Menunggu",
"Error moving file" => "Galat saat memindahkan berkas",
"Error" => "Galat",
"Could not rename file" => "Tidak dapat mengubah nama berkas",
"Error deleting file." => "Galat saat menghapus berkas.",
"Name" => "Nama",
"Size" => "Ukuran",
"Modified" => "Dimodifikasi",
"Upload" => "Unggah",
"_%n folder_::_%n folders_" => array("%n folder"),
"_%n file_::_%n files_" => array("%n berkas"),
"_Uploading %n file_::_Uploading %n files_" => array("Mengunggah %n berkas"),
"Your storage is full, files can not be updated or synced anymore!" => "Ruang penyimpanan Anda penuh, berkas tidak dapat diperbarui atau disinkronkan lagi!",
"Your storage is almost full ({usedSpacePercent}%)" => "Ruang penyimpanan hampir penuh ({usedSpacePercent}%)",
"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",
"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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Enskripi telah dinonaktifkan tetapi berkas anda tetap dienskripsi. Silakan menuju ke pengaturan pribadi untuk deskrip berkas anda.",
"{dirs} and {files}" => "{dirs} dan {files}",
"%s could not be renamed" => "%s tidak dapat diubah nama",
"File handling" => "Penanganan berkas",
"Maximum upload size" => "Ukuran pengunggahan maksimum",
"max. possible: " => "Kemungkinan maks.:",
"Needed for multi-file and folder downloads." => "Dibutuhkan untuk pengunduhan multi-berkas dan multi-folder",
"Enable ZIP-download" => "Aktifkan unduhan ZIP",
"0 is unlimited" => "0 berarti tidak terbatas",
"Maximum input size for ZIP files" => "Ukuran masukan maksimum untuk berkas ZIP",
"Save" => "Simpan",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Gunakan alamat ini untuk <a href=\"%s\" target=\"_blank\">mengakses Berkas via WebDAV</a>",
"New" => "Baru",
"New text file" => "Berkas teks baru",
"Text file" => "Berkas teks",
"New folder" => "Map baru",
"Folder" => "Folder",
"From link" => "Dari tautan",
"Deleted files" => "Berkas yang dihapus",
"Cancel upload" => "Batal pengunggahan",
"You dont have permission to upload or create files here" => "Anda tidak memiliki akses untuk mengunggah atau membuat berkas disini",
"Nothing in here. Upload something!" => "Tidak ada apa-apa di sini. Unggah sesuatu!",
"Download" => "Unduh",
"Unshare" => "Batalkan berbagi",
"Delete" => "Hapus",
"Upload too large" => "Yang diunggah terlalu besar",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Berkas yang dicoba untuk diunggah melebihi ukuran maksimum pengunggahan berkas di server ini.",
"Files are being scanned, please wait." => "Berkas sedang dipindai, silakan tunggu.",
"Current scanning" => "Yang sedang dipindai",
"Upgrading filesystem cache..." => "Meningkatkan tembolok sistem berkas..."
"Files are being scanned, please wait." => "Berkas sedang dipindai, silakan tunggu."
);
$PLURAL_FORMS = "nplurals=1; plural=0;";
+7 -18
View File
@@ -3,6 +3,7 @@ $TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "Gat ekki fært %s - Skrá með þessu nafni er þegar til",
"Could not move %s" => "Gat ekki fært %s",
"File name cannot be empty." => "Nafn skráar má ekki vera tómt",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ógilt nafn, táknin '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' eru ekki leyfð.",
"No file was uploaded. Unknown error" => "Engin skrá var send inn. Óþekkt villa.",
"There is no error, the file uploaded with success" => "Engin villa, innsending heppnaðist",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Innsend skrá er stærri en upload_max stillingin í php.ini:",
@@ -13,45 +14,33 @@ $TRANSLATIONS = array(
"Failed to write to disk" => "Tókst ekki að skrifa á disk",
"Invalid directory." => "Ógild mappa.",
"Files" => "Skrár",
"Not enough space available" => "Ekki nægt pláss tiltækt",
"Upload cancelled." => "Hætt við innsendingu.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Innsending í gangi. Ef þú ferð af þessari síðu mun innsending misheppnast.",
"{new_name} already exists" => "{new_name} er þegar til",
"Share" => "Deila",
"Delete" => "Eyða",
"Rename" => "Endurskýra",
"Pending" => "Bíður",
"replaced {new_name} with {old_name}" => "yfirskrifaði {new_name} með {old_name}",
"undo" => "afturkalla",
"_%n folder_::_%n folders_" => array("",""),
"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("",""),
"'.' is an invalid file name." => "'.' er ekki leyfilegt nafn.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ógilt nafn, táknin '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' eru ekki leyfð.",
"Error" => "Villa",
"Name" => "Nafn",
"Size" => "Stærð",
"Modified" => "Breytt",
"Upload" => "Senda inn",
"_%n folder_::_%n folders_" => array("",""),
"_%n file_::_%n files_" => array("",""),
"_Uploading %n file_::_Uploading %n files_" => array("",""),
"File handling" => "Meðhöndlun skrár",
"Maximum upload size" => "Hámarks stærð innsendingar",
"max. possible: " => "hámark mögulegt: ",
"Needed for multi-file and folder downloads." => "Nauðsynlegt til að sækja margar skrár og möppur í einu.",
"Enable ZIP-download" => "Virkja ZIP niðurhal.",
"0 is unlimited" => "0 er ótakmarkað",
"Maximum input size for ZIP files" => "Hámarks inntaksstærð fyrir ZIP skrár",
"Save" => "Vista",
"WebDAV" => "WebDAV",
"New" => "Nýtt",
"Text file" => "Texta skrá",
"Folder" => "Mappa",
"From link" => "Af tengli",
"Cancel upload" => "Hætta við innsendingu",
"Nothing in here. Upload something!" => "Ekkert hér. Settu eitthvað inn!",
"Download" => "Niðurhal",
"Unshare" => "Hætta deilingu",
"Delete" => "Eyða",
"Upload too large" => "Innsend skrá er of stór",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Skrárnar sem þú ert að senda inn eru stærri en hámarks innsendingarstærð á þessum netþjóni.",
"Files are being scanned, please wait." => "Verið er að skima skrár, vinsamlegast hinkraðu.",
"Current scanning" => "Er að skima"
"Files are being scanned, please wait." => "Verið er að skima skrár, vinsamlegast hinkraðu."
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
+25 -28
View File
@@ -3,13 +3,15 @@ $TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "Impossibile spostare %s - un file con questo nome esiste già",
"Could not move %s" => "Impossibile spostare %s",
"File name cannot be empty." => "Il nome del file non può essere vuoto.",
"File name must not contain \"/\". Please choose a different name." => "Il nome del file non può contenere il carattere \"/\". Scegli un nome diverso.",
"\"%s\" is an invalid file name." => "\"%s\" non è un nome file valido.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome non valido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' non sono consentiti.",
"The target folder has been moved or deleted." => "La cartella di destinazione è stata spostata o eliminata.",
"The name %s is already used in the folder %s. Please choose a different name." => "Il nome %s è attualmente in uso nella cartella %s. Scegli un nome diverso.",
"Not a valid source" => "Non è una sorgente valida",
"Server is not allowed to open URLs, please check the server configuration" => "Al server non è permesso aprire URL, controlla la configurazione del server",
"Error while downloading %s to %s" => "Errore durante lo scaricamento di %s su %s",
"Error when creating the file" => "Errore durante la creazione del file",
"Folder name cannot be empty." => "Il nome della cartella non può essere vuoto.",
"Folder name must not contain \"/\". Please choose a different name." => "Il nome della cartella non può contenere il carattere \"/\". Scegli un nome diverso.",
"Error when creating the folder" => "Errore durante la creazione della cartella",
"Unable to set upload directory." => "Impossibile impostare una cartella di caricamento.",
"Invalid Token" => "Token non valido",
@@ -22,71 +24,66 @@ $TRANSLATIONS = array(
"Missing a temporary folder" => "Manca una cartella temporanea",
"Failed to write to disk" => "Scrittura su disco non riuscita",
"Not enough storage available" => "Spazio di archiviazione insufficiente",
"Upload failed. Could not get file info." => "Caricamento non riuscito. Impossibile ottenere informazioni sul file.",
"Upload failed. Could not find uploaded file" => "Caricamento non riuscito. Impossibile trovare il file caricato.",
"Upload failed. Could not get file info." => "Caricamento non riuscito. Impossibile ottenere informazioni sul file.",
"Invalid directory." => "Cartella non valida.",
"Files" => "File",
"All files" => "Tutti i file",
"Unable to upload {filename} as it is a directory or has 0 bytes" => "Impossibile caricare {filename} poiché è una cartella oppure ha una dimensione di 0 byte.",
"Not enough space available" => "Spazio disponibile insufficiente",
"Total file size {size1} exceeds upload limit {size2}" => "La dimensione totale del file {size1} supera il limite di caricamento {size2}",
"Not enough free space, you are uploading {size1} but only {size2} is left" => "Spazio insufficiente, stai caricando {size1}, ma è rimasto solo {size2}",
"Upload cancelled." => "Invio annullato",
"Could not get result from server." => "Impossibile ottenere il risultato dal server.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Caricamento del file in corso. La chiusura della pagina annullerà il caricamento.",
"URL cannot be empty" => "L'URL non può essere vuoto.",
"In the home folder 'Shared' is a reserved filename" => "Nella cartella home 'Shared' è un nome riservato",
"{new_name} already exists" => "{new_name} esiste già",
"Could not create file" => "Impossibile creare il file",
"Could not create folder" => "Impossibile creare la cartella",
"Error fetching URL" => "Errore durante il recupero dello URL",
"Share" => "Condividi",
"Delete permanently" => "Elimina definitivamente",
"Delete" => "Elimina",
"Rename" => "Rinomina",
"Your download is being prepared. This might take some time if the files are big." => "Il tuo scaricamento è in fase di preparazione. Ciò potrebbe richiedere del tempo se i file sono grandi.",
"Pending" => "In corso",
"Error moving file." => "Errore durante lo spostamento del file.",
"Error moving file" => "Errore durante lo spostamento del file",
"Error" => "Errore",
"Could not rename file" => "Impossibile rinominare il file",
"replaced {new_name} with {old_name}" => "sostituito {new_name} con {old_name}",
"undo" => "annulla",
"Error deleting file." => "Errore durante l'eliminazione del file.",
"Name" => "Nome",
"Size" => "Dimensione",
"Modified" => "Modificato",
"_%n folder_::_%n folders_" => array("%n cartella","%n cartelle"),
"_%n file_::_%n files_" => array("%n file","%n file"),
"{dirs} and {files}" => "{dirs} e {files}",
"_Uploading %n file_::_Uploading %n files_" => array("Caricamento di %n file in corso","Caricamento di %n file in corso"),
"'.' is an invalid file name." => "'.' non è un nome file valido.",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome non valido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' non sono consentiti.",
"\"{name}\" is an invalid file name." => "\"{name}\" non è un nome file valido.",
"Your storage is full, files can not be updated or synced anymore!" => "Lo spazio di archiviazione è pieno, i file non possono essere più aggiornati o sincronizzati!",
"Your storage is almost full ({usedSpacePercent}%)" => "Lo spazio di archiviazione è quasi pieno ({usedSpacePercent}%)",
"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",
"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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "La cifratura è stata disabilitata ma i tuoi file sono ancora cifrati. Vai nelle impostazioni personali per decifrare i file.",
"Your download is being prepared. This might take some time if the files are big." => "Il tuo scaricamento è in fase di preparazione. Ciò potrebbe richiedere del tempo se i file sono grandi.",
"Error moving file" => "Errore durante lo spostamento del file",
"Error" => "Errore",
"Name" => "Nome",
"Size" => "Dimensione",
"Modified" => "Modificato",
"Invalid folder name. Usage of 'Shared' is reserved." => "Nome della cartella non valido. L'uso di 'Shared' è riservato.",
"{dirs} and {files}" => "{dirs} e {files}",
"%s could not be renamed" => "%s non può essere rinominato",
"Upload" => "Carica",
"Upload (max. %s)" => "Carica (massimo %s)",
"File handling" => "Gestione file",
"Maximum upload size" => "Dimensione massima upload",
"max. possible: " => "numero mass.: ",
"Needed for multi-file and folder downloads." => "Necessario per lo scaricamento di file multipli e cartelle.",
"Enable ZIP-download" => "Abilita scaricamento ZIP",
"0 is unlimited" => "0 è illimitato",
"Maximum input size for ZIP files" => "Dimensione massima per i file ZIP",
"Save" => "Salva",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Utilizza questo indirizzo per <a href=\"%s\" target=\"_blank\">accedere ai tuoi file con WebDAV</a>",
"New" => "Nuovo",
"New text file" => "Nuovo file di testo",
"Text file" => "File di testo",
"New folder" => "Nuova cartella",
"Folder" => "Cartella",
"From link" => "Da collegamento",
"Deleted files" => "File eliminati",
"Cancel upload" => "Annulla invio",
"You dont have permission to upload or create files here" => "Qui non hai i permessi di caricare o creare file",
"Nothing in here. Upload something!" => "Non c'è niente qui. Carica qualcosa!",
"Download" => "Scarica",
"Unshare" => "Rimuovi condivisione",
"Delete" => "Elimina",
"Upload too large" => "Caricamento troppo grande",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "I file che stai provando a caricare superano la dimensione massima consentita su questo server.",
"Files are being scanned, please wait." => "Scansione dei file in corso, attendi",
"Current scanning" => "Scansione corrente",
"Upgrading filesystem cache..." => "Aggiornamento della cache del filesystem in corso..."
"Currently scanning" => "Scansione in corso"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
+89
View File
@@ -0,0 +1,89 @@
<?php
$TRANSLATIONS = array(
"Could not move %s - File with this name already exists" => "%s を移動できませんでした ― この名前のファイルはすでに存在します",
"Could not move %s" => "%s を移動できませんでした",
"File name cannot be empty." => "ファイル名を空にすることはできません。",
"\"%s\" is an invalid file name." => "\"%s\" は無効なファイル名です。",
"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "無効な名前、'\\', '/', '<', '>', ':', '\"', '|', '?', '*' は使用できません。",
"The target folder has been moved or deleted." => "対象のフォルダーは移動されたか、削除されました。",
"The name %s is already used in the folder %s. Please choose a different name." => "%s はフォルダー %s ですでに使われています。別の名前を選択してください。",
"Not a valid source" => "有効なソースではありません",
"Server is not allowed to open URLs, please check the server configuration" => "サーバーは、URLを開くことは許されません。サーバーの設定をチェックしてください。",
"Error while downloading %s to %s" => "%s から %s へのダウンロードエラー",
"Error when creating the file" => "ファイルの生成エラー",
"Folder name cannot be empty." => "フォルダー名は空にできません",
"Error when creating the folder" => "フォルダーの生成エラー",
"Unable to set upload directory." => "アップロードディレクトリを設定できません。",
"Invalid Token" => "無効なトークン",
"No file was uploaded. Unknown error" => "ファイルは何もアップロードされていません。不明なエラー",
"There is no error, the file uploaded with success" => "エラーはありません。ファイルのアップロードは成功しました",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "アップロードされたファイルはphp.ini の upload_max_filesize に設定されたサイズを超えています:",
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "アップロードファイルはHTMLフォームで指定された MAX_FILE_SIZE の制限を超えています",
"The uploaded file was only partially uploaded" => "アップロードファイルは一部分だけアップロードされました",
"No file was uploaded" => "ファイルはアップロードされませんでした",
"Missing a temporary folder" => "一時保存フォルダーが見つかりません",
"Failed to write to disk" => "ディスクへの書き込みに失敗しました",
"Not enough storage available" => "ストレージに十分な空き容量がありません",
"Upload failed. Could not find uploaded file" => "アップロードに失敗。アップロード済みのファイルを見つけることができませんでした。",
"Upload failed. Could not get file info." => "アップロードに失敗。ファイル情報を取得できませんでした。",
"Invalid directory." => "無効なディレクトリです。",
"Files" => "ファイル",
"All files" => "すべてのファイル",
"Unable to upload {filename} as it is a directory or has 0 bytes" => "ディレクトリもしくは0バイトのため {filename} をアップロードできません",
"Total file size {size1} exceeds upload limit {size2}" => "合計ファイルサイズ {size1} はアップロード制限 {size2} を超過しています。",
"Not enough free space, you are uploading {size1} but only {size2} is left" => "空き容量が十分でなく、 {size1} をアップロードしていますが、 {size2} しか残っていません。",
"Upload cancelled." => "アップロードはキャンセルされました。",
"Could not get result from server." => "サーバーから結果を取得できませんでした。",
"File upload is in progress. Leaving the page now will cancel the upload." => "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。",
"URL cannot be empty" => "URL は空にできません",
"{new_name} already exists" => "{new_name} はすでに存在します",
"Could not create file" => "ファイルを作成できませんでした",
"Could not create folder" => "フォルダーを作成できませんでした",
"Error fetching URL" => "URL取得エラー",
"Share" => "共有",
"Delete permanently" => "完全に削除する",
"Delete" => "削除",
"Rename" => "名前の変更",
"Your download is being prepared. This might take some time if the files are big." => "ダウンロードの準備中です。ファイルサイズが大きい場合は少し時間がかかるかもしれません。",
"Pending" => "中断",
"Error moving file." => "ファイル移動でエラー",
"Error moving file" => "ファイルの移動エラー",
"Error" => "エラー",
"Could not rename file" => "ファイルの名前変更ができませんでした",
"Error deleting file." => "ファイルの削除エラー。",
"Name" => "名前",
"Size" => "サイズ",
"Modified" => "更新日時",
"_%n folder_::_%n folders_" => array("%n 個のフォルダー"),
"_%n file_::_%n files_" => array("%n 個のファイル"),
"_Uploading %n file_::_Uploading %n files_" => array("%n 個のファイルをアップロード中"),
"\"{name}\" is an invalid file name." => "\"{name}\" は無効なファイル名です。",
"Your storage is full, files can not be updated or synced anymore!" => "あなたのストレージは一杯です。ファイルの更新と同期はもうできません!",
"Your storage is almost full ({usedSpacePercent}%)" => "ストレージがほぼ一杯です({usedSpacePercent}%",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "暗号化アプリは有効ですが、あなたの暗号化キーは初期化されていません。ログアウトした後に、再度ログインしてください",
"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "暗号化アプリの無効なプライベートキーです。あなたの暗号化されたファイルへアクセスするために、個人設定からプライベートキーのパスワードを更新してください。",
"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "暗号化の機能は無効化されましたが、ファイルはすでに暗号化されています。個人設定からファイルを複合を行ってください。",
"{dirs} and {files}" => "{dirs} と {files}",
"%s could not be renamed" => "%sの名前を変更できませんでした",
"Upload (max. %s)" => "アップロード ( 最大 %s )",
"File handling" => "ファイル操作",
"Maximum upload size" => "最大アップロードサイズ",
"max. possible: " => "最大容量: ",
"Save" => "保存",
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "<a href=\"%s\" target=\"_blank\">WebDAV 経由でファイルにアクセス</a> するにはこのアドレスを利用してください",
"New" => "新規作成",
"New text file" => "新規のテキストファイル作成",
"Text file" => "テキストファイル",
"New folder" => "新しいフォルダー",
"Folder" => "フォルダー",
"From link" => "リンク",
"You dont have permission to upload or create files here" => "ここにファイルをアップロードもしくは作成する権限がありません",
"Nothing in here. Upload something!" => "ここには何もありません。何かアップロードしてください。",
"Download" => "ダウンロード",
"Upload too large" => "アップロードには大きすぎます。",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "アップロードしようとしているファイルは、サーバーで規定された最大サイズを超えています。",
"Files are being scanned, please wait." => "ファイルをスキャンしています、しばらくお待ちください。",
"Currently scanning" => "現在スキャン中"
);
$PLURAL_FORMS = "nplurals=1; plural=0;";

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