wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
25845 commits 157 branches 562 tags 714 MiB
Commit graph

10729 commits

Author SHA1 Message Date
Björn Schießle
b318b9cf17 Merge pull request #17008 from owncloud/fix-17006 
Improve splitting of username and remote adress when username contains an `@`
 2015-06-26 16:01:16 +02:00
Thomas Müller
9558562883 Merge pull request #17082 from owncloud/shared-etag-propagate-file 
Fix etag propagation for single file shares
 2015-06-26 12:36:17 +02:00
Jenkins for ownCloud
b1e29c7dde [tx-robot] updated from transifex 2015-06-26 01:55:35 -04:00
Robin Appelman
0128a86df1 add some docs 2015-06-25 14:29:40 +02:00
Morris Jobke
f63915d0c8 update license headers and authors 2015-06-25 14:13:49 +02:00
Morris Jobke
5cb1e20214 remove duplicate ID in HTML template for public shares 2015-06-25 10:13:56 +02:00
Morris Jobke
160d8003f8 Merge pull request #17152 from owncloud/LDAP/AD-Typo 
Ldap/ad typo
 2015-06-25 07:56:04 +02:00
Jenkins for ownCloud
dddbfb903f [tx-robot] updated from transifex 2015-06-25 01:55:15 -04:00
Lukas Reschke
a63f6023fd Dropped an S from the mouseover 
We had a typo in the ldap initial binding menu mouse over, so changed the text in all references to be correct.
 2015-06-24 22:10:10 +02:00
Bjoern Schiessle
407db913de add occ command to trashbin to remove deleted files 2015-06-24 19:09:20 +02:00
Robin Appelman
c87ab65081 fix etag propagation for single file shares 2015-06-24 18:16:03 +02:00
Robin Appelman
f847d9409e add unit test for single file share etag propagation 2015-06-24 18:16:03 +02:00
Morris Jobke
5f59393b30 Merge pull request #17110 from owncloud/share-error-handling 
[sharing] handle shares of users that aren't available anymore
 2015-06-24 17:38:34 +02:00
Lukas Reschke
004280e407 Merge pull request #17136 from rullzer/fix_remove_link_OCS 
Allow removing of link password in OCS again
 2015-06-24 16:45:00 +02:00
Roeland Jago Douma
6c3da1ec90 Added unit test to verify link password removeal 2015-06-24 12:38:33 +02:00
Thomas Müller
4da1c84296 Rename user_webdavauth to prevent accidental activation - refs #17112 2015-06-24 12:17:17 +02:00
Jenkins for ownCloud
ceb80ac123 [tx-robot] updated from transifex 2015-06-24 01:55:55 -04:00
Morris Jobke
4f2f8a6f28 [sharing] handle shares of users that aren't available anymore 
* properly handle the case where an abandoned share is left and
  simply skip it
 2015-06-23 18:22:36 +02:00
Vincent Petry
e01db549a0 Merge pull request #17048 from owncloud/hotfix/fix-firewall-blocking-dir-message 
adding correct blocking logic for ffw
 2015-06-23 15:08:47 +02:00
Björn Schießle
cce841c665 Merge pull request #17045 from owncloud/enc_improvements 
encryption improvements
 2015-06-23 14:30:21 +02:00
Morris Jobke
a059b090c3 Merge pull request #17085 from owncloud/use-trusted-mimetype 
Use trusted mimetype
 2015-06-23 08:45:05 +02:00
Jenkins for ownCloud
3cad0d4ed2 [tx-robot] updated from transifex 2015-06-23 01:56:15 -04:00
Thomas Müller
25581c7b63 Merge pull request #16940 from owncloud/ext-s3-touchmtimefix 
Properly set mtime on S3 for touch operation
 2015-06-22 22:25:45 +02:00
Robin Appelman
5e1865530b take share target into account when updating recipient etags 2015-06-22 18:21:54 +02:00
Clark Tomlinson
5466dcadc0 adding correct blocking logic for fff 2015-06-22 11:42:42 -04:00
VicDeo
5cfcda3e95 Merge pull request #17068 from owncloud/fix_16878 
fix search for results only from subfolder
 2015-06-22 17:55:56 +03:00
