Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-19 | 686 | -13104/+12471 |
| | |||||
* | Merge pull request #4510 from owncloud/f_e_webdav_urlencoding | Thomas Müller | 2013-08-19 | 1 | -2/+2 |
|\ | | | | | Fix files_external webdav up and download when path contains ' ' | ||||
| * | replace ' ' with '%20' in urls for curl | Jörn Friedrich Dreyer | 2013-08-19 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #4467 from owncloud/storage-wrapper-quota | icewind1991 | 2013-08-19 | 19 | -147/+454 |
|\ \ | |/ |/| | Move quota logic from filesystem proxy to storage wrapper | ||||
| * | merge master in storage-wrapper-quota | Robin Appelman | 2013-08-18 | 1675 | -33543/+39887 |
| |\ | |||||
| * | | remove outdated quota proxy | Robin Appelman | 2013-08-16 | 1 | -114/+0 |
| | | | |||||
| * | | fix quota wrapper reporting negative free_space, breaking user interface | Robin Appelman | 2013-08-16 | 1 | -1/+1 |
| | | | | | | | | | | | | return 0 instead | ||||
| * | | use renamed constants | Robin Appelman | 2013-07-25 | 4 | -5/+5 |
| | | | |||||
| * | | use storage wrapper for quota instead of a filesystem proxy | Robin Appelman | 2013-07-25 | 1 | -2/+22 |
| | | | |||||
| * | | add conveince function to wrap all storages | Robin Appelman | 2013-07-25 | 1 | -0/+12 |
| | | | |||||
| * | | use renamed constants | Robin Appelman | 2013-07-25 | 1 | -2/+2 |
| | | | |||||
| * | | add option to wrap existing mounts | Robin Appelman | 2013-07-25 | 2 | -0/+14 |
| | | | |||||
| * | | fix getPermissionsCache for storage wrapper | Robin Appelman | 2013-07-25 | 1 | -1/+1 |
| | | | |||||
| * | | add quota storage wrapper | Robin Appelman | 2013-07-25 | 2 | -0/+165 |
| | | | |||||
| * | | move storage wrapper test to new namespace | Robin Appelman | 2013-07-25 | 1 | -2/+2 |
| | | | |||||
| * | | add quota streamwrapper that limits the amount of data that can be written ↵ | Robin Appelman | 2013-07-25 | 3 | -16/+225 |
| | | | | | | | | | | | | to a stream | ||||
| * | | rename constants | Robin Appelman | 2013-07-25 | 3 | -4/+5 |
| | | | |||||
* | | | Merge pull request #4509 from owncloud/add-odf-templates-master | Morris Jobke | 2013-08-19 | 4 | -1/+3 |
|\ \ \ | | | | | | | | | adding file templates for ods, odt and odp | ||||
| * | | | adding file templates for ods, odt and odp | Thomas Müller | 2013-08-18 | 4 | -1/+3 |
|/ / / | |||||
* | | | Merge pull request #4239 from owncloud/decrypt_files_again | Björn Schießle | 2013-08-18 | 23 | -123/+565 |
|\ \ \ | | | | | | | | | Enable user to decrypt files again after encryption app was disabled | ||||
| * | | | revert changes to 3rdparty submodule reference | Bjoern Schiessle | 2013-08-18 | 1 | -0/+0 |
| | | | | |||||
| * | | | don't change the etags if a file gets encrypted/decrypted to avoid that the ↵ | Bjoern Schiessle | 2013-08-18 | 1 | -24/+32 |
| | | | | | | | | | | | | | | | | sync client downloads all files again | ||||
| * | | | Merge branch 'master' into decrypt_files_again | Bjoern Schiessle | 2013-08-17 | 1514 | -17058/+24960 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/tests/keymanager.php | ||||
| * | | | | remove whitespaces and some leftover code from testing | Bjoern Schiessle | 2013-08-15 | 2 | -2/+2 |
| | | | | | |||||
| * | | | | throw exception if encryption was disabled but files are still encrypted to ↵ | Bjoern Schiessle | 2013-08-14 | 1 | -1/+11 |
| | | | | | | | | | | | | | | | | | | | | prevent the client from syncing unreadable files | ||||
| * | | | | check if some encrypted files are left after the app was disabled and warn ↵ | Bjoern Schiessle | 2013-08-12 | 6 | -7/+42 |
| | | | | | | | | | | | | | | | | | | | | the user | ||||
| * | | | | preserve mtime if file gets encrypted/decrypted | Bjoern Schiessle | 2013-08-12 | 1 | -1/+13 |
| | | | | | |||||
| * | | | | fix array declaration | Bjoern Schiessle | 2013-08-12 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | don't know why it works locally but not on the build server... let's keep it ↵ | Bjoern Schiessle | 2013-07-31 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | out for the moment | ||||
| * | | | | use OC\Files\View to read encrypted file, so that it also works with ↵ | Bjoern Schiessle | 2013-07-31 | 1 | -4/+7 |
| | | | | | | | | | | | | | | | | | | | | external storages | ||||
| * | | | | this hopefully fixes testRecoveryForUser(), works locally | Bjoern Schiessle | 2013-07-31 | 1 | -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 Schiessle | 2013-07-31 | 1 | -3/+0 |
| | | | | | |||||
| * | | | | fix searchUsers() call in group.php | Bjoern Schiessle | 2013-07-31 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | fixing some unit tests | Bjoern Schiessle | 2013-07-30 | 2 | -6/+6 |
| | | | | | |||||
| * | | | | we need to use the path relative to data/ | Bjoern Schiessle | 2013-07-30 | 1 | -4/+1 |
| | | | | | |||||
| * | | | | handle error if we can't handle the given path | Bjoern Schiessle | 2013-07-30 | 2 | -2/+7 |
| | | | | | |||||
| * | | | | remove unused method, the right one is in util.php | Bjoern Schiessle | 2013-07-30 | 1 | -4/+0 |
| | | | | | |||||
| * | | | | adapt unit tests to the modified stream wrapper | Bjoern Schiessle | 2013-07-30 | 5 | -35/+35 |
| | | | | | |||||
| * | | | | only show decrypt all files option if encrypted files are available | Bjoern Schiessle | 2013-07-30 | 1 | -2/+1 |
| | | | | | |||||
| * | | | | encrypt/decrypt file versions | Bjoern Schiessle | 2013-07-30 | 1 | -3/+124 |
| | | | | | |||||
| * | | | | check if app is enabled | Bjoern Schiessle | 2013-07-30 | 1 | -7/+8 |
| | | | | | |||||
| * | | | | only write keyfiles if it was a new file, otherwise nothing changed | Bjoern Schiessle | 2013-07-30 | 1 | -38/+45 |
| | | | | | |||||
| * | | | | use path relative to data/ | Bjoern Schiessle | 2013-07-30 | 1 | -4/+1 |
| | | | | | |||||
| * | | | | improved error handling | Bjoern Schiessle | 2013-07-30 | 2 | -14/+34 |
| | | | | | |||||
| * | | | | working decrypt files method | Bjoern Schiessle | 2013-07-29 | 6 | -37/+173 |
| | | | | | |||||
| * | | | | add decryptall.php | Björn Schießle | 2013-07-29 | 1 | -0/+14 |
| | | | | | |||||
| * | | | | register decrypt all route | Björn Schießle | 2013-07-29 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | add ajax call to decrypt all files | Björn Schießle | 2013-07-29 | 3 | -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ßle | 2013-07-29 | 6 | -9/+68 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | app was disabled Conflicts: settings/templates/personal.php | ||||
* | | | | | Merge pull request #4498 from owncloud/uploadprogress-near-uploadbutton | Christopher | 2013-08-18 | 1 | -4/+14 |
|\ \ \ \ \ | | | | | | | | | | | | | move upload progress bar near upload button, more contextual |