230029e509
Merge pull request #18368 from owncloud/version-retention
...
Add versions obligation
2015-09-15 19:32:07 +02:00
82c2e0df7c
Merge branch 'master' into version-retention
2015-09-15 19:29:06 +02:00
9883d5b85d
Merge pull request #18915 from owncloud/node-getfoldercontents-use-view-logic
...
Use the view logic for getFolderContent for the node api
2015-09-15 18:04:01 +02:00
e545c2eec5
Merge pull request #17811 from owncloud/dav-lock-wide
...
Wrap the entire dav PUT in a read lock
2015-09-15 17:22:00 +02:00
ae9ea244f2
Merge pull request #19043 from owncloud/fix-php-doc-of-encrypt-all
...
Function does return void
2015-09-15 17:03:34 +02:00
cb529acc5c
Follow PSR
2015-09-15 17:08:54 +03:00
d57f3bf9cc
Update options description
2015-09-15 17:08:54 +03:00
c3dc5b0317
Add method docblock
2015-09-15 17:08:54 +03:00
f46b434a12
Namespacing, reusing
2015-09-15 17:08:54 +03:00
c3e055549e
Improvements
2015-09-15 17:08:54 +03:00
b95d1e6683
Add quota status to expiration check
2015-09-15 17:08:54 +03:00
7ef937d8ad
Add versions obligation
2015-09-15 17:08:54 +03:00
650e600b94
Merge pull request #18273 from owncloud/files-sidebar-toggle
...
Keep right sidebar open, add Details action
2015-09-15 14:45:34 +02:00
decdaf0018
Merge pull request #19024 from owncloud/remove-get_temp_dir
...
Remove get_temp_dir()
2015-09-15 14:18:29 +02:00
474f13c9d6
Merge pull request #19041 from owncloud/issue-19007-parameter-name
...
Fix parameter name to match the specs
2015-09-15 14:15:46 +02:00
7953cc9494
Function does return void
...
This function does return void and not a bool.
2015-09-15 14:02:10 +02:00
e82a225d04
Merge pull request #18964 from owncloud/availability-integer
...
Use integer for availability instead of bool
2015-09-15 13:24:55 +02:00
b6fe5b6f3c
Merge pull request #19039 from owncloud/setup-autoloader-earlier
...
Define allowed app roots earlier
2015-09-15 13:24:35 +02:00
665716095b
Fix parameter name to match the specs
2015-09-15 12:14:14 +02:00
8e1b403b16
Catch apps which have been removed manually
2015-09-15 12:10:23 +02:00
4680691ca6
Define allowed app roots earlier
...
The autoloader needs to be run before including the app.php, otherwise it depends on what app gets executed first and apps that rely on the dependency of other apps in app.php may break.
2015-09-15 12:10:23 +02:00
1d315512ea
Merge pull request #19029 from owncloud/allow-tests-folder-in-autoloader
...
Allow /tests folder in autoloader by default
2015-09-15 12:06:45 +02:00
f8619870ea
Remove get_temp_dir()
2015-09-15 11:33:25 +02:00
65ebba44ce
Allow /tests folder in autoloader by default
...
Given the fact that "/tests" is not shipped by default and this has broken some applications and frustrated quite some people we should add "/tests" to the default allowed autoloading set.
I do consider the security impact marginally since the /tests folder is not shipped within the release as well as usually has a hard requirement on being called by phpunit.
2015-09-15 11:32:07 +02:00
5ca690e2f8
Use integer for availability instead of bool
2015-09-15 10:18:32 +02:00
24d2cbf3de
[tx-robot] updated from transifex
2015-09-15 01:54:50 -04:00
d0cea82969
Fixed sidebar toggle entry
...
Properly highlight the row after selecting the item.
This also fixes the unit tests by changing the order of registration of
file actions.
2015-09-14 20:45:30 +02:00
8a6574e81a
Keep right sidebar open, add Details action
2015-09-14 20:45:30 +02:00
688981b55c
allow hook cancel
2015-09-14 20:35:33 +02:00
9202d2f45a
fix chunking tests
2015-09-14 20:35:33 +02:00
75f126da49
use the correct path for cache updates when doing chunked assembly
2015-09-14 20:35:33 +02:00
80f054ddd3
also verify cache in dav upload tests
2015-09-14 20:35:33 +02:00
6386327150
work directly on storages when doing a chunked upload assembly
2015-09-14 20:35:33 +02:00
b424151459
handle notfound exceptions in lock plugin
2015-09-14 20:35:33 +02:00
17b671ee25
adjust tests to handle before/after locking
2015-09-14 20:35:33 +02:00
e612d3123f
wrap the entire put operation in a read lock
2015-09-14 20:35:33 +02:00
209abaadbb
expose locking api in sabre connector
2015-09-14 20:35:33 +02:00
fb9e75edb6
Merge pull request #18973 from owncloud/try-fixing-app-config-on-oracle
...
Do not compare the value on Oracle
2015-09-14 17:59:52 +02:00
2d0f0e898d
Only check the "was updated/inserted" when not on Oracle...
2015-09-14 15:27:06 +02:00
4a777d686b
Merge pull request #18966 from owncloud/ext-remove-numeric-id
...
Remove storing storage_id in mount.json
2015-09-14 15:04:23 +02:00
1369525e7f
Merge pull request #18982 from owncloud/fix_18878
...
enforce loading icon in sidebar to be 32x32
2015-09-14 12:47:53 +02:00
f9b05578a6
Merge pull request #19012 from owncloud/occ_encrypt_all_fix_name
...
use the same pattern for the command name like every other command
2015-09-14 12:37:06 +02:00
341b733dec
Merge pull request #19010 from owncloud/use-proper-web-root
...
Use / instead of an empty string as cookie path
2015-09-14 12:14:46 +02:00
0e805d5310
Do not compare the value on Oracle
...
As per docs: http://docs.oracle.com/cd/E11882_01/server.112/e26088/conditions002.htm#i1033286
> Large objects (LOBs) are not supported in comparison conditions.
2015-09-14 12:14:25 +02:00
04db96adaf
Merge pull request #19006 from owncloud/individual-it-patch-1
...
allow ".." in folder names
2015-09-14 15:56:53 +05:45
69b64b5b10
use the same pattern for the command name like every other command
2015-09-14 12:00:39 +02:00
3adbfbfd69
Use / instead of an empty string as cookie path
...
When an empty string is used as cookie path PHP will assign the current directory as cookie path.
This means when an user had installed an ownCloud under "/", which is mapped to an empty string in \OC::$WEBROOT, and accessed it the cookie was set to values such as "/index.php/apps/files" since the web browser assumed this to be a directory. This means that multiple encryption cookies were set for the same domain resulting in potential havoc.
With this patch the path will be set to "/" in case an empty web root is installed which makes the cookie accessible to the whole domain.
To test this setup multiple ownCloud instances on the same domain under different ports and have both installed under "/", then try to login in both of it and previously this can in some cases lead to a lockout of the user.
Note that this affects the cookies that the browsers do sent and thus to test this you need to clear all cookies from your browser previously. I consider this an acceptable behaviour for now since this code is only in master.
Fixes https://github.com/owncloud/core/issues/18919
2015-09-14 11:22:34 +02:00
211a243784
[tx-robot] updated from transifex
2015-09-14 01:55:35 -04:00
f7e66d49fc
allow ".." in folder names
...
".." are valid in folder names, only ".." by itself is invalid
fix for #18987
2015-09-14 10:42:00 +05:45
c15ba0d658
Merge pull request #18996 from owncloud/ext-swift-dependencycheck
...
Fix dependency check for Swift and SMB_OC
2015-09-13 22:41:07 +01:00
Lukas Reschke
Robin Appelman
Thomas Müller
Victor Dubiniuk
Frank Karlitschek
Joas Schilling
Robin McCorkell
Jenkins for ownCloud
Vincent Petry
Robin Appelman
Björn Schießle
Individual IT Services
Bjoern Schiessle