summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* fix merge conflictBjörn Schießle2013-01-31133-1002/+1855
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2013-01-3159-205/+61
| * merge master into filesystemRobin Appelman2013-01-3031-36/+290
| |\
| | * 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
| | * | LDAP: update quota on every uncached userExists, i.e. also on every isLoggedI...Arthur Schiwon2013-01-301-0/+1
| | * | [tx-robot] updated from transifexJenkins for ownCloud2013-01-3017-4/+88
| | * | Merge pull request #1360 from owncloud/display_nameLukas Reschke2013-01-293-2/+47
| | |\ \
| | | * | LDAP: implement support for ownCloud Display NamesArthur Schiwon2013-01-291-0/+44
| | | * | show display name instead of uid in the public shared files viewBjörn Schießle2013-01-252-2/+3
| | * | | 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-298-3/+31
| | |/ / /
| * | | | Files: Dont get maxUploadSize if the filecache needs to be upgradedRobin Appelman2013-01-301-3/+2
| * | | | Sharing: partailly fix searchByMimeRobin Appelman2013-01-281-27/+28
| * | | | Files: fix sharing newly uploaded filesRobin Appelman2013-01-281-17/+20
| * | | | fix files_version hooksRobin Appelman2013-01-281-17/+17
| * | | | change required ownCloud version to 4.91Robin Appelman2013-01-286-6/+6
| * | | | merge master into filesystemRobin Appelman2013-01-289-38/+8
| |\| | |
| * | | | Move streamwrappers to seperate files and put them in a namespaceRobin Appelman2013-01-287-37/+39
| * | | | Merge branch 'master' into filesystemRobin Appelman2013-01-2867-88/+146
| |\ \ \ \
| * \ \ \ \ merge master into filesystemRobin Appelman2013-01-2695-288/+418
| |\ \ \ \ \
| * \ \ \ \ \ merge master into filesystemRobin Appelman2013-01-2235-794/+4105
| |\ \ \ \ \ \
| * | | | | | | Fix external storage UI for new storage namespacesMichael Gapczynski2013-01-213-6/+7
| * | | | | | | Merge branch 'master' into filesystemRobin Appelman2013-01-2213-2/+25
| |\ \ \ \ \ \ \
| * | | | | | | | Files: don't load fileactions.js when upgrading filecacheRobin Appelman2013-01-211-1/+1
| * | | | | | | | merge master into filesytemRobin Appelman2013-01-2092-189/+314
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Implement getETag() in shared storageMichael Gapczynski2013-01-191-1/+8
| * | | | | | | | | Files: make sure keybinds js is loaded after files jsRobin Appelman2013-01-161-1/+1
| * | | | | | | | | merge master into filesystemRobin Appelman2013-01-1645-58/+58
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Cache: more efficient upgradingRobin Appelman2013-01-151-0/+2
| * | | | | | | | | | Cache: show upgrade progressRobin Appelman2013-01-156-39/+115
| * | | | | | | | | | merge master into filesystemRobin Appelman2013-01-15154-727/+999
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Return NOT_FOUND in shared cacheMichael Gapczynski2013-01-101-1/+1
| * | | | | | | | | | | Make Google Drive storage id unique, before it was anonymousanonymousMichael Gapczynski2013-01-091-1/+1
| * | | | | | | | | | | Almost fix Shared scanner...Michael Gapczynski2013-01-075-9/+26
| * | | | | | | | | | | Maked Shared_Permissions extend Permissions classMichael Gapczynski2013-01-071-6/+6
| * | | | | | | | | | | Fix mimetypes in shared cacheMichael Gapczynski2013-01-071-1/+8
| * | | | | | | | | | | merge master into filesystemRobin Appelman2013-01-0748-15/+95
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove unnecessary length parameter from last commitMichael Gapczynski2013-01-031-3/+3
| * | | | | | | | | | | | Update old storage classes names to the new namespace during mountingMichael Gapczynski2013-01-031-0/+12
| * | | | | | | | | | | | Don't mount shared storage unless there are shared filesMichael Gapczynski2013-01-031-2/+4
| * | | | | | | | | | | | merge master into filesystemRobin Appelman2013-01-0357-57/+511
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Use the source Scanner for shared storage when the path is specifiedMichael Gapczynski2013-01-011-3/+13
| * | | | | | | | | | | | | Initialize storageId variable in shared cacheMichael Gapczynski2013-01-011-0/+1
| * | | | | | | | | | | | | Actually add Shared_WatcherMichael Gapczynski2013-01-011-0/+51