summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* no need to list users if all users already had a key-pairBjoern Schiessle2015-09-241-0/+6
* Merge pull request #19303 from owncloud/usecorrectvariableThomas Müller2015-09-242-1/+26
|\
| * add is* storage testsJörn Friedrich Dreyer2015-09-231-0/+25
| * use correct variableJörn Friedrich Dreyer2015-09-231-1/+1
* | Merge pull request #19313 from owncloud/ext-validate-mountThomas Müller2015-09-2415-40/+143
|\ \
| * | Unit tests for storage validation in serviceRobin McCorkell2015-09-232-0/+56
| * | Perform visibility checks on storagesRobin McCorkell2015-09-2314-40/+87
* | | Merge pull request #19328 from owncloud/update-shipped-apps-listThomas Müller2015-09-241-2/+2
|\ \ \
| * | | Remove user_webdavauth which is now part of user_externalJoas Schilling2015-09-241-1/+0
| * | | Update the list of shipped appsJoas Schilling2015-09-241-1/+2
| | |/ | |/|
* | | Merge pull request #19326 from owncloud/issue-19314-querybuilder-set-nullThomas Müller2015-09-242-1/+5
|\ \ \
| * | | Allow `set('column', 'null')` to work like in DoctrineJoas Schilling2015-09-242-1/+5
* | | | Merge pull request #16479 from owncloud/core-fixgetrelativepathwrongmatchesThomas Müller2015-09-242-29/+107
|\ \ \ \ | |/ / / |/| | |
| * | | Add more tests for relativePathJoas Schilling2015-09-221-23/+91
| * | | Prevent wrong matches in getRelativePathVincent Petry2015-09-222-11/+21
* | | | Merge pull request #19307 from owncloud/large-sidebar-preview-resizeThomas Müller2015-09-242-5/+9
|\ \ \ \
| * \ \ \ Merge branch 'master' into large-sidebar-preview-resizeMorris Jobke2015-09-2425-255/+338
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | adjust the height of the sidebar preview image when resizing the browserRobin Appelman2015-09-232-5/+9
* | | | | Merge pull request #19292 from owncloud/close-iconThomas Müller2015-09-242-1/+8
|\ \ \ \ \
| * | | | | add slight shadow to close icon to make it visible on top of dark images, fix...Jan-Christoph Borchardt2015-09-232-1/+8
* | | | | | Merge pull request #18352 from owncloud/ocs_api_sharees_autocomplete_blockerThomas Müller2015-09-245-49/+425
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Do not allow user enumeration if the config is disabledJoas Schilling2015-09-232-49/+409
| * | | | | Add option to disable autocomplete in share dialogMorris Jobke2015-09-233-0/+16
* | | | | | Merge pull request #19163 from owncloud/search-elsewhere-wordingJan-Christoph Borchardt2015-09-231-2/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | fix wording of other search results to 'in other folders'Jan-Christoph Borchardt2015-09-231-2/+2
|/ / / / /
* | | | | Merge pull request #19301 from owncloud/ie8-checkboxesHendrik Leppelsack2015-09-231-0/+5
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | display checkboxes in ie8Hendrik Leppelsack2015-09-231-0/+5
|/ / / /
* | | | Merge pull request #19139 from owncloud/ext-revert-permissionsThomas Müller2015-09-2319-243/+253
|\ \ \ \
| * | | | Mark SMB_OC and SFTP_Key as deprecated backendsRobin McCorkell2015-09-232-4/+8
| * | | | Hide deprecated backends in external storage GUIRobin McCorkell2015-09-232-3/+19
| * | | | Add deprecation mechanic to IdentifierTraitRobin McCorkell2015-09-233-0/+37
| * | | | Revert "Implement more fine-grained external storage permissions model"Robin McCorkell2015-09-2317-237/+190
| | |/ / | |/| |
* | | | Merge pull request #19308 from owncloud/fix-titleMorris Jobke2015-09-232-3/+8
|\ \ \ \ | |_|/ / |/| | |
| * | | Show 'Apps' in the browser title when app management is openThomas Müller2015-09-232-3/+8
|/ / /
* | | Revert "use correct variable"Jörn Friedrich Dreyer2015-09-231-1/+1
* | | Merge pull request #19295 from owncloud/share-fixintparsingThomas Müller2015-09-232-7/+70
|\ \ \
| * | | Fix parsing int attributes from share.php responseVincent Petry2015-09-232-7/+70
| |/ /
* / / use correct variableJörn Friedrich Dreyer2015-09-231-1/+1
|/ /
* | Merge pull request #19289 from owncloud/fix-type-hint-errors-containerThomas Müller2015-09-232-2/+3
|\ \
| * \ Merge branch 'master' into fix-type-hint-errors-containerMorris Jobke2015-09-233-13/+28
| |\ \
| * | | Fix type hint errors in the container and the interfaceJoas Schilling2015-09-232-2/+3
* | | | Merge pull request #19220 from individual-it/fix_19164Thomas Müller2015-09-231-0/+2
|\ \ \ \
| * | | | re initialize OC.Share.currentShares OC.Share.itemShares Individual IT Services2015-09-211-0/+2
* | | | | Merge pull request #19236 from owncloud/call_dot_directories_functionThomas Müller2015-09-2310-12/+12
|\ \ \ \ \
| * | | | | Replaces if ($file === '.' || $file === '..') by if(\OC\Files\Filesystem::isI...Martin2015-09-2210-12/+12
* | | | | | Merge pull request #19277 from owncloud/files-plusbuttonfixThomas Müller2015-09-231-3/+4
|\ \ \ \ \ \
| * | | | | | Only render the plus button when it makes senseVincent Petry2015-09-221-3/+4
* | | | | | | Merge pull request #19279 from owncloud/share-fixbogusentryThomas Müller2015-09-231-0/+3
|\ \ \ \ \ \ \
| * | | | | | | Fix bogus entry that appears when switching with arrow keysVincent Petry2015-09-221-0/+3
| |/ / / / / /
* | | | | | | Merge pull request #19247 from owncloud/fix_locking_copy_operationThomas Müller2015-09-232-42/+98
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |