| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into appframework-master | Thomas Müller | 2013-09-25 | 5 | -23/+61 |
| |\ | | | | | | | | | | | Conflicts: apps/files/lib/helper.php apps/files_trashbin/lib/helper.php | ||||
| | * | remove unneccessary lib in namespace | Jörn Friedrich Dreyer | 2013-09-20 | 5 | -10/+10 |
| | | | |||||
| | * | namespaces use upcasefirst parts | Jörn Friedrich Dreyer | 2013-09-20 | 5 | -10/+10 |
| | | | | | | | | | | | 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! | ||||
| | * | Merge branch 'master' into fix_3728_with_file_exists_dialog | Jörn Friedrich Dreyer | 2013-09-19 | 1 | -2/+4 |
| | |\ | | | | | | | | | | | | | Conflicts: apps/files/js/filelist.js | ||||
| | | * | adding comma to get cleaner diffs in the future | Thomas Müller | 2013-09-18 | 1 | -1/+1 |
| | | | | |||||
| | | * | add permissions of the file to the json response | Thomas Müller | 2013-09-18 | 1 | -1/+2 |
| | | | | |||||
| | * | | Merge branch 'master' into fix_3728_with_file_exists_dialog | Jörn Friedrich Dreyer | 2013-09-17 | 2 | -31/+66 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | fix upload of multiple files | Jörn Friedrich Dreyer | 2013-09-06 | 1 | -23/+38 |
| | | | | |||||
| | * | | refactor replace and autorename resolution in upload.php | Jörn Friedrich Dreyer | 2013-09-06 | 1 | -39/+33 |
| | | | | |||||
| | * | | Merge branch 'master' into fix_3728_with_file_exists_dialog | Jörn Friedrich Dreyer | 2013-09-04 | 5 | -24/+43 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/ajax/upload.php apps/files/js/file-upload.js apps/files/js/filelist.js apps/files/js/files.js apps/files/templates/part.list.php | ||||
| | * | | | reduced complexity, added listing conflicts to dialog | Jörn Friedrich Dreyer | 2013-08-22 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | progress fixes | Jörn Friedrich Dreyer | 2013-08-16 | 1 | -4/+5 |
| | | | | | |||||
| | * | | | fix whitespace, check selected files before starting upload | Jörn Friedrich Dreyer | 2013-08-14 | 1 | -8/+31 |
| | | | | | |||||
| * | | | | use \OC::$server->getPreviewManager() instead of \OCP\Preview | Thomas Müller | 2013-09-17 | 1 | -3/+3 |
| | |_|/ |/| | | |||||
| * | | | Merge pull request #4853 from owncloud/external-shared_mimetype-icons | Thomas Müller | 2013-09-15 | 1 | -11/+9 |
| |\ \ \ | | | | | | | | | Use external and shared icons in OC.Dialogs.filepicker() | ||||
| | * | | | Use external and shared icons in OC.Dialogs.filepicker() | kondou | 2013-09-14 | 1 | -11/+9 |
| | | | | | |||||
| * | | | | Fixed ajax support to also update the current dir permissions | Vincent Petry | 2013-09-13 | 1 | -0/+4 |
| | | | | | |||||
| * | | | | Ajax calls for "files" and "files_trashbin" apps | Vincent Petry | 2013-09-13 | 1 | -20/+18 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Frontend: - The files app list now uses ajax calls to refresh the list. - Added support the browser back button (history API). - Added mask + spinner while loading file list Backend: - Added utility function in core JS for parsing query strings. - Moved file list + breadcrumb template data code to helper functions - Fixed some file paths in trashbin app to be similar to the files app | ||||
| * | | | Merge pull request #4816 from owncloud/fixing-723-master | Jan-Christoph Borchardt | 2013-09-12 | 1 | -0/+1 |
| |\ \ \ | | | | | | | | | Fixing 723 master | ||||
| | * | | | adding calls to \OCA\files\lib\Helper::determineIcon($i) in files, trashbin ↵ | Thomas Müller | 2013-09-12 | 1 | -0/+1 |
| | | |/ | |/| | | | | | | | and sharing | ||||
| * | | | Clean up rawlist.php and fix non-array request | kondou | 2013-09-12 | 1 | -20/+30 |
| | | | | |||||
| * | | | Split some lines, use ===, avoid unnecessary operation | kondou | 2013-09-11 | 1 | -5/+7 |
| | | | | |||||
| * | | | Use usort() instead of uasort() to not maintain keys | kondou | 2013-09-06 | 1 | -1/+1 |
| | | | | |||||
| * | | | Sort files by name, not by mimetype | kondou | 2013-09-05 | 1 | -0/+9 |
| | | | | |||||
| * | | | Only use mimetype_list and clean up a bit | kondou | 2013-09-05 | 1 | -9/+10 |
| | | | | |||||
| * | | | Make it possible to pass rawlist.php an JSON array, to filter by more than ↵ | kondou | 2013-09-05 | 1 | -5/+17 |
| |/ / | | | | | | | one mimetype | ||||
| * | | use gerMimeTypeDetector detectPath instead of getMimeType | Georg Ehrke | 2013-08-30 | 1 | -1/+1 |
| | | | |||||
| * | | backport of #4357 to master | Thomas Müller | 2013-08-27 | 1 | -10/+14 |
| | | | |||||
| * | | Merge pull request #4497 from owncloud/newlines_at_eof_kondou | Kondou | 2013-08-18 | 1 | -1/+1 |
| |\ \ | | | | | | | Add newlines at the end of files | ||||
| | * | | Add _many_ newlines at the end of files | kondou | 2013-08-18 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #4483 from owncloud/compare-true-false | Bart Visscher | 2013-08-18 | 2 | -2/+2 |
| |\ \ \ | |/ / |/| | | Compare result are already true/false | ||||
| | * | | Fix spacing of all touched lines. | Andreas Fischer | 2013-08-17 | 1 | -1/+1 |
| | | | | |||||
| | * | | Compare result are already true/false | Bart Visscher | 2013-08-17 | 2 | -2/+2 |
| | | | | |||||
| * | | | communicate size of newly created file back and update UI | Thomas Müller | 2013-08-16 | 1 | -0/+2 |
| | | | | |||||
| * | | | Merge branch 'master' into mimetype-defaults | Thomas Müller | 2013-08-16 | 2 | -42/+49 |
| |\| | | | | | | | | | | | | | | Conflicts: apps/files/ajax/newfile.php | ||||
| | * | | Use multiple lines for the JSON data array. | Andreas Fischer | 2013-08-08 | 1 | -1/+5 |
| | | | | |||||
| | * | | Adjust JSON code to stable5. | Andreas Fischer | 2013-08-08 | 1 | -1/+2 |
| | | | | |||||
| | * | | Do not repeat JSON success code. | Andreas Fischer | 2013-08-08 | 1 | -8/+7 |
| | | | | |||||
| | * | | Do not repeat definition of $target. | Andreas Fischer | 2013-08-08 | 1 | -5/+6 |
| | |/ | |||||
| | * | Check expected type after JSON decode instead of checking what is not expected. | Andreas Fischer | 2013-08-07 | 1 | -1/+1 |
| | | | | | | | | | This will also allow "true" and "false" as filenames instead of only "null". | ||||
| * | | add the option to have templates for newly created files | Robin Appelman | 2013-08-07 | 1 | -34/+38 |
| |/ | |||||
| * | Split scanning logic from ajax file | Robin Appelman | 2013-07-19 | 1 | -45/+29 |
| | | |||||
| * | Merge branch 'master' into fixing-3942-master | Thomas Müller | 2013-07-06 | 1 | -1/+1 |
| |\ | | | | | | | | | Conflicts: apps/files/ajax/upload.php | ||||
| | * | proper fix for getting the shared item if no user is logged in | Thomas Müller | 2013-07-05 | 1 | -4/+5 |
| | | | |||||
| | * | php 5.3 compliant now | Thomas Müller | 2013-07-05 | 1 | -1/+2 |
| | | | |||||
| | * | get the real physical folder name for anonymous upload | Thomas Müller | 2013-07-05 | 1 | -2/+7 |
| | | | |||||
| * | | on reshares we now recursively move to the root of all reshares - therefore ↵ | Thomas Müller | 2013-07-05 | 1 | -15/+14 |
| | | | | | | | | | some code has been refactured and added as a new public function | ||||
| * | | handle anonymous upload to reshared folder | Thomas Müller | 2013-07-05 | 1 | -0/+5 |
| |/ | |||||
| * | fix uploading when ['dirtoken'] is not set | Robin Appelman | 2013-07-01 | 1 | -1/+1 |
| | | |||||
| * | code style | Robin Appelman | 2013-07-01 | 1 | -34/+34 |
| | | |||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| aboutsummaryrefslogtreecommitdiffstats |