Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update license header script to only use code changes | Morris Jobke | 2015-10-05 | 1 | -2/+3 |
| | | | | * ignores the first lines of a file with the license header | ||||
* | Merge pull request #19591 from owncloud/files-renametooltipplacement | Hendrik Leppelsack | 2015-10-05 | 1 | -2/+2 |
|\ | | | | | Fix tooltip placement on rename error | ||||
| * | Fix tooltip placement on rename error | Vincent Petry | 2015-10-05 | 1 | -2/+2 |
|/ | |||||
* | Merge pull request #19582 from owncloud/fix_19456 | Morris Jobke | 2015-10-05 | 2 | -0/+9 |
|\ | | | | | add some output to explain the pre-conditions for decrypt-all | ||||
| * | add some output to explain the pre-conditions for decrypt-all | Bjoern Schiessle | 2015-10-05 | 2 | -0/+9 |
|/ | |||||
* | Merge pull request #19576 from owncloud/update-example-theme | Thomas Müller | 2015-10-05 | 1 | -0/+81 |
|\ | | | | | Update example theme with App URLs and PHPDoc | ||||
| * | Update example theme with App URLs and PHPDoc | Morris Jobke | 2015-10-05 | 1 | -0/+81 |
| | | |||||
* | | Merge pull request #19574 from ↵ | Thomas Müller | 2015-10-05 | 1 | -12/+23 |
|\ \ | | | | | | | | | | | | | owncloud/fix-sharing-tests-assuming-empty-share-table Clear the shares after the test like storages and files | ||||
| * | | Clear the shares after the test like storages and files | Joas Schilling | 2015-10-05 | 1 | -12/+23 |
| | | | |||||
* | | | 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 #19416 from owncloud/node-hook-connector | Thomas Müller | 2015-10-05 | 3 | -1/+332 |
|\ \ \ | | | | | | | | | pass view hooks trough to the node hooks | ||||
| * | | | remove unused use | Robin Appelman | 2015-09-28 | 1 | -1/+0 |
| | | | | |||||
| * | | | pass view hooks trough to the node hooks | Robin Appelman | 2015-09-28 | 1 | -1/+5 |
| | | | | |||||
| * | | | Add hook connector to connect view and node hooks | Robin Appelman | 2015-09-28 | 2 | -0/+328 |
| | | | | |||||
* | | | | 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 | 2 | -25/+47 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix filelist size issues, breadcrumb, multiselect | ||||
| * | | | | | Fix filelist size issues, breadcrumb, multiselect | Vincent Petry | 2015-10-02 | 2 | -25/+47 |
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 |
| | | | | | | |||||
* | | | | | | Merge pull request #19560 from owncloud/add-note-about-x-forwarded-for | Jörn Friedrich Dreyer | 2015-10-05 | 1 | -0/+3 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | Add notice about X-Forwarded-For | ||||
| * | | | | | Add notice about X-Forwarded-For | Lukas Reschke | 2015-10-05 | 1 | -0/+3 |
|/ / / / / | |||||
* | | | | | [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 | 44 | -20/+482 |
| | | | | | |||||
* | | | | | Merge pull request #19543 from owncloud/fix-19542 | Thomas Müller | 2015-10-03 | 1 | -1/+1 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Check if decoded JSON returned null | ||||
| * | | | | Check if decoded JSON returned null | Lukas Reschke | 2015-10-02 | 1 | -1/+1 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | The value might return null resulting in a PHP error. Fixes https://github.com/owncloud/core/issues/19542 | ||||
* | | | | Merge pull request #19545 from owncloud/fix-16908 | Thomas Müller | 2015-10-03 | 2 | -0/+3 |
|\ \ \ \ | | | | | | | | | | | Add remark that $run is not supported anymore | ||||
| * | | | | Add remark that $run is not supported anymore | Lukas Reschke | 2015-10-02 | 2 | -0/+3 |
| |/ / / | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/16908 | ||||
* / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-03 | 190 | -30/+798 |
|/ / / | |||||
* | | | 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 |
| | | | | |||||
* | | | | Merge pull request #19538 from owncloud/versions-lock | Thomas Müller | 2015-10-02 | 1 | -0/+9 |
|\ \ \ \ | | | | | | | | | | | Lock files when rolling back version | ||||
| * | | | | Lock files when rolling back version | Robin Appelman | 2015-10-02 | 1 | -0/+9 |
| | | | | | |||||
* | | | | | Merge pull request #19272 from owncloud/mimetypes-enhanced | Thomas Müller | 2015-10-02 | 8 | -35/+186 |
|\ \ \ \ \ | | | | | | | | | | | | | Introduce a few new mimetypes for code, fix recursive mimetype aliases | ||||
| * | | | | | Added mimetype repair step | Roeland Jago Douma | 2015-10-02 | 3 | -1/+125 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Version number increased | ||||
| * | | | | | Updated some mimetypes | Roeland Jago Douma | 2015-10-02 | 3 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | * c++ and cpp now both map to code | ||||
| * | | | | | Allow recursive mimetype aliases | Robin McCorkell | 2015-10-02 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | application/xml -> text/html -> text/code | ||||
| * | | | | | Introduce a few new mimetypes for code | Robin McCorkell | 2015-10-02 | 3 | -33/+58 |
| | | | | | | |||||
* | | | | | | Merge pull request #19536 from owncloud/share-focusonsharefield | Thomas Müller | 2015-10-02 | 1 | -1/+8 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Focus on share field after first display | ||||
| * | | | | | Focus on share field after first display | Vincent Petry | 2015-10-02 | 1 | -1/+8 |
| |/ / / / | |||||
* | | | | | Merge pull request #19525 from ↵ | Robin Appelman | 2015-10-02 | 2 | -27/+141 |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | owncloud/share-preventmovemountpointintosharedfolder Prevent moving mount point into already shared folder (outgoing) | ||||
| * | | | | Prevent moving mount point into already shared folder (outgoing) | Vincent Petry | 2015-10-02 | 2 | -27/+141 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | | | Merge pull request #19533 from owncloud/free-space-inf | Robin Appelman | 2015-10-02 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Work around INF=0 on some shared hosts | ||||
| * | | | | | Work around INF=0 on some shared hosts | Robin Appelman | 2015-10-02 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | 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 |
| | | | | | |