summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-09-229-5/+46
|
* Merge pull request #4927 from owncloud/fix_namespaces_and_autoloadingThomas Müller2013-09-2114-27/+26
|\ | | | | namespaces use upcasefirst parts
| * remove unneccessary lib in namespaceJörn Friedrich Dreyer2013-09-2010-20/+19
| |
| * namespaces use upcasefirst partsJörn Friedrich Dreyer2013-09-2013-26/+26
| | | | | | | | | | 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-2064-156/+12
| |
* | 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-1965-9/+955
|\ \ | | | | | | | | | | | | 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-1964-154/+1094
| | |\ \
| | * | | 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-1860-1/+895
| | | |
* | | | 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-184-85/+121
| | | |
* | | | 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
| * | | Merge pull request #4872 from owncloud/refactor_upload_progressJörn Friedrich Dreyer2013-09-181-135/+173
| |\ \ \ | | | | | | | | | | refactor upload progress
| | * | | refactor upload progressJörn Friedrich Dreyer2013-09-161-135/+173
| | | | |
* | | | | Merge branch 'master' into fix_3728_with_file_exists_dialogJörn Friedrich Dreyer2013-09-183-18/+26
|\| | | |
| * | | | Merge pull request #4708 from owncloud/encryption_fixesBjörn Schießle2013-09-183-18/+26
| |\ \ \ \ | | |_|/ / | |/| | | make sure that initial encryption also starts for a fresh installation
| | * | | performance improvement, check configuration only if no private key existsBjoern Schiessle2013-09-171-7/+12
| | | | |
| | * | | check if stream wrapper is already registered to avoid warningBjoern Schiessle2013-09-031-1/+3
| | | | |
| | * | | make sure that initial encryption also starts for a fresh installationBjoern Schiessle2013-09-032-11/+12
| | | | |
* | | | | use existsJörn Friedrich Dreyer2013-09-171-1/+1
| | | | |
* | | | | Merge branch 'master' into fix_3728_with_file_exists_dialogJörn Friedrich Dreyer2013-09-1741-469/+1045
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-162-2/+4
| | |/ / | |/| |
| * | | Merge pull request #4838 from owncloud/refactor_upload_jsThomas Müller2013-09-163-33/+26
| |\ \ \ | | | | | | | | | | 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-133-33/+26
| | | | |
| * | | | Merge pull request #4853 from owncloud/external-shared_mimetype-iconsThomas Müller2013-09-151-11/+9
| |\ \ \ \ | | | | | | | | | | | | Use external and shared icons in OC.Dialogs.filepicker()
| | * | | | Use external and shared icons in OC.Dialogs.filepicker()kondou2013-09-141-11/+9
| | | | | |
| * | | | | Merge pull request #4501 from owncloud/ajaxfilelistThomas Müller2013-09-1419-258/+705
| |\ \ \ \ \ | | |/ / / / | |/| | | | Ajax calls for "files" and "files_trashbin" apps
| | * | | | Fixed files_trashbin to also use hash URL part for IE8Vincent Petry2013-09-132-2/+27
| | | | | |
| | * | | | Use hash part of URL for IE8 in files appVincent Petry2013-09-134-16/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this fix, the URL wasn't updated in IE8 when navigating into folders. This fix makes use of the hash part of URLs to make this work in IE8, since IE8 doesn't support the history API nor changing the URL without redirecting. From now, both the regular query URL "?dir=somedir" and "#?dir=somedir" will work in both IE8 and non-IE8 browsers. In IE8, query based URLs are automatically converted to hash URLs upon page load. The conversion is done on the server side by redirecting the user to the updated URL. When loading a page directly using a hash URL in the form "#?dir=somedir" in IE8, the server doesn't get the hash, so it will not return any results in that case and rely on ajax to load the first page.
| | * | | | Fixed loading mask/spinner to stay fixed on scrollVincent Petry2013-09-131-1/+1
| | | | | |