blizzz
fede36d515
Merge pull request #6308 from owncloud/fix_webdav_session_login_user_comparison
...
Fix webdav session login user comparison
2013-12-13 07:56:28 -08:00
Vincent Petry
527a16852e
Merge pull request #6367 from owncloud/fix_expiration_date_conversion
...
rely only on php DateTime to parse the db datetime string
2013-12-13 07:36:30 -08:00
Vincent Petry
dd7b074dfa
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.
Backport of df1a404
2013-12-13 14:36:35 +01:00
Jörn Friedrich Dreyer
f8088ecd29
rely only on php DateTime to parse the db datetime string
2013-12-12 19:09:21 +01:00
Andreas Fischer
66af605697
Send "SET NAMES utf8" to MySQL for PHP below 5.3.6
2013-12-12 12:26:17 -05:00
Arthur Schiwon
c770089b50
coding style
2013-12-11 14:01:48 +01:00
Arthur Schiwon
afaac05f61
coding style
2013-12-11 13:57:02 +01:00
Arthur Schiwon
aba8199a82
On webdav sesssions, loginname was compared to username which does not need to match necessarily
2013-12-11 13:56:45 +01:00
Morris Jobke
2417c8a49e
fix plural translation - fixes #6226
2013-12-09 10:41:51 +01:00
Robin Appelman
e78a309111
remove background jobs if they are failing
2013-12-06 20:57:58 +01:00
Robin Appelman
46a4ad4f3c
Catch exceptions from background jobs and log them
2013-12-06 20:57:52 +01:00
Robin Appelman
713651738c
reuse etags when doing a background scan
2013-12-06 19:19:10 +01:00
Bart Visscher
1475245465
XSendfile and encryption don't work together
...
The file on disk is encrypted, and not readable on client systems
2013-12-06 19:07:22 +01:00
Bart Visscher
a2bbbb1448
Users of getFolderContent are mostly interested in the unecrypted file size
2013-12-06 19:06:42 +01:00
Bjoern Schiessle
f3e341edac
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-06 14:42:09 +01:00
Nico Kaiser
7eb505e6dd
Fix user's displayName being overwritten by (old) cookie
2013-12-05 20:56:41 +01:00
Vincent Petry
fd634fdec8
Added unit test for the test() method
...
This is to make sure that method isn't broken
2013-12-04 13:22:25 +01:00
Frank Karlitschek
8dc3cb2ffb
lower required php version to 5.3.3
2013-12-04 10:51:12 +01:00
Thomas Mueller
6f7b394d99
fixing PHPDoc and spelling
2013-12-03 17:49:37 +01:00
Andreas Fischer
91f47645b0
Use getLastError() everywhere.
2013-12-03 17:49:37 +01:00
Andreas Fischer
18903cc8f7
Add getLastError()
2013-12-03 17:49:37 +01:00
Andreas Fischer
7e467484a8
No function as oci_last_error. It's oci_error.
2013-12-03 17:49:37 +01:00
Andreas Fischer
21bf6abd41
There is no property such as dbusername. It's 'dbuser'.
2013-12-03 17:49:37 +01:00
Andreas Fischer
401728b2a2
Correct property name. It's 'dbpassword', with the 'db' prefix.
2013-12-03 17:49:37 +01:00
Andreas Fischer
bfd0dc3314
Correct property name. It's just 'tableprefix', without the 'db' prefix.
2013-12-03 17:49:37 +01:00
Robin Appelman
5ac3f9bfa5
check if a directory exists before we try to remove it
2013-12-03 12:45:41 +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
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
Robin Appelman
c47e46fda0
fix custom routes defined by apps
2013-11-27 15:35:49 +01:00
Morris Jobke
a81909097c
Merge pull request #6027 from owncloud/public-api-restful-routing-oc6
...
fix appframework routing
2013-11-27 01:55:52 -08:00
Morris Jobke
7755e69af0
add PHPDoc for urlParams
2013-11-27 10:55:06 +01:00
Morris Jobke
b910524acb
add comment from @DeepDiver
2013-11-27 10:32:48 +01:00
