summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into fix_3728_with_file_exists_dialogJörn Friedrich Dreyer2013-09-1965-9/+955
|\
| * Merge pull request #4900 from owncloud/fixing-4488-masterJörn Friedrich Dreyer2013-09-193-2/+13
| |\
| | * 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:Jörn Friedrich Dreyer2013-09-173-5/+44
| | |/
| * | [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 i...Jörn Friedrich Dreyer2013-09-192-3/+3
|\ \ \
| * \ \ Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core i...Thomas Müller2013-09-191-26/+26
| |\ \ \
| * | | | 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
* | | 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
|\| |
| * | Merge pull request #4872 from owncloud/refactor_upload_progressJörn Friedrich Dreyer2013-09-181-135/+173
| |\ \
| | * | 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
| |\ \ \ | | |_|/ | |/| |
| | * | 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
|\| | |
| * | | [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 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()kondou2013-09-141-11/+9
| * | | | Merge pull request #4501 from owncloud/ajaxfilelistThomas Müller2013-09-1419-258/+705
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | 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
| | * | | Fixed loading mask/spinner to stay fixed on scrollVincent Petry2013-09-131-1/+1
| | * | | Fixed JS error in trashbin appVincent Petry2013-09-131-0/+4
| | * | | Changed breadcrumb event handling to not use delegateVincent Petry2013-09-131-4/+3
| | * | | Fixed ajax support to also update the current dir permissionsVincent Petry2013-09-135-21/+45
| | * | | Added missing "files" JS to files_trashbin moduleVincent Petry2013-09-131-0/+1
| | * | | update file summary on ajax file list loadThomas Müller2013-09-131-0/+1
| | * | | fixing breadcrumbs on ajax loading of filesThomas Müller2013-09-133-65/+78
| | * | | calling replaceSVG() to display breadcrumb images correctly on IE8Thomas Müller2013-09-131-0/+6
| | * | | fixing no-repeat for IE8Thomas Müller2013-09-131-0/+1
| | * | | Ajax calls for "files" and "files_trashbin" appsVincent Petry2013-09-1319-181/+486
| | |/ /
| * / / [tx-robot] updated from transifexJenkins for ownCloud2013-09-138-7/+50
| |/ /
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-10 07:35:52 +0000