Joas Schilling
738b78f1b0 Use \OC\HintException and translate the hint 2015-06-22 15:34:06 +02:00
Jan-Christoph Borchardt
9dde482315 remove whitespace on bottom when no search results, fix laylout, fix #16878 2015-06-22 15:30:29 +02:00
Lukas Reschke
3d2ac6dbb6 Use trusted mimetype 
We shall not use untrusted mimetypes in this context
 2015-06-22 15:30:27 +02:00
Bjoern Schiessle
8eda9ae83c add filter-empty class if no search result in current folder 2015-06-22 12:13:05 +02:00
Jenkins for ownCloud
c77e44117d [tx-robot] updated from transifex 2015-06-22 01:55:00 -04:00
Robin McCorkell
05fb9ceef9 Merge pull request #17025 from owncloud/sftp-rmdir-emptydir 
Workaround for empty dir deletion for SFTP
 2015-06-21 23:50:58 +01:00
Jenkins for ownCloud
59513ac377 [tx-robot] updated from transifex 2015-06-21 01:55:06 -04:00
Jenkins for ownCloud
183bd6dd49 [tx-robot] updated from transifex 2015-06-20 01:55:10 -04:00
Bjoern Schiessle
ed3dc199ae remove files_encryption from database at the end of the migration process 2015-06-19 14:15:56 +02:00
Thomas Müller
5c2646a4bf Merge pull request #17024 from owncloud/master-verify-if-path-exists-in-upload 
[master] Verify if path exists
 2015-06-19 13:20:38 +02:00
Jenkins for ownCloud
a5eb2f01a9 [tx-robot] updated from transifex 2015-06-19 01:55:29 -04:00
Vincent Petry
e15dd783ab Workaround for empty dir deletion for SFTP 
Explicitly clear the stat cache after deleting an empty folder to make
sure it is properly detected as deleted in subsequent requests.

This works around a problem with phpseclib where the folder is properly
deleted remotely but the stat cache was not updated.
 2015-06-18 17:40:38 +02:00
Lukas Reschke
ebb5523698 Verify if path exists 
We need to check if the path exists and throw an error instead of handling this situation ungraciously.
 2015-06-18 16:48:32 +02:00
Björn Schießle
7a0917e5b2 Merge pull request #16692 from owncloud/add_social_media_buttons 
Add social media buttons
 2015-06-18 14:41:58 +02:00
Bjoern Schiessle
f9093466bf add id to url 2015-06-18 13:00:50 +02:00
Thomas Müller
a04cb82fd9 Merge pull request #16890 from owncloud/fix-16588 
the user is gone, userExists will not bring him back. But the user's …
 2015-06-18 12:51:06 +02:00
Lukas Reschke
8d4f918671 Merge pull request #16993 from owncloud/verify-if-path-exists 
[master] Verify if path exists
 2015-06-18 10:05:12 +02:00
Jenkins for ownCloud
c4cb34da9d [tx-robot] updated from transifex 2015-06-18 01:55:14 -04:00
Morris Jobke
9a0b0ba488 Merge pull request #16893 from owncloud/fixSlideToggle 
Fix childs of slideToggle not sliding the target
 2015-06-17 16:06:47 +02:00
Jan-Christoph Borchardt
b43bfaf132 fix look of 'Share with me via ownCloud' button, fix wording 2015-06-17 16:05:05 +02:00
Lukas Reschke
414896d8a0 Throw nicer error message instead 500 2015-06-17 15:39:13 +02:00
Lukas Reschke
2d648ed0eb Verify if path exists 
We need to verify if the specified path exists to gracefully prevent errors.
 2015-06-17 15:06:50 +02:00
