summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 8.2.3v8.2.3C Montero-Luque2016-03-081-2/+2
* 8.2.3 RC2v8.2.3RC2C Montero-Luque2016-03-041-2/+2
* Merge pull request #22868 from owncloud/stable8.2-backport-22865C. Montero Luque2016-03-045-16/+93
|\
| * Run cleanup of expired DB file locks to background jobMorris Jobke2016-03-045-16/+93
* | Merge pull request #22862 from owncloud/stable8.2-trashbin-checkpathC. Montero Luque2016-03-041-1/+1
|\ \ | |/ |/|
| * Properly check path validity before deleting to trashVincent Petry2016-03-041-1/+1
|/
* Merge pull request #22802 from RealRancor/backport_22776_stable8.2Frank Karlitschek2016-03-031-0/+6
|\
| * Add Versions app header to config.sample.phpRealRancor2016-03-031-0/+6
|/
* 8.2.3 RC1v8.2.3RC1C Montero-Luque2016-03-012-3/+3
* Merge pull request #22752 from owncloud/part-file-root-82Vincent Petry2016-03-014-12/+104
|\
| * Don't apply quota in stream wrapper for part filesVincent Petry2016-03-011-5/+22
| * add config sampleRobin Appelman2016-03-011-1/+9
| * allow putting the part file in the view rootRobin Appelman2016-03-012-6/+73
* | Merge pull request #22751 from owncloud/stable8.2-codecheckerusesThomas Müller2016-03-011-1/+4
|\ \ | |/ |/|
| * Fixing CodeChecker usage :see_no_evil:Thomas Müller2016-03-011-1/+4
|/
* Merge pull request #22325 from owncloud/dav-upload-scan-in-lock-82Vincent Petry2016-03-011-5/+5
|\
| * scan the file in the write lock when uploading over davRobin Appelman2016-02-111-5/+5
* | Merge pull request #22705 from owncloud/backport-22677-theme-overwriting-lang...Morris Jobke2016-03-013-8/+39
|\ \
| * | Improved JS L10N bundle merging + testsVincent Petry2016-03-012-3/+9
| * | Allow to overwrite a single language string via the theme folderJoas Schilling2016-02-292-8/+33
* | | Merge pull request #22657 from owncloud/stable8.2-backport-21854Vincent Petry2016-03-011-0/+17
|\ \ \
| * | | Fix addUserToGroup hook of the share codeMorris Jobke2016-02-251-0/+17
* | | | Merge pull request #22712 from owncloud/kill-coverage-on-scrutinizer-stable8.2Morris Jobke2016-02-291-4/+0
|\ \ \ \
| * | | | Update .scrutinizer.ymlThomas Müller2016-02-291-4/+0
|/ / / /
* | | | Merge pull request #22665 from owncloud/backport-22599-stable8.2Thomas Müller2016-02-291-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | take the first result of that array, if present. Fixes 2nd display name to be...Arthur Schiwon2016-02-261-2/+2
| |/ /
* | | Merge pull request #22685 from owncloud/stable8.2-fix-thrashbin-cronjobMorris Jobke2016-02-291-0/+6
|\ \ \
| * | | Skip users with no trashbinVictor Dubiniuk2016-02-261-0/+6
|/ / /
* | | Merge pull request #22676 from owncloud/fed-share-etag-82Morris Jobke2016-02-263-8/+78
|\ \ \
| * | | use the default view for propagation if possibleRobin Appelman2016-02-262-8/+28
| * | | Add test for owner etag propagationRobin Appelman2016-02-261-0/+50
* | | | Merge pull request #22574 from owncloud/backport-22419-console-add-user-group...Roeland Douma2016-02-261-1/+10
|\ \ \ \ | |_|/ / |/| | |
| * | | Make sure to init the users Filesystem so we can add group sharesJoas Schilling2016-02-221-1/+10
* | | | Merge pull request #22649 from owncloud/external-share-manager-82Thomas Müller2016-02-251-3/+4
|\ \ \ \
| * | | | inject the correct external share manager into the storageRobin Appelman2016-02-251-3/+4
| | |/ / | |/| |
* | | | Merge pull request #22629 from owncloud/stable8.2-fedshare-testremote-after-404Thomas Müller2016-02-251-0/+3
|\ \ \ \
| * | | | Properly trigger testRemote after getting a 404 from remote fed shareVincent Petry2016-02-241-0/+3
* | | | | Merge pull request #22633 from owncloud/stable8.2-backport-22565Vincent Petry2016-02-251-0/+4
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Avoids scanning the root storageMorris Jobke2016-02-241-0/+4
* | | | | Merge pull request #22626 from owncloud/fix_broken_unencrypted_size_8.2Björn Schießle2016-02-252-4/+286
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | recalculate unencrypted size if we assume that the size stored in the db is n...Bjoern Schiessle2016-02-252-4/+286
| |/ / /
* | | | Merge pull request #22614 from owncloud/backport-22358-stable8.2Morris Jobke2016-02-244-5/+32
|\ \ \ \ | |/ / / |/| | |
| * | | Fix race condition when switching filter mode. Fixes #22278Arthur Schiwon2016-02-244-5/+32
| |/ /
* | | Merge pull request #22571 from owncloud/stable8.2-backport-21544Morris Jobke2016-02-241-0/+3
|\ \ \ | |/ / |/| |
| * | set etag and permission fields for trashbin entriesRobin Appelman2016-02-221-0/+3
* | | Merge pull request #22557 from owncloud/backport-22496-share-group-problemRoeland Douma2016-02-221-1/+1
|\ \ \ | |/ / |/| |
| * | Fix on shared groups assignment.Leonardo Diez2016-02-221-1/+1
* | | Merge pull request #22562 from owncloud/stable8.2-ie-publicpagefooterMorris Jobke2016-02-221-0/+5
|\ \ \
| * | | Fix public page footer position in IEVincent Petry2016-02-221-0/+5
|/ / /
* | | Merge pull request #22556 from owncloud/stable8.2-fix-pagination-in-ieVincent Petry2016-02-221-1/+0
|\ \ \ | |/ / |/| |