mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
11,452 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

11452 Commits

Author SHA1 Message Date
Robin Appelman f547b66d6b check fix if session start is successfull 2013-05-28 01:13:36 +02:00
Robin Appelman e73c04501e Fix session not working error 2013-05-28 01:10:18 +02:00
Robin Appelman 44f9af5a7f Use the new session wrapper 2013-05-28 01:04:09 +02:00
Robin Appelman 76d13120ea Abstract the session away in a class 2013-05-28 00:50:00 +02:00
Frank Karlitschek aeff1a4c4d Merge pull request #3510 from owncloud/publicemitter 
Add PublicEmitter class
 2013-05-27 13:45:47 -07:00
Robin Appelman 9e65f40d1b Add PublicEmitter class 2013-05-27 20:20:06 +02:00
Björn Schießle 4c05259ccf legacyBlockDecryprt() needs to be public 2013-05-27 17:35:38 +02:00
Björn Schießle df22a7c495 make legacyDecrypt() private als always call legacyBlockDecrypt() from other classes 2013-05-27 17:35:28 +02:00
Björn Schießle 8b35578833 fix migration from old to new encryption 2013-05-27 17:35:06 +02:00
Björn Schießle f8d1c32112 Merge pull request #3506 from owncloud/fix_3320 
fix https://github.com/owncloud/core/issues/3320
 2013-05-27 08:04:55 -07:00
Thomas Tanghus c6d6925b78 Merge pull request #3495 from owncloud/file_encryption_util_is_error 
added OC_DB::isError and logging for #3486
 2013-05-27 07:56:12 -07:00
Michael Gapczynski 6151c0d310 Merge pull request #3412 from owncloud/fix_2013 
Don't set Content-Length header if size is unknown
 2013-05-27 07:44:35 -07:00
Georg Ehrke 841b420bc4 add event.preventDefault to undelete function 2013-05-27 16:37:43 +02:00
Georg Ehrke d408cd7f37 fix https://github.com/owncloud/core/issues/3320 2013-05-27 15:24:37 +02:00
Florin Peter 80433fc4c4 Merge branch 'master' into file_encryption_util_is_error 
Conflicts:
	apps/files_encryption/lib/util.php
 2013-05-27 14:41:53 +02:00
Björn Schießle 5e243b48bb Merge pull request #3481 from owncloud/firsttime_enc 
fix first time encryption after app was enabled
 2013-05-27 05:17:31 -07:00
FlorinPeter d878926256 Merge pull request #3496 from owncloud/file_encryption_tests 
improved tests for files_encryption
 2013-05-27 05:15:21 -07:00
Florin Peter 8cf827ee9d Merge branch 'master' into file_encryption_tests 2013-05-27 12:54:33 +02:00
Florin Peter 89f0c8f39d added check by numRows() 
changed to public api where it was possible
reformat code to comply with the coding guidelines
 2013-05-27 12:41:55 +02:00
Jenkins for ownCloud 73e0b4c10a [tx-robot] updated from transifex 2013-05-27 02:07:24 +02:00
Florin Peter 9dd277576a added users for tests 
reformat code to meet coding guidelines
 2013-05-26 20:44:15 +02:00
Florin Peter c7981abbc9 improved test 
- fixed testPermanentDeleteFile sometimes failed
- speed optimization
- reformat code
 2013-05-26 03:22:16 +02:00
Jenkins for ownCloud 0c621ff6a9 [tx-robot] updated from transifex 2013-05-26 02:03:54 +02:00
Florin Peter 788c5940f0 fixed error rising from fetchRow 2013-05-25 23:20:55 +02:00
Florin Peter 9a6cd89a69 added OC_DB::isError and logging 2013-05-25 21:33:05 +02:00
Michael Gapczynski dbb6a10364 Merge pull request #3478 from davidak/master 
small typo fix: added 2 whitespaces
 2013-05-25 11:21:21 -07:00
Michael Gapczynski 0fdf3a7e63 Merge pull request #3388 from roha4000/master 
Duplicate DB entries in filecache table when renaming folder in WebUI #2
 2013-05-25 11:18:20 -07:00
Michael Gapczynski c870aed1b6 Merge pull request #3493 from owncloud/bumpversion 
Bump version for files_encryption changes
 2013-05-25 10:20:42 -07:00
Michael Gapczynski 2893bb9543 Bump version for files_encryption changes 2013-05-25 11:42:28 -04:00
Frank Karlitschek 29c8cbf4d1 increase version and add warning 2013-05-25 12:08:18 +02:00
Jenkins for ownCloud 6a6c18dfab [tx-robot] updated from transifex 2013-05-25 02:11:52 +02:00
Florin Peter fba7200b05 improved trashbin test again 2013-05-24 23:12:16 +02:00
Florin Peter b32823a96e improved trashbin test 2013-05-24 23:12:07 +02:00
Thomas Mueller 1f9ac7850d meanwhile phpunit is seq faulting with mysql as well 2013-05-24 21:50:34 +02:00
Thomas Müller ae9adcaf8c Merge pull request #3482 from owncloud/fix_helper 
use the recoveryPassword var instead of accessing the POST array
 2013-05-24 10:20:00 -07:00
Björn Schießle f56802a437 no use the recoveryPassword var instead of accessing the POST array 2013-05-24 18:37:58 +02:00
Björn Schießle 5ce4149e75 fix first time encryption after app was enabled 2013-05-24 17:35:00 +02:00
Thomas Müller 39603b193b Merge pull request #3479 from owncloud/testing-oracle-on-master 
adding Oracle support to autotest.sh
 2013-05-24 07:32:54 -07:00
Thomas Mueller a753d14de9 adding Oracle support to autotest.sh 2013-05-24 15:19:13 +02:00
davidak 56006ea852 small typo fix: added 2 whitespaces 2013-05-24 14:31:06 +02:00
Thomas Müller 4911305887 Merge pull request #3416 from owncloud/files_encryption 
New files encryption app
 2013-05-24 02:21:19 -07:00
Alessandro Cosentino 3fbfe3c06a small typo in the comments 2013-05-23 20:59:02 -04:00
Michael Gapczynski a98d6c4be6 Merge pull request #3425 from owncloud/move-storages 
Support for moving/copying folders between storages
 2013-05-23 17:35:11 -07:00
Jenkins for ownCloud b47729c5fc [tx-robot] updated from transifex 2013-05-24 02:02:43 +02:00
Florin Peter 6c8de5ae6d fixes after review from @DeepDiver1975 2013-05-23 23:56:31 +02:00
Florin Peter adc930d9f9 added l10n support in apps/files_encryption/ajax/adminrecovery.php 2013-05-23 22:09:28 +02:00
Björn Schießle 7b07168c46 code clean up; nicer solution to solve the public link share problem if a user is logged in 2013-05-23 21:18:31 +02:00
Björn Schießle a9ebf2aabe fix public link share if a user is logged in 2013-05-23 20:30:07 +02:00
Michael Gapczynski 30330b4343 Merge branch 'master' into move-storages 
Conflicts:
	tests/lib/files/view.php
 2013-05-23 10:25:12 -04:00
Michael Gapczynski 3b6d850e59 Switch to calling deleteAll via storage to avoid emitting delete hook 2013-05-23 10:23:16 -04:00