summaryrefslogtreecommitdiffstats
path: root/apps/files/js
Commit message (Expand)AuthorAgeFilesLines
...
* | Files: fix moving files by DnDRobin Appelman2013-01-311-0/+8
* | fix merge conflictBjörn Schießle2013-01-312-46/+141
|\ \
| * \ merge master into filesystemRobin Appelman2013-01-301-23/+109
| |\ \
| | * | use $.trim() for IE8Jörn Friedrich Dreyer2013-01-301-2/+2
| | * | reset checkbox after getting selected files instead of ofter dragging, speed ...Jörn Friedrich Dreyer2013-01-301-18/+13
| | * | use post instead of getJörn Friedrich Dreyer2013-01-301-2/+2
| | * | add multselect dndJörn Friedrich Dreyer2013-01-301-21/+108
| | |/
| | * Merge pull request #1227 from owncloud/hideuploadprogresscancelinielt10Thomas Müller2013-01-301-0/+4
| | |\
| | | * hide upload progress bar and cancel action in IE < 10Jörn Friedrich Dreyer2013-01-181-0/+4
| * | | merge master into filesystemRobin Appelman2013-01-281-20/+0
| |\| |
| * | | merge master into filesystemRobin Appelman2013-01-263-51/+77
| |\ \ \
| * \ \ \ merge master into filesytemRobin Appelman2013-01-202-1/+81
| |\ \ \ \
| * \ \ \ \ merge master into filesystemRobin Appelman2013-01-162-8/+8
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Cache: show upgrade progressRobin Appelman2013-01-151-0/+17
| * | | | | merge master into filesystemRobin Appelman2013-01-152-45/+68
| |\ \ \ \ \
| * \ \ \ \ \ merge master into filesystemRobin Appelman2013-01-072-5/+17
| |\ \ \ \ \ \
| * \ \ \ \ \ \ merge master into filesystemRobin Appelman2012-12-253-25/+14
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ merge master into filesystemRobin Appelman2012-12-152-2/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into filesystemRobin Appelman2012-12-113-22/+174
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ merge master into filesystemRobin Appelman2012-11-301-2/+2
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ merge master into filesystemRobin Appelman2012-11-233-14/+36
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ merge master into filesystemRobin Appelman2012-11-231-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | use background scannerRobin Appelman2012-11-231-23/+15
* | | | | | | | | | | | | | make spinner title translatableBjörn Schießle2013-01-301-1/+1
* | | | | | | | | | | | | | show a spinner instead of the delete button while moving files to the trash binBjörn Schießle2013-01-301-3/+15
* | | | | | | | | | | | | | icons added; empty trash bin message addedBjörn Schießle2013-01-291-1/+1
* | | | | | | | | | | | | | merge conflict fixedBjörn Schießle2013-01-281-43/+0
* | | | | | | | | | | | | | fix merge conflictsBjörn Schießle2013-01-282-47/+97
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Use HTML5 data attribute + fix undefined variableLukas Reschke2013-01-261-20/+0
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #1059 from owncloud/fixing-998-masterThomas Müller2013-01-262-51/+57
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | replace #notification with OC.Notification callThomas Mueller2013-01-191-2/+1
| | * | | | | | | | | | | | Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-191-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | update used space percent after each ajax call and display the notificationThomas Mueller2013-01-191-2/+10
| | * | | | | | | | | | | | Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-183-26/+107
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | fixing indent - sorryy wrong setting on the IDE :-(Thomas Mueller2013-01-111-17/+15
| | * | | | | | | | | | | | | adding accidentally removed line - THX @bartv2Thomas Mueller2013-01-111-0/+1
| | * | | | | | | | | | | | | Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-112-41/+64
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-062-5/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | | javascript notification functions have been moved to js.js for common useThomas Mueller2013-01-042-43/+22
| | * | | | | | | | | | | | | | notifications are now shown/hidden using the js functions hideNotification an...Thomas Mueller2013-01-022-38/+60
| | | |_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | rename 'publicListView' switch to 'disableSharing' because this is not only u...Björn Schießle2013-01-221-3/+3
| * | | | | | | | | | | | | | Remove closing tagLukas Reschke2013-01-211-1/+0
| * | | | | | | | | | | | | | No inline JS in appsLukas Reschke2013-01-211-0/+21
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | no undo notification for deleted file, we use the trash bin insteadBjörn Schießle2013-01-221-54/+15
* | | | | | | | | | | | | | allow to look into deleted directoriesBjörn Schießle2013-01-221-0/+1
* | | | | | | | | | | | | | introduce option to disable download actionBjörn Schießle2013-01-221-6/+10
* | | | | | | | | | | | | | call the trash bin viewBjörn Schießle2013-01-221-2/+2
* | | | | | | | | | | | | | add trash button to web interfaceBjörn Schießle2013-01-221-0/+5
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #1228 from owncloud/generating_zip_messageJan-Christoph Borchardt2013-01-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Change the second part of the notificationLukas Reschke2013-01-191-1/+1