Commit graph

27321 commits

Author SHA1 Message Date
RealRancor
a4ceb5fafe Path to mount.json needs to be absolute in config.sample.php 2015-09-29 17:05:25 +02:00
Thomas Müller
90810cc605 Merge pull request #19355 from owncloud/cache_result_of_checkUpgrade
[jenkins] Cache result of check upgrade
2015-09-29 16:19:39 +02:00
Thomas Müller
e45ce4acd1 Merge pull request #19437 from owncloud/sabredav-2.1.7
Update sabre/dav to 2.1.7
2015-09-29 16:19:18 +02:00
Thomas Müller
99f440148f Merge pull request #19441 from owncloud/debug-log-mode-during-upgrade
[upgrade] switch to debug logging on upgrade
2015-09-29 16:08:31 +02:00
Individual IT Services
fbe43e6a26 cache result of \OCP\Util::needUpgrade()
reduce calls of \OCP\Util::needUpgrade()
where \OCP\Util::needUpgrade() is called we can call as well
self::checkUpgrade and use the cached result
In line 877 the call way unnecessary anyway because of the first part of
the if statement

move caching to \OCP\Util::needUpgrade

renaming variable

fixing testNeedUpgradeCore()

cache result of checkUpgrade() in self::$needUpgrade

reduce calls of \OCP\Util::needUpgrade()
where \OCP\Util::needUpgrade() is called we can call as well
self::checkUpgrade and use the cached result
In line 877 the call way unnecessary anyway because of the first part of
the if statement

move caching to \OCP\Util::needUpgrade

renaming variable

fixing testNeedUpgradeCore()

fix typo in variable name

deleting tabs
2015-09-29 15:34:42 +02:00
Thomas Müller
1abd4f52bb Merge pull request #19440 from owncloud/allow-blob-for-images-per-default
Add blob: scheme to default CSP policy
2015-09-29 15:13:04 +02:00
Thomas Müller
733673b39d Merge pull request #19365 from owncloud/files-detailsbar-interaction
Fix sidebar interaction
2015-09-29 14:44:28 +02:00
Morris Jobke
5acb38b5b3 [upgrade] switch to debug logging on upgrade
* resets afterwards
* adds output about the previous log level
2015-09-29 14:35:32 +02:00
Lukas Reschke
e735a9915c Add blob: scheme to default CSP policy
Fixes https://github.com/owncloud/core/issues/19438
2015-09-29 14:27:35 +02:00
Thomas Müller
c061b3e44b Merge pull request #18105 from owncloud/ocs-api-integration-tests
First integration tests for provisioning api
2015-09-29 14:23:04 +02:00
Thomas Müller
f886f0683d Update sabre/dav to 2.1.7 2015-09-29 14:21:24 +02:00
Thomas Müller
e3a98e4959 Support different server ports - defined by EXECUTOR_NUMBER 2015-09-29 13:56:56 +02:00
Thomas Müller
c2dd0f80ec Merge pull request #19424 from owncloud/use-jsqueeze
Use jsqueeze
2015-09-29 13:44:26 +02:00
Sergio Bertolin
2d1f509acf added delete user test 2015-09-29 13:42:32 +02:00
Thomas Müller
933121c66f Use ci profile 2015-09-29 13:42:32 +02:00
Thomas Müller
db0a8aa795 Use fixed port for now 2015-09-29 13:42:32 +02:00
Thomas Müller
925aa6c0f5 Test user creation 2015-09-29 13:42:32 +02:00
Thomas Müller
cb6e1b115d require autoload.php 2015-09-29 13:42:32 +02:00
Thomas Müller
6749071667 Adding phpunit for the assertions 2015-09-29 13:42:32 +02:00
Thomas Müller
d26aab7e05 Adding missing files 2015-09-29 13:42:32 +02:00
Thomas Müller
631303c1e7 First integration tests for provisioning api 2015-09-29 13:42:32 +02:00
Thomas Müller
580a961020 Merge pull request #17601 from owncloud/publicwebdav-allowajaxwhendisabled
Allow ajax requests on public webdav interface
2015-09-29 13:21:50 +02:00
Thomas Müller
037cce7f05 Merge pull request #19418 from owncloud/fix-parsehashquery
Consider both hash params and query when parsing URL
2015-09-29 13:21:34 +02:00
Thomas Müller
69430e0310 Merge pull request #19367 from owncloud/lock-transaction-no-log
remove warning when trying to get a lock while in transaction
2015-09-29 13:18:34 +02:00
Thomas Müller
3cd82b8918 Merge pull request #19411 from owncloud/files-sidebar-shareloadspinner
Show loading spinner for first fetch of shares
2015-09-29 13:18:04 +02:00
Thomas Müller
f2cd334c8a Merge pull request #19417 from owncloud/files-upload-checkconflictbeforeupload
Show conflict dialog before upload when possible
2015-09-29 13:17:47 +02:00
Thomas Müller
54b507306a Merge pull request #19409 from owncloud/files-sidebar-hiding-tabs
Hide sidebar tab headers conditionally
2015-09-29 13:17:38 +02:00
Thomas Müller
6414b4b516 Merge pull request #19426 from owncloud/fix-legacy-CSP-for-images
Whitelist "data:" in legacy CSP headers
2015-09-29 13:17:23 +02:00
Thomas Müller
4cc0f5bf8e Update 3rdparty submodule 2015-09-29 13:13:08 +02:00
Lukas Reschke
c269f658eb Merge pull request #19431 from phil-davis/r2
Session closed exception wording
2015-09-29 11:45:33 +02:00
Phil Davis
7940a3fb65 Session closed exception wording
and a small comment typo
2015-09-29 12:17:47 +05:45
Jenkins for ownCloud
aa3596a410 [tx-robot] updated from transifex 2015-09-29 01:55:02 -04:00
Olivier Paroz
c4bac1655d Fix CSP for images for legacy apps
Fixes #19425
2015-09-28 23:21:26 +02:00
Thomas Müller
766b69a0c8 User upstream class SeparatorFilter 2015-09-28 22:52:45 +02:00
Thomas Müller
d40867d855 Suer JSqueezeFilter instead of JSMinFilter 2015-09-28 22:51:43 +02:00
Vincent Petry
71dabc6c13 Consider both hash params and query when parsing URL 2015-09-28 18:37:40 +02:00
Robin Appelman
7fa9f29d7f Merge pull request #19408 from owncloud/fix-trashbin-checkbox
Fix checkbox in trashbin
2015-09-28 18:27:52 +02:00
Vincent Petry
851390a69a Merge pull request #19413 from owncloud/share-nopermission-link
Still show share link when recipient but no share permission
2015-09-28 17:52:53 +02:00
Vincent Petry
cc8efaa037 Show conflict dialog before upload when possible
When uploading files, first check if the files exist in the current file
list. For the ones that do, show a conflict dialog.
For the rest, upload directly.

