summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-05-05196-474/+420
|
* Merge pull request #15544 from rullzer/fix_15263Jan-Christoph Borchardt2015-05-041-0/+9
|\ | | | | [WIP] Only show SSL table header if there are certificates
| * Only show SSL table header if there are certificatesRoeland Jago Douma2015-05-041-0/+9
| |
* | Merge pull request #16048 from owncloud/fix-mb-stringLukas Reschke2015-05-041-7/+13
|\ \ | |/ |/| Check `mbstring.func_overload` only if the mb module is installed.
| * Check `mbstring.func_overload` only if the mb module is installed.Lukas Reschke2015-05-041-2/+17
| | | | | | | | Fixes https://github.com/owncloud/core/issues/14670
| * Remove PHP 5.4 warning in checkSetupLukas Reschke2015-05-041-9/+0
| | | | | | | | This is catched in index.php as older PHP versions will never execute the code path until there due to 5.4 syntax changes.
* | Merge pull request #16026 from owncloud/enc_ux_improvementsBjörn Schießle2015-05-041-3/+7
|\ \ | |/ |/| [encryption] some small ux improvements
| * some small ux improvementsBjoern Schiessle2015-05-041-3/+7
| |
* | Merge pull request #16042 from owncloud/fix-output-bufferingThomas Müller2015-05-042-1/+2
|\ \ | | | | | | Remove hard-dependency on disabled output_buffering
| * | Remove hard-dependency on disabled output_bufferingLukas Reschke2015-05-042-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | This removes the hard-dependency on output buffering as requested at https://github.com/owncloud/core/issues/16013 since a lot of distributions such as Debian and Ubuntu decided to use `4096` instead of the PHP recommended and documented default value of `off`. However, we still should encourage disabling this setting for improved performance and reliability thus the setting switches in `.user.ini` and `.htaccess` are remaining there. It is very likely that we in other cases also should disable the output buffering but aren't doing it everywhere and thus causing memory problems. Fixes https://github.com/owncloud/core/issues/16013
* | | Merge pull request #16044 from owncloud/issue-15977-occ-encryption-statusThomas Müller2015-05-042-0/+57
|\ \ \ | | | | | | | | Add an occ command to get the status of encryption
| * | | Add an occ command to get the status of encryptionJoas Schilling2015-05-042-0/+57
| | | |
* | | | Merge pull request #16040 from owncloud/fix-orphaned-shares-jobLukas Reschke2015-05-041-3/+8
|\ \ \ \ | | | | | | | | | | Fix DeleteOrphanedSharesJob
| * | | | Fix DeleteOrphanedSharesJobMorris Jobke2015-05-041-3/+8
| | |/ / | |/| | | | | | | | | | | | | | | | | | * remove unneeded use statements * the the interval properly in the constructor * set the log level to debug (from info) - fixes #16036
* | | | Merge pull request #16043 from owncloud/activity-288-log-entry-when-no-favoriteLukas Reschke2015-05-041-0/+1
|\ \ \ \ | |_|/ / |/| | | Fix undefined variable $tagId
| * | | Fix undefined variable $tagIdJoas Schilling2015-05-041-0/+1
| |/ /
* | | Merge pull request #15772 from ↵Joas Schilling2015-05-044-8/+68
|\ \ \ | |/ / |/| | | | | | | | owncloud/issue-15771-dont-restrict-permissions-for-share-owner Do not restrict permissions for the original owner
| * | Ignore "parent" shares when the sharee is the owner of the reshare-sourceJoas Schilling2015-04-291-0/+2
| | |
| * | Correctly select file cache values also when checking group sharesJoas Schilling2015-04-291-7/+7
| | |
| * | Add a test to share a subfolder of a folder shared with the owner by groupJoas Schilling2015-04-291-0/+33
| | |
| * | Added unit test for reshare by share ownerVincent Petry2015-04-291-0/+25
| | |
| * | Do not restrict permissions for the original ownerJoas Schilling2015-04-291-1/+1
| | |
* | | Merge pull request #15652 from oparoz/better-text-previewsLukas Reschke2015-05-042-13/+60
|\ \ \ | | | | | | | | Show a text preview instead of a bitmap preview of text
| * | | Remove overflow+watermarkOlivier Paroz2015-04-232-14/+6
| | | |
| * | | Use authorization headers for better compatibilityOlivier Paroz2015-04-231-22/+25
| | | | | | | | | | | | | | | | | | | | + add ellipsis + fix OC.generateUrl calls
| * | | An idea to suggest that this is just a sample of the full textOlivier Paroz2015-04-232-1/+15
| | | |
| * | | Use webDAV to have access to HTTP byte rangesOlivier Paroz2015-04-231-1/+4
| | | |
| * | | Cache the token valueOlivier Paroz2015-04-231-4/+3
| | | |
| * | | Show a text preview instead of a bitmap preview of textOlivier Paroz2015-04-232-6/+42
| | | | | | | | | | | | | | | | + fix the preview height
* | | | Merge pull request #15752 from owncloud/feature/fix-encryption-return-valuesThomas Müller2015-05-044-93/+299
|\ \ \ \ | |_|_|/ |/| | | [enc2] fixing return values and adding tests
| * | | change error codes to 400Clark Tomlinson2015-04-242-20/+20
| | | |
| * | | fix messages from settings crontrollerClark Tomlinson2015-04-222-14/+15
| | | |
| * | | remove status's and adjust jsClark Tomlinson2015-04-223-67/+88
| | | |
| * | | destupify testsClark Tomlinson2015-04-222-104/+100
| | | |
| * | | fixing return values and adding testsClark Tomlinson2015-04-222-32/+220
| | | |
* | | | Merge pull request #15584 from owncloud/enc_fix_upload_shared_folderThomas Müller2015-05-045-3/+87
|\ \ \ \ | | | | | | | | | | skip user if we don't have a public key
| * | | | Simplify the testJoas Schilling2015-04-303-14/+8
| | | | |
| * | | | Allow setting protected propertiesJoas Schilling2015-04-301-0/+4
| | | | |
| * | | | skip user if we don't have a public keyBjoern Schiessle2015-04-303-1/+87
| | | | |
* | | | | Merge pull request #16020 from owncloud/set-charset-via-ini-setThomas Müller2015-05-041-0/+7
|\ \ \ \ \ | | | | | | | | | | | | Try to set required ini values in base.php
| * | | | | Try to set required ini values in base.phpLukas Reschke2015-05-031-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/16006
* | | | | | Merge pull request #15958 from owncloud/usage-of-public-log-interfaceThomas Müller2015-05-048-17/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use internally \OCP\ILogger instead of \OC\Log
| * | | | | | Use internally \OCP\ILogger instead of \OC\LogMorris Jobke2015-04-308-17/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * this is the preparation for some upcoming logger related changes * also fixes an issue in the public interface where we request an internal class as parameter
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-0416-2/+154
| | | | | | |
* | | | | | | 8.1 alpha 3Frank Karlitschek2015-05-031-2/+2
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #15486 from owncloud/versions-rollbackkeepfileidMorris Jobke2015-05-032-4/+121
|\ \ \ \ \ \ | | | | | | | | | | | | | | Keep fileid when restoring version, using stream copy
| * | | | | | Use moveFromStorage instead of streamCopy when restoring versionVincent Petry2015-04-301-14/+1
| | | | | | |
| * | | | | | Fix version rollback to keep fileidVincent Petry2015-04-302-4/+134
| | | | | | |
* | | | | | | Merge pull request #16009 from owncloud/fix-searchresultsMorris Jobke2015-05-031-4/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | fix search results from other places, account for margin-bottom in files list
| * | | | | | | fix search results from other places, account for margin-bottom in files listJan-Christoph Borchardt2015-05-021-4/+6
| | | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-23 14:56:16 +0000