summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #14261 from owncloud/fix-last-login-masterLukas Reschke2015-02-162-12/+12
|\ | | | | Return milliseconds instead of seconds for lastLogin - refs #14005
| * fixing unit tests in UsersControllerTestThomas Müller2015-02-161-11/+11
| |
| * Return milliseconds instead of seconds for lastLogin - refs #14005Thomas Müller2015-02-161-1/+1
| |
* | Merge pull request #14263 from owncloud/missing-visibility-activity-iextensionThomas Müller2015-02-161-1/+1
|\ \ | | | | | | Add visibility to interface to make scrutinizer 1 step happier
| * | Add visibility to interface to make scrutinizer 1 step happierJoas Schilling2015-02-161-1/+1
| | |
* | | Merge pull request #13879 from owncloud/add_debug_log_for_memcache_instantiationThomas Müller2015-02-163-7/+21
|\ \ \ | |/ / |/| | add debug log for memcache instantiation
| * | add debug log for memcache instantiationJörn Friedrich Dreyer2015-02-163-7/+21
|/ /
* | Merge pull request #14128 from owncloud/drop-unused-methodsMorris Jobke2015-02-163-48/+10
|\ \ | | | | | | Remove unused function and correct PHPDoc
| * | Remove unused function and correct PHPDocLukas Reschke2015-02-163-48/+10
| | |
* | | Merge pull request #10673 from owncloud/smb-newMorris Jobke2015-02-1677-670/+5411
|\ \ \ | |_|/ |/| | New SMB storage backend
| * | also make sure we have a leading slash for the test rootRobin Appelman2015-02-162-4/+3
| | |
| * | make sure the root has a trailing slashRobin Appelman2015-02-161-0/+3
| | |
| * | remove outdated testRobin Appelman2015-02-161-39/+0
| | |
| * | handle deleting non existing filesRobin Appelman2015-02-161-7/+11
| | |
| * | Use better way to check for the existence of smbclientRobin Appelman2015-02-161-7/+2
| | |
| * | New SMB storage backendRobin Appelman2015-02-1675-628/+5407
| |/
* | Merge pull request #13750 from owncloud/enhanced-code-checkerThomas Müller2015-02-1612-51/+389
|\ \ | | | | | | Implement php code checker to detect usage of not allowed private ...
| * | Update 3rdparty commit to masterThomas Müller2015-02-161-0/+0
| | |
| * | integrate code checker in the installerThomas Müller2015-02-113-54/+27
| | |
| * | implement php code checker to detect usage of not allowed private APIs - ↵Thomas Müller2015-02-1012-1/+366
| | | | | | | | | | | | including console command to check local code to be used by developers
* | | Merge pull request #13269 from owncloud/issue/13211-cache-array-implementationJoas Schilling2015-02-163-1/+89
|\ \ \ | | | | | | | | Add an array implementation of cache and use it if we are not debugging
| * | | Add an array implementation of cache and use it if we are not debuggingJoas Schilling2015-02-163-1/+89
| | | |
* | | | Merge pull request #14194 from owncloud/url-encode-logout-attributeThomas Müller2015-02-163-5/+5
|\ \ \ \ | | | | | | | | | | URLEncode logout attribute
| * | | | URLEncode logout attributeLukas Reschke2015-02-133-5/+5
| | | | | | | | | | | | | | | | | | | | Otherwise logout can fail if the requesttoken contains a +
* | | | | Merge pull request #13890 from owncloud/add-no-referrerLukas Reschke2015-02-169-19/+44
|\ \ \ \ \ | | | | | | | | | | | | Add `rel="noreferrer"` where possible and switch to HTTPS
| * | | | | Add noreferrer to footer URILukas Reschke2015-02-161-1/+2
| | | | | |
| * | | | | Deduplicate template code and do not translate the linksJoas Schilling2015-02-097-11/+35
| | | | | |
| * | | | | Add `rel="noreferrer"` where possible and switch to HTTPSLukas Reschke2015-02-046-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | Just to follow good practise and prevent some automated scanners to complain about "Cross-domain Referer leakage".
* | | | | | Merge pull request #14243 from owncloud/console-execution-time-masterMorris Jobke2015-02-161-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | console commands shall not be limited with respect to execution time
| * | | | | | console commands shall not be limited with respect to execution time - fixes ↵Thomas Müller2015-02-161-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | #14156
* | | | | | | Merge pull request #14076 from owncloud/autotest-external-ftpThomas Müller2015-02-163-4/+105
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | [files_external] ftp tests
| * | | | | | [files_external] ftp testsMorris Jobke2015-02-103-4/+105
| | | | | | |
* | | | | | | Merge pull request #14201 from owncloud/propagator-dont-decrease-mtimeThomas Müller2015-02-163-4/+29
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Dont lower the mtime of a folder when propagating changes
| * | | | | | | update testRobin Appelman2015-02-131-0/+2
| | | | | | | |
| * | | | | | | Dont lower the mtime of a folder when propagating changesRobin Appelman2015-02-132-4/+27
| | | | | | | |
* | | | | | | | Merge pull request #13809 from owncloud/fix-autoloader-messageThomas Müller2015-02-161-1/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Properly show the warning about the missing composer autoloader
| * | | | | | | | Properly show the warning about the missing composer autoloaderMorris Jobke2015-01-311-1/+4
| | | | | | | | |
* | | | | | | | | Merge pull request #13922 from owncloud/smb-autotest-externalThomas Müller2015-02-165-13/+112
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | [files_external] add SMB autotest
| * | | | | | | | | [files_external] add SMB autotestMorris Jobke2015-02-105-13/+112
| | | | | | | | | |
* | | | | | | | | | Merge pull request #14138 from owncloud/fix-image-flip-php53Thomas Müller2015-02-161-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | Don't flip image in PHP 5.4
| * | | | | | | | | Check if imageflip is availableMorris Jobke2015-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * imageflip() isn't available in PHP < 5.5 * fixes #14130
* | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-166-22/+30
| | | | | | | | | |
* | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-1536-48/+98
| | | | | | | | | |
* | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-1430-70/+128
| | | | | | | | | |
* | | | | | | | | | Merge pull request #14206 from owncloud/issue/14204-revert-14171Thomas Müller2015-02-132-17/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | Issue/14204 revert #14171
| * | | | | | | | | Update version to a higher one then beforeJoas Schilling2015-02-131-1/+1
| | | | | | | | | |
| * | | | | | | | | Revert "Improve: Index for file_map"Joas Schilling2015-02-131-18/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c9b56084051ad33f15ad8a1a7fee95d38ba0d954.
| * | | | | | | | | Revert "Incorporate review changes"Joas Schilling2015-02-132-1/+3
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f6a452cabf02e4a8005f874a77754f68abbc8fa5.
* | | | | | | | | Merge pull request #14178 from RealRancor/fix_config_sampleMorris Jobke2015-02-131-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Removed anchor in config.sample.php
| * | | | | | | | | Removed anchor in config.sample.phpRealRancor2015-02-121-1/+1
| | |_|_|_|_|/ / / | |/| | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-22 14:50:21 +0000