Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update example theme with App URLs and PHPDoc | Morris Jobke | 2015-10-05 | 1 | -0/+81 |
| | |||||
* | 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 |
| | | | | | | |||||
* | | | | | | Merge pull request #19482 from owncloud/kill-unused-method | Thomas Müller | 2015-10-02 | 2 | -40/+5 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | [l10n] remove unused static methods | ||||
| * | | | | | [l10n] remove unused static methods | Morris Jobke | 2015-10-02 | 2 | -40/+5 |
| |/ / / / | |||||
* | | | | | Merge pull request #19523 from owncloud/fix-seconds-ago | Thomas Müller | 2015-10-02 | 3 | -2/+6 |
|\ \ \ \ \ | |/ / / / |/| | | | | 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 | 3 | -2/+6 |
| |/ / / | | | | | | | | | | | | | * 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 | 2 | -6/+16 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Make sure the conflict dialog is loaded before adding conflicts |