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

56476 Commits

Author SHA1 Message Date
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
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
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
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
Georg Ehrke 183f8c90af use false instead of 0 2013-05-27 19:26:53 +02:00
Georg Ehrke 557cc4c1ab make method names camelCase 2013-05-27 19:24:31 +02:00
Georg Ehrke d69b7e24d2 update comment 2013-05-27 19:20:29 +02:00
Georg Ehrke 3f52393866 don't show a warning if internet connection is disabled on purpose 2013-05-27 19:19:47 +02:00
Georg Ehrke 58c9175a56 move check if internet connection is disabled on purpose to a dedicated method 2013-05-27 19:19:17 +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
Michael Gapczynski 16925672e8 Merge branch 'master' into googledrive 2013-05-27 11:35:57 -04:00
Björn Schießle 4c05259ccf legacyBlockDecryprt() needs to be public 2013-05-27 17:35:38 +02:00
Michael Gapczynski 0953b68556 Return null if file size is negative for WebDAV, fix #2013 2013-05-27 11:35:31 -04: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