Robin McCorkell
6a2e7632d1
Fix JS unit tests
2015-11-21 22:54:21 +00:00
Robin McCorkell
8f4b780a90
Fix external storage priority logic
2015-11-21 22:54:21 +00:00
Robin McCorkell
2efffb810d
Load applicable users/groups correctly
2015-11-21 22:54:21 +00:00
Robin McCorkell
28876bf463
Display applicable global storages in personal mount list
2015-11-21 22:54:21 +00:00
Robin McCorkell
a1704c8623
Render external storages list in JS
2015-11-21 22:54:21 +00:00
Jenkins for ownCloud
eb42340fa3
[tx-robot] updated from transifex
2015-11-21 01:54:59 -05:00
Thomas Müller
f3ff858323
Merge pull request #20641 from owncloud/files_external_missing_backend
...
dont die if the external storage backend doesn't exist
2015-11-20 16:06:25 +01:00
Robin Appelman
90ff4641e7
dont die if the external storage backend doesn't exist
2015-11-20 15:23:09 +01:00
Thomas Müller
427d107b9f
Merge pull request #20614 from owncloud/use-mocks-when-testing-isSharingDisabledForUser
...
Use mocks when testing isSharingDisabledForUser
2015-11-20 15:22:52 +01:00
Thomas Müller
c86483f3ed
Adjust PHPDoc as suggested
2015-11-20 14:38:29 +01:00
Thomas Müller
308aaf89cd
Merge pull request #14077 from owncloud/autotest-external-swift
...
[files_external] swift tests
2015-11-20 13:57:54 +01:00
Thomas Müller
129ec4fb40
Merge pull request #20624 from owncloud/clean_3rparty_tests
...
Bump 3rdparty. No longer ship 3rdparty tests dirs
2015-11-20 10:16:28 +01:00
Roeland Jago Douma
e733244148
Bump 3rdparty. No longer ship tests dirs
2015-11-20 08:05:54 +01:00
Jenkins for ownCloud
764504de19
[tx-robot] updated from transifex
2015-11-20 01:55:32 -05:00
Thomas Müller
479cee66f4
Merge pull request #20034 from owncloud/icewind_streams_0.3.0
...
Bump 3rdparty for icewind/streams-0.3.0
2015-11-19 17:27:30 +01:00
Thomas Müller
5c796143d5
Merge pull request #20615 from owncloud/systemtag-fix-method-name
...
Adjust the method name to reflect it's behaviour
2015-11-19 17:27:14 +01:00
Thomas Müller
fd28bda3d9
Merge pull request #20611 from owncloud/files-newmenuremovetextfile
...
Remove "Text file" entry in the "+" menu
2015-11-19 16:58:27 +01:00
Thomas Müller
420f3010bc
Merge pull request #20355 from owncloud/add-carddav-sharing
...
Add carddav sharing
2015-11-19 16:53:57 +01:00
Thomas Müller
1b4cd19d2a
Merge pull request #20603 from owncloud/joblist--more-robust
...
Make the JobList test more robust by sorting the result of getAll bef…
2015-11-19 16:53:37 +01:00
Thomas Müller
c565a7b042
Fix failing unit test 💀
2015-11-19 16:44:43 +01:00
Joas Schilling
ea2bf49be0
Adjust the method name to reflect it's behaviour
2015-11-19 16:08:21 +01:00
Thomas Müller
30dd610a2a
Merge pull request #20563 from owncloud/systemtags-interface
...
Core interfaces for system tags and its manager
2015-11-19 15:47:47 +01:00
Vincent Petry
8fc0e05564
Remove "Text file" entry in the "+" menu
...
The text editor app will register this instead.
Also made "fileList" a non-private attribute to make it possible for
plugins to access the attached file list object.
2015-11-19 15:36:21 +01:00
Thomas Müller
9ec2850c78
Use mocks when testing isSharingDisabledForUser
2015-11-19 15:36:16 +01:00
Roeland Jago Douma
ca6bd5cacd
Follow the interface again
2015-11-19 14:34:59 +01:00
Roeland Jago Douma
e342973888
Bump 3rdparty for icewind/streams-0.3.0
2015-11-19 14:34:56 +01:00
Thomas Müller
bcc486ffdc
Adding an existing sharee is idempotent
2015-11-19 11:34:59 +01:00
Thomas Müller
0f434e0b9b
Implement CSRF protection
2015-11-19 11:34:59 +01:00
Thomas Müller
4eb15885c9
Addressbook sharing added based on a simplified approach which is based on calendar sharing standard
2015-11-19 11:34:31 +01:00
Vincent Petry
ea6341df29
Core interfaces for system tags and its manager
2015-11-19 11:31:25 +01:00
Thomas Müller
58eaeb267c
Merge pull request #20570 from owncloud/integration-fix-docs
...
Integration fix docs
2015-11-19 11:31:10 +01:00
Thomas Müller
3869db1290
Merge pull request #20537 from owncloud/add-internal-locking-to-new-webdav-endpoint
...
Add internal locking plugin
2015-11-19 10:55:07 +01:00
Thomas Müller
4ff34daedb
Merge pull request #20533 from owncloud/log-level
...
clarify log level setting design, fix #20514
2015-11-19 10:41:30 +01:00
Thomas Müller
3cac07bedb
Merge pull request #20594 from owncloud/use-proper-variable
...
Use proper variable
2015-11-19 10:41:14 +01:00
Joas Schilling
0b8335ff2f
Make the JobList test more robust by sorting the result of getAll before comparison
2015-11-19 09:25:34 +01:00
Jenkins for ownCloud
c10be07c1b
[tx-robot] updated from transifex
2015-11-19 01:55:13 -05:00
Lukas Reschke
048ad25416
Use proper variable
...
`$shares` is not defined. Introduced with c3e7d324c5
and thus also in stable8.2
2015-11-18 22:28:48 +01:00
Robin Appelman
da5285dc23
Merge pull request #20584 from owncloud/fileinfo-owner-external-share
...
Fix getOwner for external shares
2015-11-18 21:49:10 +01:00
Thomas Müller
de30b2173d
Merge pull request #20585 from owncloud/fix-htaccess-dav
...
Update .well-known redirects to the new dav endpoint
2015-11-18 20:16:01 +01:00
Thomas Müller
7451e5bebc
Update .well-known redirects to the new dav endpoint
...
This reverts commit 68321efd29
.
2015-11-18 17:41:03 +01:00
Thomas Müller
68321efd29
Revert "Update .well-known redirects to the new dav endpoint"
...
This reverts commit d831c255ea
.
2015-11-18 17:38:46 +01:00
Thomas Müller
d831c255ea
Update .well-known redirects to the new dav endpoint
2015-11-18 17:37:07 +01:00
Robin Appelman
71b86c0ed4
Handle non existing users as owner in the view
2015-11-18 17:08:18 +01:00
Robin Appelman
1d82d93baa
Implement getOwner for external share storage
2015-11-18 17:08:02 +01:00
Thomas Müller
d8b73fde1a
Merge pull request #20371 from owncloud/add-caldav-2
...
Introducing CalDAV into core
2015-11-18 16:32:19 +01:00
Thomas Müller
90bd53c94e
Merge pull request #20567 from owncloud/dav-internalfileidprop
...
Add internal fileid to webdav response
2015-11-18 14:43:55 +01:00
Thomas Müller
8d74e28af6
Merge pull request #20438 from owncloud/memcache-key-length-fix
...
Handle errors on memcached level
2015-11-18 14:20:57 +01:00
Jan-Christoph Borchardt
9671103121
clarify log level setting design, fix #20514
2015-11-18 14:04:09 +01:00
Joas Schilling
90b020cf88
Delete when it is a directory...
2015-11-18 12:53:36 +01:00
Joas Schilling
fbcdf17089
Fix doc blocks
2015-11-18 12:53:20 +01:00