Jan-Christoph Borchardt
2abedd544b remove unneeded span around Settings text, fixes cursor 2015-06-17 14:37:58 +02:00
Arthur Schiwon
0e522a0b01 delete user test to take getHome into account to ensure it is also deleted subsequently 2015-06-17 14:13:01 +02:00
Bjoern Schiessle
fa16c1f9b4 fix path to owncloud logo 2015-06-17 13:53:59 +02:00
Bjoern Schiessle
ac9733a8b8 make the click actions work 2015-06-17 13:53:59 +02:00
Jan-Christoph Borchardt
4599da9608 federated cloud ID: add icons, fix HTML & layout, fix wording 2015-06-17 13:53:59 +02:00
Bjoern Schiessle
06d0a41915 add social media button for diaspora, twitter, facebook and google+ 2015-06-17 13:53:59 +02:00
Thomas Müller
d2305f2527 Merge pull request #16729 from owncloud/scanner-read-lock 
keep a read lock while scanning a file or folder
 2015-06-17 11:52:54 +02:00
Jenkins for ownCloud
3898b8c9b8 [tx-robot] updated from transifex 2015-06-17 01:55:34 -04:00
Bjoern Schiessle
b645d795d2 add occ tool to delete versions 2015-06-16 16:56:27 +02:00
Morris Jobke
b052eccd9a Merge pull request #16938 from owncloud/ext-s3-opendirduplicate 
Skip directory entry in S3 opendir
 2015-06-16 09:48:10 +02:00
Jenkins for ownCloud
0a5d73b874 [tx-robot] updated from transifex 2015-06-16 01:55:41 -04:00
Vincent Petry
f98030020f Properly set mtime on S3 for touch operation 
The code was missing the "MetadataDirective".
Once added, some other parts of the code failed because the format of mtime was wrong.
So this PR uses the RFC format that the S3 library already uses.

Additionally, the code path where mtime is null was missing. Now defaulting to
the current time.
 2015-06-15 17:35:09 +02:00
Vincent Petry
d3f828af45 Skip directory entry in S3 opendir 
The result set contains the directory itself, so skip it to avoid
scanning a non-existing directory
 2015-06-15 17:30:09 +02:00
Robin Appelman
f02e110aea explain pre-hook scan 2015-06-15 15:43:19 +02:00
Robin Appelman
5efbab4ab8 ensure we dont have to scan a file in the trash wrapper 2015-06-15 14:32:29 +02:00
Thomas Müller
433db48027 Merge pull request #16911 from oparoz/prettier-public-thumbnails 
Determine the size we need before asking for a thumbnail
 2015-06-15 13:30:44 +02:00
Thomas Müller
3ce616fb03 Merge pull request #16885 from owncloud/files-previewurlresolutionrounding 
Truncate preview resolution
 2015-06-15 12:53:05 +02:00
Jenkins for ownCloud
2806c9476c [tx-robot] updated from transifex 2015-06-15 01:54:58 -04:00
Jenkins for ownCloud
fe9b28a800 [tx-robot] updated from transifex 2015-06-14 01:54:49 -04:00
Jenkins for ownCloud
51d181f331 [tx-robot] updated from transifex 2015-06-13 01:55:04 -04:00
Olivier Paroz
7b84343cfc floats are not welcome when setting the size of a preview 2015-06-12 18:56:18 +02:00
Olivier Paroz
8ff4a66f01 Determine the size we need before asking for a thumbnail 
We need to set the size of the preview using the devicePixelRatio and use that as arguments when using the preview endpoint or that endpoint will use the default 36x36 and thumbnails will be blurry on high DPI devices
 2015-06-12 18:50:21 +02:00
Jenkins for ownCloud
abd70932c6 [tx-robot] updated from transifex 2015-06-12 01:55:11 -04:00
Arthur Schiwon
97127cd971 the user is gone, userExists will not bring him back. But the user's folder needs to be deleted anyway 2015-06-11 18:24:45 +02:00
Vincent Petry
d256425aba Truncate preview resolution 
This prevents having float numbers appear in the URL
 2015-06-11 17:17:40 +02:00
Jenkins for ownCloud
88d3c9ad40 [tx-robot] updated from transifex 2015-06-11 01:55:05 -04:00
Thomas Müller
4747c7f509 Merge pull request #16736 from owncloud/utilize-member-of 
Utilize memberOf to boost loading time on users page (depending on LDAP server config)
 2015-06-10 08:47:53 +02:00
