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

14635 Commits

Author SHA1 Message Date
Thomas Müller b70d67d49a Merge pull request #5237 from owncloud/coverage-on-windows-master 
PHP Code Coverage on windows master
 2013-10-17 02:23:15 -07:00
Bjoern Schiessle ab6ee79e11 adjust tests 2013-10-17 11:23:07 +02:00
Bjoern Schiessle abf10ac9bd new option to add reshares to the result 2013-10-17 11:10:31 +02:00
Frank Karlitschek 186c6a56d1 Merge pull request #4949 from owncloud/improve_unknown_preview_backend 
use svg to generate filetype icon if imagick available
 2013-10-17 01:48:34 -07:00
Vincent Petry 9cfb438ff7 Fixed upload permissions distinction between public and logged in upload 
Fixes #5370
 2013-10-17 10:46:55 +02:00
raghunayyar e7603aa6b4 Updates ownCloud title to Application - ownCloud 2013-10-17 14:10:06 +05:30
Frank Karlitschek d70a6c3f98 Merge pull request #4935 from owncloud/webdav-depth-fix-master 
WebDAV depth infinity support - the dirty way
 2013-10-17 01:37:38 -07:00
Thomas Müller 810816916c Merge pull request #5375 from owncloud/fix-api-documentation 
Public API documentation fixes
 2013-10-17 01:25:24 -07:00
Morris Jobke 30f4d91d01 Public API documentation fixes 
refs #4883

 * http/response.php
 * config.php
 * response.php
 * files.php
 * idbconnection.php
 * app.php
 * user.php
 * template.php
 * share.php
 * db.php
 * icache.php & il10n.php
 2013-10-17 00:49:15 +02:00
Morris Jobke 04783da829 Merge pull request #5276 from owncloud/fixing-5170-master 
only text/plain is now used to generate text previews
 2013-10-16 14:21:40 -07:00
Morris Jobke a132144eca Merge pull request #5262 from owncloud/files-ie8-conflictdialogbrokenfix 
Fixed conflict dialog in IE8
 2013-10-16 12:52:41 -07:00
Morris Jobke 1c4dbaeab1 Fix warning box in IE8 
* simulates a black transparent background on a blue pane
 2013-10-16 21:45:11 +02:00
Thomas Müller 221a650815 Merge branch 'master' into activities-api 
Conflicts:
	lib/private/server.php
 2013-10-16 21:15:25 +02:00
Thomas Müller 2fe9294c5d Merge pull request #5157 from owncloud/fixing-appframework-master 
Fixing appframework for OC6
 2013-10-16 11:45:54 -07:00
Thomas Müller cdaa1db0d1 re-enable test in SecurityMiddlewareTest 2013-10-16 16:33:56 +02:00
Thomas Müller fdeef5e874 Merge branch 'master' into fixing-appframework-master 
Conflicts:
	lib/private/appframework/middleware/security/securitymiddleware.php
	tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
 2013-10-16 15:45:55 +02:00
Thomas Müller c3f7d22adc Merge pull request #5067 from owncloud/urlParams_fix 
Get urlParams registered before Request is instantiated
 2013-10-16 06:42:09 -07:00
Thomas Müller 852a50aa89 remove test code 2013-10-16 15:38:56 +02:00
Thomas Müller 8c2b0b1394 Merge branch 'master' into activities-api 2013-10-16 15:36:35 +02:00
Thomas Müller aca66270c7 accept text/markdown as well 2013-10-16 15:31:43 +02:00
Thomas Müller d8a7b1e537 Merge branch 'master' into fixing-5170-master 2013-10-16 14:48:55 +02:00
Morris Jobke db31541fe1 Merge pull request #5353 from owncloud/files-dndtodirbroken 
Fixed drag and drop to subfolder and breadcrumb
 2013-10-16 04:52:35 -07:00
Thomas Müller fa3a65aea7 Merge pull request #5325 from owncloud/setup-fs-on-apache-auth-backend 
file system is now initialized with apache authentication as well
 2013-10-16 04:23:45 -07:00
Vincent Petry 52e31405f7 Added timeout value to WebDAV post setup check 
Fixes #5357
 2013-10-16 12:34:22 +02:00
