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

27547 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bjoern Schiessle
0ce28a574a if mountpoint is applicable to all users the old API expects a array with 'all' 2015-10-02 16:17:28 +02:00
Vincent Petry
64ca00925b Prevent moving mount point into already shared folder (outgoing) 
It is already not allowed to share a folder containing mount points /
incoming shares.

This fixes an issue that made it possible to bypass the check by moving
the incoming share mount point into an existing outgoing share folder.
 2015-10-02 16:14:42 +02:00
Roeland Jago Douma
c80dd82fe4 Added mimetype repair step 
* Version number increased
 2015-10-02 16:06:56 +02:00
Roeland Jago Douma
57ceee13a9 Updated some mimetypes 
* c++ and cpp now both map to code
 2015-10-02 15:28:23 +02:00
Robin McCorkell
aeb20675dd Allow recursive mimetype aliases 
application/xml -> text/html -> text/code
 2015-10-02 15:28:23 +02:00
Robin McCorkell
cd7aff47e1 Introduce a few new mimetypes for code 2015-10-02 15:28:23 +02:00
Robin Appelman
af01c04360 Merge pull request #19533 from owncloud/free-space-inf 
Work around INF=0 on some shared hosts
 2015-10-02 15:04:28 +02:00
Thomas Müller
54e19d7ca3 Merge pull request #19514 from owncloud/list_remote_shares_in_shared_with_you 
List remote shares in shared with you
 2015-10-02 14:48:12 +02:00
Thomas Müller
c64101ff6e Merge pull request #19482 from owncloud/kill-unused-method 
[l10n] remove unused static methods
 2015-10-02 14:21:08 +02:00
Robin Appelman
a1d0d23b6a Work around INF=0 on some shared hosts 2015-10-02 14:16:13 +02:00
Thomas Müller
594a3e4e22 Merge pull request #19523 from owncloud/fix-seconds-ago 
Fix moment.js "a few seconds ago" with "seconds ago"
 2015-10-02 14:11:46 +02:00
Morris Jobke
6b53f7c40e [l10n] remove unused static methods 2015-10-02 12:51:45 +02:00
Roeland Jago Douma
4adc78b78b Fix and extend unit tests 2015-10-02 12:45:52 +02:00
Roeland Jago Douma
40dd2d9dbe More fileinfo 2015-10-02 12:45:52 +02:00
Roeland Jago Douma
eeafccb3a6 Start to show remote shares in shared with you section 2015-10-02 12:45:47 +02:00
Thomas Müller
4fb2ef3bac Merge pull request #19497 from owncloud/ie8-multiselect-delete-action-puke 
[IE8] Fix dangling Delete action when multiselect is enabled
 2015-10-02 12:16:31 +02:00
Thomas Müller
2912d0e3e3 Merge pull request #19499 from owncloud/files-versions-properlyreloadafterrevert 
Reload versions list after revert
 2015-10-02 12:16:10 +02:00
Thomas Müller
f9093688cc Merge pull request #19500 from owncloud/fix_trash_with_encryption2 
[trashbin] fix broken versions on restore
 2015-10-02 12:15:58 +02:00
Thomas Müller
3564a837d8 Merge pull request #19521 from owncloud/files-conflictdialog-loadpromise 
Make sure the conflict dialog is loaded before adding conflicts
 2015-10-02 12:15:44 +02:00
Thomas Müller
d0f6bfe7b6 Merge pull request #19508 from owncloud/setting-to-skip-migration-tests 
setting to skip migration tests by default
 2015-10-02 12:15:23 +02:00
Thomas Müller
8944cb539e Merge pull request #19510 from owncloud/json-grouplist-sharing-exclude 
save excluded groups in json format
 2015-10-02 12:14:36 +02:00
Thomas Müller
ccbdcf0ab3 Merge pull request #19522 from owncloud/activity-395-less-sidebar-text 
Activity 395 less sidebar text
 2015-10-02 12:13:53 +02:00
Thomas Müller
daf9a63d43 Merge pull request #19386 from owncloud/ocs_shareapi_extenstion 
OCS endpoint to list remote shares
 2015-10-02 12:13:36 +02:00
Roeland Jago Douma
3d2acb5003 sharingcheckmiddleware now handles externalshares as well 
Added new annotations for the externalsharescontroller class
* @NoOutgoingFederatedSharingRequired
* @NoIncomingFederatedSharingRequired

By default both are required for all functions in the
externalSharesController.

A proper exception is thrown and then a 405 is returned instead of the
default error page. Since it is only an API endpoint this makes more
sense.

Unit tests added and updated
 2015-10-02 12:03:53 +02:00
Roeland Jago Douma
dc38e674a5 Split files_sharing middelware 
Since for external shares there is no need for link shares to be enabled
we should check which controller is actually being called.

