Arthur Schiwon
f26ba5846d
coding style
2013-12-13 16:58:16 +01:00
Arthur Schiwon
dcfda5c2a9
coding style
2013-12-13 16:58:09 +01:00
Arthur Schiwon
91d6a6dd7c
On webdav sesssions, loginname was compared to username which does not need to match necessarily
2013-12-13 16:58:03 +01:00
Jörn Friedrich Dreyer
6408125edc
rely only on php DateTime to parse the db datetime string
2013-12-13 16:38:05 +01:00
Vincent Petry
ad998c1fb5
Merge pull request #6390 from owncloud/migration-fixwebroot
...
Fix webroot for update page
2013-12-13 05:35:29 -08:00
Vincent Petry
df1a404466
Fix webroot for update page
...
On the update page, config.js was missing which caused oc_webroot to not
be available. That would trigger the faulty oc_webroot fallback that
didn't take URLs like "/owncloud/index.php/files/apps" into account.
This fix adds config.js in the update page and also a fix for the
oc_webroot fallback, in case it is used elsewhere.
2013-12-13 12:56:48 +01:00
Thomas Müller
7b30ffbf23
Merge pull request #6318 from owncloud/gethome-cache
...
cache the home folder of a User
2013-12-13 01:30:43 -08:00
Robin Appelman
f23b7a262f
fix fallback overwriting result of getHome
2013-12-12 12:57:25 +01:00
Robin Appelman
366d75e947
cache the home folder of a User
2013-12-11 16:22:26 +01:00
Andreas Fischer
cdd182ce35
Send "SET NAMES utf8" to MySQL for PHP below 5.3.6
2013-12-11 00:19:51 +01:00
Jenkins for ownCloud
6aab1ebf44
[tx-robot] updated from transifex
2013-12-09 06:40:22 -05:00
blizzz
bc3650e48c
Merge pull request #6231 from owncloud/fix-plural-l10n
...
fix plural translation - fixes #6226
2013-12-09 01:41:06 -08:00
Jenkins for ownCloud
079d20a80e
[tx-robot] updated from transifex
2013-12-07 22:28:29 -05:00
Morris Jobke
4c4c9096c4
fix plural translation - fixes #6226
2013-12-07 11:38:01 +01:00
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