summaryrefslogtreecommitdiffstats
path: root/apps/files/js
Commit message (Expand)AuthorAgeFilesLines
* prevent user from creating or renaming sth. to an existing filenameJörn Friedrich Dreyer2013-10-223-433/+492
* give getSelectedFilesTrash() a unique name for the trash.js to avoid confusio...Bjoern Schiessle2013-10-181-5/+5
* Fixed sharing status update for new/uploaded filesVincent Petry2013-10-173-4/+14
* Merge pull request #5262 from owncloud/files-ie8-conflictdialogbrokenfixMorris Jobke2013-10-161-1/+5
|\
| * Fixed conflict dialog in IE8Vincent Petry2013-10-101-1/+5
* | Merge pull request #5353 from owncloud/files-dndtodirbrokenMorris Jobke2013-10-161-14/+22
|\ \
| * | Fixed drag and drop upload to breadcrumbVincent Petry2013-10-151-26/+22
| * | Fixed drag and drop onto foldersVincent Petry2013-10-151-5/+17
* | | Disabled ajax mode for public files viewVincent Petry2013-10-142-21/+27
|/ /
* | Merge pull request #5207 from owncloud/fixing-4011-part2-masterThomas Müller2013-10-111-1/+1
|\ \
| * | catch exceptions while uploading and pass on the error messageThomas Müller2013-10-081-1/+1
* | | File actions are now updated after create/upload fileVincent Petry2013-10-111-2/+5
| |/ |/|
* | Merge pull request #5134 from owncloud/trashbin-homeiconbrokenVincent Petry2013-10-091-3/+6
|\ \
| * | Do not call changeDirectory() when no dir set on breadcrumbVincent Petry2013-10-041-3/+6
| |/
* | Merge pull request #4921 from owncloud/file_conflicts_dialog_fixesVicDeo2013-10-074-39/+6
|\ \
| * | remove double uri encodingJörn Friedrich Dreyer2013-10-071-4/+4
| * | canceling individual uploads is currently impossible because there is no plac...Jörn Friedrich Dreyer2013-10-072-34/+1
| * | use !== comparisonJörn Friedrich Dreyer2013-10-071-1/+1
| |/
* / Fix breadcrumb to reinit dnd after ajax nav #5064Vincent Petry2013-10-071-6/+8
|/
* Merge pull request #4933 from owncloud/1376-filesappplussigninurlbugVincent Petry2013-10-041-2/+6
|\
| * Replace plus sign with space in files app URL #4932Vincent Petry2013-09-201-2/+6
* | Shortened notification message that was too longVincent Petry2013-10-041-1/+1
* | Merge branch 'master' into encryption_improved_error_messages_4617Bjoern Schiessle2013-09-301-1/+5
|\ \
| * | implement previews for public uploadGeorg Ehrke2013-09-231-1/+5
| |/
* | Merge branch 'master' into encryption_improved_error_messages_4617Bjoern Schiessle2013-09-236-581/+1411
|\|
| * Merge branch 'master' into fix_3728_with_file_exists_dialogJörn Friedrich Dreyer2013-09-193-6/+53
| |\
| | * Merge pull request #4900 from owncloud/fixing-4488-masterJörn Friedrich Dreyer2013-09-192-1/+11
| | |\
| | | * Merge branch 'master' into fixing-4488-masterThomas Müller2013-09-191-135/+173
| | | |\
| | | * | 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
| | * | | Merge pull request #4263 from owncloud/search_scrolltoJörn Friedrich Dreyer2013-09-192-5/+41
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | initial scrollto implementation:Jörn Friedrich Dreyer2013-09-172-5/+41
| | | |/
| * | | 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
| * | | 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
| |\| |
| | * | 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-174-140/+351
| |\|
| * | Merge branch 'master' into fix_3728_with_file_exists_dialogJörn Friedrich Dreyer2013-09-101-76/+75
| |\ \
| * | | whitespace and indentation fixesJörn Friedrich Dreyer2013-09-081-28/+28
| * | | remove unused hooksJörn Friedrich Dreyer2013-09-082-23/+0
| * | | cleanup commentsJörn Friedrich Dreyer2013-09-082-203/+75
| * | | fine ie8 compatabilityJörn Friedrich Dreyer2013-09-061-1/+5