aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update example theme with App URLs and PHPDocMorris Jobke2015-10-051-0/+81
|
* Merge pull request #19416 from owncloud/node-hook-connectorThomas Müller2015-10-053-1/+332
|\ | | | | pass view hooks trough to the node hooks
| * remove unused useRobin Appelman2015-09-281-1/+0
| |
| * pass view hooks trough to the node hooksRobin Appelman2015-09-281-1/+5
| |
| * Add hook connector to connect view and node hooksRobin Appelman2015-09-282-0/+328
| |
* | Merge pull request #19552 from owncloud/inline_fileactions_alttextThomas Müller2015-10-052-1/+58
|\ \ | | | | | | If an inline files action provides an alt text show it
| * | If an inline files action provides an alt text show itRoeland Jago Douma2015-10-032-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-shorterThomas Müller2015-10-052-25/+47
|\ \ \ | | | | | | | | Fix filelist size issues, breadcrumb, multiselect
| * | | Fix filelist size issues, breadcrumb, multiselectVincent Petry2015-10-022-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-16154Thomas Müller2015-10-051-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 portArthur Schiwon2015-10-031-4/+5
| | | | |
* | | | | Merge pull request #19560 from owncloud/add-note-about-x-forwarded-forJörn Friedrich Dreyer2015-10-051-0/+3
|\ \ \ \ \ | | | | | | | | | | | | Add notice about X-Forwarded-For
| * | | | | Add notice about X-Forwarded-ForLukas Reschke2015-10-051-0/+3
|/ / / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-052-0/+10
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-0444-20/+482
| | | | |
* | | | | Merge pull request #19543 from owncloud/fix-19542Thomas Müller2015-10-031-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | Check if decoded JSON returned null
| * | | | Check if decoded JSON returned nullLukas Reschke2015-10-021-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-16908Thomas Müller2015-10-032-0/+3
|\ \ \ \ | | | | | | | | | | Add remark that $run is not supported anymore
| * | | | Add remark that $run is not supported anymoreLukas Reschke2015-10-022-0/+3
| |/ / / | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/16908
* / / / [tx-robot] updated from transifexJenkins for ownCloud2015-10-03190-30/+798
|/ / /
* | | Merge pull request #19534 from owncloud/fix_19532Thomas Müller2015-10-021-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 Schiessle2015-10-021-0/+5
| | | |
* | | | Merge pull request #19538 from owncloud/versions-lockThomas Müller2015-10-021-0/+9
|\ \ \ \ | | | | | | | | | | Lock files when rolling back version
| * | | | Lock files when rolling back versionRobin Appelman2015-10-021-0/+9
| | | | |
* | | | | Merge pull request #19272 from owncloud/mimetypes-enhancedThomas Müller2015-10-028-35/+186
|\ \ \ \ \ | | | | | | | | | | | | Introduce a few new mimetypes for code, fix recursive mimetype aliases
| * | | | | Added mimetype repair stepRoeland Jago Douma2015-10-023-1/+125
| | | | | | | | | | | | | | | | | | | | | | | | * Version number increased
| * | | | | Updated some mimetypesRoeland Jago Douma2015-10-023-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | * c++ and cpp now both map to code
| * | | | | Allow recursive mimetype aliasesRobin McCorkell2015-10-022-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | application/xml -> text/html -> text/code
| * | | | | Introduce a few new mimetypes for codeRobin McCorkell2015-10-023-33/+58
| | | | | |
* | | | | | Merge pull request #19536 from owncloud/share-focusonsharefieldThomas Müller2015-10-021-1/+8
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Focus on share field after first display
| * | | | | Focus on share field after first displayVincent Petry2015-10-021-1/+8
| |/ / / /
* | | | | Merge pull request #19525 from ↵Robin Appelman2015-10-022-27/+141
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | owncloud/share-preventmovemountpointintosharedfolder Prevent moving mount point into already shared folder (outgoing)
| * | | | Prevent moving mount point into already shared folder (outgoing)Vincent Petry2015-10-022-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-infRobin Appelman2015-10-021-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Work around INF=0 on some shared hosts
| * | | | | Work around INF=0 on some shared hostsRobin Appelman2015-10-021-1/+1
| | | | | |
* | | | | | Merge pull request #19514 from owncloud/list_remote_shares_in_shared_with_youThomas Müller2015-10-022-17/+171
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | List remote shares in shared with you
| * | | | | Fix and extend unit testsRoeland Jago Douma2015-10-022-14/+111
| | | | | |
| * | | | | More fileinfoRoeland Jago Douma2015-10-021-4/+8
| | | | | |
| * | | | | Start to show remote shares in shared with you sectionRoeland Jago Douma2015-10-021-6/+59
| | | | | |
* | | | | | Merge pull request #19482 from owncloud/kill-unused-methodThomas Müller2015-10-022-40/+5
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | [l10n] remove unused static methods
| * | | | | [l10n] remove unused static methodsMorris Jobke2015-10-022-40/+5
| |/ / / /
* | | | | Merge pull request #19523 from owncloud/fix-seconds-agoThomas Müller2015-10-023-2/+6
|\ \ \ \ \ | |/ / / / |/| | | | Fix moment.js "a few seconds ago" with "seconds ago"
| * | | | Fix moment.js "a few seconds ago" with "seconds ago"Morris Jobke2015-10-023-2/+6
| |/ / / | | | | | | | | | | | | * fixes #18627
* | | | Merge pull request #19497 from owncloud/ie8-multiselect-delete-action-pukeThomas Müller2015-10-021-0/+4
|\ \ \ \ | | | | | | | | | | [IE8] Fix dangling Delete action when multiselect is enabled
| * | | | [IE8] Fix dangling Delete action when multiselect is enabledVincent Petry2015-10-011-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-properlyreloadafterrevertThomas Müller2015-10-022-2/+13
|\ \ \ \ \ | | | | | | | | | | | | Reload versions list after revert
| * | | | | Reload versions list after revertVincent Petry2015-10-012-2/+13
| |/ / / /
* | | | | Merge pull request #19500 from owncloud/fix_trash_with_encryption2Thomas Müller2015-10-022-18/+26
|\ \ \ \ \ | | | | | | | | | | | | [trashbin] fix broken versions on restore
| * | | | | first copy to owner and then move to current user because the encryptionBjoern Schiessle2015-10-012-18/+26
| | | | | | | | | | | | | | | | | | | | | | | | wrapper always expect to work on the owner storage
* | | | | | Merge pull request #19521 from owncloud/files-conflictdialog-loadpromiseThomas Müller2015-10-022-6/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | Make sure the conflict dialog is loaded before adding conflicts