This makes sure that in all cases we verify that the files_sharing app
is enabled. But only for the share controller (public shares) we check
if the API is enabled and if links are enabled.

TODO: add checks for federated sharing as well
 2015-10-02 11:56:11 +02:00
Morris Jobke
4b3a5a257f Fix moment.js "a few seconds ago" with "seconds ago" 
* fixes #18627
 2015-10-02 10:51:51 +02:00
Jörn Friedrich Dreyer
aaabe356b5 Merge pull request #19520 from owncloud/issue-17420-modify-group-count-when-changing-memberships 
Modify the group user count when changing membership of a user
 2015-10-02 10:34:57 +02:00
Joas Schilling
e478d925c3 Fix intendation 2015-10-02 10:01:33 +02:00
Joas Schilling
17ab8e6c39 Use shorter text on the sidebar for files_sharing activities 2015-10-02 10:01:33 +02:00
Vincent Petry
5dff9d88cb Make sure the conflict dialog is loaded before adding conflicts 2015-10-02 09:55:43 +02:00
Joas Schilling
f3864c5444 Use shorter text on the sidebar for files activities 2015-10-02 09:54:07 +02:00
Joas Schilling
7707bbe648 Allow identifying whether the current item is the filtered one 2015-10-02 09:53:39 +02:00
Jörn Friedrich Dreyer
3dec30d0e0 Merge pull request #19484 from owncloud/ie8-checkbox-rage 
[IE8] Fix checkboxes in login page and file list
 2015-10-02 08:58:16 +02:00
Jörn Friedrich Dreyer
bf4c3ce134 Merge pull request #19496 from owncloud/ie8-filenamewidth-sickness 
[IE8] Remove non-working ellipsis support
 2015-10-02 08:57:51 +02:00
Jörn Friedrich Dreyer
3098fd0d30 Merge pull request #19505 from owncloud/returnfloatforquota 
always return float, update doc
 2015-10-02 08:57:04 +02:00
Jörn Friedrich Dreyer
b18307aafb Merge pull request #19480 from owncloud/fix-l10n 
Fix l10n on master
 2015-10-02 08:56:33 +02:00
Joas Schilling
3ce45863ab Modify the group user count when changing membership of a user 2015-10-02 08:55:53 +02:00
Roeland Jago Douma
c924b6740a Do not return unneeded info 2015-10-02 08:11:50 +02:00
Jenkins for ownCloud
3b4592718a [tx-robot] updated from transifex 2015-10-02 01:54:51 -04:00
Roeland Jago Douma
c3e7d324c5 Extend share info 
The data from the share_external is not to much. Thus we enrich this
data with info from the filecache.

This allows endpoints using this to actually show usefull information.

The filecache might not be up to date but that is a sacrifice we need to
make in terms of speed. Else the number of remote PROPFINDS grows
lineary with the number of remote shares wich will make this endpoint
practically unusable.
 2015-10-02 07:41:57 +02:00
Roeland Jago Douma
0d3009951f Made routes remote_shares only again 
Since we need a unique id to accept/reject shares for now we keep the
pending shares under remote_shares.

* remote_shares/pending lists pending shares
* PUT/DELETE to remote_shares/pending/<ID> will accept/reject the share
 2015-10-02 07:40:53 +02:00
Roeland Jago Douma
7310c4166a Added '../remote_shares' endpoint 
* list incoming remote shares at 'remote_shares'
* get per share info at 'remote_shares/<ID>'
* delete remote share with a DELETE to 'remote_shares/<ID>'
 2015-10-02 07:40:04 +02:00
Roeland Jago Douma
4a62021141 Move OCS endpoint ../remote_share to ../pending_shares 2015-10-02 07:39:58 +02:00
VicDeo
f891b91cf8 Merge pull request #19518 from owncloud/checkboxes-file-restore 
Display checkboxes properly after file restore
 2015-10-02 00:20:40 +03:00
Hendrik Leppelsack
d4ce713749 display checkboxes properly after file restore 2015-10-01 22:54:36 +02:00
Bjoern Schiessle
b940287ffa first copy to owner and then move to current user because the encryption 
wrapper always expect to work on the owner storage
 2015-10-01 17:09:17 +02:00
Vincent Petry
b6114ba2b6 Reload versions list after revert 2015-10-01 17:06:24 +02:00
Thomas Müller
b6591084a1 Merge pull request #19463 from owncloud/fix_18132 
encryption: versions should always use the keys of the original file, no need to …
 2015-10-01 16:56:28 +02:00
Robin Appelman
8ae4f5bf1a Merge pull request #17703 from owncloud/preview-better-cache-use 
Better cache usage for previews
 2015-10-01 16:24:29 +02:00
Thomas Müller
b2dd5cb616 save excluded groups in json format - fixes #10983 2015-10-01 15:37:55 +02:00