9fe5033f1e
PHPDoc updated
2014-03-10 17:15:19 +07:00
41f814515e
Merge branch 'master' into close-session-faster-master
2014-03-10 17:00:09 +07:00
4fdf7682c9
Merge pull request #7398 from owncloud/trash_dont_rely_on_db
...
[trash] fall back if file is not in db
2014-03-10 16:04:47 +07:00
a074adb2af
fix close() implementation in \OC\Session\Internal
2014-03-10 15:36:20 +07:00
4562909a20
get trash size from file cache
2014-03-10 15:13:28 +07:00
3c5185edab
Merge pull request #7632 from owncloud/fix-7582-master
...
we first shall check if the current session is valid - otherwise the ses...
2014-03-10 15:10:19 +07:00
f0603a971d
close the session for all DAV calls right after authentication - no need to write to the session afterwards
2014-03-10 14:40:36 +07:00
73a1ece753
adding an explicit close method to class session - write operations (set and remove) being called after close() will throw an exception
2014-03-10 14:21:12 +07:00
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 +07:00
212699e389
Merge pull request #7628 from owncloud/fileinfo-type
...
Fix FileInfo->getType errors
2014-03-09 23:34:01 +07:00
25f523680a
fixing ident
2014-03-07 20:06:06 +07:00
0d90b90d94
we first shall check if the current session is valid - otherwise the session-id will be regenerated on login via basic auth
2014-03-07 20:00:34 +07:00
51165a1a04
Check if value exists before returning
2014-03-07 15:16:35 +07:00
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 +07:00
65f52fee4f
Fix FileInfo->getType errors
2014-03-07 14:52:44 +07:00
3eb58d9973
Merge pull request #7529 from owncloud/getlocalfile-cache
...
Add caching for getLocalFile on remote storages
2014-03-07 13:29:47 +07:00
7f24d42ca5
Propagate unencrypted_size up to the file cache root
2014-03-07 11:00:22 +07:00
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 +07:00
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 +07:00
1b8cf18c91
Merge pull request #7182 from owncloud/imagerotate_and_loadbase64_fix
...
Fix imagerotate and move loadFromBase64() one up
2014-03-06 17:18:17 +07:00
6e4ea09d52
Merge pull request #7494 from owncloud/fix-7307
...
Replace OC.Router.generate() with OC.generateUrl()
2014-03-06 14:49:12 +07:00
0dcac65aa1
Fixed upload issue when free space is not known
2014-03-06 13:53:55 +07:00
eb5265b106
fix merge conflicts
2014-03-06 11:55:45 +07:00
9136e6ad30
Fixed X-Forwarded-Host parsing
2014-03-06 11:51:25 +07:00
f8fe2753b1
Added localhost as trusted domain
2014-03-06 11:51:10 +07:00
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 +07:00
32b29c9d73
Merge branch 'master' into fix-7307
...
Conflicts:
core/js/router.js
settings/js/admin.js
2014-03-06 00:15:08 +07:00
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 +07:00
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 +07:00
dbf83aada2
fix issue with Non-static method Imagick ../..; @ doesn't seem to work in this case
2014-03-05 15:57:45 +07:00
32a5d51fa6
add fclose, fixes issue from bdb96b9af8
2014-03-05 15:37:26 +07:00
bdb96b9af8
fix issue with spamming logging files when loading cached thumbnail
2014-03-05 13:20:50 +07:00
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 +07:00
7edd8df07f
Merge pull request #7521 from owncloud/docstrings_2_kondou
...
Fix some more docstrings
2014-03-05 00:40:49 +07:00
9986b470ee
Merge pull request #7251 from owncloud/fix-ocsapi-getuser
...
Add displayname for admins on external api
2014-03-04 15:37:45 +07:00
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 +07:00
a8c67dc675
Add caching for getLocalFile on remote storages
2014-03-04 15:44:58 +07:00
ad195a881e
Merge pull request #7453 from owncloud/preview-fileinfo
...
Cache the fileinfo in OC\Preview
2014-03-03 18:52:25 +07:00
5e3b6f1fd9
Fix some more docstrings
2014-03-03 17:32:29 +07:00
7983c90fdc
Merge pull request #7500 from owncloud/theme-mailtemplate
...
Enable theming of the mail template header
2014-03-03 17:22:33 +07:00
79ae3c4527
Allow XML entity loader for MDB2 schema loader
...
Forward port of 762b0d9
2014-03-03 14:17:51 +07:00
b8d0fc9494
make mail notification header color themable
2014-03-03 12:43:22 +07:00
1291303c5a
Replace OC.Router.generate() with OC.generateUrl()
2014-03-02 22:30:24 +07:00
084050530c
Merge pull request #7486 from owncloud/l10n_docstrings
...
Fix some docstrings in l10n.php
2014-03-01 10:38:48 +07:00
eff7667d26
Merge pull request #7433 from owncloud/config_basic_auth
...
Config to disable basic_auth username checking
2014-03-01 06:08:32 +07:00
5d5306175f
Fix some docstrings in l10n.php
2014-03-01 03:38:35 +07:00
195bdff91f
move replace to inside isset
2014-02-28 11:19:19 +07:00
4ab7f58745
replace spaces in download link without encoding entire URL
2014-02-28 11:15:49 +07:00
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 +07:00
d3866754a4
Merge pull request #7471 from owncloud/fix-css-loading
...
CSS is now loaded directly instead via PHP
2014-02-28 14:19:36 +07:00
Thomas Müller
Vincent Petry
Bjoern Schiessle
Thomas Tanghus
Robin Appelman
icewind1991
Georg Ehrke
Lukas Reschke
Tom Needham
kondou
Frank Karlitschek
Jan-Christoph Borchardt
Morris Jobke
Myles McNamara