Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | $_POST["adminEnableRecovery"] is a string | Björn Schießle | 2013-05-28 | 1 | -1/+1 |
* | changed to public log api | Florin Peter | 2013-05-27 | 4 | -16/+16 |
* | replace == with === and replace != with !== | Florin Peter | 2013-05-27 | 9 | -58/+52 |
* | changed basic auth to test user | Florin Peter | 2013-05-27 | 1 | -3/+3 |
* | 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 | 2 | -309/+398 |
|\| | |||||
| * | 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 branch 'master' into file_encryption_util_is_error | Florin Peter | 2013-05-27 | 70 | -611/+949 |
| |\| | |||||
| * | | 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 |
* | | | 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 branch 'master' into file_encryption_tests | Florin Peter | 2013-05-27 | 3 | -2/+25 |
|\ \ \ | |||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-27 | 3 | -2/+25 |
* | | | | 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 | 60 | -9/+163 |
| |/ |/| | |||||
* | | 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 |
| |/ | |||||
* | | increase version and add warning | Frank Karlitschek | 2013-05-25 | 2 | -2/+2 |
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-25 | 62 | -243/+96 |
* | | improved trashbin test again | Florin Peter | 2013-05-24 | 1 | -0/+1 |
* | | improved trashbin test | Florin Peter | 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 #3416 from owncloud/files_encryption | Thomas Müller | 2013-05-24 | 63 | -2728/+7274 |
|\ | |||||
| * | 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 | 4 | -9/+11 |
| |\ | |||||
| * | | added trash bin tests | Florin Peter | 2013-05-22 | 1 | -0/+269 |
| * | | added static function registerHooks() for better unit tests handling | Florin Peter | 2013-05-22 | 2 | -5/+12 |
| * | | settings clean-up; There is no blacklist in the new encryption app | Björn Schießle | 2013-05-22 | 2 | -34/+1 |
| * | | improved error messages | Björn Schießle | 2013-05-22 | 2 | -6/+12 |
| * | | Merge branch 'master' into files_encryption | Björn Schießle | 2013-05-22 | 2 | -0/+9 |
| |\ \ | |||||
| * | | | fix pgsql error | Florin Peter | 2013-05-22 | 1 | -2/+5 |
| * | | | improved tests | Florin Peter | 2013-05-22 | 6 | -388/+301 |
| * | | | fixed finding encrypted files in subfolders and removed unused code | Florin Peter | 2013-05-22 | 4 | -200/+61 |
| * | | | added webdav test | Florin Peter | 2013-05-21 | 1 | -0/+251 |
| * | | | fixed postFileSize | Florin Peter | 2013-05-21 | 1 | -11/+19 |