blizzz
|
6a747106db
|
Merge pull request #6150 from owncloud/backgroundjob-log-exception
Remove background jobs that are giving errors
|
2013-12-06 11:56:53 -08:00 |
Vincent Petry
|
123bc9921a
|
Merge pull request #6201 from owncloud/backgroundscan-reuse-etag
reuse etags when doing a background scan
|
2013-12-06 10:13:14 -08:00 |
Robin Appelman
|
9eca2471b3
|
Merge branch 'master' into backgroundscan-reuse-etag
|
2013-12-06 18:27:46 +01:00 |
Bart Visscher
|
4c8bc61753
|
XSendfile and encryption don't work together
The file on disk is encrypted, and not readable on client systems
|
2013-12-06 17:59:59 +01:00 |
|
Bart Visscher
|
6aa9daf4e6
|
Users of getFolderContent are mostly interested in the unecrypted file size
|
2013-12-06 15:51:49 +01:00 |
Björn Schießle
|
b18c8e5c53
|
Merge pull request #6206 from owncloud/sharing_etag_propagation_on_expire
Sharing etag propagation on expire
|
2013-12-06 05:41:08 -08:00 |
Morris Jobke
|
9c4bbf9ad7
|
Revert "Revert "Fix user's displayName being overwritten by (old) cookie""
This reverts commit eba35d28cd.
|
2013-12-05 20:53:11 +01:00 |
Bjoern Schiessle
|
3f7aac1a79
|
add a optional parameter to skip check for expired files, this is necessary to find out to whom a file was shared after it was expired.
|
2013-12-05 17:29:15 +01:00 |
|
Morris Jobke
|
eba35d28cd
|
Revert "Fix user's displayName being overwritten by (old) cookie"
This reverts commit 2a7380cc21.
|
2013-12-05 16:12:46 +01:00 |
|
Robin Appelman
|
01ab15a2b0
|
reuse etags when doing a background scan
|
2013-12-05 15:23:34 +01:00 |
Nico Kaiser
|
2a7380cc21
|
Fix user's displayName being overwritten by (old) cookie
|
2013-12-05 14:18:32 +01:00 |
Jenkins for ownCloud
|
7e702f294f
|
[tx-robot] updated from transifex
|
2013-12-04 18:14:17 -05:00 |
|
Morris Jobke
|
d73875b2b4
|
Merge pull request #6169 from owncloud/php_version_warning
PHP version warning
|
2013-12-04 01:49:54 -08:00 |
Frank Karlitschek
|
61296ed7bb
|
lower required php version to 5.3.3
|
2013-12-04 10:25:22 +01:00 |
|
Frank Karlitschek
|
8fdbb98899
|
Merge pull request #6168 from owncloud/extstorage-testtestmethod
Added unit test for the test() method of ext storage
|
2013-12-03 11:00:49 -08:00 |
|
Thomas Müller
|
16eb7c15d2
|
Merge pull request #6076 from owncloud/fix-6073-master
Correct property name. It's just 'tableprefix', without the 'db' prefix.
|
2013-12-03 08:21:45 -08:00 |
|
Vincent Petry
|
6cf9844e9c
|
Added unit test for the test() method
This is to make sure that method isn't broken
|
2013-12-03 14:35:53 +01:00 |
|
Frank Karlitschek
|
b83e891456
|
Merge pull request #5929 from owncloud/code_check_on
switch code checker on by default. apps are not allowed to access
|
2013-12-03 01:14:35 -08:00 |
|
Thomas Müller
|
a999350f69
|
Merge pull request #6158 from owncloud/rmdir-check
check if a directory exists before we try to remove it
|
2013-12-02 15:14:41 -08:00 |
|
Jenkins for ownCloud
|
83ec234f53
|
[tx-robot] updated from transifex
|
2013-12-02 17:28:29 -05:00 |
|
Robin Appelman
|
64bfcbee0a
|
check if a directory exists before we try to remove it
|
2013-12-02 22:44:28 +01:00 |
|
Robin Appelman
|
4f4ad72460
|
remove background jobs if they are failing
|
2013-12-02 13:43:26 +01:00 |
|
Robin Appelman
|
35bb6f7e3a
|
Catch exceptions from background jobs and log them
|
2013-12-02 13:41:47 +01:00 |
|
Thomas Mueller
|
87e795a693
|
fixing PHPDoc and spelling
|
2013-12-02 08:42:28 +01:00 |
|
Thomas Müller
|
832be7c908
|
Merge pull request #6052 from owncloud/datetime-doctrine
Get rid of date strings for DB. Completely use Doctrine and DateTime.
|
2013-12-01 01:29:35 -08:00 |
|
Jenkins for ownCloud
|
1b18c5a047
|
[tx-robot] updated from transifex
|
2013-11-29 14:10:40 -05:00 |
|
Frank Karlitschek
|
3c62de90fd
|
Merge pull request #6129 from owncloud/chunking-fixtouchafterassemble
Fixed touch after chunk assembling
|
2013-11-29 09:19:51 -08:00 |
|
Vincent Petry
|
80d2371f97
|
Fixed touch after chunk assembling
Fixed touch after chunk assembling which was using the wrong path,
resulting in the creation of an extra file.
Fixes #6007
|
2013-11-29 16:29:35 +01:00 |
|
Frank Karlitschek
|
7ca0de9bd3
|
make 5.3.8 the minimum supported version. This fixes several issues with broken PHP versions like: https://github.com/owncloud/core/issues/5734
Also make the version compare clearer. It was pure luck that floatval on a php version returned the correct value.
|
2013-11-29 15:46:10 +01:00 |
|
Frank Karlitschek
|
a03ba06dcd
|
Merge pull request #6077 from owncloud/fix-api-documentation
API doc for contacts manager, server container and share
|
2013-11-29 03:24:19 -08:00 |
|
Morris Jobke
|
41a1a32e5a
|
Merge pull request #6099 from owncloud/fix_source_not_found_warnings
make sure that we don't try to access an already deleted files
|
2013-11-28 12:59:24 -08:00 |
|
Morris Jobke
|
0cbe9d79ba
|
Merge pull request #6106 from owncloud/fix_preview_creation
Fix preview creation
|
2013-11-28 12:48:19 -08:00 |
|
Bjoern Schiessle
|
466ed01e5d
|
correctFolder() already resolves the dirname internally
|
2013-11-28 19:25:49 +01:00 |
|
Bjoern Schiessle
|
bdfef554c4
|
add PHPDoc for setMimetype()
|
2013-11-28 19:05:43 +01:00 |
|
Bjoern Schiessle
|
eeb31420fe
|
we need to be able to set the mimetype manually
|
2013-11-28 18:52:58 +01:00 |
|
Bjoern Schiessle
|
eaedda2116
|
make sure that we don't try to access an already deleted files, fixes some file source not found warnings
|
2013-11-28 13:31:08 +01:00 |
|
Frank Karlitschek
|
dab3629ff5
|
Merge pull request #6089 from owncloud/files-mimetyperefreshafterrename
Redetect mime type whenever extension is renamed
|
2013-11-28 03:46:42 -08:00 |
Andreas Fischer
|
93b0bd0a9e
|
Use getLastError() everywhere.
|
2013-11-28 12:05:46 +01:00 |
|
Andreas Fischer
|
904573d0d0
|
Add getLastError()
|
2013-11-28 12:04:28 +01:00 |
|
Andreas Fischer
|
955127231a
|
No function as oci_last_error. It's oci_error.
|
2013-11-28 11:37:29 +01:00 |
|
Andreas Fischer
|
fcf332abbf
|
There is no property such as dbusername. It's 'dbuser'.
|
2013-11-28 11:33:49 +01:00 |
|
Andreas Fischer
|
b90f88f939
|
Correct property name. It's 'dbpassword', with the 'db' prefix.
|
2013-11-28 11:33:43 +01:00 |
|
Andreas Fischer
|
005c98e46c
|
Correct property name. It's just 'tableprefix', without the 'db' prefix.
|
2013-11-28 11:23:45 +01:00 |
|
Frank Karlitschek
|
d2567129a1
|
Merge pull request #6072 from owncloud/mssql-fix-schema-migration-oc6
on mssql the schema migration sometimes fails due to an already existing...
|
2013-11-28 02:16:16 -08:00 |
|
Thomas Müller
|
f23d641b82
|
Merge pull request #6084 from owncloud/fix-app-routing
fix custom routes defined by apps
|
2013-11-28 00:00:09 -08:00 |
|
Vincent Petry
|
43b1cf7988
|
Redetect mime type whenever extension is renamed
|
2013-11-27 21:34:51 +01:00 |
|
Robin Appelman
|
885d04bc86
|
Fix getRawPathInfo for the '/' edge case
|
2013-11-27 21:28:54 +01:00 |
|
Morris Jobke
|
39f9e16f20
|
Merge pull request #6086 from owncloud/incognito_mode
return false if user is in incognito mode
|
2013-11-27 09:11:18 -08:00 |
|
Jenkins for ownCloud
|
4a78f12682
|
[tx-robot] updated from transifex
|
2013-11-27 12:10:54 -05:00 |
|
Bjoern Schiessle
|
6deda1b9f6
|
return false if user is in incognito mode
|
2013-11-27 16:52:30 +01:00 |