summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #768 from nextcloud/s3-objectstoreRobin Appelman2016-11-1819-315/+827
|\
| * add tests for FileInfo::isMountedRobin Appelman2016-11-161-0/+46
| * add tests for http/outputRobin Appelman2016-11-161-0/+31
| * add comment for non empty text fileRobin Appelman2016-11-161-1/+1
| * Fix themeing unit testsRoeland Jago Douma2016-11-161-20/+29
| * Dont create 0 byte text filesRobin Appelman2016-11-161-1/+1
| * fopen s3 objects directly to work around unexplainable guzzle bugRobin Appelman2016-11-161-30/+21
| * fix theming images when using primary storageRobin Appelman2016-11-161-10/+17
| * allow passing a stream to StreamResponseRobin Appelman2016-11-163-5/+10
| * Improve isMounted to handle primary storage object storeRobin Appelman2016-11-162-2/+7
| * add amazon s3 objectstore backendRobin Appelman2016-11-162-0/+154
| * split testing of objectstoragestorage and objectstore implementationsRobin Appelman2016-11-165-177/+409
| * split off s3 connection logicRobin Appelman2016-11-162-100/+132
* | Merge pull request #2196 from nextcloud/cache-owner-displaynameLukas Reschke2016-11-181-1/+10
|\ \
| * | cache the displayname of the share ownerRobin Appelman2016-11-181-1/+10
* | | Merge pull request #2108 from nextcloud/properly-parse-ie-useragentLukas Reschke2016-11-181-1/+1
|\ \ \
| * | | Properly parse IE 11 user agentMorris Jobke2016-11-141-1/+1
* | | | Merge pull request #2064 from nextcloud/oc-26189Morris Jobke2016-11-182-60/+120
|\ \ \ \
| * | | | Add submit button to validate the federated server,Felix Heidecke2016-11-092-60/+120
* | | | | Merge pull request #2116 from nextcloud/downstream-26511Morris Jobke2016-11-184-7/+50
|\ \ \ \ \
| * | | | | Display changes in file versions tab view and detailsView (#26511)Michael Jobst2016-11-144-7/+50
* | | | | | Merge pull request #2194 from nextcloud/jquery-dropdown-fixesMorris Jobke2016-11-182-3/+7
|\ \ \ \ \ \
| * | | | | | jQuery UI dropdown: correct max-height of 4 1/2 entriesJan-Christoph Borchardt2016-11-171-3/+3
| * | | | | | jQuery UI dropdown: correct clickable area of 44pxJan-Christoph Borchardt2016-11-171-0/+4
* | | | | | | Merge pull request #2184 from nextcloud/share-join-cacheMorris Jobke2016-11-1810-85/+173
|\ \ \ \ \ \ \
| * | | | | | | also work with group sharesRobin Appelman2016-11-171-1/+5
| * | | | | | | fix getting root entry when not provided by the share providerRobin Appelman2016-11-171-1/+1
| * | | | | | | let the share backend get the node cacheentry to save queriesRobin Appelman2016-11-176-27/+108
| * | | | | | | dont use the source cache/storage until neededRobin Appelman2016-11-171-15/+9
| * | | | | | | make source cache injectable in cache wrappersRobin Appelman2016-11-172-42/+46
| * | | | | | | Allow aliasing columns when using the query builderRobin Appelman2016-11-171-0/+5
| | |_|_|_|/ / | |/| | | | |
* | | | | | | [tx-robot] updated from transifexNextcloud bot2016-11-1880-60/+246
* | | | | | | Merge pull request #2178 from nextcloud/federation_sharing_changesMorris Jobke2016-11-182-2/+2
|\ \ \ \ \ \ \
| * | | | | | | don't add server automatically to trusted serverBjoern Schiessle2016-11-172-2/+2
* | | | | | | | Merge pull request #2136 from nextcloud/sharing-layoutJan-Christoph Borchardt2016-11-189-33/+47
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | use copy icon for local link rather than link icon to prevent confusion with ...Jan-Christoph Borchardt2016-11-173-5/+5
| * | | | | | | resize and pixel-perfectly align copy iconJan-Christoph Borchardt2016-11-172-5/+8
| * | | | | | | fix spacing in sidebar tabsJan-Christoph Borchardt2016-11-171-1/+1
| * | | | | | | properly align input box items in share tab viewJan-Christoph Borchardt2016-11-171-9/+14
| * | | | | | | fix layout of sharing listJan-Christoph Borchardt2016-11-173-13/+20
| * | | | | | | remove Unshare icon in listJan-Christoph Borchardt2016-11-171-1/+0
* | | | | | | | Merge pull request #2177 from nextcloud/appmanager-getapppathMorris Jobke2016-11-174-0/+67
|\ \ \ \ \ \ \ \
| * | | | | | | | Expose getAppPath to public APIJulius Haertl2016-11-174-0/+67
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #2188 from nextcloud/remove-settings-pane-in-apps-managementMorris Jobke2016-11-171-5/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove settings pane in app managementMorris Jobke2016-11-171-5/+0
* | | | | | | | | Merge pull request #2187 from nextcloud/select2-adjustmentsMorris Jobke2016-11-171-1/+13
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | select2: show cursor pointer on hovering entriesJan-Christoph Borchardt2016-11-171-0/+9
| * | | | | | | | select2: make sure dropdown always shows a last half entry to hint at moreJan-Christoph Borchardt2016-11-171-1/+1
| * | | | | | | | select2: ellipsize long namesJan-Christoph Borchardt2016-11-171-0/+3
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #2176 from nextcloud/share-cache-root-infoMorris Jobke2016-11-174-3/+37
|\ \ \ \ \ \ \ \