Commit graph

28352 commits

Author SHA1 Message Date
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
Vincent Petry
978303e03e Add internal fileid to webdav response
Introduce a new property "oc:fileid" to return the internal file id.

This is because the original "oc:id" property is a compound and it is
not possible to extract the real id without knowing the instance id. The
instance id is not available to external clients.
2015-11-18 11:41:04 +01:00
Thomas Müller
6efa72867a Merge pull request #20540 from owncloud/fix-format-call-in-logger
Try to fix logging errors we did observe on ci ....
2015-11-18 09:18:54 +01:00
Thomas Müller
aba119951e Merge pull request #20494 from owncloud/storage-forbidden-exception
Allow storage wrappers to through a forbidden exception with retry information for clients
2015-11-18 09:13:45 +01:00
Thomas Müller
11f123c7d8 Merge pull request #20546 from owncloud/provision_api_fix
[provisioning api] Return empty list if group does not have subadmins
2015-11-18 09:13:13 +01:00
Thomas Müller
8db9c49cda Merge pull request #20551 from owncloud/notification-fix-tests
Notification - Add tests for the "return $this" and fix it on the new method
2015-11-18 09:12:27 +01:00
Jenkins for ownCloud
cd4380c322 [tx-robot] updated from transifex 2015-11-18 01:55:08 -05:00
Thomas Müller
20c251a575 Merge pull request #20188 from owncloud/webdav-exposeshareowner
Expose share owner id and display name via files webdav
2015-11-17 13:40:25 +01:00
Thomas Müller
74ce6d29e1 Merge pull request #20544 from owncloud/move-index-to-appframework
Move index.php from files to AppFramework
2015-11-17 12:49:38 +01:00
Joas Schilling
e2cfcd992c Allow storage wrappers to through a forbidden exception with retry information 2015-11-17 10:39:52 +01:00
Joas Schilling
2fde6a77d7 Add tests for the "return $this" and fix it on the new method 2015-11-17 09:26:13 +01:00
Thomas Müller
705d208a8a Merge pull request #20539 from owncloud/notification-api-adjustment
Notification api update
2015-11-17 08:39:06 +01:00
Jenkins for ownCloud
56f44a457c [tx-robot] updated from transifex 2015-11-17 01:55:08 -05:00
Roeland Jago Douma
6dcaac7e2c Return empty list if group does not have subadmins
Instead of throwing an error just return an empty list. Since that is
actually what it is.

Fixes #19789
2015-11-16 22:24:53 +01:00
Robin Appelman
d49fc9a5fc fix ip detection for swift-ceph 2015-11-16 21:52:31 +01:00
Lukas Reschke
daa388ce8d Move index.php from files to AppFramework
1. Allows it to use the more secure CSP rules of the AppFramework.
2. Adds some unit tests.
2015-11-16 21:10:11 +01:00
Thomas Müller
e4568234a5 Use uri as displayname 2015-11-16 21:01:27 +01:00
Thomas Müller
5ec64c4fd7 Merge pull request #20292 from owncloud/provisioning_api_group_unittest
Moved grouptest over to pure unit tests
2015-11-16 18:00:03 +01:00
Thomas Müller
a0b649442c components was not written to the database 2015-11-16 17:57:39 +01:00
Thomas Müller
854f9dbea7 Merge pull request #20541 from owncloud/password_policy-is-not-experimantal
password_policy is a shipped app
2015-11-16 16:51:27 +01:00
Thomas Müller
2784907782 password_policy is a shipped app 2015-11-16 16:36:12 +01:00
Thomas Müller
6ffd042a64 fixes #20538 2015-11-16 16:29:21 +01:00
Thomas Müller
fc296aad5d Add occ command to create a new calendar 2015-11-16 16:29:01 +01:00
Joas Schilling
40d5d55124 Remove the icon for now 2015-11-16 16:17:23 +01:00
Joas Schilling
1666af89c2 Add "is primary action" to actions 2015-11-16 16:14:52 +01:00
Robin Appelman
cfc2d0b8fe Merge pull request #20534 from owncloud/sftp-parse-host
Fix parsing of sftp hosts when using ipv6
2015-11-16 16:14:06 +01:00
Thomas Müller
5fc414abfd Add internal locking plugin - fixes #20502 2015-11-16 16:09:04 +01:00
Thomas Müller
867fd94dc6 Add scheduling backend 2015-11-16 15:49:46 +01:00
Vincent Petry
d62f410f92 Add "owner-id" and "owner-display-name" Webdav properties 2015-11-16 15:31:41 +01:00
Thomas Müller
8169e4fdc8 Merge pull request #20465 from owncloud/forms.css
Move form styles from styles.css to inputs.css
2015-11-16 15:29:02 +01:00
Thomas Müller
23e7a62717 Fix Oracle 2015-11-16 15:28:34 +01:00
Thomas Müller
9ea81b71f5 Merge pull request #20532 from owncloud/ocs-allow-v2
Allow creating OCS v2 links in JS
2015-11-16 15:15:53 +01:00
Thomas Müller
28ed2d8072 Merge pull request #20447 from owncloud/heading-styles
standardize sizes for headings
2015-11-16 15:01:00 +01:00
Thomas Müller
2cb94cd4eb Merge pull request #20356 from owncloud/share2.0_getShare
[Share2.0] OCS Share API getShare uses new code
2015-11-16 15:00:30 +01:00
Thomas Müller
10d2b68f8f Merge pull request #18605 from owncloud/api-adduser-for-subadmins
enable api addUser for subadmins
2015-11-16 14:57:27 +01:00
Robin Appelman
67710e62fa Fix parsing of sftp hosts when using ipv6 2015-11-16 14:56:03 +01:00
Jan-Christoph Borchardt
5b72d9026f standardize sizes for headings 2015-11-16 14:42:10 +01:00
Roeland Jago Douma
61425b7621 Moved grouptest over to pure unit tests 2015-11-16 14:40:01 +01:00
Joas Schilling
78c456b895 Allow creating OCS v2 links in JS 2015-11-16 14:23:43 +01:00
Thomas Müller
a03b1f1ee9 Merge pull request #20522 from owncloud/update-strengthify
Update strengthify to 0.4.2
2015-11-16 13:51:11 +01:00
Roeland Jago Douma
1e9fc33212 [Share2.0] OCS Share API getShare uses new code 2015-11-16 13:32:28 +01:00
Thomas Müller
2b13c5db0f Introducing CalDAV into core 2015-11-16 13:24:50 +01:00
Thomas Müller
5e3d29b661 Merge pull request #20505 from owncloud/fakelocking-for-mac
Add fake locker plugin for WebDAVFS
2015-11-16 13:15:40 +01:00
Thomas Müller
f0af761fa6 Merge pull request #20463 from owncloud/sharing-api-integration-tests-adding-cases
Sharing api integration tests adding cases
2015-11-16 11:54:46 +01:00
Morris Jobke
b1abef77e4 Update strengthify to 0.4.2
* includes local changes (ported them to upstream - see #10625)
* tipsy -> tooltip
* re-renders the element on scroll of a parent - fixes #20454
2015-11-16 11:16:38 +01:00
Thomas Müller
650945a2a0 Merge pull request #20510 from owncloud/avatar_unittest_fix
[Avatar] No need to setup FS for avatar tests
2015-11-16 10:30:28 +01:00
Jenkins for ownCloud
ae58409f22 [tx-robot] updated from transifex 2015-11-16 01:54:50 -05:00