If the upload operation detects a conflict on the server side, it will
also continue populating the conflict dialog.

From now on, server side conflict can only occur if someone concurrently
uploaded a file into the same folder but the current user hasn't
refreshed the list yet.
2015-09-28 17:50:11 +02:00
Vincent Petry
d47d240a35 Still show share link when recipient but no share permission
This makes it possible for the recipient to still trigger the sidebar
and share tab to see information about the share.

In the case where the file is not shared and no permissions exists, no
action icon will be displayed.
2015-09-28 16:23:33 +02:00
Vincent Petry
a823a79f12 Show loading spinner for first fetch of shares
Whenever the sidebar first loads shares, show a spinner instead of an
empty content
2015-09-28 15:57:57 +02:00
Vincent Petry
f9acf4627e Fix sidebar interaction
- Clicking a file row or selecting it will open the sidebar.
- When sidebar is open, its contents update with the last selection.
- Dragging doesn't open the sidebar but does update its contents if it was
open already.
- Switching folders closes the sidebar.
- Close sidebar when highlighted file got deleted/removed from list
2015-09-28 15:23:37 +02:00
Vincent Petry
a8fb0038e9 Hide sidebar tab headers conditionally
Added canDisplay() in DetailsTabView that should return false if the tab
header of this tab must be hidden
2015-09-28 14:57:44 +02:00
Hendrik Leppelsack
24ee83db30 fix checkbox in trashbin 2015-09-28 13:45:24 +02:00
Thomas Müller
d68079f932 Merge pull request #18548 from owncloud/repair-mimetype-limitversion
Repair mime types only when upgrading from OC 8.0
2015-09-28 12:56:36 +02:00
Thomas Müller
72024ad201 Merge pull request #19404 from owncloud/files-sidebar-sorttabs
Fix tabs order in files sidebar
2015-09-28 12:55:38 +02:00
Thomas Müller
d007c32907 Merge pull request #19402 from owncloud/public-recognizeauthsession
Allow public webdav auth to recognize sesssion
2015-09-28 12:53:33 +02:00
Thomas Müller
716ff81b27 Merge pull request #19401 from owncloud/files-actionsorder
Fix order of actions in the files actions menu
2015-09-28 12:53:11 +02:00
Thomas Müller
0bf2bb0751 Merge pull request #19318 from owncloud/tarstreamer
Stream zip or tar
2015-09-28 12:31:27 +02:00
Vincent Petry
5e4a52d3c2 Fix tabs order in files sidebar 2015-09-28 12:30:12 +02:00