summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #25227 from owncloud/usecorrecttypeVincent Petry2016-06-231-1/+1
|\
| * use string array when fetching share idsJörn Friedrich Dreyer2016-06-231-1/+1
|/
* Merge pull request #25229 from owncloud/stable8.2-enc-revertversionsizeVincent Petry2016-06-221-0/+11
|\
| * Rollback version must also adjust cached sizeVincent Petry2016-06-221-0/+11
|/
* Also increase htaccess versionv8.2.6RC1Vincent Petry2016-06-161-1/+1
* ownCloud 8.2.6 RC1Daniel Molkentin2016-06-161-2/+2
* Merge pull request #25139 from owncloud/stable82-backport-25126Vincent Petry2016-06-161-0/+2
|\
| * load authentication apps firstChristoph Wurst2016-06-161-0/+2
* | Merge pull request #25122 from owncloud/scanner-locking-shared-82Joas Schilling2016-06-161-2/+2
|\ \ | |/ |/|
| * Fix scanner lock on shared storages resulting into locked filesRobin Appelman2016-06-151-2/+2
|/
* Merge pull request #25101 from owncloud/cross-storage-move-updater-82Vincent Petry2016-06-151-3/+4
|\
| * fix updating folder sizes with cross storage moveRobin Appelman2016-06-141-3/+4
|/
* Merge pull request #25037 from owncloud/handle_delete_with_unavailable_storageVincent Petry2016-06-131-0/+3
|\
| * Fix typoJuan Pablo Villafáñez2016-06-101-1/+1
| * Handle storage not available to show an error messageJuan Pablo Villafáñez2016-06-101-0/+3
|/
* Merge pull request #25040 from owncloud/stable8.2-construct-pathVincent Petry2016-06-091-4/+6
|\
| * Construct path to the version file from the current directory and filename. F...Victor Dubiniuk2016-06-081-4/+6
|/
* Merge pull request #24945 from owncloud/fix_21173_stable8.2Vincent Petry2016-06-021-0/+1
|\
| * normalize path in getInternalPathGeorg Ehrke2016-06-011-0/+1
* | Merge pull request #24959 from owncloud/stable8.2_24869Vincent Petry2016-06-021-2/+6
|\ \ | |/ |/|
| * Use a capped memory cache for the user/group cacheRoeland Jago Douma2016-06-011-2/+6
|/
* Merge pull request #24924 from owncloud/stable8.2-backport-24795Christoph Wurst2016-06-012-2/+3
|\
| * Allow opening the password reset link in a new window when its a URLJoas Schilling2016-05-312-2/+3
* | Merge pull request #24418 from owncloud/fix_24182_8.2Christoph Wurst2016-06-011-1/+9
|\ \
| * | first call the post_login hooks, before we call getUserFolder.Björn Schießle2016-05-031-1/+5
| * | Fixes #23899Thomas Müller2016-05-031-0/+4
* | | Merge pull request #23571 from owncloud/stable8.2-backport-23362Vincent Petry2016-06-011-9/+25
|\ \ \
| * | | Read available l10n files also from theme folderMorris Jobke2016-03-241-9/+25
* | | | 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
|\ \ \
| * | | trigger size calculation after scanningRobin Appelman2016-05-301-0/+6
|/ / /
* | | dont update search onResize (#24862)Georg Ehrke2016-05-301-2/+0
* | | Merge pull request #24841 from owncloud/islocal-cacheRoeland Douma2016-05-301-4/+8
|\ \ \
| * | | 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.phpCarla Schroder2016-05-241-2/+3
|/ / /
* | | [Stable8.2] Use a CappedCache in the user database backend (#24413)Roeland Douma2016-05-243-3/+25
* | | Merge pull request #24704 from owncloud/locking-mark-reload-free-82Vincent Petry2016-05-191-0/+3
|\ \ \
| * | | 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
|\ \ \ \
| * | | | Allow chunk GC mtime tolerance for unfinished part chunksVincent Petry2016-05-181-1/+3
|/ / / /
* | | | [stable8.2] Wait a while even after successful connect ... (#24535)Thomas Müller2016-05-171-3/+4
* | | | Merge pull request #24656 from owncloud/can-not-disable-server2server-sharing...Vincent Petry2016-05-171-1/+7
|\ \ \ \
| * | | | 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
|\ \ \ \
| * | | | 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
|\ \ \ \
| * | | | LDAP: do not attempt to process user records without display name, fixes fata...Arthur Schiwon2016-05-095-1/+141
| | |_|/ | |/| |
* | | | Merge pull request #24504 from owncloud/stable8.2-updater-server-configurableVincent Petry2016-05-133-64/+38
|\ \ \ \
| * | | | Make update server URL configurableLukas Reschke2016-05-093-64/+38
| |/ / /