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

19836 commits

This branch
This branch
All branches
Author SHA1 Message Date
Vincent Petry
cc8c1d8e07 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.
 2014-08-14 15:18:49 +02:00
Volkan Gezer
a4b416f115 Merge pull request #10410 from owncloud/typo 
ascii typo
 2014-08-14 12:23:49 +02:00
Björn Schießle
27d94e9273 Merge pull request #10295 from owncloud/file_actions_error_handling 
file actions improved error handling
 2014-08-14 11:44:50 +02:00
Morris Jobke
987a0565fb Merge pull request #10395 from owncloud/close-filehandle-lib-files 
Close open file handles in files library
 2014-08-14 10:57:54 +02:00
Jenkins for ownCloud
67b7160e7b [tx-robot] updated from transifex 2014-08-14 01:55:35 -04:00
Volkan Gezer
46309a9ee4 ascii typo 2014-08-14 00:32:08 +02:00
Thomas Müller
fc462c5edb Merge pull request #10396 from owncloud/kill-filesync 
Kill filesync.php in files/appinfo
 2014-08-13 23:56:59 +02:00
Thomas Müller
6d94fc846d Merge pull request #10394 from owncloud/close-filehandle-lib-image 
Close file handle if exception occurs in image class
 2014-08-13 22:41:33 +02:00
Lukas Reschke
2c8aa3751c Merge pull request #10403 from owncloud/getid-cast-int 
Cast file id's to int so we can compare them properly
 2014-08-13 20:11:08 +02:00
Robin Appelman
bba59bf815 Cast file id's to int so we can compare them properly 2014-08-13 19:18:34 +02:00
blizzz
54491e8c68 Merge pull request #10323 from gekmihesg/master 
Load authentication backends before tryBasicAuth
 2014-08-13 16:08:48 +02:00
Morris Jobke
cad52dbce9 Kill filesync.php in files/appinfo 
* ref comment: https://github.com/owncloud/core/issues/10392#issuecomment-52050567
 2014-08-13 15:58:43 +02:00
Morris Jobke
c6bf51c457 Close open file handles in files library 
ref #10392
 2014-08-13 15:48:32 +02:00
Morris Jobke
f61658945f Close file handle if exception occurs in image class 
ref #10392
 2014-08-13 15:19:58 +02:00
Thomas Müller
9ab0ebbedc Merge pull request #10387 from owncloud/quick_fix_for_unit_tests 
don't clean up the test environment if a data provider was finished
 2014-08-13 15:01:29 +02:00
Vincent Petry
f282a5cff0 Merge pull request #9754 from owncloud/enc_support_aes_256 
[encryption] support aes 256
 2014-08-13 12:34:21 +02:00
Bjoern Schiessle
1e0e870e18 don't clean up the test environment if a data provider was finished 2014-08-13 11:41:11 +02:00
Thomas Müller
fc46fbd154 Merge pull request #10333 from owncloud/tar-55 
Fix Tar support for php >=5.5
 2014-08-13 11:10:18 +02:00
Jenkins for ownCloud
609a52ebe2 [tx-robot] updated from transifex 2014-08-13 01:54:44 -04:00
Morris Jobke
b4fd5fb275 Merge pull request #10377 from owncloud/git-fixes 
fixes from git push force
 2014-08-12 23:15:09 +02:00
Morris Jobke
d4eaa74b76 fixes from git push force 2014-08-12 21:29:05 +02:00
Bjoern Schiessle
c67fee3abd fix broken variable name, recoveryPasswordSupported is now recoveryEnabledForUser 2014-08-12 21:15:55 +02:00
Bjoern Schiessle
53c5a84eac add unit tests 2014-08-12 21:15:39 +02:00
Bjoern Schiessle
da1feafc78 fix detection of system wide mount points 2014-08-12 21:14:22 +02:00
Robin Appelman
174805f5e3 Merge pull request #9762 from owncloud/owner-public 
Return the proper owner for home storages
 2014-08-12 14:29:17 +02:00
