wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
31465 commits 157 branches 562 tags 714 MiB
Commit graph

13122 commits

Author SHA1 Message Date
Roeland Jago Douma
8c0ef4c4bd Add sharePermissions webdav property 
This property can be queries by the clients so they know the max
permissions they can use to share a file with. This will improve the UX.

The oc:permissions proptery is not enough since mountpoints have
different permissions (delete + move by default).

By making it a new property the clients can just request it. On older
servers it will just return a 404 for that property (and thus they know
they have to fall back to their hacky work arounds). But if the property
is returned the client can show proper info.

* unit tests
* intergration test
 2016-03-31 20:12:34 +02:00
Thomas Müller
dea3985e86 Merge pull request #23516 from owncloud/dropbox-stream-download 
Dropbox stream download with RetryWrapper
 2016-03-31 20:07:36 +02:00
Lukas Reschke
ba69a90ab5 Enforce type 2016-03-31 19:32:30 +02:00
Vincent Petry
262547ba3d Return 401 DummyBasicAuth in case of ajax call 2016-03-31 19:31:31 +02:00
Jan-Christoph Borchardt
a8a98d42cb improve emptycontent styles 2016-03-31 15:31:04 +02:00
Thomas Müller
8394985e14 Merge pull request #23672 from owncloud/use-retry-wrapper-for-sftp 
Use RetryWrapper for SFTP storage
 2016-03-31 11:24:47 +02:00
Jenkins for ownCloud
82da373ee7 [tx-robot] updated from transifex 2016-03-31 01:55:24 -04:00
Thomas Müller
d7072ee8e5 Merge pull request #23642 from stweil/master 
apps: Fix some typos found by codespell
 2016-03-30 23:47:00 +02:00
Thomas Müller
395c3d852d Merge pull request #23508 from owncloud/text-columns-should-have-length 
Text columns should really have a length 🙈
 2016-03-30 23:46:26 +02:00
Lukas Reschke
3dc5c59e57 Use RetryWrapper for SFTP storage 
Equivalent to https://github.com/owncloud/core/pull/23442

Required for making encryption work with external storage reliable.
 2016-03-30 22:45:09 +02:00
Thomas Müller
00c9974d94 Merge pull request #23663 from owncloud/share-displayownerfix 
Fix displaying owner before share icon in file list
 2016-03-30 18:42:25 +02:00
Vincent Petry
7be541bda1 GDrive stream download with RetryWrapper 2016-03-30 18:39:41 +02:00
Vincent Petry
a9aa39efbf Fix displaying owner before share icon in file list 
Initial display of owner was missing
 2016-03-30 18:09:02 +02:00
Lukas Reschke
bd93722e12 Use the shipped cacerts.pem instead of the global one 
The one we ship may cause problems since Equifax is not included anymore (SHA-1 certs) are deprecated. We should just be consistent here and also use the certificate file which is used by the other calls in the library.
 2016-03-30 16:58:39 +02:00
Morris Jobke
6ffaf726d8 Design LDAP wizard to better integrate into the design 
* mostly replaces gray background with white one
 2016-03-30 15:24:14 +02:00
Stefan Weil
524b374f02 apps/files_external: Fix typos in comments (found and fixed by codespell) 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2016-03-30 13:27:12 +02:00
Stefan Weil
217d9e8e95 apps/files_trashbin: Fix typos in comments (found and fixed by codespell) 
Fix also a wrong word.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2016-03-30 10:14:26 +02:00
Stefan Weil
65b0127241 apps/dav: Fix typos in comments (found and fixed by codespell) 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2016-03-30 10:14:26 +02:00
Jenkins for ownCloud
fc708c1e04 [tx-robot] updated from transifex 2016-03-30 01:57:41 -04:00
Thomas Müller
cd850dc325 Merge pull request #23568 from owncloud/finally-fix-23328-now-for-addressbooks-as-well 
Handle group shares of addressbooks on v1 as well ... now FINALLY ....
 2016-03-29 18:41:40 +02:00
Jenkins for ownCloud
dd5bbc31f2 [tx-robot] updated from transifex 2016-03-29 01:55:16 -04:00
Jenkins for ownCloud
a092fe3bf8 [tx-robot] updated from transifex 2016-03-28 01:55:08 -04:00
Jenkins for ownCloud
1079554284 [tx-robot] updated from transifex 2016-03-27 01:55:45 -04:00
Achim Königs
596a8416c2 Merge branch 'master' into alarms_for_birthdayevents 2016-03-26 14:27:38 +01:00
Jenkins for ownCloud
3e33b686b1 [tx-robot] updated from transifex 2016-03-26 01:55:15 -04:00
Jenkins for ownCloud
ae97b8e1c2 [tx-robot] updated from transifex 2016-03-25 01:55:47 -04:00
Thomas Müller
ab0db65b23 Merge pull request #23549 from owncloud/dav-sharetypes-remote 
Return remote shares in oc:share-types Webdav property
 2016-03-24 22:44:19 +01:00
