summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4010 from nextcloud/fac-58-mimetype-on-creating-directoriesJoas Schilling2017-03-241-0/+6
|\
| * Fix workflow engine mimetype detection when creating a directoryJoas Schilling2017-03-231-0/+6
* | Merge pull request #4013 from nextcloud/bundle_vendor_jsLukas Reschke2017-03-241-2/+0
|\ \
| * | Handlebars is already loaded by core.jsRoeland Jago Douma2017-03-231-2/+0
* | | [tx-robot] updated from transifexNextcloud bot2017-03-2472-324/+346
* | | Merge pull request #3879 from nextcloud/downstream-26915Morris Jobke2017-03-231-1/+1
|\ \ \
| * | | Make deleting a group compatible with ocs v2Joas Schilling2017-03-231-1/+1
* | | | 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 #3965 from nextcloud/downstream-27343Morris Jobke2017-03-231-4/+33
|\ \ \ \ \ \
| * | | | | | improve file transfer codeMorris Jobke2017-03-221-26/+15
| * | | | | | Providing --path option to transfer-ownershipSujith H2017-03-201-4/+44
* | | | | | | 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 #4000 from nextcloud/backport-27216Lukas Reschke2017-03-231-0/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | allow configuring authType for DAV backendJörn Friedrich Dreyer2017-03-221-0/+2
| |/ / / / / /
* | | | | | | 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 #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 #3999 from nextcloud/backport-27262Morris Jobke2017-03-232-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Updated UI messages relating to the encryption functionalityMatthew Setter2017-03-222-2/+2
| | |_|_|/ / / / | |/| | | | | |
* / | | | | | | [tx-robot] updated from transifexNextcloud bot2017-03-238-2/+32
|/ / / / / / /
* | | / / / / [tx-robot] updated from transifexNextcloud bot2017-03-2240-14/+280
| |_|/ / / / |/| | | | |
* | | | | | Revert "Bundle vendor js"Roeland Jago Douma2017-03-221-0/+2
| |_|_|_|/ |/| | | |
* | | | | Merge pull request #3795 from nextcloud/bundle_vendor_jsRoeland Jago Douma2017-03-221-2/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Handlebars is already loaded by core.jsRoeland Jago Douma2017-03-221-2/+0
* | | | | Merge pull request #3972 from nextcloud/merge-some-more-cssRoeland Jago Douma2017-03-2215-13/+13
|\ \ \ \ \
| * | | | | fix pathMorris Jobke2017-03-212-1/+1
| * | | | | Merge some CSS files using our SCSS compilerLukas Reschke2017-03-2115-13/+13
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-03-2238-50/+224
* | | | | | Fix reshare with user activity messageJoas Schilling2017-03-211-1/+1
| |/ / / / |/| | | |
* | | | | Merge pull request #3937 from nextcloud/downstream-27234Morris Jobke2017-03-211-1/+1
|\ \ \ \ \
| * | | | | fix typo in sftp public keyMartin2017-03-191-1/+1
| | |/ / / | |/| | |
* | | | | [master] Fix brandingLukas Reschke2017-03-211-1/+1
| |/ / / |/| | |
* | | | Merge pull request #3955 from nextcloud/downstream-27113Roeland Jago Douma2017-03-213-1/+7
|\ \ \ \
| * | | | [CI] Can we get some faster phpunit execution? (#27113)Thomas Müller2017-03-203-1/+7
| |/ / /
* | / / [tx-robot] updated from transifexNextcloud bot2017-03-2122-6/+90
| |/ / |/| |
* | | Log access to preview imagesLukas Reschke2017-03-203-13/+56
| |/ |/|
* | Merge pull request #3957 from nextcloud/downstream-27307Christoph Wurst2017-03-201-1/+8
|\ \
| * | Fix provisioning API callJoas Schilling2017-03-201-1/+8