Georg Ehrke
|
5433a50461
|
validate size of file
|
2013-05-30 10:44:27 +02:00 |
|
Georg Ehrke
|
d8008ae421
|
Merge branch 'master' into oc_preview
|
2013-05-29 13:24:14 +02:00 |
|
Georg Ehrke
|
a76360347c
|
fix c&p fail
|
2013-05-29 13:13:47 +02:00 |
|
Georg Ehrke
|
1e252b6763
|
more style fixes
|
2013-05-29 13:11:43 +02:00 |
|
Georg Ehrke
|
6b90416891
|
add php preview backend
|
2013-05-29 13:09:38 +02:00 |
|
Georg Ehrke
|
7408ab660a
|
respect coding style guidelines
|
2013-05-29 13:03:33 +02:00 |
|
Georg Ehrke
|
268246fac8
|
namespace fix
|
2013-05-29 12:48:21 +02:00 |
|
Georg Ehrke
|
fa6b96090a
|
move to OC namespace
|
2013-05-29 12:46:54 +02:00 |
|
Georg Ehrke
|
eebc15dce0
|
connect preview lib to filesystem hooks
|
2013-05-29 12:01:43 +02:00 |
Jenkins for ownCloud
|
7c0c6bd779
|
[tx-robot] updated from transifex
|
2013-05-29 02:10:54 +02:00 |
icewind1991
|
fee43ec506
|
Merge pull request #3511 from owncloud/sessionclass
Abstract session access away in a class
|
2013-05-28 13:37:39 -07: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 |
|
Georg Ehrke
|
a03787bc42
|
make preview cache work with encryption and improve error handling
|
2013-05-28 16:04:39 +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 |
|
Georg Ehrke
|
08a022aaa4
|
don't give ffmpeg wanted size, cause it doesn't care about aspect ratio
|
2013-05-28 12:09:46 +02:00 |
|
Georg Ehrke
|
55b00fe819
|
make pdf backend work with encryption
|
2013-05-28 11:59:20 +02:00 |
|
Georg Ehrke
|
738cc48a85
|
make mp3 backend work with encryption
|
2013-05-28 11:49:18 +02:00 |
|
Georg Ehrke
|
4d52dfb0a0
|
make movie backend work with encryption
|
2013-05-28 11:48:02 +02: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 |
|
Georg Ehrke
|
7555332d58
|
remove whitespace
|
2013-05-28 11:31:48 +02:00 |
|
Georg Ehrke
|
5ae1333c76
|
add preview backend for text based files
|
2013-05-28 11:29:01 +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 |
|
Georg Ehrke
|
707f52f1db
|
check if the imagick extension is loaded
|
2013-05-28 10:23:40 +02:00 |
|
Georg Ehrke
|
005d8e9870
|
update images.php
|
2013-05-28 10:21:02 +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 |
|
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 |