]>
source.dussan.org Git - nextcloud-server.git/log
Georg Ehrke [Thu, 30 May 2013 08:44:23 +0000 (10:44 +0200)]
validate size of file
Georg Ehrke [Wed, 29 May 2013 11:24:14 +0000 (13:24 +0200)]
Merge branch 'master' into oc_preview
Georg Ehrke [Wed, 29 May 2013 11:13:47 +0000 (13:13 +0200)]
fix c&p fail
Georg Ehrke [Wed, 29 May 2013 11:11:43 +0000 (13:11 +0200)]
more style fixes
Georg Ehrke [Wed, 29 May 2013 11:09:38 +0000 (13:09 +0200)]
add php preview backend
Georg Ehrke [Wed, 29 May 2013 11:03:33 +0000 (13:03 +0200)]
respect coding style guidelines
Georg Ehrke [Wed, 29 May 2013 10:48:21 +0000 (12:48 +0200)]
namespace fix
Georg Ehrke [Wed, 29 May 2013 10:33:24 +0000 (12:33 +0200)]
move to OC namespace
Georg Ehrke [Wed, 29 May 2013 10:01:43 +0000 (12:01 +0200)]
connect preview lib to filesystem hooks
Jenkins for ownCloud [Wed, 29 May 2013 00:10:54 +0000 (02:10 +0200)]
[tx-robot] updated from transifex
icewind1991 [Tue, 28 May 2013 20:37:39 +0000 (13:37 -0700)]
Merge pull request #3511 from owncloud/sessionclass
Abstract session access away in a class
Robin Appelman [Tue, 28 May 2013 15:21:44 +0000 (17:21 +0200)]
didn't mean to commit this yet
Florin Peter [Tue, 28 May 2013 15:06:37 +0000 (17:06 +0200)]
fixed missing convert to new session handler
Florin Peter [Tue, 28 May 2013 15:04:44 +0000 (17:04 +0200)]
Merge branch 'sessionclass' of https://github.com/owncloud/core into sessionclass
Florin Peter [Tue, 28 May 2013 15:04:35 +0000 (17:04 +0200)]
fixed encryption session namespace to avoid problems
Robin Appelman [Tue, 28 May 2013 14:52:40 +0000 (16:52 +0200)]
implement ArrayInterface with Session
Georg Ehrke [Tue, 28 May 2013 14:04:39 +0000 (16:04 +0200)]
make preview cache work with encryption and improve error handling
Robin Appelman [Tue, 28 May 2013 12:55:42 +0000 (14:55 +0200)]
merge master into sessionclass
Jörn Friedrich Dreyer [Tue, 28 May 2013 12:18:43 +0000 (05:18 -0700)]
Merge pull request #3179 from pawl/patch-1
Improve IE Compatibility
Jörn Friedrich Dreyer [Tue, 28 May 2013 11:48:38 +0000 (04:48 -0700)]
Merge pull request #2778 from Kondou-ger/optimize_pictures
Optimize pictures with optipng.
Georg Ehrke [Tue, 28 May 2013 10:09:46 +0000 (12:09 +0200)]
don't give ffmpeg wanted size, cause it doesn't care about aspect ratio
Georg Ehrke [Tue, 28 May 2013 09:59:20 +0000 (11:59 +0200)]
make pdf backend work with encryption
Georg Ehrke [Tue, 28 May 2013 09:49:18 +0000 (11:49 +0200)]
make mp3 backend work with encryption
Georg Ehrke [Tue, 28 May 2013 09:48:02 +0000 (11:48 +0200)]
make movie backend work with encryption
blizzz [Tue, 28 May 2013 09:39:02 +0000 (02:39 -0700)]
Merge pull request #3488 from zafi/master
The "lost password" field in the personal setting depends on OC_USER_BACKEND_SET_PASSWORD
Georg Ehrke [Tue, 28 May 2013 09:31:48 +0000 (11:31 +0200)]
remove whitespace
Georg Ehrke [Tue, 28 May 2013 09:29:01 +0000 (11:29 +0200)]
add preview backend for text based files
FlorinPeter [Tue, 28 May 2013 08:55:55 +0000 (01:55 -0700)]
Merge pull request #3512 from owncloud/file_encryption_session_fix
fix for losing private key while being logged in and accessing a public link
Georg Ehrke [Tue, 28 May 2013 08:23:40 +0000 (10:23 +0200)]
check if the imagick extension is loaded
Georg Ehrke [Tue, 28 May 2013 08:21:02 +0000 (10:21 +0200)]
update images.php
Florin Peter [Tue, 28 May 2013 07:36:14 +0000 (09:36 +0200)]
fix for undefined index
Florin Peter [Tue, 28 May 2013 07:27:04 +0000 (09:27 +0200)]
fix for losing private key while being logged in and accessing a public link
Jenkins for ownCloud [Tue, 28 May 2013 00:07:51 +0000 (02:07 +0200)]
[tx-robot] updated from transifex
Robin Appelman [Mon, 27 May 2013 23:31:26 +0000 (01:31 +0200)]
fix syntax error
Robin Appelman [Mon, 27 May 2013 23:15:38 +0000 (01:15 +0200)]
provide a dummy session for CLI
Robin Appelman [Mon, 27 May 2013 23:13:36 +0000 (01:13 +0200)]
check fix if session start is successfull
Robin Appelman [Mon, 27 May 2013 23:10:18 +0000 (01:10 +0200)]
Fix session not working error
Robin Appelman [Mon, 27 May 2013 23:04:09 +0000 (01:04 +0200)]
Use the new session wrapper
Robin Appelman [Mon, 27 May 2013 22:50:00 +0000 (00:50 +0200)]
Abstract the session away in a class
Frank Karlitschek [Mon, 27 May 2013 20:45:47 +0000 (13:45 -0700)]
Merge pull request #3510 from owncloud/publicemitter
Add PublicEmitter class
Robin Appelman [Mon, 27 May 2013 18:20:06 +0000 (20:20 +0200)]
Add PublicEmitter class
Björn Schießle [Mon, 27 May 2013 11:47:03 +0000 (13:47 +0200)]
legacyBlockDecryprt() needs to be public
Björn Schießle [Mon, 27 May 2013 10:21:39 +0000 (12:21 +0200)]
make legacyDecrypt() private als always call legacyBlockDecrypt() from other classes
Björn Schießle [Mon, 27 May 2013 10:02:27 +0000 (12:02 +0200)]
fix migration from old to new encryption
Björn Schießle [Mon, 27 May 2013 15:04:55 +0000 (08:04 -0700)]
Merge pull request #3506 from owncloud/fix_3320
fix https://github.com/owncloud/core/issues/3320
Thomas Tanghus [Mon, 27 May 2013 14:56:12 +0000 (07:56 -0700)]
Merge pull request #3495 from owncloud/file_encryption_util_is_error
added OC_DB::isError and logging for #3486
Michael Gapczynski [Mon, 27 May 2013 14:44:35 +0000 (07:44 -0700)]
Merge pull request #3412 from owncloud/fix_2013
Don't set Content-Length header if size is unknown
Georg Ehrke [Mon, 27 May 2013 14:37:43 +0000 (16:37 +0200)]
add event.preventDefault to undelete function
Georg Ehrke [Mon, 27 May 2013 13:24:37 +0000 (15:24 +0200)]
fix https://github.com/owncloud/core/issues/3320
Florin Peter [Mon, 27 May 2013 12:41:53 +0000 (14:41 +0200)]
Merge branch 'master' into file_encryption_util_is_error
Conflicts:
apps/files_encryption/lib/util.php
Björn Schießle [Mon, 27 May 2013 12:17:31 +0000 (05:17 -0700)]
Merge pull request #3481 from owncloud/firsttime_enc
fix first time encryption after app was enabled
FlorinPeter [Mon, 27 May 2013 12:15:21 +0000 (05:15 -0700)]
Merge pull request #3496 from owncloud/file_encryption_tests
improved tests for files_encryption
Florin Peter [Mon, 27 May 2013 10:54:33 +0000 (12:54 +0200)]
Merge branch 'master' into file_encryption_tests
Florin Peter [Mon, 27 May 2013 10:41:55 +0000 (12:41 +0200)]
added check by numRows()
changed to public api where it was possible
reformat code to comply with the coding guidelines
Georg Ehrke [Mon, 27 May 2013 09:09:55 +0000 (11:09 +0200)]
make svg preview backend work with encryption
Georg Ehrke [Mon, 27 May 2013 08:45:21 +0000 (10:45 +0200)]
make image preview backend work with encryption
Jenkins for ownCloud [Mon, 27 May 2013 00:07:24 +0000 (02:07 +0200)]
[tx-robot] updated from transifex
Florin Peter [Sun, 26 May 2013 18:44:15 +0000 (20:44 +0200)]
added users for tests
reformat code to meet coding guidelines
Florin Peter [Sun, 26 May 2013 01:22:16 +0000 (03:22 +0200)]
improved test
- fixed testPermanentDeleteFile sometimes failed
- speed optimization
- reformat code
Jenkins for ownCloud [Sun, 26 May 2013 00:03:54 +0000 (02:03 +0200)]
[tx-robot] updated from transifex
Florin Peter [Sat, 25 May 2013 21:07:19 +0000 (23:07 +0200)]
fixed error rising from fetchRow
Florin Peter [Sat, 25 May 2013 19:33:05 +0000 (21:33 +0200)]
added OC_DB::isError and logging
Michael Gapczynski [Sat, 25 May 2013 18:21:21 +0000 (11:21 -0700)]
Merge pull request #3478 from davidak/master
small typo fix: added 2 whitespaces
Michael Gapczynski [Sat, 25 May 2013 18:18:20 +0000 (11:18 -0700)]
Merge pull request #3388 from roha4000/master
Duplicate DB entries in filecache table when renaming folder in WebUI #2
Michael Gapczynski [Sat, 25 May 2013 17:20:42 +0000 (10:20 -0700)]
Merge pull request #3493 from owncloud/bumpversion
Bump version for files_encryption changes
Michael Gapczynski [Sat, 25 May 2013 15:42:28 +0000 (11:42 -0400)]
Bump version for files_encryption changes
Georg Ehrke [Sat, 25 May 2013 10:16:25 +0000 (12:16 +0200)]
Merge branch 'master' into oc_preview
Frank Karlitschek [Sat, 25 May 2013 10:08:18 +0000 (12:08 +0200)]
increase version and add warning
Georg Ehrke [Sat, 25 May 2013 09:05:37 +0000 (11:05 +0200)]
add sample config for previews
zafi [Sat, 25 May 2013 07:03:07 +0000 (09:03 +0200)]
The "lost password" field depends on OC_USER_BACKEND_SET_PASSWORD
so it should only be visible for users with a supporting backend.
Jenkins for ownCloud [Sat, 25 May 2013 00:11:52 +0000 (02:11 +0200)]
[tx-robot] updated from transifex
Florin Peter [Fri, 24 May 2013 20:01:27 +0000 (22:01 +0200)]
improved trashbin test again
Florin Peter [Fri, 24 May 2013 19:35:18 +0000 (21:35 +0200)]
improved trashbin test
Thomas Mueller [Fri, 24 May 2013 19:50:34 +0000 (21:50 +0200)]
meanwhile phpunit is seq faulting with mysql as well
Thomas Müller [Fri, 24 May 2013 17:20:00 +0000 (10:20 -0700)]
Merge pull request #3482 from owncloud/fix_helper
use the recoveryPassword var instead of accessing the POST array
Björn Schießle [Fri, 24 May 2013 16:37:58 +0000 (18:37 +0200)]
no use the recoveryPassword var instead of accessing the POST array
Björn Schießle [Fri, 24 May 2013 15:35:00 +0000 (17:35 +0200)]
fix first time encryption after app was enabled
Thomas Müller [Fri, 24 May 2013 14:32:54 +0000 (07:32 -0700)]
Merge pull request #3479 from owncloud/testing-oracle-on-master
adding Oracle support to autotest.sh
Thomas Mueller [Fri, 24 May 2013 13:19:13 +0000 (15:19 +0200)]
adding Oracle support to autotest.sh
davidak [Fri, 24 May 2013 12:31:06 +0000 (14:31 +0200)]
small typo fix: added 2 whitespaces
Thomas Müller [Fri, 24 May 2013 09:21:19 +0000 (02:21 -0700)]
Merge pull request #3416 from owncloud/files_encryption
New files encryption app
Alessandro Cosentino [Fri, 24 May 2013 00:59:02 +0000 (20:59 -0400)]
small typo in the comments
Michael Gapczynski [Fri, 24 May 2013 00:35:11 +0000 (17:35 -0700)]
Merge pull request #3425 from owncloud/move-storages
Support for moving/copying folders between storages
Jenkins for ownCloud [Fri, 24 May 2013 00:02:43 +0000 (02:02 +0200)]
[tx-robot] updated from transifex
Florin Peter [Thu, 23 May 2013 21:56:31 +0000 (23:56 +0200)]
fixes after review from @DeepDiver1975
Florin Peter [Thu, 23 May 2013 20:09:28 +0000 (22:09 +0200)]
added l10n support in apps/files_encryption/ajax/adminrecovery.php
Björn Schießle [Thu, 23 May 2013 19:18:31 +0000 (21:18 +0200)]
code clean up; nicer solution to solve the public link share problem if a user is logged in
Björn Schießle [Thu, 23 May 2013 18:30:07 +0000 (20:30 +0200)]
fix public link share if a user is logged in
Michael Gapczynski [Thu, 23 May 2013 14:25:12 +0000 (10:25 -0400)]
Merge branch 'master' into move-storages
Conflicts:
tests/lib/files/view.php
Michael Gapczynski [Thu, 23 May 2013 14:23:16 +0000 (10:23 -0400)]
Switch to calling deleteAll via storage to avoid emitting delete hook
Björn Schießle [Thu, 23 May 2013 09:11:57 +0000 (11:11 +0200)]
Merge branch 'master' into files_encryption
Jenkins for ownCloud [Thu, 23 May 2013 00:00:27 +0000 (02:00 +0200)]
[tx-robot] updated from transifex
Michael Gapczynski [Wed, 22 May 2013 22:20:15 +0000 (15:20 -0700)]
Merge pull request #3457 from owncloud/fix-share-links
Fix public links
Florin Peter [Wed, 22 May 2013 21:51:35 +0000 (23:51 +0200)]
added trash bin tests
Florin Peter [Wed, 22 May 2013 21:50:45 +0000 (23:50 +0200)]
added static function registerHooks() for better unit tests handling
Michael Gapczynski [Wed, 22 May 2013 19:02:11 +0000 (15:02 -0400)]
RUNTIME_NOSETUPFS no longer exists, using tearDownFS() in public links instead
Björn Schießle [Wed, 22 May 2013 16:30:29 +0000 (18:30 +0200)]
revert changes to .gitmodules, they were applied by accident
Björn Schießle [Wed, 22 May 2013 16:28:44 +0000 (18:28 +0200)]
revert submodule changes
Björn Schießle [Wed, 22 May 2013 16:05:12 +0000 (18:05 +0200)]
settings clean-up; There is no blacklist in the new encryption app
Björn Schießle [Wed, 22 May 2013 16:01:18 +0000 (18:01 +0200)]
improved error messages