summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-08-19686-13104/+12471
|
* Merge pull request #4510 from owncloud/f_e_webdav_urlencodingThomas Müller2013-08-191-2/+2
|\ | | | | Fix files_external webdav up and download when path contains ' '
| * replace ' ' with '%20' in urls for curlJörn Friedrich Dreyer2013-08-191-2/+2
| |
* | Merge pull request #4467 from owncloud/storage-wrapper-quotaicewind19912013-08-1919-147/+454
|\ \ | |/ |/| Move quota logic from filesystem proxy to storage wrapper
| * merge master in storage-wrapper-quotaRobin Appelman2013-08-181675-33543/+39887
| |\
| * | remove outdated quota proxyRobin Appelman2013-08-161-114/+0
| | |
| * | fix quota wrapper reporting negative free_space, breaking user interfaceRobin Appelman2013-08-161-1/+1
| | | | | | | | | | | | return 0 instead
| * | use renamed constantsRobin Appelman2013-07-254-5/+5
| | |
| * | use storage wrapper for quota instead of a filesystem proxyRobin Appelman2013-07-251-2/+22
| | |
| * | add conveince function to wrap all storagesRobin Appelman2013-07-251-0/+12
| | |
| * | use renamed constantsRobin Appelman2013-07-251-2/+2
| | |
| * | add option to wrap existing mountsRobin Appelman2013-07-252-0/+14
| | |
| * | fix getPermissionsCache for storage wrapperRobin Appelman2013-07-251-1/+1
| | |
| * | add quota storage wrapperRobin Appelman2013-07-252-0/+165
| | |
| * | move storage wrapper test to new namespaceRobin Appelman2013-07-251-2/+2
| | |
| * | add quota streamwrapper that limits the amount of data that can be written ↵Robin Appelman2013-07-253-16/+225
| | | | | | | | | | | | to a stream
| * | rename constantsRobin Appelman2013-07-253-4/+5
| | |
* | | Merge pull request #4509 from owncloud/add-odf-templates-masterMorris Jobke2013-08-194-1/+3
|\ \ \ | | | | | | | | adding file templates for ods, odt and odp
| * | | adding file templates for ods, odt and odpThomas Müller2013-08-184-1/+3
|/ / /
* | | Merge pull request #4239 from owncloud/decrypt_files_againBjörn Schießle2013-08-1823-123/+565
|\ \ \ | | | | | | | | Enable user to decrypt files again after encryption app was disabled
| * | | revert changes to 3rdparty submodule referenceBjoern Schiessle2013-08-181-0/+0
| | | |
| * | | don't change the etags if a file gets encrypted/decrypted to avoid that the ↵Bjoern Schiessle2013-08-181-24/+32
| | | | | | | | | | | | | | | | sync client downloads all files again
| * | | Merge branch 'master' into decrypt_files_againBjoern Schiessle2013-08-171514-17058/+24960
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/tests/keymanager.php
| * | | | remove whitespaces and some leftover code from testingBjoern Schiessle2013-08-152-2/+2
| | | | |
| * | | | throw exception if encryption was disabled but files are still encrypted to ↵Bjoern Schiessle2013-08-141-1/+11
| | | | | | | | | | | | | | | | | | | | prevent the client from syncing unreadable files
| * | | | check if some encrypted files are left after the app was disabled and warn ↵Bjoern Schiessle2013-08-126-7/+42
| | | | | | | | | | | | | | | | | | | | the user
| * | | | preserve mtime if file gets encrypted/decryptedBjoern Schiessle2013-08-121-1/+13
| | | | |
| * | | | fix array declarationBjoern Schiessle2013-08-121-1/+1
| | | | |
| * | | | don't know why it works locally but not on the build server... let's keep it ↵Bjoern Schiessle2013-07-311-0/+3
| | | | | | | | | | | | | | | | | | | | out for the moment
| * | | | use OC\Files\View to read encrypted file, so that it also works with ↵Bjoern Schiessle2013-07-311-4/+7
| | | | | | | | | | | | | | | | | | | | external storages
| * | | | this hopefully fixes testRecoveryForUser(), works locallyBjoern Schiessle2013-07-311-7/+10
| | | | | | | | | | | | | | | | | | | | for now I disabled testRecoveryFile(), no idea why jenkins deletes complete folders... Works nicely in the real world
| * | | | this test works locally, let's see what out build server says...Bjoern Schiessle2013-07-311-3/+0
| | | | |
| * | | | fix searchUsers() call in group.phpBjoern Schiessle2013-07-311-1/+1
| | | | |
| * | | | fixing some unit testsBjoern Schiessle2013-07-302-6/+6
| | | | |
| * | | | we need to use the path relative to data/Bjoern Schiessle2013-07-301-4/+1
| | | | |
| * | | | handle error if we can't handle the given pathBjoern Schiessle2013-07-302-2/+7
| | | | |
| * | | | remove unused method, the right one is in util.phpBjoern Schiessle2013-07-301-4/+0
| | | | |
| * | | | adapt unit tests to the modified stream wrapperBjoern Schiessle2013-07-305-35/+35
| | | | |
| * | | | only show decrypt all files option if encrypted files are availableBjoern Schiessle2013-07-301-2/+1
| | | | |
| * | | | encrypt/decrypt file versionsBjoern Schiessle2013-07-301-3/+124
| | | | |
| * | | | check if app is enabledBjoern Schiessle2013-07-301-7/+8
| | | | |
| * | | | only write keyfiles if it was a new file, otherwise nothing changedBjoern Schiessle2013-07-301-38/+45
| | | | |
| * | | | use path relative to data/Bjoern Schiessle2013-07-301-4/+1
| | | | |
| * | | | improved error handlingBjoern Schiessle2013-07-302-14/+34
| | | | |
| * | | | working decrypt files methodBjoern Schiessle2013-07-296-37/+173
| | | | |
| * | | | add decryptall.phpBjörn Schießle2013-07-291-0/+14
| | | | |
| * | | | register decrypt all routeBjörn Schießle2013-07-291-0/+2
| | | | |
| * | | | add ajax call to decrypt all filesBjörn Schießle2013-07-293-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/lib/crypt.php
| * | | | user interface to allow user to decrypt all his files once the encryption ↵Björn Schießle2013-07-296-9/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | app was disabled Conflicts: settings/templates/personal.php
* | | | | Merge pull request #4498 from owncloud/uploadprogress-near-uploadbuttonChristopher2013-08-181-4/+14
|\ \ \ \ \ | | | | | | | | | | | | move upload progress bar near upload button, more contextual