751487ded7
merge changes for files_encryption
2013-05-15 10:20:19 +02:00
807740a07a
fix for losing mount point "/"
2013-05-15 10:19:38 +02:00
226aec8d56
Merge branch 'master' into files_encryption
2013-05-15 03:22:06 +02:00
0e55accee2
Set the SQLite database lock timeout to 60 seconds which is the default in PHP anyways. I don't know why the MDB2 driver has this hardcoded to 0.1 seconds. This potentially fixes a lot of SQLite database lock problems and stuck in maintainance mode during upgrade issues.
2013-05-13 02:42:18 +02:00
c5cb3f9577
Merge pull request #3311 from owncloud/disable_mbstring.func_overload
...
disable mbstring.func_overload in setup v.3
2013-05-12 03:28:18 -07:00
baf058316c
disable mbstring.func_overload in setup
2013-05-12 10:56:32 +02:00
63d51980e1
Get config from template
2013-05-12 10:51:21 +02:00
74f92d0c7f
[tx-robot] updated from transifex
2013-05-12 02:05:29 +02:00
9f3c156aca
Merge pull request #3283 from owncloud/move-legacy-fs
...
Move legacy filesystem classes
2013-05-10 07:53:04 -07:00
9134395b43
don't emit rename hooks on partial file renames
2013-05-10 12:01:50 +02:00
c3b0d3d38c
rename isIgnoredFile to isPartialFile, remove check of blacklisted files in isPartialFile, correct usage of isPartialFile and isFileBlacklisted
2013-05-10 12:00:13 +02:00
2e81efc37e
don't call correctFolder() in touchHook, it will be called later in the writeUpdate()
2013-05-08 23:00:24 +02:00
0e30e68b22
update etag for for the touched file
2013-05-08 23:00:03 +02:00
d9c19fa8d7
Move legacy filesystem classes
2013-05-08 16:48:47 +02:00
e8a80c6c2f
Merge pull request #3271 from owncloud/fix_for_util_tearDownFS
...
fix for tearDownFS, after filesystem::tearDown() in Util
2013-05-08 05:43:54 -07:00
71fc4a2cf4
Autoloader: fix loading app clases located in lib/
2013-05-08 00:50:33 +02:00
2a01d39940
Autoloader: load the 3rdparty libraries using prefixes
2013-05-07 23:07:47 +02:00
0d25c0001c
check for setlocale after setting up the paths to prevent autoloader confusion
2013-05-07 22:53:07 +02:00
6d903cf7ae
Autoloader: add support for custom namespace paths
2013-05-07 22:39:35 +02:00
72ed74f28a
Autoloader: split getting the class paths and loading the class
2013-05-07 22:26:55 +02:00
03d8907df8
fix for tearDownFS, after filesystem::tearDown() the root is not mounted
2013-05-07 22:26:16 +02:00
cac86bb4db
Allow disabling the global classpath in an autoloader
2013-05-07 22:24:47 +02:00
d1fcb7eb52
Allow the autoloader to try mutliple possible paths for each path
2013-05-07 22:21:59 +02:00
19cfe74bf5
Add per-autoloader classPath
2013-05-07 22:19:00 +02:00
0b5f6b9c13
Move autoloader to it's own class
2013-05-07 22:16:17 +02:00
5b61c5d478
Merge pull request #3044 from owncloud/backgroundwatcher
...
Add a background job to watch for external filesystem changes
2013-05-07 10:00:00 -07:00
349a533f66
Merge pull request #3025 from owncloud/move-file
...
Cache: only look for child entires when doing a move operation when moving a folder
2013-05-07 07:52:57 -07:00
398fbb61f8
Merge pull request #2813 from owncloud/improve-lib-check
...
added correct check for gd and check for php-intl
2013-05-07 06:12:40 -07:00
2b9da8a6c9
remove hard php-intl requirement
2013-05-07 13:51:30 +02:00
51a1f829b8
Merge pull request #3120 from owncloud/ocs_properties
...
Allow subclassing of OC_OCS_Result class by changing properties from 'private' to 'protected'
2013-05-05 23:20:25 -07:00
a876240b32
[tx-robot] updated from transifex
2013-05-04 02:00:54 +02:00
a541b80592
Merge pull request #3222 from owncloud/fix-3218
...
Fix retrieving of mount points for shared storage, fix #3218
2013-05-03 06:02:33 -07:00
dcbbca1f89
Merge pull request #2972 from AndreasErgenzinger/master
...
Translations for themes
2013-05-03 05:41:28 -07:00
05a0b4533b
Merge pull request #2491 from riso/xsendfile_fix_zip
...
improved handling of xsendfile zip generation race condition
2013-05-03 05:37:01 -07:00
cb5a69dd22
Merge pull request #3216 from owncloud/fix-api-3rdparty
...
fix bug that would only return error responses for 3rdparty apps
2013-05-02 15:40:10 -07:00
444a209a2a
Merge pull request #3183 from miicha/patch-1
...
fixing mimetype for "new" ms office formats
2013-05-02 15:39:10 -07:00
73d7cae6df
One more mount point fix
2013-05-02 18:22:43 -04:00
7039421efc
Fix retrieving of mount points for shared storage, fix #3218
2013-05-02 17:47:11 -04:00
11afb2e5a8
respect format output
2013-05-02 14:51:53 +02:00
0f38e6ec9c
logout before output to not run into header already sent problems
2013-05-02 14:49:05 +02:00
ed0c23a9cc
fix bug that would only return error responses for 3rdparty apps
2013-05-02 14:36:16 +02:00
7f58b0ef7c
typo fix in a comment.
2013-05-01 12:29:15 +03:00
b464970142
Merge pull request #3169 from owncloud/fix_infinite_loop_for_file_cache
...
fix for infinite loop causing on files_encryption branch when testing
2013-04-29 17:05:41 -07:00
5764bf088e
[tx-robot] updated from transifex
2013-04-30 01:59:18 +02:00
fbf9233648
fixing mimetype for "new" ms office formats
...
right mime types for docx, pptx and xlsx
with the old mimetype I got a warning message from office everytime I opend such a file (it was downloaded as "filename.docx.doc")
2013-04-30 02:38:05 +03:00
f55aaad858
fix for infinite loop causing on files_encryption branch when testing "apps/files_encryption/test/crypt.php" on Method testSymmetricStreamEncryptShortFileContent
2013-04-29 15:43:48 +02:00
1f194b7bdc
Merge pull request #3154 from owncloud/fix_3153
...
Change app identifier for core api routes
2013-04-28 03:51:21 -07:00
901e0c598d
[tx-robot] updated from transifex
2013-04-28 02:01:38 +02:00
51a1f41225
Merge pull request #3121 from owncloud/ocs_fix_api_response
...
Fix the api response when a shipped and third party app both fail.
2013-04-27 10:05:06 -07:00
d33f6b9af6
Use correct variable when checking auth
2013-04-27 17:45:23 +01:00
Florin Peter
Frank Karlitschek
Morris Jobke
Thomas Tanghus
Lukas Reschke
Jenkins for ownCloud
Jörn Friedrich Dreyer
Björn Schießle
Robin Appelman
icewind1991
Michael Gapczynski
Bart Visscher
Tom Needham
Bernhard Posselt
joel hansson
miicha
Florin Peter
Tom Needham