mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
17,013 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

5966 Commits

Author SHA1 Message Date
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
Thomas Müller 20f26068e7 Merge pull request #7476 from owncloud/type-hinting 
Type hinting
 2014-04-03 20:02:27 +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 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
Jenkins for ownCloud 73dd5ff26c [tx-robot] updated from transifex 2014-04-02 01:56:39 -04: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
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
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
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
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
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
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
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
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
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
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
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
Thomas Tanghus c14107550d Use UrlGenerator in OC\Util::redirectToDefaultPage(). Fix #7936 2014-03-28 18:05:48 +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 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
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
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
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
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
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 93b984ecf8 css files are not to be routed through index.php anymore 2014-03-26 15:36:55 +01:00
Robin Appelman 9b2bb7c6ab fix undefined index warning in router 2014-03-26 13:02:11 +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
Jenkins for ownCloud 75d8de378c [tx-robot] updated from transifex 2014-03-26 01:56:21 -04: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