wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
11018 commits 157 branches 562 tags 714 MiB
Commit graph

11018 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Gapczynski
d8c660c6d5 Switch to using Google Drive SDK, closes #2047 2013-05-16 20:09:32 -04:00
Bernhard Posselt
1ec92b6377 Merge pull request #3329 from owncloud/increase_lock_timeout 
Set the SQLite database lock timeout to 60 seconds which is the default ...
 2013-05-13 06:56:07 -07:00
Lukas Reschke
665663432c Merge pull request #3326 from owncloud/fix-3321 
Add requesttoken to guest view
 2013-05-13 05:45:38 -07:00
Lukas Reschke
739f799912 Add requesttoken to guest view 
Should fix #3321
 2013-05-13 14:23:56 +02:00
Morris Jobke
e60cf2a997 Merge pull request #3235 from NCTU-NBA/pr-langcode 
Modify zh_* language codes
 2013-05-13 00:42:13 -07:00
Frank Karlitschek
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
Jenkins for ownCloud
e8c154f341 [tx-robot] updated from transifex 2013-05-13 02:10:20 +02:00
Pellaeon Lin
935675ab49 Merge remote-tracking branch 'upstream/master' into pr-langcode 2013-05-12 22:32:22 +08:00
Morris Jobke
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
Lukas Reschke
564f26475c Merge pull request #3290 from owncloud/config-data 
Move config data to template
 2013-05-12 02:40:30 -07:00
Thomas Tanghus
baf058316c disable mbstring.func_overload in setup 2013-05-12 10:56:32 +02:00
Lukas Reschke
337e3ed61f Typo 2013-05-12 10:51:21 +02:00
Lukas Reschke
63d51980e1 Get config from template 2013-05-12 10:51:21 +02:00
Jenkins for ownCloud
74f92d0c7f [tx-robot] updated from transifex 2013-05-12 02:05:29 +02:00
icewind1991
dd4a31df48 Merge pull request #3309 from owncloud/no_explicit_autoload 
Use new autoloader class in tests
 2013-05-11 14:22:08 -07:00
Thomas Tanghus
0d852dce3b Use new autoloader class 2013-05-11 22:44:45 +02:00
Morris Jobke
ea88e295d3 Merge pull request #3296 from owncloud/disable_mbstring.func_overload 
disable mbstring.func_overload
 2013-05-11 02:01:19 -07:00
Jan-Christoph Borchardt
f3f74f826a Merge pull request #3257 from owncloud/fix_3251 
Fix 3251
 2013-05-10 08:41:27 -07:00
Morris Jobke
9f3c156aca Merge pull request #3283 from owncloud/move-legacy-fs 
Move legacy filesystem classes
 2013-05-10 07:53:04 -07:00
icewind1991
5667d11f7d Merge pull request #3304 from owncloud/fix_bypass_fo_file_blacklist 
Properly check file blacklist
 2013-05-10 06:15:34 -07:00
Jörn Friedrich Dreyer
9134395b43 don't emit rename hooks on partial file renames 2013-05-10 12:01:50 +02:00
Jörn Friedrich Dreyer
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
Thomas Tanghus
78559c0863 disable mbstring.func_overload 2013-05-10 02:13:59 +03:00
kondou
ee1ce055fc Fix #3251 
Using ksort now, instead of prefilling the commonlanguages array.
 2013-05-09 23:19:37 +02:00
Michael Gapczynski
c112ac4408 Merge pull request #3277 from owncloud/fix-change-password 
fix inconsistent post parameters in change password operation
 2013-05-09 13:06:40 -07:00
Björn Schießle
2e81efc37e don't call correctFolder() in touchHook, it will be called later in the writeUpdate() 2013-05-08 23:00:24 +02:00
Björn Schießle
bda8187f3b rename a file if it gets restored so that it no longer exists as a version. Otherwise it can happen that the expire() function removes all other versions so that we end up with only one version which is exactly the same as the original file 2013-05-08 23:00:13 +02:00
Björn Schießle
0e30e68b22 update etag for for the touched file 2013-05-08 23:00:03 +02:00
Björn Schießle
b9134dcd6a touch file relative to users file folder, otherwise the hooks will be ignored 2013-05-08 22:59:49 +02:00
Robin Appelman
d9c19fa8d7 Move legacy filesystem classes 2013-05-08 16:48:47 +02:00
FlorinPeter
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
Björn Schießle
135991474b fix inconsistent post parameters in change password operation 2013-05-08 12:38:09 +02:00
Bart Visscher
d3ba20fee7 Merge pull request #3272 from owncloud/legacy-autoloader 
Move autoloader to it's own class
 2013-05-08 00:08:31 -07:00
Robin Appelman
71fc4a2cf4 Autoloader: fix loading app clases located in lib/ 2013-05-08 00:50:33 +02:00
Robin Appelman
e21a3a1a23 Autoloader: test cases 2013-05-07 23:08:36 +02:00
Robin Appelman
2a01d39940 Autoloader: load the 3rdparty libraries using prefixes 2013-05-07 23:07:47 +02:00
Robin Appelman
0d25c0001c check for setlocale after setting up the paths to prevent autoloader confusion 2013-05-07 22:53:07 +02:00
Robin Appelman
6d903cf7ae Autoloader: add support for custom namespace paths 2013-05-07 22:39:35 +02:00
Robin Appelman
72ed74f28a Autoloader: split getting the class paths and loading the class 2013-05-07 22:26:55 +02:00
Florin Peter
03d8907df8 fix for tearDownFS, after filesystem::tearDown() the root is not mounted 2013-05-07 22:26:16 +02:00
Robin Appelman
cac86bb4db Allow disabling the global classpath in an autoloader 2013-05-07 22:24:47 +02:00
Robin Appelman
d1fcb7eb52 Allow the autoloader to try mutliple possible paths for each path 2013-05-07 22:21:59 +02:00
Robin Appelman
19cfe74bf5 Add per-autoloader classPath 2013-05-07 22:19:00 +02:00
Robin Appelman
0b5f6b9c13 Move autoloader to it's own class 2013-05-07 22:16:17 +02:00
Bart Visscher
175633d380 Merge pull request #3050 from owncloud/===_and_!==_in_user_ldap-app 
Use === and !== in user_ldap app
 2013-05-07 12:45:43 -07:00
icewind1991
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
Michael Gapczynski
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
Bart Visscher
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
Morris Jobke
2b9da8a6c9 remove hard php-intl requirement 2013-05-07 13:51:30 +02:00
Morris Jobke
deb0885e46 Merge pull request #3246 from owncloud/newfile-mimetype 
Files: set the proper mimetype when creating a new text file
 2013-05-07 01:53:43 -07:00