Commit Graph

11437 Commits (80433fc4c4b052d788d9a942ce9d332b0f526362)
 

Author SHA1 Message Date
Florin Peter 80433fc4c4 Merge branch 'master' into file_encryption_util_is_error 13 years ago
Björn Schießle 5e243b48bb Merge pull request #3481 from owncloud/firsttime_enc 13 years ago
FlorinPeter d878926256 Merge pull request #3496 from owncloud/file_encryption_tests 13 years ago
Florin Peter 8cf827ee9d Merge branch 'master' into file_encryption_tests 13 years ago
Florin Peter 89f0c8f39d added check by numRows() 13 years ago
Jenkins for ownCloud 73e0b4c10a [tx-robot] updated from transifex 13 years ago
Florin Peter 9dd277576a added users for tests 13 years ago
Florin Peter c7981abbc9 improved test 13 years ago
Jenkins for ownCloud 0c621ff6a9 [tx-robot] updated from transifex 13 years ago
Florin Peter 788c5940f0 fixed error rising from fetchRow 13 years ago
Florin Peter 9a6cd89a69 added OC_DB::isError and logging 13 years ago
Michael Gapczynski dbb6a10364 Merge pull request #3478 from davidak/master 13 years ago
Michael Gapczynski 0fdf3a7e63 Merge pull request #3388 from roha4000/master 13 years ago
Michael Gapczynski c870aed1b6 Merge pull request #3493 from owncloud/bumpversion 13 years ago
Michael Gapczynski 2893bb9543 Bump version for files_encryption changes 13 years ago
Frank Karlitschek 29c8cbf4d1 increase version and add warning 13 years ago
Jenkins for ownCloud 6a6c18dfab [tx-robot] updated from transifex 13 years ago
Florin Peter fba7200b05 improved trashbin test again 13 years ago
Florin Peter b32823a96e improved trashbin test 13 years ago
Thomas Mueller 1f9ac7850d meanwhile phpunit is seq faulting with mysql as well 13 years ago
Thomas Müller ae9adcaf8c Merge pull request #3482 from owncloud/fix_helper 13 years ago
Björn Schießle f56802a437 no use the recoveryPassword var instead of accessing the POST array 13 years ago
Björn Schießle 5ce4149e75 fix first time encryption after app was enabled 13 years ago
Thomas Müller 39603b193b Merge pull request #3479 from owncloud/testing-oracle-on-master 13 years ago
Thomas Mueller a753d14de9 adding Oracle support to autotest.sh 13 years ago
davidak 56006ea852 small typo fix: added 2 whitespaces 13 years ago
Thomas Müller 4911305887 Merge pull request #3416 from owncloud/files_encryption 13 years ago
Alessandro Cosentino 3fbfe3c06a small typo in the comments 13 years ago
Michael Gapczynski a98d6c4be6 Merge pull request #3425 from owncloud/move-storages 13 years ago
Jenkins for ownCloud b47729c5fc [tx-robot] updated from transifex 13 years ago
Florin Peter 6c8de5ae6d fixes after review from @DeepDiver1975 13 years ago
Florin Peter adc930d9f9 added l10n support in apps/files_encryption/ajax/adminrecovery.php 13 years ago
Björn Schießle 7b07168c46 code clean up; nicer solution to solve the public link share problem if a user is logged in 13 years ago
Björn Schießle a9ebf2aabe fix public link share if a user is logged in 13 years ago
Michael Gapczynski 30330b4343 Merge branch 'master' into move-storages 13 years ago
Michael Gapczynski 3b6d850e59 Switch to calling deleteAll via storage to avoid emitting delete hook 13 years ago
Björn Schießle cb79169cf5 Merge branch 'master' into files_encryption 13 years ago
Jenkins for ownCloud 698862519d [tx-robot] updated from transifex 13 years ago
Michael Gapczynski 1cfc9d269e Merge pull request #3457 from owncloud/fix-share-links 13 years ago
Florin Peter 46c784ccdf added trash bin tests 13 years ago
Florin Peter 842d0608f1 added static function registerHooks() for better unit tests handling 13 years ago
Michael Gapczynski 9b622bdeed RUNTIME_NOSETUPFS no longer exists, using tearDownFS() in public links instead 13 years ago
Björn Schießle b2aa97f166 revert changes to .gitmodules, they were applied by accident 13 years ago
Björn Schießle 1bd42762ae revert submodule changes 13 years ago
Björn Schießle 80dea1a8c5 settings clean-up; There is no blacklist in the new encryption app 13 years ago
Björn Schießle 15a3ae6db1 improved error messages 13 years ago
Björn Schießle ee53bd1aa3 Merge branch 'master' into files_encryption 13 years ago
Thomas Müller 26732ecaa6 Merge pull request #3337 from owncloud/oracle_fixes 13 years ago
Jörn Friedrich Dreyer 1f1abe595d cleanup codestyle 13 years ago
Jörn Friedrich Dreyer cbd5eb9a1a use to_char only for oracle, whitespace 13 years ago