summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Display the module settings in the list of the encryption modulesJoas Schilling2015-05-046-9/+21
|
* 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
| | | | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-0378-112/+34
| | | | | | |
* | | | | | | Merge pull request #16001 from owncloud/add-multiselect-new-titleMorris Jobke2015-05-022-2/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | also add title to multiselect create new element, force multiselect wider width, fix #15954
| * | | | | | | force minimum multiselect width to properly show longer groupsJan-Christoph Borchardt2015-05-011-1/+1
| | | | | | | |
| * | | | | | | also add title to multiselect create new element, fix #15954Jan-Christoph Borchardt2015-05-011-1/+2
| |/ / / / / /
* | | | | | | Merge pull request #16015 from owncloud/add-proper-versioningMorris Jobke2015-05-021-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add proper versioning for doc URL
| * | | | | | | Add proper versioning for doc URLLukas Reschke2015-05-021-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per 8.1 we have docs for minor versions as well so we need to link to `8.1` here instead to `8.0`. Fixes https://github.com/owncloud/core/issues/16002
* | | | | | | Merge pull request #16005 from owncloud/remove-more-appsLukas Reschke2015-05-021-3/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | remove 'More apps' link from apps mgmt now that we have support for experimental apps
| * | | | | | | remove 'More apps' link from apps mgmt now that we have support for ↵Jan-Christoph Borchardt2015-05-011-3/+0
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | experimental apps
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-0228-56/+62
| | | | | | |
* | | | | | | Merge pull request #15937 from owncloud/file-lockingThomas Müller2015-05-0114-23/+891
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Add memcache based shared/exclusive locking
| * | | | | | allow getting the path from the lockedexceptionRobin Appelman2015-04-303-2/+42
| | | | | | |
| * | | | | | add tests for castraitRobin Appelman2015-04-301-0/+73
| | | | | | |
| * | | | | | use trait for cas polyfill for xcacheRobin Appelman2015-04-301-24/+2
| | | | | | |
| * | | | | | add memcache based shared/exclusive lockingRobin Appelman2015-04-305-0/+321
| | | | | | |
| * | | | | | add compare and swap to memcacheRobin Appelman2015-04-308-2/+144
| | | | | | |
| * | | | | | extends memcache with add, inc and decRobin Appelman2015-04-307-22/+336
| | |_|/ / / | |/| | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-0124-14/+238
| | | | | |
* | | | | | Merge pull request #15993 from owncloud/admin-documentationMorris Jobke2015-05-012-1/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | add admin documentation links for Sharing, Encryption and Email server
| * | | | | | fix layout for documentation link hintsJan-Christoph Borchardt2015-04-301-0/+7
| | | | | | |
| * | | | | | add admin documentation links for Sharing, Encryption and Email serverJan-Christoph Borchardt2015-04-301-1/+10
|/ / / / / /
* | | | | | Merge pull request #15955 from owncloud/move-dummy-encryptionThomas Müller2015-04-305-218/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Moving encryption_dummy to the apps repo
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-12 11:53:10 +0000