Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | | * | Merge branch 'master' into remove_unused_vars | Björn Schießle | 2013-05-27 | 4 | -15/+13 | |
| | | | |\ | |_|_|_|/ |/| | | | | ||||||
* | | | | | legacyBlockDecryprt() needs to be public | Björn Schießle | 2013-05-27 | 1 | -1/+1 | |
* | | | | | make legacyDecrypt() private als always call legacyBlockDecrypt() from other ... | Björn Schießle | 2013-05-27 | 4 | -6/+6 | |
* | | | | | fix migration from old to new encryption | Björn Schießle | 2013-05-27 | 2 | -3/+1 | |
| | | | * | replace == with === | Björn Schießle | 2013-05-27 | 2 | -3/+3 | |
| | | | * | reformat code | Florin Peter | 2013-05-27 | 11 | -660/+694 | |
| | | | * | Merge branch 'master' into remove_unused_vars | Florin Peter | 2013-05-27 | 3 | -310/+402 | |
| | | | |\ | |_|_|_|/ |/| | | | | ||||||
* | | | | | Merge pull request #3506 from owncloud/fix_3320 | Björn Schießle | 2013-05-27 | 1 | -0/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | add event.preventDefault to undelete function | Georg Ehrke | 2013-05-27 | 1 | -0/+1 | |
| * | | | | | fix https://github.com/owncloud/core/issues/3320 | Georg Ehrke | 2013-05-27 | 1 | -0/+1 | |
* | | | | | | Merge pull request #3495 from owncloud/file_encryption_util_is_error | Thomas Tanghus | 2013-05-27 | 1 | -310/+397 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Merge branch 'master' into file_encryption_util_is_error | Florin Peter | 2013-05-27 | 689 | -2005/+2383 | |
| |\| | | | | | ||||||
| * | | | | | | added check by numRows() | Florin Peter | 2013-05-27 | 1 | -335/+387 | |
| * | | | | | | fixed error rising from fetchRow | Florin Peter | 2013-05-25 | 1 | -22/+27 | |
| * | | | | | | added OC_DB::isError and logging | Florin Peter | 2013-05-25 | 1 | -2/+36 | |
* | | | | | | | Merge pull request #3412 from owncloud/fix_2013 | Michael Gapczynski | 2013-05-27 | 1 | -1/+4 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | Don't set Content-Length header if size is unknown | Michael Gapczynski | 2013-05-17 | 1 | -1/+4 | |
| | | | | | * | fix tests, after unused variables are removed | Björn Schießle | 2013-05-27 | 1 | -1/+1 | |
| | | | | | * | remove unused varaibles | Björn Schießle | 2013-05-27 | 2 | -4/+2 | |
| |_|_|_|_|/ |/| | | | | | ||||||
* | | | | | | Merge pull request #3481 from owncloud/firsttime_enc | Björn Schießle | 2013-05-27 | 1 | -23/+12 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | fix first time encryption after app was enabled | Björn Schießle | 2013-05-24 | 1 | -23/+12 | |
* | | | | | | | Merge pull request #3496 from owncloud/file_encryption_tests | FlorinPeter | 2013-05-27 | 9 | -574/+750 | |
|\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge branch 'master' into file_encryption_tests | Florin Peter | 2013-05-27 | 551 | -1103/+1134 | |
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-27 | 551 | -1103/+1134 | |
| * | | | | | | | added users for tests | Florin Peter | 2013-05-26 | 9 | -891/+1098 | |
| * | | | | | | | improved test | Florin Peter | 2013-05-26 | 7 | -975/+944 | |
|/ / / / / / / | ||||||
* | | / / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-26 | 664 | -1349/+1535 | |
| |_|/ / / / |/| | | | | | ||||||
* | | | | | | Merge pull request #3478 from davidak/master | Michael Gapczynski | 2013-05-25 | 1 | -2/+2 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | small typo fix: added 2 whitespaces | davidak | 2013-05-24 | 1 | -2/+2 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #3388 from roha4000/master | Michael Gapczynski | 2013-05-25 | 2 | -2/+29 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | New tests to assure that a move will not affect another users cache entries | Roland Hager | 2013-05-22 | 1 | -0/+27 | |
| * | | | | | | Fixing UPDATE error in filecache table when renaming files by calling move().... | Roland Hager | 2013-05-22 | 1 | -2/+2 | |
* | | | | | | | Merge pull request #3493 from owncloud/bumpversion | Michael Gapczynski | 2013-05-25 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Bump version for files_encryption changes | Michael Gapczynski | 2013-05-25 | 1 | -1/+1 | |
* | | | | | | | | increase version and add warning | Frank Karlitschek | 2013-05-25 | 2 | -2/+2 | |
| |_|_|_|/ / / |/| | | | | | | ||||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-25 | 931 | -4912/+10526 | |
* | | | | | | | improved trashbin test again | Florin Peter | 2013-05-24 | 1 | -0/+1 | |
* | | | | | | | improved trashbin test | Florin Peter | 2013-05-24 | 1 | -1/+1 | |
* | | | | | | | meanwhile phpunit is seq faulting with mysql as well | Thomas Mueller | 2013-05-24 | 1 | -4/+4 | |
* | | | | | | | Merge pull request #3482 from owncloud/fix_helper | Thomas Müller | 2013-05-24 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | no use the recoveryPassword var instead of accessing the POST array | Björn Schießle | 2013-05-24 | 1 | -1/+1 | |
| | |_|/ / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #3479 from owncloud/testing-oracle-on-master | Thomas Müller | 2013-05-24 | 1 | -4/+55 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | adding Oracle support to autotest.sh | Thomas Mueller | 2013-05-24 | 1 | -4/+55 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #3416 from owncloud/files_encryption | Thomas Müller | 2013-05-24 | 78 | -2750/+7481 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | fixes after review from @DeepDiver1975 | Florin Peter | 2013-05-23 | 13 | -876/+752 | |
| * | | | | | | added l10n support in apps/files_encryption/ajax/adminrecovery.php | Florin Peter | 2013-05-23 | 1 | -2/+4 | |
| * | | | | | | code clean up; nicer solution to solve the public link share problem if a use... | Björn Schießle | 2013-05-23 | 2 | -25/+6 | |
| * | | | | | | fix public link share if a user is logged in | Björn Schießle | 2013-05-23 | 3 | -7/+32 | |
| * | | | | | | Merge branch 'master' into files_encryption | Björn Schießle | 2013-05-23 | 19 | -73/+85 | |
| |\| | | | | | ||||||
| * | | | | | | added trash bin tests | Florin Peter | 2013-05-22 | 1 | -0/+269 |