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

5939 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Robin Appelman d75c3d5f9a Fix routes getting lost when loading app routes twice 2014-03-25 14:28:30 +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 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
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