summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-02-18134-222/+76
* Merge pull request #14273 from owncloud/require-at-least-apcu-4-0-6Lukas Reschke2015-02-183-0/+21
|\
| * Use APCu only if available in version 4.0.6 and higherLukas Reschke2015-02-173-0/+21
* | Merge pull request #14207 from owncloud/propfind-optimizeMorris Jobke2015-02-182-18/+57
|\ \
| * | add unit test for webdav quotaRobin Appelman2015-02-131-0/+30
| * | pass fileinfo to getStorageInfoRobin Appelman2015-02-131-2/+1
| * | Cache quota info for directoriesRobin Appelman2015-02-131-16/+26
* | | Merge pull request #14293 from owncloud/issue/14270-fix-public-share-download...Daniel Hansson2015-02-171-13/+35
|\ \ \
| * | | Correctly create activities for public downloadsJoas Schilling2015-02-171-13/+35
| | |/ | |/|
* | | Merge pull request #14266 from owncloud/encodeUriComponentPerDefaultClark Tomlinson2015-02-172-6/+28
|\ \ \
| * | | Encode parameters in `OC.generateUrl` by itselfLukas Reschke2015-02-172-6/+28
| |/ /
* | | Merge pull request #14289 from owncloud/remove-null-byte-checkLukas Reschke2015-02-172-12/+0
|\ \ \ | |/ / |/| |
| * | Remove Null Byte CheckLukas Reschke2015-02-172-12/+0
|/ /
* | Merge pull request #14056 from owncloud/refactor/13976Lukas Reschke2015-02-1737-824/+1516
|\ \
| * | Incorporate review changesLukas Reschke2015-02-163-9/+20
| * | Add blackmagic due to cyclic dependency :see_no_evil:Lukas Reschke2015-02-162-4/+11
| * | Make scrutinizer happyLukas Reschke2015-02-163-3/+3
| * | Refactor OC_Request into TrustedDomainHelper and IRequestLukas Reschke2015-02-1637-822/+1496
* | | Merge pull request #13866 from rullzer/avatar_share_dialogVincent Petry2015-02-175-3/+117
|\ \ \
| * | | Extended avatar unit testsRoeland Jago Douma2015-02-131-14/+61
| * | | Added config checkRoeland Jago Douma2015-02-132-8/+19
| * | | Small unit test rewriteRoeland Jago Douma2015-02-121-1/+1
| * | | Added unit testRoeland Jago Douma2015-02-122-2/+37
| * | | Added dependancy for the JS unit testsRoeland Jago Douma2015-02-121-1/+2
| * | | Display user avatar in share dialogRoeland Jago Douma2015-02-122-2/+22
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-17346-472/+134
| |/ / |/| |
* | | Merge pull request #14261 from owncloud/fix-last-login-masterLukas Reschke2015-02-162-12/+12
|\ \ \
| * | | 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 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 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 PHPDocLukas Reschke2015-02-163-48/+10
* | | | | Merge pull request #10673 from owncloud/smb-newMorris Jobke2015-02-1677-670/+5411
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | 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
|\ \ \ \
| * | | | 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 - incl...Thomas Müller2015-02-1012-1/+366
* | | | | 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 debuggingJoas Schilling2015-02-163-1/+89
* | | | | | Merge pull request #14194 from owncloud/url-encode-logout-attributeThomas Müller2015-02-163-5/+5
|\ \ \ \ \ \
| * | | | | | URLEncode logout attributeLukas Reschke2015-02-133-5/+5