summaryrefslogtreecommitdiffstats
path: root/apps/files
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Merge branch 'master' into navigationJan-Christoph Borchardt2013-01-3147-98/+64
| |\| | |
| * | | | Merge branch 'master' into navigationJan-Christoph Borchardt2013-01-3173-429/+456
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into navigationJan-Christoph Borchardt2013-01-3014-3/+48
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | merge stylesJan-Christoph Borchardt2013-01-2872-298/+396
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | merge changes in navigationJan-Christoph Borchardt2013-01-281-2/+1
| |\ \ \ \ \
| | * | | | | More Style Fixesraghunayyar2013-01-251-2/+1
| * | | | | | fix up content and content-wrapper merge ...Jan-Christoph Borchardt2013-01-188-34/+43
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | merge master into navigationJan-Christoph Borchardt2013-01-1565-344/+811
| |\ \ \ \ \ \
| * \ \ \ \ \ \ merge master into navigationJan-Christoph Borchardt2012-12-1880-748/+957
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into navigationJan-Christoph Borchardt2012-11-0252-51/+3
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into navigationJan-Christoph Borchardt2012-11-015-5/+28
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into navigationJan-Christoph Borchardt2012-10-308-25/+41
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ merge breadcrumb root into navigationJan-Christoph Borchardt2012-10-285-121/+114
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | first version of breadcrumb 'root', still have a weird feeling about thisJan-Christoph Borchardt2012-10-283-7/+10
| * | | | | | | | | | | | Merge branch 'master' into navigationJan-Christoph Borchardt2012-10-287-12/+52
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | first icon update. Next step: make sprited hover state (like for home already)Jan-Christoph Borchardt2012-10-271-1/+1
| * | | | | | | | | | | | | first base on navigation rework, less obtrusive, icons need to be updated, se...Jan-Christoph Borchardt2012-10-261-2/+2
* | | | | | | | | | | | | | add multiple domains reverse proxy supportStefan Herbrechtsmeier2013-01-312-1/+3
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
* | | | | | | | | | | | | Files: fix moving files by DnDRobin Appelman2013-01-312-2/+10
* | | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-3145-96/+54
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
* | | | | | | | | | | | fix merge conflictBjörn Schießle2013-01-3170-358/+438
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-3148-199/+9
| * | | | | | | | | | | | merge master into filesystemRobin Appelman2013-01-3015-29/+166
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | 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
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-07 00:24:57 +0000