Vincent Petry 7037f9c6f8 Added DAV client wrapper that support timeout values 
Since SabreDAV does not support passing a timeout value to curl, this
commit adds a subclass for it that will set the timeout value to
curlRequest().
 2013-10-16 12:32:42 +02:00
Björn Schießle 9f8d52ee44 Merge pull request #5329 from owncloud/enc_fix_unencrypted_size 
try to fix unencrypted file size if it doesn't look plausible
 2013-10-16 02:25:28 -07:00
Bjoern Schiessle 6bfd8bdf63 revert last changes 2013-10-16 11:24:56 +02:00
Morris Jobke 97905775b0 Merge pull request #5354 from owncloud/enc_tests 
added simple test for getFileSize proxy
 2013-10-16 02:14:35 -07:00
Frank Karlitschek d9972fae62 6.0 alpha 2 2013-10-16 10:51:44 +02:00
Björn Schießle ada94fb558 Merge pull request #5333 from owncloud/avater_with_encryption 
avatars should also work with encryption after pr #5332 was merged
 2013-10-16 01:34:05 -07:00
Jenkins for ownCloud 630be99ddf [tx-robot] updated from transifex 2013-10-16 00:31:48 -04:00
Bjoern Schiessle 0811d2e304 added another test, if unencrypted size and encrypted size are equal we can also assume that something is wrong 2013-10-15 17:52:06 +02:00
Bjoern Schiessle beaed2195d fix comment 2013-10-15 17:36:52 +02:00
Bjoern Schiessle 0d4117f6d5 added simple test for getFileSize proxy 2013-10-15 17:33:31 +02:00
kondou e2cc7e7bf9 Fix avatar unittest 2013-10-15 17:23:47 +02:00
Morris Jobke 04ea419f50 Merge pull request #5334 from owncloud/files-sharing-actionsafterupload 
Files sharing actions + navigation fixes
 2013-10-15 08:11:17 -07:00
Vincent Petry 85d2c864d9 Merge pull request #5350 from owncloud/files-preventdeletemountpoint 
Prevent renaming/deleting mount points
 2013-10-15 07:24:14 -07:00
Vincent Petry c6f14001bb Fixed drag and drop upload to breadcrumb 2013-10-15 16:14:23 +02:00
Vincent Petry 92e646413a Fixed drag and drop onto folders 
Fixes #5351
 2013-10-15 15:59:45 +02:00
Vincent Petry 5f249e1a54 Prevent renaming/deleting mount points 
Fixed permissions returned for mount points to not include update and
delete permissions.

Fixes #5291
 2013-10-15 14:58:58 +02:00
Raghu Nayyar 8c25b5a0c1 Merge pull request #5295 from owncloud/show-eye-in-personal 
Shows The Eye permanently in the Confirm Password field in Personal Settings
 2013-10-15 02:59:53 -07:00
Bjoern Schiessle 25320f19df Merge branch 'master' into avater_with_encryption 2013-10-15 11:53:51 +02:00
Bjoern Schiessle 0b8273c768 test should work now 2013-10-15 11:53:32 +02:00
Morris Jobke 52501d6ba3 Merge pull request #5332 from owncloud/enc_run_proxy_only_for_files 
check if we are writing to user/files, otherwise skip encryption
 2013-10-15 02:44:14 -07:00
Björn Schießle a6d9319328 Merge pull request #5269 from owncloud/ocs_share_api_add_received_from 
ocs share api: add "received_from" and "received_from_displayname" field
 2013-10-15 02:17:23 -07:00
raghunayyar 2def1a8853 Removes Bogus showpassword js. thx @PVince81 2013-10-15 14:41:18 +05:30
Vincent Petry fa341e49a8 Merge pull request #5341 from owncloud/fix-logout-link-html 
Fix logout link HTML.
 2013-10-15 00:33:00 -07:00
raghunayyar 4eed240296 Should Display PasswordToggle Eye Everywhere. 2013-10-15 11:36:44 +05:30
Thomas Müller 7caf011b9a fixing syntax for openssl config 2013-10-15 00:44:55 +02:00
Thomas Müller bf99d9233c on windows we supply an openssl.cnf file in order to execute the unit tests properly 2013-10-15 00:29:47 +02:00