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

11369 commits

Author SHA1 Message Date
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
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
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
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
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
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
Vincent Petry
9e66653fb3 [IE8] Remove non-working ellipsis support 
This prevents the name element to be too wide, which would cause users
to mistakenly click on it instead of the empty space when wanting to
focus on a file for the sidebar.

Also fixed the close button on the sidebar (make it appear)
 2015-10-01 13:23:56 +02:00
Vincent Petry
8a34c29b2c [IE8] Fix dangling Delete action when multiselect is enabled 
For some reason we need to cancel out the table's top: 95px, but just
for the delete action and not the other ones... whatever, IE8...
 2015-10-01 11:50:34 +02:00
Jenkins for ownCloud
50874de1ca [tx-robot] updated from transifex 2015-10-01 01:54:55 -04:00
Thomas Müller
d6e3195b38 Merge pull request #19421 from owncloud/fix_19382 
Do noy allow empty urls to be submitted in "add to your owncloud"
 2015-09-30 22:17:18 +02:00
Vincent Petry
287fbdf77a [IE8] Fix file list checkboxes 2015-09-30 17:38:35 +02:00
Thomas Müller
1d8c10cf63 Merge pull request #19468 from owncloud/fix-36-vs-32-previews 
Change small thumbnails to 32 px
 2015-09-30 15:47:34 +02:00
Morris Jobke
2d1214d21d adjust style of disabled button 2015-09-30 15:28:28 +02:00
Thomas Müller
eeac6e2ab1 Merge pull request #19454 from owncloud/ie8-madness-returns 
[IE8] Fix file type sizes and popover menus in file list
 2015-09-30 15:15:38 +02:00
Thomas Müller
1514c0a9c3 Merge pull request #19470 from owncloud/pass-exception 
Only intercept exceptions of type "NotFoundException" instead of any …
 2015-09-30 14:38:20 +02:00
Thomas Müller
25b0b01f5e Merge pull request #19467 from owncloud/files-newmenu-highlightcurrent 
Keep opacity in current item in newFileMenu
 2015-09-30 14:21:28 +02:00
Vincent Petry
def76bed2a [IE8] opacity for active newFileMenu items 2015-09-30 14:03:51 +02:00
Roeland Jago Douma
08fd4b38f8 Do noy allow empty urls to be submitted in "add to your owncloud" 
Fixes #19382
 2015-09-30 13:55:13 +02:00
Lukas Reschke
22e724e829 Only intercept exceptions of type "NotFoundException" instead of any Exception 
The sharing backend may throw another exception for example when the activity app encounters a problem. Previously this just triggered a 404 error page and the exception got not logged at all. With this change such exceptions get not intercepted and regularly handled as exceptions so that we have meaningful log data. Also the user will be shown a window informing him that an error happened.

Helps to debug cases such as https://github.com/owncloud/core/issues/19465
 2015-09-30 13:32:20 +02:00
Thomas Müller
6d743ffac6 Merge pull request #19419 from owncloud/ldap-fix-dn-not-sanitized-when-fetched-by-memberof 
memberOf resembles a DN as well and is actively used
 2015-09-30 11:28:17 +02:00
Thomas Müller
750f19340f Merge pull request #19310 from owncloud/hide-sort-indicator 
hide sort indicator when in multiselect mode, ref #19056
 2015-09-30 11:07:45 +02:00
Thomas Müller
10978a7a61 Merge pull request #19373 from owncloud/sidebar-preview-cover 
Cover both width and height for the sidebar preview
 2015-09-30 11:07:18 +02:00
Morris Jobke
1051a3c6f5 Change small thumbnails to 32 px 
* fixes #16913
* fixes issues in IE8 where the thumbnail is too big
 2015-09-30 10:49:48 +02:00
Vincent Petry
d835115600 Keep opacity in current item in newFileMenu 
Whenever the input field appears, the menu item should keep its opacity
instead of reacting on hover.
 2015-09-30 10:44:59 +02:00
Vincent Petry
97bfc20ac8 [IE8] Fix popover menu borders for IE8 
- fixes "New" menu
- fixes file actions menu
 2015-09-29 18:28:34 +02:00
Vincent Petry
dbb6692468 [IE8] Fix filetype icon sizes 
Added hack that uses a "filter" CSS with explicit URL to fix the "New"
menu by scaling down icons and also fix the folder/filetype icon in the sidebar
by scaling it up.
 2015-09-29 18:28:31 +02:00
Thomas Müller
733673b39d Merge pull request #19365 from owncloud/files-detailsbar-interaction 
Fix sidebar interaction
 2015-09-29 14:44:28 +02:00
Vincent Petry
1015ca72c3 Prevent sort indicator hover to bypass multiselect restriction 2015-09-29 14:38:29 +02:00
Vincent Petry
d52361b09b Disable sorting when multiselect is enabled in file list 2015-09-29 13:24:33 +02:00
Thomas Müller
580a961020 Merge pull request #17601 from owncloud/publicwebdav-allowajaxwhendisabled 
Allow ajax requests on public webdav interface
 2015-09-29 13:21:50 +02:00
Thomas Müller
f2cd334c8a Merge pull request #19417 from owncloud/files-upload-checkconflictbeforeupload 
Show conflict dialog before upload when possible
 2015-09-29 13:17:47 +02:00
Thomas Müller
54b507306a Merge pull request #19409 from owncloud/files-sidebar-hiding-tabs 
Hide sidebar tab headers conditionally
 2015-09-29 13:17:38 +02:00