Vincent Petry
26513bc17b
Merge pull request #7624 from owncloud/enc-encryptedusedspacefix
...
[master] Fixed used space to be based on unencrypted size
2014-03-10 09:38:24 +01:00
Thomas Tanghus
212699e389
Merge pull request #7628 from owncloud/fileinfo-type
...
Fix FileInfo->getType errors
2014-03-09 23:34:01 +01:00
Robin Appelman
51165a1a04
Check if value exists before returning
2014-03-07 15:16:35 +01:00
Vincent Petry
48d63a6278
Return unencrypted_size of folder when queried
...
This fixes the "used space" to be based on the unencrypted size, not
encrypted size, to be consistent with how quota/space is handled when
encryption is enabled
2014-03-07 14:59:09 +01:00
Robin Appelman
65f52fee4f
Fix FileInfo->getType errors
2014-03-07 14:52:44 +01:00
icewind1991
3eb58d9973
Merge pull request #7529 from owncloud/getlocalfile-cache
...
Add caching for getLocalFile on remote storages
2014-03-07 13:29:47 +01:00
Vincent Petry
7f24d42ca5
Propagate unencrypted_size up to the file cache root
2014-03-07 11:00:22 +01:00
Vincent Petry
ba3f5fe53a
Merge pull request #7583 from owncloud/trusteddomainerrorpage
...
[master] Show warning page when accessing server from an untrusted domain
2014-03-07 10:37:16 +01:00
Vincent Petry
536c33895f
Merge pull request #7592 from owncloud/fixstoragefreespace
...
Fixed upload issue when free space is not known (ex: FTP)
2014-03-06 17:22:40 +01:00
Vincent Petry
1b8cf18c91
Merge pull request #7182 from owncloud/imagerotate_and_loadbase64_fix
...
Fix imagerotate and move loadFromBase64() one up
2014-03-06 17:18:17 +01:00
Vincent Petry
6e4ea09d52
Merge pull request #7494 from owncloud/fix-7307
...
Replace OC.Router.generate() with OC.generateUrl()
2014-03-06 14:49:12 +01:00
Vincent Petry
0dcac65aa1
Fixed upload issue when free space is not known
2014-03-06 13:53:55 +01:00
Georg Ehrke
eb5265b106
fix merge conflicts
2014-03-06 11:55:45 +01:00
Vincent Petry
9136e6ad30
Fixed X-Forwarded-Host parsing
2014-03-06 11:51:25 +01:00
Vincent Petry
f8fe2753b1
Added localhost as trusted domain
2014-03-06 11:51:10 +01:00
Vincent Petry
421cff00bd
Show warning page when accessing server from an untrusted domain
...
Added early check for the requested domain host and show a warning
page if the domain is not trusted.
2014-03-06 11:51:08 +01:00
Thomas Müller
32b29c9d73
Merge branch 'master' into fix-7307
...
Conflicts:
core/js/router.js
settings/js/admin.js
2014-03-06 00:15:08 +01:00
Lukas Reschke
e3156fa5ad
Merge pull request #7354 from pschmitt/master
...
Use 'command -v' to detect whether and where software is installed (instead of 'which')
2014-03-05 19:25:09 +01:00
Björn Schießle
9111af0478
Merge pull request #7531 from owncloud/dont_create_shared_folder
...
don't allow to create a file or folder named 'Shared' in the root folder
2014-03-05 18:13:31 +01:00
Georg Ehrke
dbf83aada2
fix issue with Non-static method Imagick ../..; @ doesn't seem to work in this case
2014-03-05 15:57:45 +01:00
Georg Ehrke
32a5d51fa6
add fclose, fixes issue from bdb96b9af8
2014-03-05 15:37:26 +01:00
Georg Ehrke
bdb96b9af8
fix issue with spamming logging files when loading cached thumbnail
2014-03-05 13:20:50 +01:00
Bjoern Schiessle
2e73c957e5
don't allow to create a file or folder named 'Shared' in the root folder, also exclude all combinations of lower and upper case letters
2014-03-05 13:16:25 +01:00
Thomas Müller
7edd8df07f
Merge pull request #7521 from owncloud/docstrings_2_kondou
...
Fix some more docstrings
2014-03-05 00:40:49 +01:00
Tom Needham
9986b470ee
Merge pull request #7251 from owncloud/fix-ocsapi-getuser
...
Add displayname for admins on external api
2014-03-04 15:37:45 +00:00
Vincent Petry
620dd4afbd
Merge pull request #7481 from tripflex/fix_downloadlink_spaces
...
replace spaces in download link without encoding entire URL
2014-03-04 16:33:41 +01:00
Robin Appelman
a8c67dc675
Add caching for getLocalFile on remote storages
2014-03-04 15:44:58 +01:00
Vincent Petry
ad195a881e
Merge pull request #7453 from owncloud/preview-fileinfo
...
Cache the fileinfo in OC\Preview
2014-03-03 18:52:25 +01:00
kondou
5e3b6f1fd9
Fix some more docstrings
2014-03-03 17:32:29 +01:00
Frank Karlitschek
7983c90fdc
Merge pull request #7500 from owncloud/theme-mailtemplate
...
Enable theming of the mail template header
2014-03-03 17:22:33 +01:00
Vincent Petry
79ae3c4527
Allow XML entity loader for MDB2 schema loader
...
Forward port of 762b0d9
from stable6 to master
2014-03-03 14:17:51 +01:00
Jan-Christoph Borchardt
b8d0fc9494
make mail notification header color themable
2014-03-03 12:43:22 +01:00
Thomas Müller
1291303c5a
Replace OC.Router.generate() with OC.generateUrl()
2014-03-02 22:30:24 +01:00
kondou
5d5306175f
Fix some docstrings in l10n.php
2014-03-01 03:38:35 +01:00
Myles McNamara
195bdff91f
move replace to inside isset
2014-02-28 11:19:19 -05:00
Myles McNamara
4ab7f58745
replace spaces in download link without encoding entire URL
2014-02-28 11:15:49 -05:00
Thomas Müller
dd32091016
Merge pull request #7444 from owncloud/fix/7443
...
remove unused code and fix wrong variable names - some PHPDoc updated
2014-02-28 14:48:21 +01:00
Morris Jobke
d3866754a4
Merge pull request #7471 from owncloud/fix-css-loading
...
CSS is now loaded directly instead via PHP
2014-02-28 14:19:36 +01:00
icewind1991
8a93a2e7d5
Merge pull request #7455 from owncloud/rawlist-fileinfo
...
Update rawlist to work with new fileinfo object
2014-02-28 12:36:56 +01:00
Lukas Reschke
4c4bb70cb6
CSS is now loaded directly instead via PHP
...
269f24cf96
was not changed in setup.php which prevented loading of CSS files in some environments (e.g. my local setup) for apps.
2014-02-28 11:14:18 +01:00
Morris Jobke
49b331be39
add BMP mimetype for BMP previews
2014-02-27 14:39:16 +01:00
Robin Appelman
7c92e2e3ad
Update rawlist to work with new fileinfo object
2014-02-27 14:04:19 +01:00
Robin Appelman
8282cfff04
Cache the fileinfo in OC\Preview
2014-02-27 13:15:18 +01:00
Vincent Petry
22adc397de
Also quote old column name during DB migration
...
This fixes alter table commands that didn't quote the old column name
2014-02-27 09:09:16 +01:00
Thomas Müller
ab850b961d
remove unused code and fix wrong variable names - some PHPDoc updated
2014-02-26 23:56:46 +01:00
icewind1991
59df3ffdf4
Merge pull request #7279 from owncloud/folderid-reuse
...
Reuse the folder id in View->getFolderContents
2014-02-26 12:18:34 +01:00
Jan-Christoph Borchardt
8759c35e74
Merge pull request #7399 from owncloud/themable-doc-links
...
introduce new theme function to allow full creation of documentation lin...
2014-02-26 12:04:52 +01:00
Vincent Petry
5c98e0c7c7
Merge pull request #7328 from owncloud/McNetic-zipstreamer
...
McNetic zipstreamer
2014-02-26 10:19:12 +01:00
Thomas Müller
574883c47a
introduce new theme function to allow full creation of documentation links: buildDocLinkToKey()
2014-02-25 23:06:23 +01:00
Vincent Petry
7f7d674c2a
Merge pull request #7335 from owncloud/fix-7333
...
Fix code to search for mount.json in custom data folders
2014-02-25 15:27:47 +01:00