summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4007 from nextcloud/backport-27155Morris Jobke2017-03-2312-78/+98
|\
| * added quit option in commentstabview.jsnoveens2017-03-2312-78/+98
* | Merge pull request #3953 from nextcloud/downstream-27027Morris Jobke2017-03-232-2/+56
|\ \
| * | set cache to failedcache when shared storage init failsRobin Appelman2017-03-232-2/+5
| * | return failed cache if the shared storage failed to setupRobin Appelman2017-03-201-0/+4
| * | also set nonmaskedstorage in error casesRobin Appelman2017-03-201-0/+5
| * | Ignore NoUserException for shares from ghostsVincent Petry2017-03-202-2/+44
* | | Merge pull request #3850 from nextcloud/search-orderMorris Jobke2017-03-233-0/+13
|\ \ \
| * | | Fix search orderingRobin Appelman2017-03-233-0/+13
* | | | Merge pull request #3965 from nextcloud/downstream-27343Morris Jobke2017-03-233-4/+154
|\ \ \ \
| * | | | improve file transfer codeMorris Jobke2017-03-221-26/+15
| * | | | Providing --path option to transfer-ownershipSujith H2017-03-203-4/+165
* | | | | Merge pull request #3998 from nextcloud/backport-27032Roeland Jago Douma2017-03-231-1/+5
|\ \ \ \ \
| * | | | | Use the expected method depending on the target being a file or folderJuan Pablo Villafáñez2017-03-221-1/+5
* | | | | | Merge pull request #4001 from nextcloud/backport-27389Morris Jobke2017-03-232-7/+9
|\ \ \ \ \ \
| * | | | | | Fix type hints and doc blocksJoas Schilling2017-03-232-8/+8
| * | | | | | Ensure that FileInfo return values as required by its phpdoc.Piotr M2017-03-221-6/+8
| |/ / / / /
* | | | | | Merge pull request #4000 from nextcloud/backport-27216Lukas Reschke2017-03-232-2/+12
|\ \ \ \ \ \
| * | | | | | allow configuring authType for DAV backendJörn Friedrich Dreyer2017-03-222-2/+12
| |/ / / / /
* | | | | | Merge pull request #3995 from nextcloud/files_scan_appdataLukas Reschke2017-03-232-1/+286
|\ \ \ \ \ \
| * | | | | | Use proper name and code styleMorris Jobke2017-03-221-2/+2
| * | | | | | Add files:scanAppData commandRoeland Jago Douma2017-03-222-1/+286
* | | | | | | Merge pull request #3948 from nextcloud/downstream-27271Lukas Reschke2017-03-231-3/+8
|\ \ \ \ \ \ \
| * | | | | | | fix path for files from root folderMorris Jobke2017-03-221-1/+5
| * | | | | | | In the real world id is an initial filenameVictor Dubiniuk2017-03-201-3/+4
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #3978 from nextcloud/scss_deps_memcacheLukas Reschke2017-03-233-41/+116
|\ \ \ \ \ \ \
| * | | | | | | Fix testsRoeland Jago Douma2017-03-221-31/+89
| * | | | | | | Cache SCSS dependency file in memcacheRoeland Jago Douma2017-03-223-11/+28
* | | | | | | | Merge pull request #3989 from nextcloud/files-external-save-buttonLukas Reschke2017-03-233-18/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | replace autosave with a save button for external storage configurationRobin Appelman2017-03-223-18/+17
* | | | | | | | | Merge pull request #3994 from nextcloud/only_init_backbone_onceLukas Reschke2017-03-231-1/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Only initialize backbone onceRoeland Jago Douma2017-03-221-1/+0
* | | | | | | | | | Merge pull request #3997 from nextcloud/backport-27353Roeland Jago Douma2017-03-233-26/+84
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update davclient.js to 0.1.1Vincent Petry2017-03-223-26/+84
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #3999 from nextcloud/backport-27262Morris Jobke2017-03-233-3/+3
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Updated UI messages relating to the encryption functionalityMatthew Setter2017-03-223-3/+3
| |/ / / / / / / /
* / / / / / / / / [tx-robot] updated from transifexNextcloud bot2017-03-2310-2/+52
|/ / / / / / / /
* | | | | / / / [tx-robot] updated from transifexNextcloud bot2017-03-2262-20/+348
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge pull request #3497 from nextcloud/mount-shared-lastMorris Jobke2017-03-224-4/+52
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | add integration test to ensure that shares dont overwrite external storagesRobin Appelman2017-03-222-2/+18
| * | | | | | mount shared mounts lastRobin Appelman2017-03-222-2/+34
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #3990 from nextcloud/remove-owncloud-root-cert-as-per-todoRoeland Jago Douma2017-03-221-66/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Remove the cert as wellJoas Schilling2017-03-221-66/+0
* | | | | | Merge pull request #3992 from nextcloud/revert-3795-bundle_vendor_jsMorris Jobke2017-03-227-42634/+16
|\ \ \ \ \ \
| * | | | | | Revert "Bundle vendor js"Roeland Jago Douma2017-03-227-42634/+16
|/ / / / / /
* | | | | | Merge pull request #3977 from nextcloud/di_ng2blizzz2017-03-227-19/+65
|\ \ \ \ \ \
| * | | | | | Register the namespace with the autoloading to allow reverse recoveryJoas Schilling2017-03-222-7/+26
| * | | | | | Also cache the namespace from appinfoJoas Schilling2017-03-221-3/+4
| * | | | | | Add the AppContainerRoeland Jago Douma2017-03-221-0/+8
| * | | | | | Don't do a recursive searchJoas Schilling2017-03-224-3/+24