Jenkins for ownCloud
4d88302b3a [tx-robot] updated from transifex 2015-06-10 01:54:55 -04:00
Thomas Müller
5f4f7e69cf Merge pull request #16810 from owncloud/disable-search-if-not-implemented 
Disable search field in case there is no search available to the curr…
 2015-06-09 23:49:25 +02:00
Morris Jobke
7550bf0917 Disable video preview if previews are disabled 2015-06-09 17:49:59 +02:00
Thomas Müller
0fde0e6569 Search results have to explicitly be added to the content area of the app 2015-06-09 12:39:40 +02:00
Morris Jobke
bacd5de453 Merge pull request #16811 from espenfjo/master 
Fix regression in preview height calculation
 2015-06-09 09:31:30 +02:00
Jenkins for ownCloud
75bd040f1c [tx-robot] updated from transifex 2015-06-09 01:55:06 -04:00
Bjoern Schiessle
d743d6d356 add hint to exception 2015-06-08 21:16:23 +02:00
Espen Fjellvær Olsen
308b97db4c Fix regression in preview height calculation 
Fix regressions introduced in a672e9d regarding the image height calculation
 2015-06-08 20:57:19 +02:00
Jenkins for ownCloud
2fb1b0864a [tx-robot] updated from transifex 2015-06-08 01:55:01 -04:00
Jenkins for ownCloud
3542148761 [tx-robot] updated from transifex 2015-06-07 01:55:03 -04:00
Jenkins for ownCloud
16708ae187 [tx-robot] updated from transifex 2015-06-06 01:55:26 -04:00
Morris Jobke
62ae39208a Add owner to the storage stats to enable better notifications 
* getstoragestats.php returns now the owner and it's display name
* show proper storage stats notifications for shared folders
 2015-06-05 18:21:41 +02:00
Thomas Müller
9899e10a04 Merge pull request #16753 from owncloud/issue-16752-check-for-existing-user-in-expire-tasks 
Check whether the user exists before trying to set up his file system
 2015-06-05 16:22:03 +02:00
Joas Schilling
bd0b9a0fe0 Add unit tests for non existing users 2015-06-05 13:23:50 +02:00
Thomas Müller
ccbb1cce3c Merge pull request #16718 from owncloud/files-catchajaxexceptions 
Catch exceptions in files ajax calls
 2015-06-05 12:01:01 +02:00
Joas Schilling
4e24486a89 Check whether the user exists before trying to set up his file system 2015-06-05 11:31:49 +02:00
Morris Jobke
c747a58978 Merge pull request #16748 from owncloud/fix-ldap-port-detection-regression 
port detection needs to take care of now thrown exceptions when LDAP …
 2015-06-05 11:10:37 +02:00
Jenkins for ownCloud
e544d5b2c6 [tx-robot] updated from transifex 2015-06-05 01:55:04 -04:00
Arthur Schiwon
6f69fab384 port detection needs to take care of now thrown exceptions when LDAP server is not available 2015-06-04 16:28:48 +02:00
Jenkins for ownCloud
66a24ff479 [tx-robot] updated from transifex 2015-06-04 01:56:24 -04:00
Arthur Schiwon
090478a95e if possible, getUserGroups should get memberships using memberOf virtual attribute 2015-06-03 17:38:27 +02:00
Morris Jobke
a90a84b0a7 Merge pull request #16691 from owncloud/trash-deleteasrecipientkeepversions 
Keep versions when deleting as recipient
 2015-06-03 16:03:31 +02:00
Arthur Schiwon
91841bb25d Implement a faster way for checking availability of memberOf. Users tab in the wizard benefits. 2015-06-03 15:23:37 +02:00
Vincent Petry
263bb46ff8 Catch exceptions in files ajax calls 2015-06-03 14:31:58 +02:00
Joas Schilling
d3e3a84cae Move the helpful method to the TestCase class 2015-06-03 12:33:29 +02:00
Jenkins for ownCloud
410a836702 [tx-robot] updated from transifex 2015-06-03 01:55:29 -04:00
Vincent Petry
61356b5560 Keep versions when deleting as recipient 
The original owner could not be resolved because the original file was
already deleted, so no versions were retained.