Volkan Gezer
e18b0fca47 Merge pull request #10357 from owncloud/l10n-alert-fix 
Fix alert text
 2014-08-12 13:56:33 +02:00
Jenkins for ownCloud
e4221869c2 [tx-robot] updated from transifex 2014-08-12 01:56:16 -04:00
Volkan Gezer
f2a775acb8 Fix alert text 2014-08-12 01:13:30 +02:00
Volkan Gezer
44ec8060a8 Merge pull request #10347 from owncloud/fix-grammar 
Transifex suggestion by mnestis
 2014-08-11 23:35:05 +02:00
Clark Tomlinson
e63853a353 Merge pull request #10335 from owncloud/fix-emptyapplist 
Fix issue when no apps are enabled
 2014-08-11 16:16:18 -04:00
Thomas Müller
3e493501da Merge pull request #9890 from owncloud/check-php-charset-master 
setting and checking default_charset in php.ini to be UTF-8
 2014-08-11 22:11:11 +02:00
Volkan Gezer
4dd9414f2c Transifex suggestion by mnestis 2014-08-11 21:31:15 +02:00
Vincent Petry
a32eac1477 Fix issue when no apps are enabled 
Properly initialize $apps array
 2014-08-11 20:36:51 +02:00
Clark Tomlinson
691306cf4e Removing ini charset override due to shared hosting issues 2014-08-11 12:15:36 -04:00
Björn Schießle
6aa8693198 Merge pull request #10336 from owncloud/fix_share_drop_down 
remove 'no people found' entry in share dialog
 2014-08-11 17:39:04 +02:00
blizzz
c46b60e822 Merge pull request #9848 from dupondje/master 
Fix memberOf detection. Fixes: #9835
 2014-08-11 16:58:30 +02:00
Robin Appelman
482bca1713 Fix Tar support for php >=5.5 2014-08-11 16:56:36 +02:00
Clark Tomlinson
7bc313a0cd Merge pull request #10066 from marc0s/issues/10065-fix-null-check 
Fix checking of NULL or empty OC::$THIRDPARTYROOT/OC::$THIRDPARTYWEBROOT
 2014-08-11 10:44:47 -04:00
Bjoern Schiessle
54b5cecfb8 remove 'no people found' entry 2014-08-11 16:03:47 +02:00
Thomas Müller
13d44f8f7f Merge pull request #10251 from owncloud/fix-dav-attributes-master 
shared files/folders are not mounted
 2014-08-11 14:40:47 +02:00
Jean-Louis Dupond
e46fc7a18a Fix initializing in #9848 2014-08-11 13:50:13 +02:00
Vincent Petry
79fa2bc391 Merge pull request #10301 from owncloud/fix-internal-mail-share-links 
Don't use /Shared as a base for links in share email
 2014-08-11 13:33:39 +02:00
Jörn Friedrich Dreyer
de9fe3a8d4 Merge pull request #10096 from owncloud/fix-6971-master 
in case $_POST['itemSourceName'] does not exist we simply default it to ...
 2014-08-11 13:32:16 +02:00
Robin Appelman
86ae3bd1e7 Merge pull request #10303 from owncloud/sharing-breadcrumb-folder-name 
use OC_Util::basename
 2014-08-11 13:10:45 +02:00
Thomas Müller
b83d00f847 Merge pull request #10249 from mroi/patch-1 
file size on non-(Linux/BSD/Windows)-installations
 2014-08-11 13:02:01 +02:00
Thomas Müller
c42ce20054 Merge pull request #10312 from owncloud/fix-old-japanese 
fix old Japanese language code redirection
 2014-08-11 12:55:39 +02:00
Bjoern Schiessle
bc8e1ebf75 new unit test added 2014-08-11 12:03:08 +02:00
Bjoern Schiessle
5b75b15292 no error if we try to delete a file which no longer exists 2014-08-11 12:03:08 +02:00
Bjoern Schiessle
5bbecdb9ee no special action for folder named 'Shared' needed 2014-08-11 12:03:08 +02:00
Bjoern Schiessle
b3cff4beb6 add error message if user wants to rename a file which no longer exists 2014-08-11 12:03:08 +02:00