Lukas Reschke
95820fbd5b Add magical regex to catch browsers 2016-03-24 19:02:16 +01:00
Thomas Müller
c46f480031 In case of exception we return an html page in case the client is a browser 2016-03-24 19:02:16 +01:00
Thomas Müller
89cd6e228d Handle group shares of addressbooks on v1 as well ... now FINALLY .... 2016-03-24 17:11:07 +01:00
Thomas Müller
a7e7f5e180 Merge pull request #23511 from owncloud/sidebar-click 
sidebar click modification
 2016-03-24 13:30:27 +01:00
Thomas Müller
3d51682440 Merge pull request #23342 from owncloud/fix-group-sharing-for-v1-caldav-and-carddav 
Fix group shares on v1 caldav and carddav
 2016-03-24 12:47:18 +01:00
Vincent Petry
9ee1f506f2 Return remote shares in oc:share-types Webdav property 
Fixes web UI to properly display the share status icon when an outgoing
remote share exists
 2016-03-24 12:16:57 +01:00
Erik Pellikka
50655cbf7f sidebar click modification 2016-03-24 11:57:40 +01:00
Thomas Müller
06e8c70400 Fix acls for calendar objects and cards - fixes #23273 2016-03-24 09:53:36 +01:00
Thomas Müller
8c2b19d2bc Return proper current-user-principal on v1 endpoints - fixes #23306 2016-03-24 09:53:36 +01:00
Thomas Müller
4c738ea9c4 Fix group shares on v1 caldav and carddav - fixes #23328 2016-03-24 09:53:36 +01:00
Lukas Reschke
cc8c0b6a90 Check if request is sent from official ownCloud client 
There are authentication backends such as Shibboleth that do send no Basic Auth credentials for DAV requests. This means that the ownCloud DAV backend would consider these requests coming from an untrusted source and require higher levels of security checks. (e.g. a CSRF check)

While an elegant solution would rely on authenticating via token (so that one can properly ensure that the request came indeed from a trusted client) this is a okay'ish workaround for this problem until we have something more reliable in the authentication code.
 2016-03-24 08:59:56 +01:00
Jenkins for ownCloud
4b3af9dfe7 [tx-robot] updated from transifex 2016-03-24 01:57:28 -04:00
Achim Königs
4b2f9e4027 add VALARM for birthday events 
ACTION=DISPLAY *should* prevents audible alarms.
 2016-03-23 23:21:10 +01:00
Vincent Petry
02c2568442 Dropbox stream download with RetryWrapper 2016-03-23 18:06:01 +01:00
Thomas Müller
765cff49fa Merge pull request #23507 from owncloud/fix-23496-master 
Avoid fatal php error dring cron execution
 2016-03-23 17:21:49 +01:00
Thomas Müller
c8d6a9594a Propagate birthday to group shares as well 2016-03-23 14:12:50 +01:00
Thomas Müller
ea07a428f4 Merge pull request #22506 from owncloud/node-get-from-cache 
Query the cache when checking if a node exists
 2016-03-23 13:08:17 +01:00
Thomas Müller
e979b9c735 Propagate birthdays of shared addressbooks to the sharee's birthday calendar as well 2016-03-23 12:29:45 +01:00
Thomas Müller
1da18a8ceb Text columns should really have a length 🙈 2016-03-23 12:03:54 +01:00
Thomas Müller
765c64c73e fixes #23496 2016-03-23 11:37:00 +01:00
Thomas Müller
24331be991 Merge pull request #23431 from owncloud/use-dav-sabre-plugin-for-browser-2 
Fix display of vcard and calendar object details page in browser plugin
 2016-03-23 11:03:55 +01:00
Thomas Müller
164282c72e Fix display of vcard and calendar object details page in browser plugin 2016-03-23 10:35:21 +01:00
Thomas Müller
61c5717281 Merge pull request #23463 from owncloud/lets-consistently-use-no-referer 
Consistently use rel=noreferrer
 2016-03-23 09:14:54 +01:00
Thomas Müller
a25872e034 Merge pull request #23495 from owncloud/disable-paste-zone 
Disable pastezone for jquery.fileupload
 2016-03-23 09:03:50 +01:00
