summaryrefslogtreecommitdiffstats
path: root/apps/files
Commit message (Expand)AuthorAgeFilesLines
* [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
| | * | | | | | | | | | | | use post instead of getJörn Friedrich Dreyer2013-01-302-5/+5
| | * | | | | | | | | | | | add multselect dndJörn Friedrich Dreyer2013-01-302-21/+119
| | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| | * | | | | | | | | | | 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
| | | | |_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | |
| | * | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-306-0/+26
| | * | | | | | | | | | | Merge pull request #1324 from owncloud/permanent-share-iconsMichael Gapczynski2013-01-281-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | fix color change on clickJan-Christoph Borchardt2013-01-281-1/+1
| | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | |
| | * / | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-296-2/+17
| | |/ / / / / / / / / /
| * | | | | | | | | | | Files: Dont get maxUploadSize if the filecache needs to be upgradedRobin Appelman2013-01-301-3/+2
| * | | | | | | | | | | Files: fix sharing newly uploaded filesRobin Appelman2013-01-281-17/+20
| * | | | | | | | | | | change required ownCloud version to 4.91Robin Appelman2013-01-281-1/+1
| * | | | | | | | | | | merge master into filesystemRobin Appelman2013-01-287-36/+6
| |\| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into filesystemRobin Appelman2013-01-2858-87/+99
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ merge master into filesystemRobin Appelman2013-01-2625-124/+183
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into filesystemRobin Appelman2013-01-229-0/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Files: don't load fileactions.js when upgrading filecacheRobin Appelman2013-01-211-1/+1
| * | | | | | | | | | | | | | merge master into filesytemRobin Appelman2013-01-2065-179/+223
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Files: make sure keybinds js is loaded after files jsRobin Appelman2013-01-161-1/+1
| * | | | | | | | | | | | | | | merge master into filesystemRobin Appelman2013-01-165-10/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Cache: more efficient upgradingRobin Appelman2013-01-151-0/+2
| * | | | | | | | | | | | | | | | Cache: show upgrade progressRobin Appelman2013-01-156-39/+115
| * | | | | | | | | | | | | | | | merge master into filesystemRobin Appelman2013-01-1555-222/+416
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | |