Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-06 | 26 | -16/+164 |
| | |||||
* | Fix tooltip placement on rename error | Vincent Petry | 2015-10-05 | 1 | -2/+2 |
| | |||||
* | add some output to explain the pre-conditions for decrypt-all | Bjoern Schiessle | 2015-10-05 | 1 | -0/+6 |
| | |||||
* | Merge pull request #19487 from owncloud/split_share_middleware | Thomas Müller | 2015-10-05 | 8 | -86/+229 |
|\ | | | | | Split files_sharing middelware | ||||
| * | sharingcheckmiddleware now handles externalshares as well | Roeland Jago Douma | 2015-10-02 | 8 | -66/+195 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Split files_sharing middelware | Roeland Jago Douma | 2015-10-02 | 2 | -29/+43 |
| | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | Merge pull request #19552 from owncloud/inline_fileactions_alttext | Thomas Müller | 2015-10-05 | 2 | -1/+58 |
|\ \ | | | | | | | If an inline files action provides an alt text show it | ||||
| * | | If an inline files action provides an alt text show it | Roeland Jago Douma | 2015-10-03 | 2 | -1/+58 |
| | | | | | | | | | | | | | | | * Added unit tests for icon display * Added unit tests for icon alt text display | ||||
* | | | Merge pull request #19539 from owncloud/fix-multiselect-overlap-shorter | Thomas Müller | 2015-10-05 | 1 | -0/+4 |
|\ \ \ | | | | | | | | | Fix filelist size issues, breadcrumb, multiselect | ||||
| * | | | Fix filelist size issues, breadcrumb, multiselect | Vincent Petry | 2015-10-02 | 1 | -0/+4 |
| | |/ | |/| | | | | | | | | | | | | | | | | - calculate multiselect header width to exclude scrollbar - call FileList._onResize() when sidebar is toggled ("appresized"), this also updates the breadcrumb width - moved global getScrollBarWidth() to OC.Util namespace | ||||
* | | | Merge pull request #19547 from owncloud/fix-16154 | Thomas Müller | 2015-10-05 | 1 | -4/+5 |
|\ \ \ | | | | | | | | | LDAP Wizard: do not be picky about credentials when only looking for … | ||||
| * | | | LDAP Wizard: do not be picky about credentials when only looking for the port | Arthur Schiwon | 2015-10-03 | 1 | -4/+5 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-05 | 2 | -0/+10 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-04 | 28 | -0/+172 |
| |_|/ |/| | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-03 | 38 | -26/+362 |
|/ / | |||||
* | | Merge pull request #19534 from owncloud/fix_19532 | Thomas Müller | 2015-10-02 | 1 | -0/+5 |
|\ \ | | | | | | | if the mountpoint is accessible for all user the array should contain 'all' | ||||
| * | | if mountpoint is applicable to all users the old API expects a array with 'all' | Bjoern Schiessle | 2015-10-02 | 1 | -0/+5 |
| | | | |||||
* | | | Lock files when rolling back version | Robin Appelman | 2015-10-02 | 1 | -0/+9 |
| | | | |||||
* | | | Merge pull request #19514 from owncloud/list_remote_shares_in_shared_with_you | Thomas Müller | 2015-10-02 | 2 | -17/+171 |
|\ \ \ | |/ / |/| | | List remote shares in shared with you | ||||
| * | | Fix and extend unit tests | Roeland Jago Douma | 2015-10-02 | 2 | -14/+111 |
| | | | |||||
| * | | More fileinfo | Roeland Jago Douma | 2015-10-02 | 1 | -4/+8 |
| | | | |||||
| * | | Start to show remote shares in shared with you section | Roeland Jago Douma | 2015-10-02 | 1 | -6/+59 |
| | | | |||||
* | | | Merge pull request #19523 from owncloud/fix-seconds-ago | Thomas Müller | 2015-10-02 | 2 | -2/+2 |
|\ \ \ | |/ / |/| | | Fix moment.js "a few seconds ago" with "seconds ago" | ||||
| * | | Fix moment.js "a few seconds ago" with "seconds ago" | Morris Jobke | 2015-10-02 | 2 | -2/+2 |
| |/ | | | | | | | * fixes #18627 | ||||
* | | Merge pull request #19497 from owncloud/ie8-multiselect-delete-action-puke | Thomas Müller | 2015-10-02 | 1 | -0/+4 |
|\ \ | | | | | | | [IE8] Fix dangling Delete action when multiselect is enabled | ||||
| * | | [IE8] Fix dangling Delete action when multiselect is enabled | Vincent Petry | 2015-10-01 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | 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... | ||||
* | | | Merge pull request #19499 from owncloud/files-versions-properlyreloadafterrevert | Thomas Müller | 2015-10-02 | 2 | -2/+13 |
|\ \ \ | | | | | | | | | Reload versions list after revert | ||||
| * | | | Reload versions list after revert | Vincent Petry | 2015-10-01 | 2 | -2/+13 |
| |/ / | |||||
* | | | Merge pull request #19500 from owncloud/fix_trash_with_encryption2 | Thomas Müller | 2015-10-02 | 2 | -18/+26 |
|\ \ \ | | | | | | | | | [trashbin] fix broken versions on restore | ||||
| * | | | first copy to owner and then move to current user because the encryption | Bjoern Schiessle | 2015-10-01 | 2 | -18/+26 |
| | | | | | | | | | | | | | | | | wrapper always expect to work on the owner storage | ||||
* | | | | Merge pull request #19521 from owncloud/files-conflictdialog-loadpromise | Thomas Müller | 2015-10-02 | 1 | -2/+5 |
|\ \ \ \ | | | | | | | | | | | Make sure the conflict dialog is loaded before adding conflicts | ||||
| * | | | | Make sure the conflict dialog is loaded before adding conflicts | Vincent Petry | 2015-10-02 | 1 | -2/+5 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #19522 from owncloud/activity-395-less-sidebar-text | Thomas Müller | 2015-10-02 | 4 | -37/+139 |
|\ \ \ \ | | | | | | | | | | | Activity 395 less sidebar text | ||||
| * | | | | Fix intendation | Joas Schilling | 2015-10-02 | 1 | -34/+34 |
| | | | | | |||||
| * | | | | Use shorter text on the sidebar for files_sharing activities | Joas Schilling | 2015-10-02 | 3 | -5/+69 |
| | | | | | |||||
| * | | | | Use shorter text on the sidebar for files activities | Joas Schilling | 2015-10-02 | 1 | -0/+38 |
| |/ / / | |||||
* | | | | Merge pull request #19386 from owncloud/ocs_shareapi_extenstion | Thomas Müller | 2015-10-02 | 3 | -7/+131 |
|\ \ \ \ | |/ / / |/| | | | OCS endpoint to list remote shares | ||||
| * | | | Do not return unneeded info | Roeland Jago Douma | 2015-10-02 | 1 | -2/+4 |
| | | | | |||||
| * | | | Extend share info | Roeland Jago Douma | 2015-10-02 | 1 | -1/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | Made routes remote_shares only again | Roeland Jago Douma | 2015-10-02 | 1 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | | Added '../remote_shares' endpoint | Roeland Jago Douma | 2015-10-02 | 3 | -4/+104 |
| | | | | | | | | | | | | | | | | | | | | | | | | * 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>' | ||||
| * | | | Move OCS endpoint ../remote_share to ../pending_shares | Roeland Jago Douma | 2015-10-02 | 1 | -3/+3 |
| | | | | |||||
* | | | | Merge pull request #19484 from owncloud/ie8-checkbox-rage | Jörn Friedrich Dreyer | 2015-10-02 | 1 | -5/+23 |
|\ \ \ \ | | | | | | | | | | | [IE8] Fix checkboxes in login page and file list | ||||
| * | | | | [IE8] Fix file list checkboxes | Vincent Petry | 2015-09-30 | 1 | -5/+23 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #19496 from owncloud/ie8-filenamewidth-sickness | Jörn Friedrich Dreyer | 2015-10-02 | 1 | -11/+0 |
|\ \ \ \ | | | | | | | | | | | [IE8] Remove non-working ellipsis support | ||||
| * | | | | [IE8] Remove non-working ellipsis support | Vincent Petry | 2015-10-01 | 1 | -11/+0 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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) | ||||
* | / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-02 | 8 | -168/+188 |
| |/ / |/| | | |||||
* | | | display checkboxes properly after file restore | Hendrik Leppelsack | 2015-10-01 | 1 | -2/+2 |
| |/ |/| | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-01 | 6 | -0/+24 |
| | | |||||
* | | Merge pull request #19421 from owncloud/fix_19382 | Thomas Müller | 2015-09-30 | 3 | -1/+19 |
|\ \ | | | | | | | Do noy allow empty urls to be submitted in "add to your owncloud" |