summaryrefslogtreecommitdiffstats
path: root/apps/files/js
Commit message (Expand)AuthorAgeFilesLines
* fixing undefined originalEventThomas Mueller2013-02-141-7/+6
* Files: always show share action at the rightRobin Appelman2013-02-111-9/+18
* count divs in actions instead of action div itself (is set to 100%)Jörn Friedrich Dreyer2013-02-101-3/+4
* extract common codeJörn Friedrich Dreyer2013-02-091-43/+88
* Merge pull request #1565 from owncloud/fix_replacingJörn Friedrich Dreyer2013-02-091-3/+0
|\
| * remove code properlyGeorg Ehrke2013-02-091-3/+0
* | Merge pull request #1560 from owncloud/fix_replacingBernhard Posselt2013-02-091-2/+2
|\|
| * remove (comment out) old code to fix replacing of filesGeorg Ehrke2013-02-091-2/+2
* | Merge pull request #1521 from schiesbn/label_fixedBjörn Schießle2013-02-091-4/+1
|\ \ | |/ |/|
| * don't call the delete button unshare, unshare operation no longer availableBjörn Schießle2013-02-071-4/+1
* | Merge pull request #1550 from owncloud/fix-files-download-linksJörn Friedrich Dreyer2013-02-091-1/+1
|\ \
| * | Fix files router download linksBart Visscher2013-02-081-1/+1
| |/
* | remove unused codeThomas Müller2013-02-081-6/+0
* | remove undefined function FileList.finishDeleteThomas Müller2013-02-081-2/+0
|/
* allow to delete single files from the trash bin permanentlyBjörn Schießle2013-02-061-0/+2
* Merge pull request #1229 from owncloud/from_live_to_onThomas Müller2013-02-032-7/+7
|\
| * Merge branch 'master' into from_live_to_onThomas Mueller2013-01-315-105/+188
| |\
| * | attach on to filelist instead of individual td elements for file link behaviourJörn Friedrich Dreyer2013-01-301-1/+1
| * | replace live() with on() in core jsJörn Friedrich Dreyer2013-01-302-7/+7
* | | call ajax scan only if a user is logged in - otherwise we'll get a 500Thomas Mueller2013-01-311-0/+4
| |/ |/|
* | 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
| |\ \ \ \ \ \ \ \ \ \ \ \