summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Display the module settings in the list of the encryption modulesJoas Schilling2015-05-043-7/+5
|
* 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-044-3/+83
|\ \ \ | | | | | | | | skip user if we don't have a public key
| * | | Simplify the testJoas Schilling2015-04-303-14/+8
| | | |
| * | | skip user if we don't have a public keyBjoern Schiessle2015-04-303-1/+87
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-0412-2/+50
| | | |
* | | | 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
| |/ / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-0220-30/+36
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-0114-4/+70
| | | |
* | | | Moving encryption_dummy to the apps repo - fixes #15950Thomas Müller2015-04-305-218/+0
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-04-3036-38/+16
| | |
* | | Merge pull request #15919 from owncloud/enc_handle_empty_filesClark Tomlinson2015-04-294-34/+118
|\ \ \ | | | | | | | | Encryption improve handling of empty and unencrypted files
| * | | method shouldn't be staticBjoern Schiessle2015-04-281-1/+1
| | | |
| * | | also create encryption keys for empty filesBjoern Schiessle2015-04-282-23/+42
| | | |
| * | | skip update of encryption keys if file is not encryptedBjoern Schiessle2015-04-283-13/+78
| | | |
* | | | Merge pull request #15908 from owncloud/fix-replace-with-sedVincent Petry2015-04-2910-10/+10
|\ \ \ \ | | | | | | | | | | Replace `replace` with `sed` statement
| * | | | Replace `replace` with `sed` statementMorris Jobke2015-04-2910-10/+10
| |/ / /
* | | | Merge pull request #15596 from owncloud/issue/15589Morris Jobke2015-04-292-9/+31
|\ \ \ \ | | | | | | | | | | Correctly generate the feedback URL for remote share
| * | | | Add tests for the correct share id on the call aswellJoas Schilling2015-04-281-3/+15
| | | | |
| * | | | Correctly send Federate-Cloud Share Feedback against the remote share IDJoas Schilling2015-04-281-6/+6
| | | | |
| * | | | check the called URLJoas Schilling2015-04-281-3/+13
| | | | |
| * | | | Correctly generate the feedback URL for remote shareJoas Schilling2015-04-281-1/+1
| |/ / / | | | | | | | | | | | | | | | | The trailing slash was added in c78e3c4a7fa1d2f474ab58551e67a50e093f6ed8 to correctly generate the encryption keys
* | | | Merge pull request #15911 from owncloud/enc_create_header_for_new_keyBjörn Schießle2015-04-292-3/+14
|\ \ \ \ | | | | | | | | | | make sure that we create a header for the encrypted private key
| * | | | make sure that we create a header for the encrypted private keyBjoern Schiessle2015-04-282-3/+14
| |/ / /
* | | | Merge pull request #15706 from owncloud/fix-15705-masterLukas Reschke2015-04-292-3/+6
|\ \ \ \ | | | | | | | | | | move creation of shared key to the login handler
| * | | | move creation of shared key to the login handler - fixes #15705Thomas Müller2015-04-172-3/+6
| | | | |
* | | | | Merge pull request #15921 from cmeh/patch-4Thomas Müller2015-04-291-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Spelling in wizardTabElementary.js: Correct "More then …" to "More than …"
| * | | | | Update wizardTabElementary.jscmeh2015-04-281-1/+1
| | |/ / / | |/| | | | | | | | Corrected "More then …" to "More than …".
* / | | | [tx-robot] updated from transifexJenkins for ownCloud2015-04-294-108/+108
|/ / / /
* | | | Merge pull request #14764 from owncloud/shared-etag-propagateMorris Jobke2015-04-2822-216/+936
|\ \ \ \ | | | | | | | | | | Propagate etags across shared storages
| * | | | dont pass floats as timestamp to the changepropagatorRobin Appelman2015-04-271-1/+1
| | | | |
| * | | | safer teardownRobin Appelman2015-04-271-1/+3
| | | | |
| * | | | use microtime to prevent race conditionsRobin Appelman2015-04-271-3/+3
| | | | |
| * | | | cleanup hooksRobin Appelman2015-04-271-0/+7
| | | | |
| * | | | triger propagation for webdav uploadsRobin Appelman2015-04-271-3/+3
| | | | | | | | | | | | | | | | | | | | use post hooks for share etag propagator
| * | | | fix mergeRobin Appelman2015-04-274-116/+76
| | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-30 01:46:27 +0000