summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-10-0642-36/+268
|
* Merge pull request #18883 from owncloud/encryption-move-same-storageThomas Müller2015-10-051-0/+3
|\ | | | | use a normal rename when moving from the same storage in the encryption wrapper
| * use a normal rename when moving from the same storage in the encryption wrapperRobin Appelman2015-10-051-0/+3
| |
* | Merge pull request #19553 from owncloud/properly_format_date_shareviewThomas Müller2015-10-052-9/+11
|\ \ | | | | | | Use DD-MM-YYYY consistently in share sidebar
| * | Use DD-MM-YYYY consistently in share sidebarRoeland Jago Douma2015-10-042-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We used to display the response from the server. Which is in non ISO8601 format. Now this is weird since the datepickers shows us 'DD-MM-YYYY' once a date is chosen. Now use momentJS to properly format the date. * Unit tests updated
* | | Merge pull request #19590 from owncloud/compactmode-sidebarfullscreenThomas Müller2015-10-051-1/+1
|\ \ \ | | | | | | | | Make sidebar properly fullscreen in mobile/compact mode
| * | | Make sidebar properly fullscreen in mobile/compact modeVincent Petry2015-10-051-1/+1
| | | |
* | | | Merge pull request #19558 from owncloud/sharing_sidebar_toggle_enforcedpassRoeland Douma2015-10-052-1/+42
|\ \ \ \ | |_|_|/ |/| | | Do not remove linkshare if there is none
| * | | Do not remove linkshare if there is noneRoeland Jago Douma2015-10-052-1/+42
|/ / / | | | | | | | | | | | | | | | | | | | | | If the password is enforced we can't create a link share right away but just show the password field. Untoggling the link sharing should not try to remove the share. * Added unit test
* | | Merge pull request #19591 from owncloud/files-renametooltipplacementHendrik Leppelsack2015-10-051-2/+2
|\ \ \ | |/ / |/| | Fix tooltip placement on rename error
| * | Fix tooltip placement on rename errorVincent Petry2015-10-051-2/+2
|/ /
* | Merge pull request #19582 from owncloud/fix_19456Morris Jobke2015-10-052-0/+9
|\ \ | | | | | | add some output to explain the pre-conditions for decrypt-all
| * | add some output to explain the pre-conditions for decrypt-allBjoern Schiessle2015-10-052-0/+9
|/ /
* | Merge pull request #19576 from owncloud/update-example-themeThomas Müller2015-10-051-0/+81
|\ \ | | | | | | Update example theme with App URLs and PHPDoc
| * | Update example theme with App URLs and PHPDocMorris Jobke2015-10-051-0/+81
| | |
* | | Merge pull request #19574 from ↵Thomas Müller2015-10-051-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 filesJoas Schilling2015-10-051-12/+23
| | | |
* | | | Merge pull request #19487 from owncloud/split_share_middlewareThomas Müller2015-10-058-86/+229
|\ \ \ \ | |_|/ / |/| | | Split files_sharing middelware
| * | | sharingcheckmiddleware now handles externalshares as wellRoeland Jago Douma2015-10-028-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 middelwareRoeland Jago Douma2015-10-022-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-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
| |/ / / /