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

6238 commits

Author SHA1 Message Date
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
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
Thomas Müller
e125dc60cd introduce new function to force a language 2014-04-15 15:12:25 +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
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 Tanghus
2fb68c120b Added explanation to mimetypes.list.php to avoid future confusion. 2014-04-14 18:21:19 +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
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
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
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
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
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
Bernhard Posselt
4af72a076d use references for middleware to fix problems on 5.3 2014-04-11 20:50:49 +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
Jenkins for ownCloud
36107e1bad [tx-robot] updated from transifex 2014-04-11 01:55:15 -04: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
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
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
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
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
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
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
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
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
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
Volkan Gezer
a4f42676ea Make hardcoded exception messages translatable 2014-04-08 20:07:25 +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
698297feb3 add optional countUsersInGroup method to group backends 2014-04-08 12:04:38 +02:00
Jenkins for ownCloud
4ad4b9768c [tx-robot] updated from transifex 2014-04-08 01:57:51 -04: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
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
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
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
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
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
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
Jenkins for ownCloud
a9d49de465 [tx-robot] updated from transifex 2014-04-06 01:56:11 -04: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
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
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
Thomas Müller
f029312e5b fixing typos/spellings 2014-04-04 11:37:47 +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
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
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
20f26068e7 Merge pull request #7476 from owncloud/type-hinting 
Type hinting
 2014-04-03 20:02:27 +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
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
Jörn Friedrich Dreyer
b9a8bd7e1f extract more methods 2014-04-02 18:32:32 +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
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
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
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
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
Robin Appelman
9c8596e95b Keep cached urls with different hostnames or baseurls seperate 2014-04-01 15:43:27 +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
371a924c92 merge master into webdav-injection 2014-03-26 14:26:07 +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
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
Thomas Müller
fb7f3008d3 idn have to be converted before being used 2014-03-24 13:46:31 +01:00
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
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
adrien
0da61a26ee remove cache all user 2014-03-21 15:50:25 +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
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
a52bc333a2 Merge pull request #7611 from owncloud/fix-updater 
Use $installedVersion instead of $currentVersion
 2014-03-21 12:16:51 +01: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
6de9033d86 Added warning for Mac OS on setup page 2014-03-20 12:57:55 +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
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
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
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
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
33e96597d1 Merge pull request #7790 from owncloud/fix/7788 
drop file cache migration OC5 -> OC6
 2014-03-19 11:29:50 +01:00
Jenkins for ownCloud
7b1d52f5b9 [tx-robot] updated from transifex 2014-03-19 01:55:39 -04:00