9fb9684da7
Merge pull request #7646 from owncloud/fix_ocs_api_unshare
...
we need the file_source to delete a share successfully
2014-03-10 16:06:17 +01: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 +01:00
5ddabd7cd0
fix mimetype detection, introduce fake etag to identify preview images
2014-03-10 15:13:28 +01:00
4562909a20
get trash size from file cache
2014-03-10 15:13:28 +01:00
abad625cac
only enable previews if the encryption is disabled
2014-03-10 15:13:28 +01:00
eab844e226
if file is not in db, fall back to restore file to the users root
2014-03-10 15:13:28 +01: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 +01:00
4a2b16d76d
update copyright header
2014-03-10 14:40:05 +01:00
26793e1f94
switch OC::getRouter usages to OC::$server->getRouter
2014-03-10 14:06:47 +01:00
8ab7d18a6a
Move the router classes to a namespace and expose it with a public interface
2014-03-10 14:04:58 +01:00
0ffd32a1ae
Merge pull request #7629 from owncloud/files-allfileswarningtypo
...
Fixed log warning when deleting a single file
2014-03-10 11:40:28 +01:00
9548670da7
we need the file_source to delete a share successfully
2014-03-10 11:35:54 +01:00
92df8deb0a
Merge pull request #7631 from ichEben/master
...
[6.0.2RC1] Share folder as link -- no public upload, drag&drop still works #7422
2014-03-10 10:04:54 +01: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 +01:00
212699e389
Merge pull request #7628 from owncloud/fileinfo-type
...
Fix FileInfo->getType errors
2014-03-09 23:34:01 +01:00
9a31e53313
Merge pull request #7567 from owncloud/apps-scroll-settings
...
restrict height of settings and make scrollable
2014-03-09 01:22:51 +01:00
25f523680a
fixing ident
2014-03-07 20:06:06 +01: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 +01:00
e7d5715114
only initialise upload dropZone if public upload is allowed
2014-03-07 17:45:24 +01:00
51165a1a04
Check if value exists before returning
2014-03-07 15:16:35 +01:00
5671aac5ca
Fixed log warning when deleting a single file
2014-03-07 15:03:35 +01: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 +01:00
65f52fee4f
Fix FileInfo->getType errors
2014-03-07 14:52:44 +01:00
3eb58d9973
Merge pull request #7529 from owncloud/getlocalfile-cache
...
Add caching for getLocalFile on remote storages
2014-03-07 13:29:47 +01:00
7f24d42ca5
Propagate unencrypted_size up to the file cache root
2014-03-07 11:00:22 +01: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 +01: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 +01: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 +01:00
242cbb802a
Reset time of last update feed polling
2014-03-06 18:19:58 +03:00
e08dbf80dc
fix: use print_escaped for radio button "checked"
...
use of p() results in escaped HTML code: checked="checked"
where it should be: checked="checked"
2014-03-06 16:03:00 +01:00
256dca935b
Revert "adding new javascript function OC.generateUrl(url, params)"
...
This reverts commit 8e667d1934
2014-03-06 15:10:32 +01:00
5f0a22586f
Merge pull request #7579 from owncloud/introduce-generateUrl-master
...
Introduce OC.generateUrl() in master
2014-03-06 15:07:28 +01:00
6e4ea09d52
Merge pull request #7494 from owncloud/fix-7307
...
Replace OC.Router.generate() with OC.generateUrl()
2014-03-06 14:49:12 +01:00
bfd0d799d8
Merge pull request #7570 from owncloud/fix_issue_imagick_non_static_4
...
fix issue with Non-static method Imagick ../..; @ doesn't seem to work in this case
2014-03-06 14:11:44 +01:00
a2e4452ed3
Merge pull request #7588 from owncloud/noise-repeat
...
fix noise not repeating
2014-03-06 14:08:46 +01:00
0dcac65aa1
Fixed upload issue when free space is not known
2014-03-06 13:53:55 +01:00
07f78c8248
Added unit tests for "add()" method for file upload
...
- Added OC.Upload.init() to make the code testable
- Added unit tests for the add() method of the uploader with some error
cases
2014-03-06 13:53:34 +01:00
e129f6845b
Added testArea for JS Unit tests
...
Added a testArea that is outside the viewport but still considered as
visible from the jQuery code.
The testArea is useful when:
- tested code tries to access DOM elements using global ids
- tested code is requiring some UI elements to be visible to activate
themselves
2014-03-06 12:50:18 +01:00
0b0687c9fc
fix noise not repeating
2014-03-06 12:38:11 +01:00
eb5265b106
fix merge conflicts
2014-03-06 11:55:45 +01:00
9136e6ad30
Fixed X-Forwarded-Host parsing
2014-03-06 11:51:25 +01:00
c7e204bd36
Added unit tests for serverHost and other related functions
2014-03-06 11:51:17 +01:00
f8fe2753b1
Added localhost as trusted domain
2014-03-06 11:51:10 +01: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 +01:00
b46517f012
adding js unit tests for OC.generateUrl()
2014-03-06 00:26:57 +01:00
8e667d1934
adding new javascript function OC.generateUrl(url, params)
2014-03-06 00:17:48 +01:00
32b29c9d73
Merge branch 'master' into fix-7307
...
Conflicts:
core/js/router.js
settings/js/admin.js
2014-03-06 00:15:08 +01:00
1785c0c9b9
Merge pull request #7575 from owncloud/issue/7571
...
Do not set #dir when on public.php
2014-03-05 19:57:25 +01: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 +01:00
1ab10cb4f7
Do not set #dir when on public.php
...
Fix #7571
2014-03-05 18:46:55 +01:00
Thomas Müller
Vincent Petry
Bjoern Schiessle
Robin Appelman
Thomas Tanghus
Jan-Christoph Borchardt
IchEben
icewind1991
Victor Dubiniuk
ideaship
Morris Jobke
Georg Ehrke
Lukas Reschke
Joas Schilling