Commit Graph

31517 Commits

Author SHA1 Message Date
Morris Jobke dba08f5fca Merge pull request #23985 from owncloud/ext-fix-namespaces
Fix namespaces for files_external
2016-04-14 16:32:01 +02:00
Thomas Müller 0cff70bb90 Merge pull request #23991 from owncloud/handle-exceptions-in-templates
Properly handle exception within templates
2016-04-14 15:38:47 +02:00
Thomas Müller 068e73cc47 Merge pull request #23975 from owncloud/change-default-calendar-and-contacts-names
Use better names for the default calendars and addressbooks
2016-04-14 11:57:43 +02:00
Thomas Müller 6d9e15c6a1 Merge pull request #22760 from owncloud/tooltip-cssfix
add word wrap to tooltips. Fixes #22746
2016-04-14 11:53:35 +02:00
Christoph Wurst 97d553b57a close navigation menu when opening app in new tab (#23914) 2016-04-14 11:53:20 +02:00
Christoph Wurst a2572ffec7 add loading feedback to user menu entries (#23916)
fixes #19857
2016-04-14 11:53:09 +02:00
Roeland Douma 411fac892a On mount make sure multiple shares with same target map to unique ones (#23937)
Scenario:
user0 shares a folder 'foo' with user2
user1 shares a folder 'foo' with user2
user2 logs in

Before: show only the 'foo' from user1

After: show both.

* Added intergration tests
2016-04-14 11:50:27 +02:00
Scrutinizer Auto-Fixer 25fff15487 Scrutinizer Auto-Fixes (#23959)
* Scrutinizer Auto-Fixes

This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com

* revert append() change
2016-04-14 11:50:06 +02:00
Thomas Müller e84da2cf54 Merge pull request #23976 from owncloud/kill-dav-migration
Remove dav migration for 9.1
2016-04-14 11:49:38 +02:00
Morris Jobke dfb98c31a3 Merge pull request #19615 from owncloud/issue-15858-mount-points-return-wrong-paths-for-getusersharingfiles
Fix Share::getUsersSharingFile() for mount points
2016-04-14 11:49:11 +02:00
Roeland Douma e396691712 Merge pull request #23986 from owncloud/psr-4_lock
Move \OC\Lock to PSR-4
2016-04-14 11:31:43 +02:00
Morris Jobke 12f1adb7bb
Properly handle exception within templates
* fixes partial printed templates when exception is thrown in between
2016-04-14 11:22:38 +02:00
Roeland Jago Douma 86e757d2b3
Move \OC\Lock to PSR-4 2016-04-14 08:28:16 +02:00
Jenkins for ownCloud 54f6c05c79 [tx-robot] updated from transifex 2016-04-14 01:55:58 -04:00
Thomas Müller 1627a7c462 Merge pull request #23981 from owncloud/app_psr4
Move \OC\App to PSR-4
2016-04-14 06:53:57 +02:00
Robin McCorkell 9a78cac2eb Fix OCA\Files\External\Api namespace 2016-04-14 00:49:47 +01:00
Robin McCorkell 4717605d22 Fix storage backend class namespaces and move to subdir
All classes that were previously \OC\Files\Storage\FooBar are now
\OCA\Files_External\Lib\Storage\FooBar
2016-04-14 00:44:28 +01:00
Roeland Jago Douma e5dd4272d3
Move \OC\App to PSR-4 2016-04-13 19:53:05 +02:00
Joas Schilling 79c17cdfa6
Fix Share::getUsersSharingFile() for mount points 2016-04-13 17:44:18 +02:00
Thomas Müller 439de52534
Remove dav migration for 9.1 2016-04-13 15:53:57 +02:00
Thomas Müller 353449bff7
Use better names for the default calendars and addressbooks - fixes #23720 2016-04-13 15:44:59 +02:00
Thomas Müller 3c0a1d4241 Merge pull request #20118 from owncloud/chunked-upload-dav
Initial implementation of the new chunked upload
2016-04-13 14:37:10 +02:00
Thomas Müller 15397a9c91 Merge pull request #23943 from owncloud/document-mysql-wait-timeout
Document an example wait timeout for MySQL in case the web hoster is …
2016-04-13 14:10:56 +02:00
Thomas Müller 7f87c3e843 Merge pull request #23962 from owncloud/activity-psr4
Move files in \OC\Activity to PSR-4
2016-04-13 14:10:07 +02:00
Christoph Wurst ce9729e460 Merge pull request #23966 from owncloud/restore-file-selection
restore selection after re-rendering file rows
2016-04-13 13:40:14 +02:00
Joas Schilling 009f96cb83 Merge pull request #23963 from owncloud/lazyRoot
Add LazyRootFolder
2016-04-13 12:53:28 +02:00
Roeland Jago Douma 55497e09a9
Make shareproviders use the lazy root folder 2016-04-13 11:23:07 +02:00
Roeland Jago Douma 5cd8382d39
Add lazyRootFolder 2016-04-13 11:23:02 +02:00
Christoph Wurst 4d02233faa restore selection after re-rendering file rows 2016-04-13 11:20:26 +02:00
Thomas Müller 838e9e3126 Merge pull request #23958 from owncloud/use-6-months-as-threshold-for-ssl
Use 6 months as SSL STS header threshold
2016-04-13 11:10:10 +02:00
Thomas Müller e90a3b5ba7 Merge pull request #23954 from stweil/master
misc: Fix some typos
2016-04-13 11:08:58 +02:00
Thomas Müller 4856d95135 Merge pull request #23921 from owncloud/show-app-download-tooltip
Show tooltip if the app is downloaded from a remote server
2016-04-13 11:08:38 +02:00
Roeland Jago Douma a5a6c85c1c
Move files in \OC\Activity to PSR-4 2016-04-13 10:29:36 +02:00
Joas Schilling 739542816a Merge pull request #23945 from owncloud/fix_oc_share_permissions
always return the complete permissions the file was shared with
2016-04-13 10:20:25 +02:00
Morris Jobke e03d289b70
Use 6 months as SSL STS header threshold
* this uses 6 months (6 * 30 * 24 * 60 * 60 = 15552000)
* old value was half a year (365 / 2 * 24 * 60 * 60 = 15768000)
* fixes #23957
2016-04-13 08:47:34 +02:00
Jenkins for ownCloud a2da7614a0 [tx-robot] updated from transifex 2016-04-13 01:54:59 -04:00
Lukas Reschke c0a6619f47 Merge pull request #23953 from owncloud/small_share_manager_fix
set $share to null if getShareByToken() failed
2016-04-13 00:49:09 +02:00
Lukas Reschke ef93ec8bc2
Add test 2016-04-12 21:32:40 +02:00
Stefan Weil ee5f5eebe5 misc: Fix some typos
Some of them were found by codespell.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-04-12 18:36:39 +02:00
Björn Schießle 499d131a09
always return the complete permissions the file was shared with 2016-04-12 17:56:56 +02:00
Björn Schießle f17ad18865
set $share to null if getShareByToken() failed 2016-04-12 17:26:09 +02:00
Thomas Müller e21642ca31 Fix unit test of file plugin 2016-04-12 15:51:09 +02:00
Thomas Müller 91e73328b8 Document an example wait timeout for MySQL in case the web hoster is killing the connection too early - fixes #15407
This reverts commit e9a9af3493.
2016-04-12 15:10:39 +02:00
Thomas Müller e9a9af3493 Revert "Document an example wait timeout for MySQL in case the web hoster is killing the connection too early - fixes #15407"
This reverts commit acad7b30be.
2016-04-12 15:09:50 +02:00
Thomas Müller acad7b30be Document an example wait timeout for MySQL in case the web hoster is killing the connection too early - fixes #15407 2016-04-12 15:08:12 +02:00
Thomas Müller bb2e68f72b Fix chunk file move 2016-04-12 14:26:42 +02:00
Stefan Weil 16df1c5188 apps: Fix typos (found by codespell) (#23862)
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-04-12 12:52:51 +02:00
Thomas Müller fdee771aca Add unit testing capabilities for templates (#23708)
Add unit testing capabilities for templates
2016-04-12 12:49:11 +02:00
Roeland Jago Douma 629bc1812e Add intergration tests for new chunking
The same intergration tests as for the old endpoint.
But now using the new chunking.

We upload 3 chunks in different order and the result should be the same
in all three.
2016-04-12 12:33:05 +02:00
Thomas Müller 72f5c539e8 Initial implementation of the new chunked upload - as specified in https://dragotin.wordpress.com/2015/06/22/owncloud-chunking-ng/ 2016-04-12 12:32:04 +02:00