This fix passes the owner and path to retainVersions() since it was
already resolved before the file deletion. This reactivates the versions
logic and creates a copy of the versions in each trashbin.
 2015-06-02 17:13:00 +02:00
Lukas Reschke
1cccb227c3 Merge pull request #16686 from owncloud/show_cloud_id 
show federated cloud id in the personal settings
 2015-06-02 17:05:33 +02:00
Morris Jobke
70f0cf67a5 L10n for federated cloud ID and rtrim '/' on ID 2015-06-02 15:16:21 +02:00
Bjoern Schiessle
6e5ed81064 show federated cloud id in the personal settings 2015-06-02 14:09:53 +02:00
Morris Jobke
cf2c599218 Merge pull request #16200 from owncloud/kill-globalfilecache 
Drop file caching
 2015-06-02 09:11:33 +02:00
Jenkins for ownCloud
baca5c60c0 [tx-robot] updated from transifex 2015-06-02 01:56:23 -04:00
Lukas Reschke
418f4e1a90 Bump Dropbox library to newest upstream version 2015-06-01 17:03:46 +02:00
Robin Appelman
661c9e2444 add changeLock to the storage api 2015-06-01 13:24:02 +02:00
Robin Appelman
536e187e51 add locking to the storage api 2015-06-01 13:22:56 +02:00
Vincent Petry
5a38964218 Merge pull request #16629 from owncloud/files-renametoreservedname 
Check target name on rename with web UI
 2015-06-01 11:07:08 +02:00
Lukas Reschke
88ee082115 Merge pull request #16638 from owncloud/fix-handlebars-l10n-method-calls 
Fix files_external l10n
 2015-06-01 09:11:21 +02:00
Jenkins for ownCloud
b1ac538679 [tx-robot] updated from transifex 2015-06-01 01:54:54 -04:00
Jenkins for ownCloud
8d23b34402 [tx-robot] updated from transifex 2015-05-31 01:54:44 -04:00
Morris Jobke
80d4309669 Fix files_external l10n 
* current l10n..pl script can't extract JS functions that are within a handlebars
  template - therefore they are duplicated until the script is fixed
 2015-05-30 14:00:52 +02:00
Jenkins for ownCloud
a3bc112412 [tx-robot] updated from transifex 2015-05-30 01:55:46 -04:00
Vincent Petry
13617c8bf1 Check target name on rename with web UI 
When renaming over the web UI, check early that the target name is
valid.

This prevents nonsensical error messages when renaming to a name with a
trailing backslash.
 2015-05-29 19:30:09 +02:00
Björn Schießle
01a241f711 Merge pull request #16622 from owncloud/versions-cancelexpireforunexistingfiles 
Abort expiration when file is gone
 2015-05-29 15:19:04 +02:00
Vincent Petry
9a6d253af3 Abort expiration when file is gone 
Sometimes a background job for versions expiration was scheduled for a
file that has been moved or deleted since.

This prevents showing useless warnings in the log and simply bail out.
 2015-05-29 13:15:12 +02:00
Thomas Müller
c700f42b68 Merge pull request #16517 from owncloud/remove-logo-wide 
replace logo-wide on share page as well with better icon + text
 2015-05-29 12:15:02 +02:00
Martin
f084eb07f2 Missing translation in ldap part.wizard-server.php 2015-05-29 10:50:02 +02:00
Jenkins for ownCloud
fff0fb66d6 [tx-robot] updated from transifex 2015-05-29 01:56:13 -04:00
Thomas Müller
b95ebb76e5 Merge pull request #16607 from owncloud/ie9-textpreviewfallback 
Fallback to picture preview for IE <= 9
 2015-05-28 20:45:14 +02:00
Thomas Müller
863139c1e2 Merge pull request #16585 from mmattel/Missing_translation_in_External_storage_back_end 
Make string 'SFTP with secret key login' translateable
 2015-05-28 20:42:08 +02:00
Vincent Petry
29c68a4e61 Return 404 in shareinfo.php when outgoing s2s disabled 2015-05-28 17:59:43 +02:00
Vincent Petry
2daef7c7dc Fallback to picture preview for IE <= 9 
IE 9 and below do not provide window.btoa and there is currently no way
to generate base64 strings without introducting further dependencies.

