wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
11487 commits 157 branches 562 tags 714 MiB
Commit graph

5578 commits

Author SHA1 Message Date
Florin Peter
efd629462e changes after review 2013-05-29 12:23:33 +02:00
Florin Peter
c398fc59ad Merge branch 'master' into remove_unused_vars 
Conflicts:
	apps/files_encryption/hooks/hooks.php
	apps/files_encryption/lib/proxy.php
	apps/files_encryption/lib/session.php
	apps/files_encryption/lib/stream.php
 2013-05-29 09:21:00 +02:00
Jenkins for ownCloud
7c0c6bd779 [tx-robot] updated from transifex 2013-05-29 02:10:54 +02:00
Florin Peter
4b4b447e2a fixed missing convert to new session handler 2013-05-28 17:06:37 +02:00
Florin Peter
6ae7bde788 fixed encryption session namespace to avoid problems 2013-05-28 17:04:35 +02:00
Robin Appelman
cc0cf93136 merge master into sessionclass 2013-05-28 14:55:42 +02:00
Florin Peter
09b54ccb2b Merge branch 'master' into remove_unused_vars 
Conflicts:
	apps/files_encryption/lib/session.php
	apps/files_encryption/lib/util.php
 2013-05-28 11:00:49 +02:00
Björn Schießle
3a76c22372 $_POST["adminEnableRecovery"] is a string 2013-05-28 10:51:12 +02:00
Florin Peter
0041711fe3 fix for undefined index 2013-05-28 09:36:14 +02:00
Florin Peter
6f9e425939 fix for losing private key while being logged in and accessing a public link 2013-05-28 09:27:04 +02:00
Jenkins for ownCloud
3420d853ab [tx-robot] updated from transifex 2013-05-28 02:07:51 +02:00
Robin Appelman
9c99048429 fix syntax error 2013-05-28 01:31:26 +02:00
Robin Appelman
44f9af5a7f Use the new session wrapper 2013-05-28 01:04:09 +02:00
Florin Peter
e1e1c58969 changed to public log api 2013-05-27 20:51:52 +02:00
Florin Peter
7224fc98b2 replace == with === and replace != with !== 2013-05-27 20:44:38 +02:00
Florin Peter
6075aff687 changed basic auth to test user 2013-05-27 20:32:59 +02:00
Björn Schießle
2c3c60c1af Merge branch 'master' into remove_unused_vars 
Conflicts:
	apps/files_encryption/hooks/hooks.php
	apps/files_encryption/lib/crypt.php
	apps/files_encryption/lib/proxy.php
 2013-05-27 18:09:35 +02:00
Björn Schießle
c81e34ef89 replace == with === 2013-05-27 18:03:29 +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
Florin Peter
5d32e214b7 reformat code 2013-05-27 17:26:58 +02:00
Florin Peter
690bf9b8c4 Merge branch 'master' into remove_unused_vars 
Conflicts:
	apps/files_encryption/lib/util.php
 2013-05-27 17:26:35 +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
Georg Ehrke
841b420bc4 add event.preventDefault to undelete function 2013-05-27 16:37:43 +02:00
Björn Schießle
710e9c2d14 fix tests, after unused variables are removed 2013-05-27 15:34:57 +02:00
Björn Schießle
1a3f7891ea remove unused varaibles 2013-05-27 15:31:26 +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
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
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
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
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
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