icewind1991
|
fee43ec506
|
Merge pull request #3511 from owncloud/sessionclass
Abstract session access away in a class
|
2013-05-28 13:37:39 -07:00 |
Florin Peter
|
71a532fc4d
|
fixed if fopen returns false typically on external storage
|
2013-05-28 20:50:14 +02:00 |
Robin Appelman
|
fa6bfe8837
|
didn't mean to commit this yet
|
2013-05-28 17:21:44 +02:00 |
Florin Peter
|
4b4b447e2a
|
fixed missing convert to new session handler
|
2013-05-28 17:06:37 +02:00 |
Florin Peter
|
5b7395f55b
|
Merge branch 'sessionclass' of https://github.com/owncloud/core into sessionclass
|
2013-05-28 17:04:44 +02:00 |
Florin Peter
|
6ae7bde788
|
fixed encryption session namespace to avoid problems
|
2013-05-28 17:04:35 +02:00 |
Robin Appelman
|
57f712f8a9
|
implement ArrayInterface with Session
|
2013-05-28 16:52:40 +02:00 |
Robin Appelman
|
cc0cf93136
|
merge master into sessionclass
|
2013-05-28 14:55:42 +02:00 |
Jörn Friedrich Dreyer
|
1d720099c3
|
Merge pull request #3179 from pawl/patch-1
Improve IE Compatibility
|
2013-05-28 05:18:43 -07:00 |
Jörn Friedrich Dreyer
|
da55c76168
|
Merge pull request #2778 from Kondou-ger/optimize_pictures
Optimize pictures with optipng.
|
2013-05-28 04:48:38 -07:00 |
blizzz
|
3beff3fdc2
|
Merge pull request #3488 from zafi/master
The "lost password" field in the personal setting depends on OC_USER_BACKEND_SET_PASSWORD
|
2013-05-28 02:39:02 -07: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 |
FlorinPeter
|
086c33ef57
|
Merge pull request #3512 from owncloud/file_encryption_session_fix
fix for losing private key while being logged in and accessing a public link
|
2013-05-28 01:55:55 -07: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
|
040045cc2e
|
provide a dummy session for CLI
|
2013-05-28 01:15:38 +02:00 |
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 |
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 |
Robin Appelman
|
9e65f40d1b
|
Add PublicEmitter class
|
2013-05-27 20:20:06 +02:00 |
kondou
|
3001db6b50
|
Update jquery to 1.10.0 & add jquery-migrate 1.2.1
|
2013-05-27 20:13:13 +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 |
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 |
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 |
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 |