summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | set result entry identifier earlier, i.e. before a continue for the same leve...Arthur Schiwon2014-05-161-2/+2
* | | Merge pull request #9033 from owncloud/validate-direLukas Reschke2014-06-161-5/+16
|\ \ \
| * | | Add deprecation notice to load* functionsLukas Reschke2014-06-141-5/+16
* | | | Merge pull request #9008 from owncloud/repair-parent-stable6Vincent Petry2014-06-163-43/+94
|\ \ \ \ | |/ / / |/| | |
| * | | Fix unit testRobin Appelman2014-06-161-2/+2
| * | | remove unused argumentRobin Appelman2014-06-121-4/+3
| * | | add some commentsRobin Appelman2014-06-121-0/+2
| * | | Repair broken parent link in the scannerRobin Appelman2014-06-122-37/+87
| | |/ | |/|
* | | Merge pull request #9015 from owncloud/stable6-downloadwithdisabledzipMorris Jobke2014-06-132-5/+14
|\ \ \
| * | | Fix public download link when zip download is disabledVincent Petry2014-06-122-5/+14
| |/ /
* | | Merge pull request #8988 from owncloud/stable6_fix_encryptionVincent Petry2014-06-132-8/+9
|\ \ \
| * | | fix rename of encryption keysBjoern Schiessle2014-06-112-8/+9
* | | | Merge pull request #9016 from owncloud/stable6-maxheartbeatintervalMorris Jobke2014-06-131-0/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | Added max heartbeat interval to prevent integer overflowVincent Petry2014-06-121-0/+5
|/ / /
* / / Fix copy conflict dialog translationJörn Friedrich Dreyer2014-06-112-5/+8
|/ /
* | Merge pull request #8970 from owncloud/cache-change-propagator-stable6Vincent Petry2014-06-107-57/+316
|\ \
| * | Fix unit testsRobin Appelman2014-06-103-14/+17
| * | Fix size calculation during recursive scanRobin Appelman2014-06-101-7/+3
| * | Fix unit testsRobin Appelman2014-06-102-5/+11
| * | Fix recursive scanningRobin Appelman2014-06-101-3/+5
| * | propagate changes in the scannerRobin Appelman2014-06-103-1/+77
| * | Split of cache writes in the scanner to their own methodsRobin Appelman2014-06-101-40/+46
| * | Add a change propagator class to handle propagating etag and mtime changesRobin Appelman2014-06-102-0/+170
|/ /
* | Merge pull request #8885 from owncloud/flock-stable6Thomas Müller2014-06-0619-30/+176
|\ \
| * | fix failing unit testThomas Müller2014-06-061-5/+2
| * | Dont backport unit tests for code that isn't backportedRobin Appelman2014-06-051-51/+0
| * | added missing LockNotAcquiredExceptionThomas Müller2014-06-051-0/+47
| * | Continued flock work.ringmaster2014-06-0518-32/+185
* | | keep long file names in one line to not overflow download button on mobileJan-Christoph Borchardt2014-06-061-0/+13
* | | add max-width to directLink input to prevent overflowJan-Christoph Borchardt2014-06-061-0/+1
|/ /
* | Merge pull request #8870 from owncloud/storage-instanceof-stable6Vincent Petry2014-06-059-7/+65
|\ \
| * | Pass any methods custom to specific storage implementations to the wrapped st...Robin Appelman2014-06-041-0/+11
| * | Fix storage wrapper being called with nullRobin Appelman2014-06-041-1/+1
| * | Use instanceOfStorage instead of instanceofRobin Appelman2014-06-042-5/+8
| * | Add ->instanceOfStorage to handle instanceof for storage wrappersRobin Appelman2014-06-046-1/+45
|/ /
* | Merge pull request #8847 from owncloud/stable6_backport_8557Thomas Müller2014-06-041-2/+11
|\ \
| * | Allow apps to create custom session handlers.ringmaster2014-06-031-2/+11
* | | Merge pull request #8850 from owncloud/stable6_backport_8607Thomas Müller2014-06-042-8/+45
|\ \ \ | |/ / |/| |
| * | [backport] [stable6] Skip filescan but execute hooksringmaster2014-06-032-8/+45
|/ /
* | Merge pull request #8579 from owncloud/ldap_nail_filter_on_upgradeblizzz2014-06-022-13/+31
|\ \
| * | simpler and better readable assignmentArthur Schiwon2014-05-281-4/+1
| * | bump version and don't overwrite values on next update if not necessaryArthur Schiwon2014-05-142-13/+22
| * | get the correct version number for compare -.-Arthur Schiwon2014-05-141-1/+1
| * | LDAP: set filter mode to raw, so filters will not be changed and broken after...Arthur Schiwon2014-05-131-0/+12
* | | Merge pull request #8672 from owncloud/stable6-obfuscatepasswordsFrank Karlitschek2014-06-026-93/+627
|\ \ \
| * | | Added password obfuscation for external storage configVincent Petry2014-05-226-93/+627
* | | | Merge pull request #8692 from owncloud/fix_unit_tests_oc6Thomas Müller2014-05-282-3/+3
|\ \ \ \
| * | | | fix expectation - same as in masterThomas Müller2014-05-271-1/+1
| * | | | don't expect depreciated OC_FilesystemViewBjoern Schiessle2014-05-231-2/+2
| |/ / /
* | | | Merge pull request #8683 from owncloud/log-upload-error-stable6Thomas Müller2014-05-281-1/+3
|\ \ \ \