summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #13368 from owncloud/memcache_lowlatencyLukas Reschke2015-03-056-44/+199
|\ | | | | Refactor \OC\Memcache\Factory
| * \OC\Memcache\Cache implements \OCP\ICacheRobin McCorkell2015-03-051-1/+1
| |
| * Refactor \OC\Memcache\FactoryRobin McCorkell2015-03-055-43/+198
| | | | | | | | | | | | | | | | | | | | Caches divided up into two groups: distributed and local. 'Low latency' is an alias for local caches, while the standard `create()` call tries to get distributed caches first, then local caches. Memcache backend is set in `config.php`, with the keys `memcache.local` and `memcache.distributed`. If not set, `memcache.distributed` defaults to the value of `memcache.local`.
* | [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 tests
| * | 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-config
| * | | 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 PHPDoc
| * | | | Fix PHPDocLukas Reschke2015-03-042-2/+2
| | | | | | | | | | | | | | | | | | | | That apparently went lost when changing the signature.
* | | | | Merge pull request #14690 from owncloud/trash-deletelink-unittestVincent Petry2015-03-041-0/+22
|\ \ \ \ \ | |/ / / / |/| | | | Add unit test for selection overlay actions in trashbin
| * | | | 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\NoopScanner
| * | | | 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
|\ \ \ \ | |/ / / |/| | | adding a windows smb config for testing to ci
| * | | Fix slash normalization error in AmazonS3Migration unit testRobin McCorkell2015-03-041-3/+3
| | | | | | | | | | | | | | | | | | | | Since aa821ecc00f11b6382f6e033db18445d9e51d6b9 leading and trailing slashes are trimmed in the file cache paths
| * | | Use dummy storages instead of real storages in files_external unit testsRobin McCorkell2015-03-031-39/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We were using the SMB and SFTP backends, which since Icewind's new SMB library results in an actual attempted connection just by constructing the storage. This commit replaces all references to real storages (except when necessary) with a dummy storage class.
| * | | 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 fixes
| * | Avatars in share dialog fixesRoeland Jago Douma2015-03-034-37/+72
| | | | | | | | | | | | | | | | | | | | | * Avatar for "xxxx share with you..." to the left * Avatars for groups and remote shares (use default placeholder) * Modified and added unit tests * Use the same css for all the avatars in the dropdown
* | | 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 ...
| * | | Update scanFile() and scanChildren() to the new signature of the parent classJoas Schilling2015-03-041-6/+7
| | | |
* | | | Merge pull request #14326 from ↵Morris Jobke2015-03-041-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | owncloud/remove-unnessary-backslashes-from-translation Remove unnecessary backslashes from translations
| * | | | Remove unnecessary backslashes from translationsJoas Schilling2015-02-181-2/+2
| | | | |
* | | | | Merge pull request #14651 from ↵Morris Jobke2015-03-0417-267/+456
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | owncloud/add-some-headers-to-htaccess-for-my-best-friend-jenkins Let users configure security headers in their Webserver
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doing this in the PHP code is not the right approach for multiple reasons: 1. A bug in the PHP code prevents them from being added to the response. 2. They are only added when something is served via PHP and not in other cases (that makes for example the newest IE UXSS which is not yet patched by Microsoft exploitable on ownCloud) 3. Some headers such as the Strict-Transport-Security might require custom modifications by administrators. This was not possible before and lead to buggy situations. This pull request moves those headers out of the PHP code and adds a security check to the admin settings performed via JS.
* | | | | | [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
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | Jenkins #14650
| * | | | | 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 ↵Joas Schilling2015-03-031-2/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | metaworx/replace-static-dbtableprefix-with-config-dbtableprefix use `dbtableprefix` for temp table and index names
| * | | | | replace 'oc_' with dbtableprefix form config for temporary table names and ↵martin-rueegg2015-03-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | indexes
* | | | | | Merge pull request #14574 from owncloud/fix-irequest-for-older-php-versionsThomas Müller2015-03-034-122/+48
|\ \ \ \ \ \ | | | | | | | | | | | | | | Read from IRequest instead of reading twice
| * | | | | | Simplify codeLukas Reschke2015-03-011-2/+3
| | | | | | |
| * | | | | | Read from IRequest instead of reading twiceLukas Reschke2015-02-274-122/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Potentially fixes https://github.com/owncloud/core/issues/14541 and https://github.com/owncloud/core/issues/14506
* | | | | | | Merge pull request #14638 from owncloud/issue/14538-repairstep-drop-old-tablesThomas Müller2015-03-034-0/+147
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add a repair step to delete old tables
| * | | | | | | 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 sample
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [Master] Remove hacky Substring support for MSSQL
| * | | | | | | | Remove hacky Substring support for MSSQLLukas Reschke2015-02-251-102/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Substring() is not required for the core functionality and this allows us to get rid of a huge hack...
* | | | | | | | | Merge pull request #14653 from sebomoto/fix_loading_feedbackMorris Jobke2015-03-031-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | fix for loading spinner reappearing after errors in db-connection
| * | | | | | | | | 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 "Download from URL" feature
| * | | | | | | | | remove $content parameterThomas Müller2015-03-021-7/+4
| | | | | | | | | |
| * | | | | | | | | Remove "Download from URL" featureLukas Reschke2015-03-023-163/+15
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/13326
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-03106-122/+198
| |_|_|_|_|_|/ / |/| | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-30 23:28:52 +0000