summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Combine additional files_sharing scriptsRoeland Jago Douma2017-03-242-3/+6
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* 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 directory
| * Fix workflow engine mimetype detection when creating a directoryJoas Schilling2017-03-231-0/+6
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #4013 from nextcloud/bundle_vendor_jsLukas Reschke2017-03-241-2/+0
|\ \ | | | | | | Bundle vendor js
| * | Handlebars is already loaded by core.jsRoeland Jago Douma2017-03-231-2/+0
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | [tx-robot] updated from transifexNextcloud bot2017-03-2472-324/+346
| | |
* | | Merge pull request #3879 from nextcloud/downstream-26915Morris Jobke2017-03-231-1/+1
|\ \ \ | | | | | | | | Added integration tests for sharees using v2.php
| * | | Make deleting a group compatible with ocs v2Joas Schilling2017-03-231-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #4007 from nextcloud/backport-27155Morris Jobke2017-03-2312-78/+98
|\ \ \ \ | | | | | | | | | | Change showTemporary notifications for closable ones
| * | | | added quit option in commentstabview.jsnoveens2017-03-2312-78/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added quit option in notif in app.js added quit option in notif in file-upload.js added quit option in notif in fileinfomodel.js added quit option in notif in filelist.js added quit option in notif in filelist.js added quit option in notif in tagsplugin.js added quit option in notif in statusmanager.js added quit option in notif in external.js added quit option in notif in versionstabview.js added quit option in notif in notification.js changes according to the latest review. timeout removed since there is a button to close it translation capability added typo fixed test files updated small errors fixed Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #3953 from nextcloud/downstream-27027Morris Jobke2017-03-232-2/+56
|\ \ \ \ \ | | | | | | | | | | | | Ignore NoUserException for shares from ghosts
| * | | | | set cache to failedcache when shared storage init failsRobin Appelman2017-03-232-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | return failed cache if the shared storage failed to setupRobin Appelman2017-03-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | also set nonmaskedstorage in error casesRobin Appelman2017-03-201-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | Ignore NoUserException for shares from ghostsVincent Petry2017-03-202-2/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add unit tests for FailedStorage init from SharedStorage Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #3965 from nextcloud/downstream-27343Morris Jobke2017-03-231-4/+33
|\ \ \ \ \ \ | | | | | | | | | | | | | | Providing --path option to transfer-ownership
| * | | | | | improve file transfer codeMorris Jobke2017-03-221-26/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | | Providing --path option to transfer-ownershipSujith H2017-03-201-4/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will help user to selectively move the folders specified using --path option, instead of moving entire folder under files directory. Signed-off-by: Sujith H <sharidasan@owncloud.com> Update the integration test for transfer-ownership Update the integration test for transfer-ownership as the new option --path is introduced in the command. Signed-off-by: Sujith H <sharidasan@owncloud.com> Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | 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 folder
| * | | | | | | Use the expected method depending on the target being a file or folderJuan Pablo Villafáñez2017-03-221-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | | Merge pull request #4000 from nextcloud/backport-27216Lukas Reschke2017-03-231-0/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | allow configuring authType for DAV backend
| * | | | | | | allow configuring authType for DAV backendJörn Friedrich Dreyer2017-03-221-0/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | Merge pull request #3995 from nextcloud/files_scan_appdataLukas Reschke2017-03-232-1/+286
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add files:scanAppData command
| * | | | | | | Use proper name and code styleMorris Jobke2017-03-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | | | Add files:scanAppData commandRoeland Jago Douma2017-03-222-1/+286
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/nextcloud/server/issues/3041 Add a dedicated command to scan the special appdata dir Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | | Merge pull request #3948 from nextcloud/downstream-27271Lukas Reschke2017-03-231-3/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Tooltip in trashbin with previous location
| * | | | | | | | fix path for files from root folderMorris Jobke2017-03-221-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | | | | In the real world id is an initial filenameVictor Dubiniuk2017-03-201-3/+4
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | | Merge pull request #3989 from nextcloud/files-external-save-buttonLukas Reschke2017-03-233-18/+17
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | replace autosave with a save button for external storage configuration
| * | | | | | | | replace autosave with a save button for external storage configurationRobin Appelman2017-03-223-18/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | | | Merge pull request #3999 from nextcloud/backport-27262Morris Jobke2017-03-232-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | Updated UI messages relating to the encryption functionality
| * | | | | | | | Updated UI messages relating to the encryption functionalityMatthew Setter2017-03-222-2/+2
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reason for updating these messages, is that grammatically they're not quite correct. They showed a combination of: - Related phrases, which could be either separated or joined better - Related sentences, but which should be expressed as separate ones They were also missing full-stops to end the them. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* / | | | | | | [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
|\ \ \ \ \ | |/ / / / |/| | | | Bundle vendor js
| * | | | Handlebars is already loaded by core.jsRoeland Jago Douma2017-03-221-2/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #3972 from nextcloud/merge-some-more-cssRoeland Jago Douma2017-03-2215-13/+13
|\ \ \ \ \ | | | | | | | | | | | | Merge some CSS files using our SCSS compiler
| * | | | | fix pathMorris Jobke2017-03-212-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | Merge some CSS files using our SCSS compilerLukas Reschke2017-03-2115-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This saves around 4 requests on the average page load. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-03-2238-50/+224
| | | | | |
* | | | | | Fix reshare with user activity messageJoas Schilling2017-03-211-1/+1
| |/ / / / |/| | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #3937 from nextcloud/downstream-27234Morris Jobke2017-03-211-1/+1
|\ \ \ \ \ | | | | | | | | | | | | fix typo in sftp public key
| * | | | | fix typo in sftp public keyMartin2017-03-191-1/+1
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | [master] Fix brandingLukas Reschke2017-03-211-1/+1
| |/ / / |/| | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | Merge pull request #3955 from nextcloud/downstream-27113Roeland Jago Douma2017-03-213-1/+7
|\ \ \ \ | | | | | | | | | | Can we get some faster phpunit execution?
| * | | | [CI] Can we get some faster phpunit execution? (#27113)Thomas Müller2017-03-203-1/+7
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Don't backup globals and static attributes * Unset global variable to remove impact on followup tests Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | / / [tx-robot] updated from transifexNextcloud bot2017-03-2122-6/+90
| |/ / |/| |
* | | Log access to preview imagesLukas Reschke2017-03-203-13/+56
| |/ |/| | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | Merge pull request #3957 from nextcloud/downstream-27307Christoph Wurst2017-03-201-1/+8
|\ \ | | | | | | Follow up to #3949 (app exists on enable)
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-25 19:03:21 +0000