summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Check whether the file id is valid, before using it to delete the previewsJoas Schilling2015-03-091-9/+10
* Merge pull request #13368 from owncloud/memcache_lowlatencyLukas Reschke2015-03-056-44/+199
|\
| * \OC\Memcache\Cache implements \OCP\ICacheRobin McCorkell2015-03-051-1/+1
| * Refactor \OC\Memcache\FactoryRobin McCorkell2015-03-055-43/+198
* | [tx-robot] updated from transifexJenkins for ownCloud2015-03-05220-750/+32
* | Merge pull request #14691 from owncloud/karma-forcejasmine2Morris Jobke2015-03-041-2/+2
|\ \
| * | Make sure we use Jasmine 2 for running JS unit testsVincent Petry2015-03-041-2/+2
* | | Merge pull request #14672 from Crote/masterMorris Jobke2015-03-041-3/+10
|\ \ \
| * | | Add --show-password option to ldap:show-configLaurens Post2015-03-041-3/+10
* | | | Merge pull request #14693 from owncloud/fix-phpdocVincent Petry2015-03-042-2/+2
|\ \ \ \
| * | | | Fix PHPDocLukas Reschke2015-03-042-2/+2
* | | | | Merge pull request #14690 from owncloud/trash-deletelink-unittestVincent Petry2015-03-041-0/+22
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add unit test for selection overlay actions in trashbinVincent Petry2015-03-041-0/+22
| | |/ / | |/| |
* | | | Merge pull request #14685 from owncloud/test-noop-scannerMorris Jobke2015-03-041-0/+76
|\ \ \ \
| * | | | Add a test for ObjectStore\NoopScannerJoas Schilling2015-03-041-0/+76
| | |_|/ | |/| |
* | | | Merge pull request #14675 from owncloud/files-external-smb-windowsThomas Müller2015-03-044-42/+136
|\ \ \ \ | |/ / / |/| | |
| * | | Fix slash normalization error in AmazonS3Migration unit testRobin McCorkell2015-03-041-3/+3
| * | | Use dummy storages instead of real storages in files_external unit testsRobin McCorkell2015-03-031-39/+81
| * | | adding a windows smb config for testingThomas Müller2015-03-032-0/+52
| | |/ | |/|
* | | Merge pull request #14582 from rullzer/avatar_fixesMorris Jobke2015-03-044-37/+72
|\ \ \ | |_|/ |/| |
| * | Avatars in share dialog fixesRoeland Jago Douma2015-03-034-37/+72
* | | Merge pull request #14682 from owncloud/issue/14681-noop-scanner-outdatedVincent Petry2015-03-041-6/+7
|\ \ \
| * | | Update scanFile() and scanChildren() to the new signature of the parent classJoas Schilling2015-03-041-6/+7
* | | | Merge pull request #14326 from owncloud/remove-unnessary-backslashes-from-tra...Morris Jobke2015-03-041-2/+2
|\ \ \ \
| * | | | Remove unnecessary backslashes from translationsJoas Schilling2015-02-181-2/+2
* | | | | Merge pull request #14651 from owncloud/add-some-headers-to-htaccess-for-my-b...Morris Jobke2015-03-0417-267/+456
|\ \ \ \ \
| * | | | | Added missing done() calls for async testsVincent Petry2015-03-031-20/+31
| * | | | | Let users configure security headers in their WebserverLukas Reschke2015-03-0217-267/+445
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-04164-712/+160
* | | | | | Merge pull request #14674 from owncloud/fix-l10n-getlanguagecode-2Joas Schilling2015-03-034-25/+25
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Fix the behaviour of getLanguageCode() to match the expectation of the nameJoas Schilling2015-03-032-23/+8
| * | | | | Use findLanguage() instead of creating the object firstJoas Schilling2015-03-031-2/+1
| * | | | | Add a test of what everyone thinks should be the result of this methodJoas Schilling2015-03-031-0/+16
* | | | | | Merge pull request #14660 from metaworx/replace-static-dbtableprefix-with-con...Joas Schilling2015-03-031-2/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | replace 'oc_' with dbtableprefix form config for temporary table names and in...martin-rueegg2015-03-031-2/+2
* | | | | | Merge pull request #14574 from owncloud/fix-irequest-for-older-php-versionsThomas Müller2015-03-034-122/+48
|\ \ \ \ \ \
| * | | | | | Simplify codeLukas Reschke2015-03-011-2/+3
| * | | | | | Read from IRequest instead of reading twiceLukas Reschke2015-02-274-122/+47
* | | | | | | Merge pull request #14638 from owncloud/issue/14538-repairstep-drop-old-tablesThomas Müller2015-03-034-0/+147
|\ \ \ \ \ \ \
| * | | | | | | Add a test for dropping the tablesJoas Schilling2015-03-032-0/+62
| * | | | | | | Add a repair step to delete old tablesJoas Schilling2015-03-022-0/+85
* | | | | | | | Merge pull request #14586 from owncloud/proper-appcodechecker-docuThomas Müller2015-03-031-2/+3
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | proper description of appcodechecker in config sampleMorris Jobke2015-02-271-2/+3
* | | | | | | | Merge pull request #14496 from owncloud/kill-substr-mssql-masterThomas Müller2015-03-031-102/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove hacky Substring support for MSSQLLukas Reschke2015-02-251-102/+0
* | | | | | | | | Merge pull request #14653 from sebomoto/fix_loading_feedbackMorris Jobke2015-03-031-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix for loading spinner reappearing after errors in db-connectionSebastian Bolt2015-03-021-0/+1
* | | | | | | | | | Merge pull request #14652 from owncloud/kill-download-from-urlVincent Petry2015-03-033-164/+13
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | remove $content parameterThomas Müller2015-03-021-7/+4
| * | | | | | | | | Remove "Download from URL" featureLukas Reschke2015-03-023-163/+15
| | |_|_|_|_|_|/ / | |/| | | | | | |