aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into navigationJan-Christoph Borchardt2013-01-3173-429/+456
|\
| * 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
| | * | 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
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ merge master into filesystemRobin Appelman2013-01-0746-9/+87
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ merge master into filesystemRobin Appelman2013-01-0311-34/+195
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ merge master into filesystemRobin Appelman2012-12-2513-99/+138
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ merge master into filesystemRobin Appelman2012-12-158-15/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into filesystemRobin Appelman2012-12-119-93/+278
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ merge master into filesystemRobin Appelman2012-12-068-1/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge master into filesystemRobin Appelman2012-12-034-1/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge master into filesystemRobin Appelman2012-12-0265-223/+231
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | add upgrade path from old cache to preserve file id'sRobin Appelman2012-11-302-3/+13
| | * | | | | | | | | | | | | | | | | merge master into filesystemRobin Appelman2012-11-3020-5/+60
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into filesystemRobin Appelman2012-11-2553-51/+34
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | Add checks for storage objectMichael Gapczynski2012-11-241-7/+8
| | * | | | | | | | | | | | | | | | | | | merge master into filesystemRobin Appelman2012-11-236-19/+42
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge master into filesystemRobin Appelman2012-11-234-1/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | use background scannerRobin Appelman2012-11-232-55/+72
| | * | | | | | | | | | | | | | | | | | | | | merge master into filesystemRobin Appelman2012-11-216-15/+76
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge master into filesystemRobin Appelman2012-11-184-6/+23
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into filesystemRobin Appelman2012-11-151-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge master into filesystemRobin Appelman2012-11-1557-19/+151
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | fix undefined index when loading files appRobin Appelman2012-11-082-4/+2
| | * | | | | | | | | | | | | | | | | | | | | | | | | fix rename parameter orderRobin Appelman2012-11-081-3/+3
| | * | | | | | | | | | | | | | | | | | | | | | | | | merge master into filesystemRobin Appelman2012-11-0844-401/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge master into filesystemRobin Appelman2012-11-076-40/+16
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge master into filesystemRobin Appelman2012-11-0448-14/+148
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge master into filesystemRobin Appelman2012-11-0252-51/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into filesystemRobin Appelman2012-11-015-5/+28
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge master into filesystemRobin Appelman2012-10-309-136/+137
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into filesystemRobin Appelman2012-10-271-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \