summaryrefslogtreecommitdiffstats
path: root/apps/files
Commit message (Expand)AuthorAgeFilesLines
* 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 #1562 from schiesbn/fix_namingBernhard Posselt2013-02-091-1/+1
|\ \
| * | rename trash to trash binBjörn Schießle2013-02-091-1/+1
| |/
* | 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-092-2/+2
|\ \
| * | Fix files router download linksBart Visscher2013-02-082-2/+2
* | | Merge pull request #1541 from owncloud/fixing-1540-masterJörn Friedrich Dreyer2013-02-092-8/+0
|\ \ \
| * | | remove unused codeThomas Müller2013-02-081-6/+0
| * | | remove undefined function FileList.finishDeleteThomas Müller2013-02-081-2/+0
| |/ /
* / / [tx-robot] updated from transifexJenkins for ownCloud2013-02-0933-33/+9
|/ /
* | Merge pull request #1534 from owncloud/files_l10nThomas Müller2013-02-083-6/+10
|\ \
| * | Files: explicitly defineRobin Appelman2013-02-082-0/+4
| * | Files: rename 'space' to 'storage' in upload.phpRobin Appelman2013-02-071-1/+1
| * | Files: add translation support back to move/renameRobin Appelman2013-02-072-5/+5
| |/
* | [tx-robot] updated from transifexJenkins for ownCloud2013-02-0810-1/+22
* | Merge pull request #1507 from tripflex/masterBart Visscher2013-02-071-1/+1
|\ \ | |/ |/|
| * Remove left float from actions div classMyles McNamara2013-02-061-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2013-02-072-2/+11
* | Merge pull request #1498 from schiesbn/delete_trashLukas Reschke2013-02-061-0/+2
|\ \ | |/ |/|
| * allow to delete single files from the trash bin permanentlyBjörn Schießle2013-02-061-0/+2
* | Merge pull request #1428 from owncloud/content_positioningThomas Tanghus2013-02-062-5/+5
|\ \ | |/ |/|
| * Add 'hascontrols' class for content with fixed topbar.Thomas Tanghus2013-02-042-11/+11
| * Files: fix positioning of Trash button and upload progress barRobin Appelman2013-02-042-10/+10
| * Fix leftcontent positioning. Ref #1255Thomas Tanghus2013-02-031-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2013-02-061-1/+6
* | Remove undefined crumb variable from home breadcrumbMichael Gapczynski2013-02-041-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2013-02-051-1/+4
* | 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-3175-526/+521
| |\ \
| * | | 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
* | | | Merge pull request #1340 from owncloud/fixing-js-errors-public-link-masterThomas Müller2013-02-032-1/+5
|\ \ \ \
| * | | | call ajax scan only if a user is logged in - otherwise we'll get a 500Thomas Mueller2013-01-311-0/+4
| * | | | Merge branch 'master' into fixing-js-errors-public-link-masterThomas Mueller2013-01-3175-516/+554
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | call ajax scan only if a user is logged in - otherwise we'll get a 500Thomas Mueller2013-01-281-5/+7
| * | | | fixing href for foldersThomas Mueller2013-01-281-1/+1
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-043-30/+65
| |_|_|/ |/| | |
* | | | Merge pull request #1422 from TheSFReader/masterThomas Müller2013-02-031-1/+2
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'refs/remotes/upstream/master'TheSFReader2013-02-026-8/+25
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'refs/remotes/upstream/master'TheSFReader2013-02-019-10/+25
| |\ \ \ \ \
| * | | | | | Correct itTheSFReader2013-02-011-1/+2
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-032-1/+6
| |_|/ / / / |/| | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-026-8/+25
| |/ / / / |/| | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-014-2/+12
* | | | | Merge pull request #1351 from owncloud/navigationMichael Gapczynski2013-01-313-7/+10
|\ \ \ \ \ | |_|_|/ / |/| | | |