So for now the solution is to fall back to the ugly picture mode for
text files whenever IE <= 9 is used.
 2015-05-28 15:36:28 +02:00
Björn Schießle
e1483f65c3 Merge pull request #16591 from owncloud/enc_improved_error_message 
improved error message for various states
 2015-05-28 10:55:53 +02:00
Jenkins for ownCloud
1726d84e73 [tx-robot] updated from transifex 2015-05-28 01:55:22 -04:00
Bjoern Schiessle
68db3059ee detect migration status 2015-05-27 21:00:02 +02:00
Bjoern Schiessle
5549641f1f improve error messages displayed to the user 2015-05-27 21:00:02 +02:00
Martin
cdbf472c4d Make string 'SFTP with secret key login' translatable 2015-05-27 15:38:05 +02:00
Jenkins for ownCloud
fda0995e4c [tx-robot] updated from transifex 2015-05-27 01:55:34 -04:00
Björn Schießle
9366dde875 Merge pull request #15985 from owncloud/hotfix/fix-encryption-references 
[enc2] fix references to legacy encryption app name
 2015-05-26 17:28:27 +02:00
Vincent Petry
39c6a36488 Merge pull request #16532 from owncloud/cors-no-cookie-auth 
Disallow cookie auth for cors requests
 2015-05-26 12:12:04 +02:00
Jenkins for ownCloud
6198fb20cb [tx-robot] updated from transifex 2015-05-26 01:54:57 -04:00
Jenkins for ownCloud
fe610a65d3 [tx-robot] updated from transifex 2015-05-25 01:55:06 -04:00
Jenkins for ownCloud
06934e7c00 [tx-robot] updated from transifex 2015-05-24 01:55:03 -04:00
Jenkins for ownCloud
e189435499 [tx-robot] updated from transifex 2015-05-23 01:55:05 -04:00
Roeland Jago Douma
41a8f45b93 OCS Share API link shares now always have an url 
To make sure clients have the correct and latest link add an url field
to all OCS Share API return statements on public link shares.

* Added unit tests
 2015-05-22 14:42:57 +02:00
Bernhard Posselt
c8e3599cad disallow cookie auth for cors requests 
testing ...

fixes

fix test

add php doc

fix small mistake

add another phpdoc

remove not working cors annotations from files app
 2015-05-22 14:06:26 +02:00
Jenkins for ownCloud
156881efce [tx-robot] updated from transifex 2015-05-22 01:55:04 -04:00
Jan-Christoph Borchardt
78a0464354 replace logo-wide on share page as well with better icon + text 2015-05-22 00:04:47 +02:00
Jenkins for ownCloud
42dd40ad80 [tx-robot] updated from transifex 2015-05-21 01:55:57 -04:00
Vincent Petry
d560d1ef2a Merge pull request #16469 from oparoz/restore-minheight-for-single-public-previews 
Restore min-height for single previews
 2015-05-20 16:48:27 +02:00
Morris Jobke
39d1e99228 Merge pull request #16322 from owncloud/trash-view 
dont go trough the view when moving to trash
 2015-05-20 14:44:01 +02:00
Morris Jobke
1a67e5cdc3 Merge pull request #16465 from owncloud/s2s-returnpropererrorwhenpublicwebdavdisabled 
Return 401 when accessing public webdav and s2s is disabled
 2015-05-20 14:28:45 +02:00
Olivier Paroz
13ab251c6d Restore min-height for single previews 2015-05-20 14:09:31 +02:00
Vincent Petry
7386257676 Merge pull request #16075 from owncloud/skeleton-copy-delay 
wait with copying the skeleton untill login and setupfs are done
 2015-05-20 13:52:08 +02:00
Vincent Petry
f2a900e04c Return 401 when accessing public webdav and s2s is disabled 2015-05-20 12:19:03 +02:00
Morris Jobke
3a4568313f Merge pull request #16326 from owncloud/fix-16192 
include base dn test in functionality test
 2015-05-20 12:12:52 +02:00