Thomas Müller
ee649d58c5
Merge pull request #19289 from owncloud/fix-type-hint-errors-container
...
Fix type hint errors in the container and the interface
2015-09-23 11:42:03 +02:00
Thomas Müller
bcdb3c26da
Merge pull request #19236 from owncloud/call_dot_directories_function
...
Replaces if ($file === '.' || $file === '..') by public function call isIgnoredDir
2015-09-23 11:34:23 +02:00
Thomas Müller
ad71d92acf
Merge pull request #19247 from owncloud/fix_locking_copy_operation
...
locking: handle exceptions correctly during copy operation
2015-09-23 11:28:27 +02:00
Morris Jobke
56a795ad37
Merge branch 'master' into fix-type-hint-errors-container
2015-09-23 11:01:59 +02:00
Thomas Müller
f3d60df56d
Merge pull request #19267 from owncloud/individual-it-reduce_db_calls_for_filelocks
...
[jenkins] Individual it reduce db calls for filelocks
2015-09-23 10:59:58 +02:00
Joas Schilling
ee75f9f594
Fix type hint errors in the container and the interface
2015-09-23 10:13:41 +02:00
Martin
491250320a
Replaces if ($file === '.' || $file === '..') by if(\OC\Files\Filesystem::isIgnoredDir($file)). Eases to find where this operation is used.
2015-09-22 17:53:15 +02:00
Lukas Reschke
63b2bc136a
Move mimetype files into /resources/config/
2015-09-22 16:43:28 +02:00
Lukas Reschke
a8e8a9dfb9
Move certificate bundle into resources/config/
2015-09-22 16:43:28 +02:00
Robin Appelman
498e8f712c
Merge pull request #19268 from owncloud/revert-18911
...
Revert "Show cached previews directly"
2015-09-22 16:05:38 +02:00
Individual IT Services
5f11049852
reduce amount of db calls needed for file-locks
...
return result of insertIfNotExist()
reducing initLockField, throwing exeption in releaseLock
don't throw exception in releaseLock()
cleaning up whitespaces
2015-09-22 15:04:15 +02:00
Robin Appelman
d9db959331
Revert "Show cached previews directly"
...
This reverts commit 1b708e26ef
.
2015-09-22 15:01:31 +02:00
Bjoern Schiessle
17a64360e5
catch excexptions during the copy operation and make sure that we free the lock correctly
2015-09-22 11:32:10 +02:00
Lukas Reschke
36ce254ffd
Move dummy backend to Tests namespace
2015-09-22 11:01:11 +02:00
Thomas Müller
67231ed9a7
Merge pull request #19231 from phil-davis/r1
...
Minor text typos
2015-09-21 23:35:30 +02:00
Phil Davis
a165710e99
Minor text typos
...
that I noticed while looking at some code.
2015-09-21 23:04:25 +05:45
Thomas Müller
fd6b4de2d4
Merge pull request #18481 from owncloud/fix-apache-login-master
...
Repeated calls to loginWithApache() should not not try to set user in…
2015-09-21 16:09:33 +02:00
Thomas Müller
d8901cf7cd
Merge pull request #19221 from owncloud/improved_error_messages
...
decrypt-all: improved error message if user doesn't exists
2015-09-21 16:06:43 +02:00
Robin Appelman
b23a5e6886
Merge pull request #17347 from owncloud/dav-fopen-overwrite
...
dont download the existing file for webdav if we're going to overwrite it
2015-09-21 14:13:04 +02:00
Robin Appelman
b520a1e520
Merge pull request #19081 from owncloud/prevent0bytedownloads
...
prevent 0 byte downloads when storage returns false
2015-09-21 13:50:35 +02:00
Robin Appelman
4ecf710dcd
dont download the existing file for webdav if we're going to overwrite it
2015-09-21 13:45:25 +02:00
Bjoern Schiessle
d2e90b6050
improved error message if user doesn't exists
2015-09-21 13:19:35 +02:00
Thomas Müller
0f2865abb2
Repeated calls to loginWithApache() should not not try to set user information in the session again
2015-09-21 11:55:41 +02:00
Thomas Müller
6006a03ef1
Merge pull request #19122 from owncloud/discardexpirationdatefornonlinkshares
...
Discard expiration date from result for non-link shares
2015-09-21 11:47:37 +02:00
Thomas Müller
9dc136a0d0
Merge pull request #19028 from owncloud/McNetic-zipstreamer-0.7
...
[jenkins] changed ZipStreamer to use composer for updates, update to 0.7
2015-09-18 17:03:49 +02:00
Thomas Müller
bbf128f1b2
Merge pull request #19098 from owncloud/db-lock-no-transaction
...
Remove the need for the transaction in the database locking backend
2015-09-18 17:02:18 +02:00
Thomas Müller
eb41a4da7f
Merge branch 'zipstreamer-0.7' of https://github.com/McNetic/owncloud_core into McNetic-zipstreamer-0.7
2015-09-18 14:43:37 +02:00
Lukas Reschke
7c6d811584
Prefer OCS Id from database
...
To be consistent with other logic the app id from the database needs to be prefered. Especially when it comes to be able to replace an outdated OCS id.
2015-09-18 13:27:26 +02:00
Lukas Reschke
947e3d7ab5
Add repair step for outdated OCS IDs
...
There is the case where OCs IDs might become outdated such as it has been with the calendar and contacts app which refer to the old dummy entry. This means that users with the old OCS id can't update updates as well will receive invalid state flags. (e.g. "experimental" instead of "approved")
To allow instances to properly update the applications in the future we need to migrate the OCS IDs for now manually.
2015-09-18 13:27:26 +02:00
Thomas Müller
188d6d2e28
Merge pull request #18911 from owncloud/preview-show-cached-directly
...
Show cached previews directly
2015-09-18 13:02:10 +02:00
Thomas Müller
0101b1c65f
Merge pull request #18840 from owncloud/fix-app-disable-route
...
Rebuild app navigation in JS
2015-09-18 13:00:58 +02:00
Thomas Müller
0eb37e2d64
Merge pull request #19092 from owncloud/allow-checking-for-notifiers
...
Allow checking whether there are notifiers registered
2015-09-18 11:57:56 +02:00
Thomas Müller
2eeb1b2b79
Merge pull request #19088 from owncloud/fix-availability-int
...
Explicitly cast number to integer
2015-09-18 08:31:56 +02:00
Thomas Müller
100d9e1976
Merge pull request #19095 from owncloud/set-priority-to-1-for-maintenance
...
Make sure Maintenance is checked before auth and others
2015-09-18 08:17:58 +02:00
Joas Schilling
44e6c4f398
Do not "use" Server
2015-09-17 15:11:05 +02:00
Robin Appelman
e9b1aa6037
improve doc
2015-09-17 14:09:28 +02:00
Joas Schilling
5eddde6486
Add a Sabre plugin that emits an event for apps
2015-09-17 13:59:27 +02:00
Robin Appelman
05fddec022
expire old lock rows
2015-09-17 13:55:04 +02:00
Vincent Petry
1911472b88
Discard expiration date from result for non-link shares
2015-09-17 13:45:26 +02:00
Jörn Friedrich Dreyer
773941dfb0
prevent 0 byte downloads when storage returns false
2015-09-17 11:16:00 +02:00
Joas Schilling
c3420fface
Allow checking whether there are notifiers registered
2015-09-17 11:08:17 +02:00
Robin Appelman
7c66328381
Remove the need for the transaction in the database locking backend
2015-09-17 11:07:59 +02:00
Joas Schilling
bc89bca803
Make sure Maintenance is checked before auth and others
2015-09-17 11:06:51 +02:00
Jenkins for ownCloud
91365a8969
[tx-robot] updated from transifex
2015-09-17 01:57:20 -04:00
Jenkins for ownCloud
0155bcf278
[tx-robot] updated from transifex
2015-09-17 01:55:25 -04:00
Thomas Müller
a1e343ae7c
Merge pull request #19086 from owncloud/restore-loadapp-autoload
...
Restore loadApp() autoload registration
2015-09-16 15:19:41 +02:00
Thomas Müller
b0414f6a30
Merge pull request #19022 from owncloud/console-loader-validroot
...
Register valid root for all installed apps in console
2015-09-16 15:17:43 +02:00
Robin McCorkell
a0094d28f1
Explicitly cast number to integer
2015-09-16 11:22:52 +01:00
Robin McCorkell
862afd80b3
Restore loadApp() autoload registration
...
Also changes the autoloader validRoots into a hashmap to try and reduce
duplicate entries
2015-09-16 10:48:03 +01:00
Thomas Müller
ed872589a3
Merge pull request #19077 from owncloud/check-maintenance-before-everything-else-master
...
Check for maintenance mode first so we send the 503 instead of login…
2015-09-16 10:22:10 +02:00