summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #23571 from owncloud/stable8.2-backport-23362Vincent Petry2016-06-011-9/+25
|\ \ \ | | | | | | | | [stable8.2] Read available l10n files also from theme folder
| * | | Read available l10n files also from theme folderMorris Jobke2016-03-241-9/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old behaviour was that only languages could be used for an app that are already present in the apps/$app/l10n folder. If there is a themed l10n that is not present in the apps default l10n folder the language could not be used and the texts are not translated. With this change this is possible and also the l10n files are loaded even if the default l10n doesn't contain the l10n file.
* | | | Add a warning when the transaction isolation level is not READ_COMMITED (#24916)Joas Schilling2016-06-012-0/+22
| |_|/ |/| |
* | | Merge pull request #24893 from owncloud/scanner-size-propagation-82Roeland Douma2016-05-311-0/+6
|\ \ \ | | | | | | | | [8.2] trigger size calculation after scanning
| * | | trigger size calculation after scanningRobin Appelman2016-05-301-0/+6
|/ / /
* | | dont update search onResize (#24862)Georg Ehrke2016-05-301-2/+0
| | | | | | | | | this.updateSearch() sets the current file list instance and clears the box. This is unnecessary and makes the search box unsuable on some mobile devices where a keyboard fade-in causes a onResize trigger, which would then clear and blur the box.
* | | Merge pull request #24841 from owncloud/islocal-cacheRoeland Douma2016-05-301-4/+8
|\ \ \ | | | | | | | | [8.2] cache isLocal for shared storage
| * | | cache isLocal for shared storageRobin Appelman2016-05-251-4/+8
|/ / /
* | | Merge pull request #24818 from owncloud/filesystem_check_changes-8.2Vincent Petry2016-05-251-2/+3
|\ \ \ | | | | | | | | clarify filesystem_check_changes in config.sample.php
| * | | clarify filesystem_check_changes in config.sample.phpCarla Schroder2016-05-241-2/+3
|/ / /
* | | [Stable8.2] Use a CappedCache in the user database backend (#24413)Roeland Douma2016-05-243-3/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use a CappedCache in the user database backend When running with a user database backend on large installations the cache can grow to significant sizes. This can be especially problematic when running big cron/repair jobs. * Allow indirect set in CappedMemoryCache
* | | Merge pull request #24704 from owncloud/locking-mark-reload-free-82Vincent Petry2016-05-191-0/+3
|\ \ \ | | | | | | | | [8.2] free up memory when releasing the last shared lock
| * | | free up memory when releasing the last shared lockRobin Appelman2016-05-181-0/+3
| | | |
* | | | Merge pull request #24692 from owncloud/stable8.2-fixchunkttlVincent Petry2016-05-181-1/+3
|\ \ \ \ | | | | | | | | | | [stable8.2] Allow chunk GC mtime tolerance for unfinished part chunks
| * | | | Allow chunk GC mtime tolerance for unfinished part chunksVincent Petry2016-05-181-1/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever part chunks are written, every fwrite in the write loop will reset the mtime to the current mtime. Only at the end will the touch() operation set the mtime to now + ttl, in the future. However the GC code is expecting that every chunk with mtime < now are old and must be deleted. This causes the GC to sometimes delete part chunks in which the write loop is slow. To fix this, a tolerance value is added in the GC code to allow for more time before a part chunk gets deleted.
* | | | [stable8.2] Wait a while even after successful connect ... (#24535)Thomas Müller2016-05-171-3/+4
| | | | | | | | | | | | Wait a while even after successful connect ...
* | | | Merge pull request #24656 from ↵Vincent Petry2016-05-171-1/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | owncloud/can-not-disable-server2server-sharing-anymore Correctly load server2server sharing configs
| * | | | Correctly load server2server sharing configsJoas Schilling2016-05-171-1/+7
|/ / / /
* | | | Merge pull request #24391 from owncloud/capped-normalized-cache-82Vincent Petry2016-05-131-1/+6
|\ \ \ \ | | | | | | | | | | [8.2] cap the normalized path cache
| * | | | cap the normalized path cacheRobin Appelman2016-05-021-1/+6
| |/ / /
* | | | Merge pull request #24498 from owncloud/backport-20804-8.2Vincent Petry2016-05-135-1/+141
|\ \ \ \ | | | | | | | | | | [stable8.2] LDAP: do not attempt to process user records without display name, fi…
| * | | | LDAP: do not attempt to process user records without display name, fixes ↵Arthur Schiwon2016-05-095-1/+141
| | |_|/ | |/| | | | | | | | | | fatal error
* | | | Merge pull request #24504 from owncloud/stable8.2-updater-server-configurableVincent Petry2016-05-133-64/+38
|\ \ \ \ | | | | | | | | | | [stable8.2] Make update server URL configurable
| * | | | Make update server URL configurableLukas Reschke2016-05-093-64/+38
| |/ / / | | | | | | | | | | | | Currently testing the updates is a big problem and not really super easy possible. Since we now have a new updater server we should also make this configurable so that people can properly test updates.
* | | | 8.2.5C Montero-Luque2016-05-121-2/+2
| | | |
* | | | Merge pull request #24573 from owncloud/stable8.2_24568Thomas Müller2016-05-111-0/+2
|\ \ \ \ | | | | | | | | | | [Stable 8.2] Fix etag propegation test race condition
| * | | | Fix test race conditionRoeland Jago Douma2016-05-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | E-tag propagation replies on the mtime of the file. Order of events: 1. add file 'foo.txt' with content 'bar' 2. Set mtime to now() - 1 3. Check if etag changed. Now this goes right often when 1 and 2 happen in the same second. However imagine 1. add file 'foo.txt' with content 'bar' (at t=0.999) 2. Set mtime to now() - 1 (at t=1.001) Now the mtime will be set to the same time. Thus not chaning the etag.
* | | | | Merge pull request #24555 from owncloud/kill-en@pirate-stable8.2Thomas Müller2016-05-1114-72/+0
|\ \ \ \ \ | |/ / / / |/| | | | [stable8.2] Yo-ho-oh - Murder all band 'o pirates
| * | | | Yo-ho-oh - Murder all band 'o piratesThomas Müller2016-05-1114-72/+0
|/ / / /
* | | | 8.2.5 RC2v8.2.5RC2C Montero-Luque2016-05-101-2/+2
| | | |
* | | | 8.2.5 RC1v8.2.5RC1C Montero-Luque2016-05-092-3/+3
| | | |
* | | | Merge pull request #24508 from ↵Thomas Müller2016-05-091-2/+9
|\ \ \ \ | |/ / / |/| | | | | | | | | | | owncloud/backport-23901-app-disabled-on-legacy-job [8.2] Catch the AutoloadNotAllowedException also for legacy jobs
| * | | Catch the AutoloadNotAllowedException also for legacy jobsJoas Schilling2016-05-091-2/+9
|/ / /
* / / 8.2.4v8.2.4C Montero-Luque2016-05-031-2/+2
|/ /
* | 8.2.4 RC2v8.2.4RC2C Montero-Luque2016-05-021-2/+2
| |
* | Merge pull request #24344 from owncloud/stable8.2_24326C. Montero Luque2016-05-021-0/+3
|\ \ | | | | | | [Stable 8.2] Make ownCloud work again in php 7.0.6
| * | Make ownCloud work again in php 7.0.6Roeland Jago Douma2016-04-291-0/+3
|/ / | | | | | | See https://bugs.php.net/bug.php?id=72117
* | 8.2.4 RC1v8.2.4RC1C Montero-Luque2016-04-262-3/+3
| |
* | Merge pull request #24283 from owncloud/backport-24262-stable8.2Vincent Petry2016-04-261-1/+2
|\ \ | | | | | | [stable8.2] check whether index is set before using it
| * | check whether index is set before using itArthur Schiwon2016-04-261-1/+2
| | |
* | | Merge pull request #24288 from owncloud/local-invalid-82Roeland Douma2016-04-262-0/+17
|\ \ \ | |/ / |/| | [8.2] error out if a local storage isn't setup correctly
| * | add testsRobin Appelman2016-04-261-0/+14
| | |
| * | error out if a local storage isn't setup correctlyRobin Appelman2016-04-261-0/+3
|/ /
* | Merge pull request #24243 from owncloud/stable8.2-backport-24052blizzz2016-04-266-48/+32
|\ \ | | | | | | [stable8.2] Fix LDAP race conditions
| * | Fix LDAP race conditionsMorris Jobke2016-04-256-48/+32
| | | | | | | | | | | | | | | | | | | | | | | | * getFromCache is wrapped in isCached * inbetween the two calls the cache entry hits it's TTL * getFromCache returns null * this fix only checkes if the returned value is null and return only non-null values
* | | Merge pull request #24260 from owncloud/scanner-locking-82Morris Jobke2016-04-261-0/+2
|\ \ \ | | | | | | | | [8.2] add locks in the scanner to prevent multiple scanners running on the …
| * | | add locks in the scanner to prevent multiple scanners running on the same filesRobin Appelman2016-04-251-0/+2
|/ / /
* | | Revert "add locks in the scanner to prevent multiple scanners running on the ↵Robin Appelman2016-04-251-2/+0
| | | | | | | | | | | | | | | | | | same files" This reverts commit fd8e3f730169ef97de98578b5b7aa726951a424e.
* | | Merge pull request #24237 from owncloud/backport-24214-stable8.2Morris Jobke2016-04-252-11/+3
|\ \ \ | | | | | | | | [stable8.2] on clone Connection, do not take over the existing LDAP resource
| * | | on clone Connection, do not take over the existing LDAP resourceArthur Schiwon2016-04-252-11/+3
| |/ / | | | | | | | | | | | | | | | | | | For one, it solves potential conflicts when using the resource. For the other, one on the login check (the only place where a clone happens currently) we do not need to rebind after confirming the user's login was successful.