summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | add locks in the scanner to prevent multiple scanners running on the same filesRobin Appelman2016-04-251-0/+2
|/ /
* | Merge pull request #24144 from owncloud/stable8.2-filelist-redirectonstoragen...blizzz2016-04-231-1/+1
|\ \
| * | Fix StorageNotAvailable exception string detectionVincent Petry2016-04-211-1/+1
* | | Merge pull request #24181 from owncloud/backport-24145-limit-background-job-r...Thomas Müller2016-04-221-0/+8
|\ \ \
| * | | Make sure that CLI cron doesn't run for ever, but makes use of the next spawnJoas Schilling2016-04-221-0/+8
* | | | Merge pull request #24197 from owncloud/backport-24183-change-background-job-...Thomas Müller2016-04-222-6/+15
|\ \ \ \ | |/ / / |/| | |
| * | | Change the sort order of background jobs to be DESC instead of ASCJoas Schilling2016-04-222-6/+15
|/ / /
* | | Merge pull request #24171 from owncloud/stable8.2-certificateThomas Müller2016-04-222-0/+15
|\ \ \
| * | | [stable8.2] Ignore certificate file if it starts with file://Lukas Reschke2016-04-212-0/+15
* | | | Merge pull request #24162 from owncloud/backport-23461-activity-without-shari...Vincent Petry2016-04-221-2/+2
|\ \ \ \
| * | | | Fix "AutoloadNotAllowedException" when files_sharing is disabledJoas Schilling2016-04-211-2/+2
* | | | | Merge pull request #23807 from owncloud/backport-of-#23760-1Vincent Petry2016-04-221-1/+1
|\ \ \ \ \
| * | | | | [stable9] Fix conditional check in MySQL setup Daniel Hansson2016-04-051-1/+1
* | | | | | Merge pull request #24152 from owncloud/remember-email-when-setting-expirationChristoph Wurst2016-04-211-2/+4
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | remember email when setting expiration dateChristoph Wurst2016-04-211-2/+4
| | |_|/ / | |/| | |
* | | | | Merge pull request #24113 from owncloud/backport-24111-chunking-users-in-back...Thomas Müller2016-04-213-56/+80
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Copy the 9.0 method for the background jobsJoas Schilling2016-04-202-2/+58
| * | | | Chunk the users correctly in the trashbin and versions background jobJoas Schilling2016-04-203-56/+24
* | | | | Merge pull request #23548 from owncloud/stable8.2-quota-recognizeremoteunlimi...Thomas Müller2016-04-211-1/+8
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Workaround to be able to recognize unlimited quota in fed sharesVincent Petry2016-03-241-1/+8
| | |_|/ | |/| |
* | | | Merge pull request #24130 from owncloud/stable82_24108Morris Jobke2016-04-201-0/+11
|\ \ \ \
| * | | | Allow setting can edit permissions on federated shares in webUIRoeland Jago Douma2016-04-201-0/+11
* | | | | Merge pull request #23984 from owncloud/fix-infinite-loop-in-unavailable-mountMorris Jobke2016-04-201-1/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fixes a possible infinite change-dir-loopArthur Schiwon2016-04-131-1/+2
* | | | | Merge pull request #24100 from owncloud/fix_23632_8.2Björn Schießle2016-04-202-10/+48
|\ \ \ \ \
| * | | | | we need to initialize the mount points of the given user before we recoverBjörn Schießle2016-04-192-10/+48
* | | | | | Merge pull request #23363 from owncloud/smb-1.0.8-82Vincent Petry2016-04-2019-58/+236
|\ \ \ \ \ \
| * | | | | | update icewind/smb to 1.0.8Robin Appelman2016-03-1719-58/+236
* | | | | | | Merge pull request #24000 from owncloud/shared-islocal-82Vincent Petry2016-04-201-0/+7
|\ \ \ \ \ \ \
| * | | | | | | implement isLocal for shared storageRobin Appelman2016-04-141-0/+7
* | | | | | | | Merge pull request #23402 from owncloud/backport-23282-stable8.2Vincent Petry2016-04-202-3/+89
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | fix writing to cache when fallback server should be used immediatelyArthur Schiwon2016-03-182-3/+89
* | | | | | | | Merge pull request #24008 from owncloud/fix_repeating_user_listRoeland Douma2016-04-191-1/+9
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Fix repeating user list in webUIRoeland Jago Douma2016-04-191-1/+9
|/ / / / / / /
* | | | | | | Merge pull request #24044 from owncloud/stable8.2-autoloadMorris Jobke2016-04-181-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Exclude autoload_static.phpLukas Reschke2016-04-171-1/+1
|/ / / / / /
* | | | | | Merge pull request #23785 from owncloud/stable8.2-backport-23304Morris Jobke2016-04-122-2/+15
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Correctly return an empty string for empty filesJoas Schilling2016-04-081-3/+9
| * | | | | Fix PHP memory leak in file_get_contents()Morris Jobke2016-04-042-2/+9
|/ / / / /
* | | | | Merge pull request #23711 from owncloud/fix_encryption_versions_on_external_s...Lukas Reschke2016-04-0112-130/+321
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | fix creation of versions of encrypted files on external storagesBjoern Schiessle2016-03-3112-130/+321
|/ / / /
* | | | Merge pull request #23505 from owncloud/ee-1149-share-propagation-entries-in-dbVincent Petry2016-03-232-2/+52
|\ \ \ \
| * | | | Chunk the shareId queryJoas Schilling2016-03-231-7/+12
| * | | | Grab the values for share propagation manually from the DBJoas Schilling2016-03-232-2/+47
* | | | | Merge pull request #23457 from owncloud/backport-23329-stable8.2Morris Jobke2016-03-232-1/+17
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Avatar must be saved after login is done and external storages set up properl...Arthur Schiwon2016-03-212-1/+17
* | | | | Merge pull request #23481 from owncloud/smb-handle-forbidden-82Thomas Müller2016-03-231-1/+18
|\ \ \ \ \
| * | | | | handle forbidden exceptions in smb backendRobin Appelman2016-03-221-1/+18
|/ / / / /
* | | | | Merge pull request #23433 from owncloud/stable82_fix_22128Thomas Müller2016-03-221-2/+15
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Do not show hash if parent is shared by linkRoeland Jago Douma2016-03-211-2/+15
| | |/ / | |/| |