| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into appframework-master | Thomas Müller | 2013-09-27 | 1 | -9/+69 |
| |\ | |||||
| | * | Merge pull request #4207 from owncloud/search_shared_files | Thomas Müller | 2013-09-27 | 1 | -9/+69 |
| | |\ | | | | | | | add initial search in shared files | ||||
| | | * | adding PHPDoc comments to getBackend | Thomas Müller | 2013-09-24 | 1 | -5/+10 |
| | | | | | | | | | | | | | ensure getChildren() is called on an instance of Share_Backend_Collection | ||||
| | | * | same for search by mime | Jörn Friedrich Dreyer | 2013-09-19 | 1 | -4/+4 |
| | | | | |||||
| | | * | add all results, sharing cache also returns entries for shared files in ↵ | Jörn Friedrich Dreyer | 2013-09-19 | 1 | -4/+4 |
| | | | | | | | | | | | | | external storages | ||||
| | | * | fix getAll(), refactor search by mime & search | Jörn Friedrich Dreyer | 2013-09-19 | 1 | -18/+37 |
| | | | | |||||
| | | * | return fixed path, skip shared files outside of 'files' | Jörn Friedrich Dreyer | 2013-09-19 | 1 | -3/+6 |
| | | | | |||||
| | | * | divide ids into chunks of 1k | Jörn Friedrich Dreyer | 2013-09-19 | 1 | -9/+18 |
| | | | | |||||
| | | * | add initial search in shared files | Jörn Friedrich Dreyer | 2013-09-19 | 1 | -1/+25 |
| | | | | |||||
| * | | | Merge branch 'master' into appframework-master | Thomas Müller | 2013-09-25 | 6 | -3/+54 |
| |\| | | | | | | | | | | | | | | | | | Conflicts: apps/files/lib/helper.php apps/files_trashbin/lib/helper.php | ||||
| | * | | remove unneccessary lib in namespace | Jörn Friedrich Dreyer | 2013-09-20 | 1 | -1/+1 |
| | | | | |||||
| | * | | namespaces use upcasefirst parts | Jörn Friedrich Dreyer | 2013-09-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | 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 | 4 | -1/+48 |
| | |\| | | | | | | | | | | | | | Conflicts: apps/files/js/filelist.js | ||||
| | | * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-18 | 4 | -1/+48 |
| | | | | |||||
| | * | | move upload dialog css to separate file | Jörn Friedrich Dreyer | 2013-09-18 | 1 | -0/+1 |
| | | | | |||||
| | * | | Merge branch 'master' into fix_3728_with_file_exists_dialog | Jörn Friedrich Dreyer | 2013-09-17 | 6 | -15/+43 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 branch 'master' into fix_3728_with_file_exists_dialog | Jörn Friedrich Dreyer | 2013-09-10 | 2 | -0/+14 |
| | |\ \ | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/file-upload.js | ||||
| | * \ \ | Merge branch 'master' into fix_3728_with_file_exists_dialog | Jörn Friedrich Dreyer | 2013-09-06 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'master' into fix_3728_with_file_exists_dialog | Jörn Friedrich Dreyer | 2013-09-04 | 18 | -34/+148 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | | | | progress fixes | Jörn Friedrich Dreyer | 2013-08-16 | 1 | -2/+5 |
| | | | | | | | |||||
| * | | | | | | use \OC::$server->getPreviewManager() instead of \OCP\Preview | Thomas Müller | 2013-09-17 | 1 | -1/+1 |
| | |_|_|_|/ |/| | | | | |||||
| * | | | | | Merge pull request #4838 from owncloud/refactor_upload_js | Thomas Müller | 2013-09-16 | 1 | -14/+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 data | Jörn Friedrich Dreyer | 2013-09-13 | 1 | -14/+13 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #4501 from owncloud/ajaxfilelist | Thomas Müller | 2013-09-14 | 2 | -2/+2 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Ajax calls for "files" and "files_trashbin" apps | ||||
| | * | | | | | | Ajax calls for "files" and "files_trashbin" apps | Vincent Petry | 2013-09-13 | 2 | -2/+2 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * / / / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-13 | 1 | -0/+7 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #4719 from owncloud/port_4701_master | Thomas Müller | 2013-09-12 | 1 | -1/+2 |
| |\ \ \ \ \ | | | | | | | | | | | | | Always check variable type before using readdir to avoid surprises | ||||
| | * | | | | | more is_resource checks before readdir | Arthur Schiwon | 2013-09-05 | 1 | -1/+2 |
| | | |/ / / | |/| | | | |||||
| * | | | | | adding calls to \OCA\files\lib\Helper::determineIcon($i) in files, trashbin ↵ | Thomas Müller | 2013-09-12 | 1 | -0/+15 |
| | | | | | | | | | | | | | | | | | | | | | and sharing | ||||
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-11 | 1 | -0/+6 |
| | |_|_|/ |/| | | | |||||
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-10 | 2 | -0/+14 |
| | |_|/ |/| | | |||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-05 | 1 | -1/+1 |
| |/ / | |||||
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-03 | 1 | -0/+6 |
| | | | |||||
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-01 | 1 | -2/+2 |
| | | | |||||
| * | | Merge master into oc_preview | Georg Ehrke | 2013-08-29 | 3 | -22/+14 |
| |\ \ | |||||
| | * | | backport of #4357 to master | Thomas Müller | 2013-08-27 | 1 | -3/+7 |
| | | | | |||||
| | * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-27 | 1 | -0/+7 |
| | | | | |||||
| | * | | kill zh_CN.GB2312 | Thomas Müller | 2013-08-27 | 1 | -19/+0 |
| | | | | |||||
| * | | | Merge master into oc_preview | Georg Ehrke | 2013-08-26 | 1 | -0/+6 |
| |\| | | |||||
| | * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-25 | 1 | -0/+6 |
| | | | | |||||
| * | | | Merge branch 'master' into oc_preview | Georg Ehrke | 2013-08-23 | 3 | -4/+11 |
| |\| | | |||||
| | * | | Merge pull request #4262 from owncloud/fix_jslint_kondou | Christopher | 2013-08-20 | 1 | -3/+3 |
| | |\ \ | | | | | | | | | Fix some JSLint warnings | ||||
| | | * \ | Merge branch 'master' into fix_jslint_kondou | kondou | 2013-08-18 | 71 | -74/+342 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/file-upload.js | ||||
| | | * | | | Fix a syntax error & have if-conds in an own line | kondou | 2013-08-01 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | Fix some JSLint warnings | kondou | 2013-07-31 | 1 | -4/+4 |
| | | | | | | |||||
| | * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-19 | 1 | -0/+7 |
| | | | | | | |||||
| | * | | | | Merge pull request #4467 from owncloud/storage-wrapper-quota | icewind1991 | 2013-08-19 | 1 | -1/+1 |
| | |\ \ \ \ | | | | | | | | | | | | | Move quota logic from filesystem proxy to storage wrapper | ||||
| | | * \ \ \ | merge master in storage-wrapper-quota | Robin Appelman | 2013-08-18 | 74 | -74/+375 |
| | | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | | * | | | | use renamed constants | Robin Appelman | 2013-07-25 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | move isMimeSupported out of template files | Georg Ehrke | 2013-08-21 | 1 | -0/+1 |
| | | | | | | | |||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| aboutsummaryrefslogtreecommitdiffstats |