aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4459 from owncloud/appframework-masterThomas Müller2013-09-302-4/+4
|\ | | | | Public API for OC6+ (includes AppFramework)
| * Merge branch 'master' into appframework-masterThomas Müller2013-09-291-2/+3
| |\
| * \ Merge branch 'master' into appframework-masterThomas Müller2013-09-272-3/+11
| |\ \
| * \ \ Merge branch 'master' into appframework-masterThomas Müller2013-09-2595-796/+2045
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/lib/helper.php apps/files_trashbin/lib/helper.php
| * | | | use \OC::$server->getPreviewManager() instead of \OCP\PreviewThomas Müller2013-09-172-4/+4
| | | | |
* | | | | Merge branch 'master' into move-aborted-upload-detection-into-plugin-masterThomas Müller2013-09-303-5/+14
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-291-2/+3
| | |_|/ | |/| |
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-272-3/+11
| | |/ | |/|
* / | fixing copyright and add class documentationThomas Müller2013-09-251-0/+1
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2013-09-245-1/+26
| |
* | Fix not displaying "Upload something!" messagekondou2013-09-231-1/+1
| | | | | | | | Fix #4940
* | implement previews for public uploadGeorg Ehrke2013-09-231-1/+5
| |
* | fix previews in shared foldersGeorg Ehrke2013-09-231-2/+2
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-09-227-3/+37
| |
* | Merge pull request #4927 from owncloud/fix_namespaces_and_autoloadingThomas Müller2013-09-218-17/+16
|\ \ | | | | | | namespaces use upcasefirst parts
| * | remove unneccessary lib in namespaceJörn Friedrich Dreyer2013-09-208-17/+16
| | |
| * | namespaces use upcasefirst partsJörn Friedrich Dreyer2013-09-207-16/+16
| | | | | | | | | | | | | | | when _ is left in namespace and files are named after their classes the autoloader will also find classes in the lib folder of an app its magic!
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-2060-154/+5
| | |
* | | Merge pull request #4684 from owncloud/improved-consoleBart Visscher2013-09-193-31/+82
|\ \ \ | |/ / |/| | Use more object oriented way for console commands
| * | Add copyright, remove starting blank lineBart Visscher2013-09-191-0/+7
| | |
| * | Use appinfo/register_command.php to add commands to the console commandBart Visscher2013-09-131-0/+9
| | |
| * | Change Files Scan command to use OC\User\ManagerBart Visscher2013-09-021-7/+18
| | |
| * | Use more object oriented way for console commandsBart Visscher2013-09-012-31/+55
| | |
* | | Merge branch 'master' into fix_3728_with_file_exists_dialogJörn Friedrich Dreyer2013-09-1922-8/+329
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: apps/files/js/filelist.js
| * \ \ Merge pull request #4900 from owncloud/fixing-4488-masterJörn Friedrich Dreyer2013-09-193-2/+13
| |\ \ \ | | | | | | | | | | File permissions are part of the ajax response of file upload
| | * \ \ Merge branch 'master' into fixing-4488-masterThomas Müller2013-09-1918-135/+442
| | |\ \ \
| | * | | | adding comma to get cleaner diffs in the futureThomas Müller2013-09-181-1/+1
| | | | | |
| | * | | | no file actions during uploadThomas Müller2013-09-181-1/+0
| | | | | |
| | * | | | remove file action elements before recreating themThomas Müller2013-09-181-0/+5
| | | | | |
| | * | | | store the permissions retrieved via ajax within the dom elementThomas Müller2013-09-181-0/+6
| | | | | |
| | * | | | add permissions of the file to the json responseThomas Müller2013-09-181-1/+2
| | | |_|/ | | |/| |
| * | | | Merge pull request #4263 from owncloud/search_scrolltoJörn Friedrich Dreyer2013-09-193-5/+44
| |\ \ \ \ | | |_|/ / | |/| | | initial scrollto implementation
| | * | | initial scrollto implementation:Jörn Friedrich Dreyer2013-09-173-5/+44
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use places/folder icon, move link construction to JS, only show icon on hover, use 'searchresult' as css class name, add filter/unfilter methods, highlight searched files in current filelist only filter when correct FileList is present
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-1817-0/+269
| | | |
* | | | fix race condition in lazy preview loadingJörn Friedrich Dreyer2013-09-191-12/+18
| | | |
* | | | Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core ↵Jörn Friedrich Dreyer2013-09-192-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | into fix_3728_with_file_exists_dialog
| * \ \ \ Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core ↵Thomas Müller2013-09-191-26/+26
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into fix_3728_with_file_exists_dialog Conflicts: apps/files/js/file-upload.js
| * | | | | fixing typos and l10nThomas Müller2013-09-192-3/+3
| | | | | |
* | | | | | fix double translation of error messageJörn Friedrich Dreyer2013-09-191-1/+1
| |/ / / / |/| | | |
* | | | | jsdoc types should go into {}Jörn Friedrich Dreyer2013-09-191-26/+26
|/ / / /
* | | | use 96x96 as 64x64 thumbnails in conflicts dialog, 64x64 looks very blocky ↵Jörn Friedrich Dreyer2013-09-191-4/+8
| | | | | | | | | | | | | | | | ... maybe something is wrong there
* | | | simplify conflict template handling, fix reopen after ESCJörn Friedrich Dreyer2013-09-181-1/+1
| | | |
* | | | move upload dialog css to separate fileJörn Friedrich Dreyer2013-09-183-85/+120
| | | |
* | | | hide excessive logging with a trace flagJörn Friedrich Dreyer2013-09-182-23/+26
| | | |
* | | | Merge branch 'master' into fix_3728_with_file_exists_dialogJörn Friedrich Dreyer2013-09-181-178/+182
|\| | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/file-upload.js
| * | | refactor upload progressJörn Friedrich Dreyer2013-09-161-135/+173
| |/ /
* | | use existsJörn Friedrich Dreyer2013-09-171-1/+1
| | |
* | | Merge branch 'master' into fix_3728_with_file_exists_dialogJörn Friedrich Dreyer2013-09-1713-266/+610
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/css/files.css apps/files/js/file-upload.js apps/files/js/filelist.js apps/files/js/files.js apps/files_sharing/js/public.js core/js/jquery.ocdialog.js core/js/oc-dialogs.js
| * | Merge pull request #4838 from owncloud/refactor_upload_jsThomas Müller2013-09-162-19/+13
| |\ \ | | | | | | | | refactor upload js & html to always use only js to fill form data
| | * | refactor upload js & html to always use only js to fill form dataJörn Friedrich Dreyer2013-09-132-19/+13
| | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-02 07:30:33 +0000