Jenkins for ownCloud
e6fb139eb9 [tx-robot] updated from transifex 2016-03-23 01:57:22 -04:00
Thomas Müller
d5be21fe81 Merge pull request #23398 from owncloud/block_group_sharing 
Allow blocking of group sharing
 2016-03-22 21:28:13 +01:00
Lukas Reschke
f8ae1bb36e Disable pastezone for jquery.fileupload 
jquery.fileupload offers the [`pastezone`](https://github.com/blueimp/jQuery-File-Upload/wiki/Options#pastezone) functionality. This functionality is enabled by default and if somebody copy-pastes something into Chrome it will automatically trigger an upload of the content to any configured jquery.fileupload element embedded in the JS.

This implementation triggers some problems:

1. The pastezone is defined globally by default (🙈). So if there are multiple fileupload's on a page (such as in the personal settings) then stuff is going to be uploaded to all embedded uploads.
2. Our server code is not able to parse the data. For example for uploads in the files app we expect a file name which is not specified => Just an error is thrown. You can reproduce this by taking a file into your clipboard and in Chrome then pressing <kbd>CTRL + V</kbd>.
3. When copy-pasting some string from MS Office on the personal page a temporary avatar with said content is created.

Considering that this is anyways was never working at all and causes bugs I've set the `pastezone` to `null`. This mens that upload via copy and paste will be disabled.

Lesson learned: Third-party JS libraries can have some weird details.
 2016-03-22 20:28:57 +01:00
Roeland Jago Douma
00f48ec37b When the Share API is disabled do not return shares 
Fixes #22668

Block everything in the OCS Share API
 2016-03-22 19:43:23 +01:00
Roeland Jago Douma
e69a09756b Respect disabled group sharing in sharee endpoint 
* Fix tests
 2016-03-22 17:13:34 +01:00
Roeland Jago Douma
52826d0e24 Block group sharing in API and in share manager 
* Fix tests
 2016-03-22 17:13:34 +01:00
Thomas Müller
48ec8ab3d3 Merge pull request #23404 from owncloud/fix-22988 
adjust PrincipalUri as returned from Sabre to effective username
 2016-03-22 14:49:54 +01:00
Thomas Müller
9fc371e436 Merge pull request #23320 from owncloud/early-creation-of-birthday-calendar 
Create the contact birthday calendar right away as soon as the comman…
 2016-03-22 10:31:01 +01:00
Thomas Müller
5e4f9b8627 Merge pull request #23440 from owncloud/fix_22286 
apply retry wrapper to make sure that we always read/write a complete block
 2016-03-22 09:50:05 +01:00
Thomas Müller
ac799a40e3 Merge pull request #23422 from owncloud/icon-and-you-translation-for-comments 
Add comment icon and "You commented" translations to activities
 2016-03-22 09:49:30 +01:00
Jenkins for ownCloud
aa5bb56010 [tx-robot] updated from transifex 2016-03-22 01:55:40 -04:00
Arthur Schiwon
be572de7f0 fix unittest 2016-03-21 21:53:16 +01:00
Thomas Müller
2357bbf80a Merge pull request #23439 from owncloud/smb-permissions 
properly use smb permissions
 2016-03-21 18:05:45 +01:00
Thomas Müller
36e1476270 Merge pull request #23388 from owncloud/issue-22887-infinite-background-job-loop-for-old-versions 
Do not create a new job when federation failed to connect but use existing job
 2016-03-21 18:04:02 +01:00
Thomas Müller
736b80f0cb Merge pull request #23323 from owncloud/gdrive-chunkupload 
Chunk upload for GDrive
 2016-03-21 18:02:55 +01:00
Thomas Müller
beef371398 Merge pull request #23292 from owncloud/dav-chunking-onlyfirehooksonce 
Do not fire pre/post hooks twice on chunk upload
 2016-03-21 18:02:30 +01:00
Thomas Müller
492a1ded1c Merge pull request #23083 from owncloud/generate-birthdays-on-upgrade 
Birthday events are generated on upgrade
 2016-03-21 17:48:02 +01:00
Bjoern Schiessle
f761733f17 apply retry wrapper to make sure that we always read/write a complete block 2016-03-21 17:39:43 +01:00
Vincent Petry
f28f538029 Do not fire pre/post hooks twice on chunk upload 2016-03-21 15:14:58 +01:00
Robin Appelman
8ab70b1231 properly use smb permissions 2016-03-21 14:35:41 +01:00
Robin Appelman
792752772d update icewind/smb to 1.0.8 2016-03-21 14:24:00 +01:00
Robin Appelman
dfbd85d723 update icewind/streams to 0.4.0 and icewind/smb to 1.0.7 in files_external 2016-03-21 14:24:00 +01:00
Robin Appelman
d0dd76bb8a set watch policy in test 2016-03-21 13:53:33 +01:00
Thomas Müller
8852fdaee3 Merge pull request #22789 from owncloud/dav-sharesproperty 
Add webdav property for share info in PROPFIND response
 2016-03-21 11:15:00 +01:00
Joas Schilling
b7f7fc7241 Do not create a new job when it failed to connect atm 2016-03-21 10:29:53 +01:00
Thomas Müller
e983bd7db0 Merge pull request #23368 from owncloud/use-dav-sabre-plugin-for-browser 
In debugging mode we enable Sabre's browser plugin since it helps a l…
 2016-03-21 10:13:27 +01:00
Thomas Müller
c77412b1ac Merge pull request #22792 from owncloud/no-recovery-key-if-the-master-key-is-enabled 
disable the recovery key if the master key is enabled
 2016-03-21 09:49:15 +01:00
Thomas Müller
8442516e10 Merge pull request #23329 from owncloud/fix-21555 
Avatar must be saved after login is done and external storages set up…
 2016-03-21 09:47:50 +01:00
Joas Schilling
b2f4e4559f Add comment icons and "You commented" translations 2016-03-21 09:41:13 +01:00
Jenkins for ownCloud
35bc315f59 [tx-robot] updated from transifex 2016-03-21 01:55:40 -04:00
Lukas Reschke
6ad957906e Consistently use rel=noreferrer 
When linking to external entities we should consistently use rel=noreferrer
 2016-03-20 15:27:20 +01:00
Jenkins for ownCloud
1f1d87d413 [tx-robot] updated from transifex 2016-03-20 01:55:09 -04:00
Jenkins for ownCloud
9c053ed465 [tx-robot] updated from transifex 2016-03-19 01:55:39 -04:00
Arthur Schiwon
117c1bffa7 adjust PrincipilUri as returned from Sabre to effective username 2016-03-18 23:31:11 +01:00
Pau
3f3498164c Fixed hidden settings and delete icons 2016-03-18 17:51:36 +01:00
Jenkins for ownCloud
a6c921267e [tx-robot] updated from transifex 2016-03-18 01:59:00 -04:00
Thomas Müller
0bc51b9118 Merge pull request #23272 from owncloud/dropbox-downloadnotthefullfileinmemory 
Fix dropbox storage to not store the whole file in memory
 2016-03-17 20:52:41 +01:00
Thomas Müller
31ee463690 Merge pull request #23282 from owncloud/fix-caching-unavailable-ldap 
fix writing to cache when fallback server should be used immediately
 2016-03-17 20:52:22 +01:00
Thomas Müller
d6d59fe227 Merge pull request #23346 from owncloud/fix_23325 
Set proper public webdav permissions when public upload disabled
 2016-03-17 20:51:54 +01:00
Roeland Jago Douma
6e6e002280 Remove duplicated copyright 2016-03-17 19:24:25 +01:00
Thomas Müller
520724d757 Necessary code changes to make browser plugin properly work 2016-03-17 18:00:06 +01:00
Thomas Müller
7d638fdb34 In debugging mode we enable Sabre's browser plugin since it helps a lot when debugging 2016-03-17 16:51:19 +01:00
Vincent Petry
950530b162 Display share status info in favorite list 
Returns the shareTypes share status info to the favorites file list.
 2016-03-17 15:35:21 +01:00
Vincent Petry
f778e48ee5 Add webdav property for share info in PROPFIND response 2016-03-17 15:35:21 +01:00
Thomas Müller
8fb3e44610 Merge pull request #23287 from owncloud/issue-22786-absolute-paths 
Fix absolute path creation for remote shares with /oc webroot
 2016-03-17 14:29:57 +01:00
Vincent Petry
5db41dfbed Only use GDrive chunks when needed 2016-03-17 12:36:47 +01:00
Roeland Jago Douma
533fdb4075 Set proper public webdav permissions when public upload disabled 
Fixes #23325

It can happen that a user shares a folder with public upload. And some
time later the admin disables public upload on the server.

To make sure this is handled correctly we need to check the config value
and reduce the permissions.

Fix is kept small to be easy backportable.
 2016-03-17 11:35:31 +01:00
Thomas Müller
828cb08d49 Merge pull request #23334 from owncloud/ext-user-mounting-gui 
Display external storage GUI even if user mounting disabled
 2016-03-17 09:55:23 +01:00
Thomas Müller
b5c56a7322 Merge pull request #23336 from owncloud/occ-typos 
Some typo corrections in occ command output
 2016-03-17 09:31:11 +01:00