]>
source.dussan.org Git - nextcloud-server.git/log
Jenkins for ownCloud [Tue, 23 Jul 2013 06:03:19 +0000 (02:03 -0400)]
[tx-robot] updated from transifex
Thomas Müller [Mon, 22 Jul 2013 21:48:49 +0000 (14:48 -0700)]
Merge pull request #4126 from owncloud/parallel-autotest.sh-master
Parallel autotest.sh master
Andreas Fischer [Mon, 22 Jul 2013 17:19:01 +0000 (19:19 +0200)]
Merge pull request #4156 from owncloud/fix_oc_image_reference
* owncloud/fix_oc_image_reference:
need to use \OC_Image to escape OCP namespace
Jörn Friedrich Dreyer [Mon, 22 Jul 2013 15:25:55 +0000 (17:25 +0200)]
need to use \OC_Image to escape OCP namespace
Kondou [Mon, 22 Jul 2013 15:05:32 +0000 (08:05 -0700)]
Merge pull request #4154 from owncloud/return-ocl10n
return result from getL10N
VicDeo [Mon, 22 Jul 2013 14:16:47 +0000 (07:16 -0700)]
Merge pull request #4071 from owncloud/fix_return_value_search_principals
OC_Connector_Sabre_Principal::searchPrincipals - return empty array instead of 0
Robin Appelman [Mon, 22 Jul 2013 13:52:02 +0000 (15:52 +0200)]
return result from getL10N
Georg Ehrke [Mon, 22 Jul 2013 13:30:57 +0000 (15:30 +0200)]
Merge branch 'master' into fix_return_value_search_principals
Thomas Müller [Mon, 22 Jul 2013 12:16:49 +0000 (05:16 -0700)]
Merge pull request #3142 from owncloud/ext-fs-irods-master
Ext fs irods master
Thomas Müller [Mon, 22 Jul 2013 11:04:59 +0000 (04:04 -0700)]
Merge pull request #4045 from owncloud/disable-anon-upload-master
Disable anon upload master
Thomas Müller [Mon, 22 Jul 2013 09:55:20 +0000 (11:55 +0200)]
Merge branch 'master' into disable-anon-upload-master
Conflicts:
settings/templates/admin.php
Thomas Müller [Mon, 22 Jul 2013 09:40:28 +0000 (11:40 +0200)]
Merge branch 'master' into ext-fs-irods-master
Thomas Müller [Mon, 22 Jul 2013 09:39:27 +0000 (11:39 +0200)]
Merge branch 'master' into parallel-autotest.sh-master
Thomas Müller [Mon, 22 Jul 2013 09:36:52 +0000 (11:36 +0200)]
Merge branch 'master' into disable-anon-upload-master
Morris Jobke [Mon, 22 Jul 2013 09:32:40 +0000 (02:32 -0700)]
Merge pull request #2980 from owncloud/===_and_!==_in_settings
Use !== and === in settings.
Thomas Müller [Mon, 22 Jul 2013 09:19:27 +0000 (02:19 -0700)]
Merge pull request #3925 from berendt/reworking_OC_Files_Storage_AmazonS3
reworking of \OC\Files\Storage\AmazonS3
Björn Schießle [Fri, 12 Jul 2013 11:25:37 +0000 (13:25 +0200)]
if the file doesn't exists; create a new one. We use this to create new text files in the web interface
Jenkins for ownCloud [Mon, 22 Jul 2013 06:03:23 +0000 (02:03 -0400)]
[tx-robot] updated from transifex
Bart Visscher [Sun, 21 Jul 2013 18:32:11 +0000 (11:32 -0700)]
Merge pull request #4131 from owncloud/scanner-split
Remove scanner logic from ajax file and place it in it's own class
Bart Visscher [Sun, 21 Jul 2013 18:20:30 +0000 (11:20 -0700)]
Merge pull request #4092 from owncloud/base-better-errors
Generate better errors in base.php
Bart Visscher [Sun, 21 Jul 2013 18:19:20 +0000 (11:19 -0700)]
Merge pull request #3880 from owncloud/code-checker
Add classes replaced by the public api to the code checker
kondou [Wed, 17 Apr 2013 13:32:03 +0000 (15:32 +0200)]
Use !== and === in settings.
icewind1991 [Sun, 21 Jul 2013 11:31:27 +0000 (04:31 -0700)]
Merge pull request #4145 from owncloud/fix-failing-master
Fix failing master
Morris Jobke [Sun, 21 Jul 2013 09:28:06 +0000 (11:28 +0200)]
mark test as incomplete because I can't reproduce jenkins failure
Morris Jobke [Sun, 21 Jul 2013 09:13:29 +0000 (11:13 +0200)]
fix failing master branch - Test_Config::testWriteData
Morris Jobke [Sun, 21 Jul 2013 08:30:00 +0000 (10:30 +0200)]
add proper deprecated tag
Morris Jobke [Sun, 21 Jul 2013 08:25:39 +0000 (01:25 -0700)]
Merge pull request #4118 from owncloud/remove-size-experiment
finally remove the file size obfuscation as it had more disadvantages.
Jenkins for ownCloud [Sun, 21 Jul 2013 06:02:41 +0000 (02:02 -0400)]
[tx-robot] updated from transifex
Morris Jobke [Sat, 20 Jul 2013 12:22:37 +0000 (05:22 -0700)]
Merge pull request #4130 from owncloud/ie-show-password
deactivate show password toggle for IE
Jenkins for ownCloud [Sat, 20 Jul 2013 06:02:50 +0000 (02:02 -0400)]
[tx-robot] updated from transifex
Jan-Christoph Borchardt [Fri, 19 Jul 2013 23:15:12 +0000 (01:15 +0200)]
add back public API function, but mark as deprecated
Thomas Müller [Fri, 19 Jul 2013 20:54:19 +0000 (13:54 -0700)]
Merge pull request #4119 from owncloud/external-storage-status
replace external storage status images with CSS, also use form to distinguish
Arthur Schiwon [Tue, 18 Jun 2013 18:03:59 +0000 (20:03 +0200)]
LDAP: fix background job, resolves #3528
Bart Visscher [Fri, 19 Jul 2013 15:37:42 +0000 (17:37 +0200)]
Result of && if not the part
Bart Visscher [Fri, 19 Jul 2013 15:32:31 +0000 (17:32 +0200)]
Correct casing of OC_User and pass through the params to getUsers
Robin Appelman [Fri, 19 Jul 2013 14:44:47 +0000 (16:44 +0200)]
Split scanning logic from ajax file
Robin Appelman [Fri, 19 Jul 2013 14:33:00 +0000 (16:33 +0200)]
add option to get the mountmanager from the filesystem
Robin Appelman [Fri, 19 Jul 2013 14:32:43 +0000 (16:32 +0200)]
Make Cache\Scanner an emitter
Jan-Christoph Borchardt [Fri, 19 Jul 2013 13:17:28 +0000 (15:17 +0200)]
deactivate show password toggle for IE
Thomas Müller [Fri, 19 Jul 2013 12:54:10 +0000 (14:54 +0200)]
don't rely on admin user but create a test user for Test_Encryption_Keymanager
Arthur Schiwon [Wed, 17 Jul 2013 15:32:43 +0000 (17:32 +0200)]
Add message about completed update
Arthur Schiwon [Mon, 15 Jul 2013 16:07:43 +0000 (18:07 +0200)]
non-ajax Upgrade script utility, usable via CLI or wget. Requires PR 4047.
Bart Visscher [Fri, 19 Jul 2013 09:40:11 +0000 (11:40 +0200)]
Add OC_L10N to public api
Bart Visscher [Fri, 19 Jul 2013 09:23:47 +0000 (11:23 +0200)]
Add OC_Image to public api
Thomas Müller [Fri, 19 Jul 2013 08:49:30 +0000 (10:49 +0200)]
pgsql support added
Thomas Müller [Fri, 19 Jul 2013 06:50:22 +0000 (08:50 +0200)]
parallel execution support for mysql added
Jenkins for ownCloud [Fri, 19 Jul 2013 06:03:14 +0000 (02:03 -0400)]
[tx-robot] updated from transifex
Andreas Fischer [Fri, 19 Jul 2013 00:19:14 +0000 (02:19 +0200)]
Merge pull request #3947 from runky/patch-1
* runky/patch-1:
Update authenticate.php
Thomas Müller [Thu, 18 Jul 2013 21:28:06 +0000 (23:28 +0200)]
Merge branch 'master' into parallel-autotest.sh-master
Bart Visscher [Thu, 18 Jul 2013 21:24:27 +0000 (14:24 -0700)]
Merge pull request #2221 from owncloud/doctrine
OC6: Implement Doctrine as the backend for OC_DB
Jan-Christoph Borchardt [Thu, 18 Jul 2013 21:00:04 +0000 (23:00 +0200)]
replace external storage status images with CSS, also use form to distinguish, fix #3910
Jan-Christoph Borchardt [Thu, 18 Jul 2013 20:15:26 +0000 (22:15 +0200)]
finally remove the file size obfuscation as it had more disadvantages. I was wrong, sorry.
Bart Visscher [Thu, 18 Jul 2013 18:28:57 +0000 (20:28 +0200)]
Tweaks to the MDB2SchemaReader
Jenkins for ownCloud [Thu, 18 Jul 2013 06:02:51 +0000 (02:02 -0400)]
[tx-robot] updated from transifex
Thomas Müller [Wed, 17 Jul 2013 20:57:43 +0000 (13:57 -0700)]
Merge pull request #4099 from owncloud/fixing-unix-timestamp-mssql-master
fixing UNIX_TIMESTAMP() for mssql
Thomas Müller [Wed, 17 Jul 2013 13:25:41 +0000 (15:25 +0200)]
Update build.xml
Markus Goetz [Wed, 17 Jul 2013 12:00:59 +0000 (05:00 -0700)]
Merge pull request #4042 from guruz/webdav_auth_check_existing
WebDAV Auth Connector: Check if already logged in
Markus Goetz [Fri, 12 Jul 2013 11:42:01 +0000 (13:42 +0200)]
WebDAV Auth Connector: Check if already logged in
Thomas Mueller [Wed, 17 Jul 2013 11:18:46 +0000 (13:18 +0200)]
fixing UNIX_TIMESTAMP() for mssql
Thomas Müller [Wed, 17 Jul 2013 07:37:02 +0000 (00:37 -0700)]
Merge pull request #4067 from owncloud/fixing-tests-win32-master
<<<EOL seems not to use proper end of lines on windows
Jenkins for ownCloud [Wed, 17 Jul 2013 06:28:02 +0000 (02:28 -0400)]
[tx-robot] updated from transifex
Robin Appelman [Tue, 16 Jul 2013 21:11:22 +0000 (23:11 +0200)]
memcache: make base testcase abstract
Bart Visscher [Tue, 16 Jul 2013 20:42:09 +0000 (22:42 +0200)]
Display the exception error backtrace preformatted
Bart Visscher [Tue, 16 Jul 2013 20:37:32 +0000 (22:37 +0200)]
Early errors (in base.php) don't have session available
Bart Visscher [Tue, 16 Jul 2013 20:36:39 +0000 (22:36 +0200)]
Cleanup error generation in base.php
Bart Visscher [Tue, 16 Jul 2013 20:32:04 +0000 (22:32 +0200)]
Use autoloader for Patchwork/PHP/Shim/Normalizer
icewind1991 [Tue, 16 Jul 2013 20:25:07 +0000 (13:25 -0700)]
Merge pull request #2395 from owncloud/cache
Seperate the memory based cache and file based cache in OC_Cache
Bart Visscher [Tue, 16 Jul 2013 19:06:53 +0000 (12:06 -0700)]
Merge pull request #3959 from owncloud/buildNotExistingFileNameForView
Fix renaming using parenthesis
Robin Appelman [Tue, 16 Jul 2013 14:08:37 +0000 (16:08 +0200)]
memcache: also switch factory to prefix
Robin Appelman [Tue, 16 Jul 2013 14:06:00 +0000 (16:06 +0200)]
mamcache: implement the ArrayAccess interface
Robin Appelman [Tue, 16 Jul 2013 13:46:27 +0000 (15:46 +0200)]
memcache: some additional unit tests
Robin Appelman [Tue, 16 Jul 2013 13:42:40 +0000 (15:42 +0200)]
memchache: use prefix string instead of global flag
Robin Appelman [Tue, 16 Jul 2013 13:34:22 +0000 (15:34 +0200)]
split out memcache factory from base class
Robin Appelman [Tue, 16 Jul 2013 13:22:47 +0000 (15:22 +0200)]
Merge branch 'master' into cache
Thomas Müller [Tue, 16 Jul 2013 09:35:48 +0000 (11:35 +0200)]
fixing / adding comments
Thomas Müller [Tue, 16 Jul 2013 09:30:56 +0000 (11:30 +0200)]
Merge branch 'master' into ext-fs-irods-master
Thomas Müller [Tue, 16 Jul 2013 09:29:58 +0000 (02:29 -0700)]
Merge pull request #4075 from owncloud/markdown-readme-master
Markdown readme master
VicDeo [Tue, 16 Jul 2013 08:23:16 +0000 (01:23 -0700)]
Merge pull request #4076 from owncloud/fix_typos_kondou
Fix some typos
Jan-Christoph Borchardt [Tue, 16 Jul 2013 07:50:06 +0000 (09:50 +0200)]
update 'get in touch' links
Jenkins for ownCloud [Tue, 16 Jul 2013 06:06:21 +0000 (02:06 -0400)]
[tx-robot] updated from transifex
kondou [Tue, 16 Jul 2013 03:56:52 +0000 (05:56 +0200)]
Fix some typos
Thomas Müller [Mon, 15 Jul 2013 22:53:56 +0000 (00:53 +0200)]
Use EXECUTOR_NUMBER in database name and user name.
Thomas Müller [Mon, 15 Jul 2013 21:58:51 +0000 (23:58 +0200)]
initial markdown verions of README
Thomas Müller [Mon, 15 Jul 2013 21:46:28 +0000 (23:46 +0200)]
rename README
Bart Visscher [Mon, 15 Jul 2013 16:23:37 +0000 (09:23 -0700)]
Merge pull request #3962 from owncloud/move-error-handlers
Move error handlers from OC_Log to OC\Log\ErrorHandler
Georg Ehrke [Mon, 15 Jul 2013 14:58:30 +0000 (16:58 +0200)]
return empty array instead of 0
Thomas Mueller [Mon, 15 Jul 2013 08:28:14 +0000 (10:28 +0200)]
<<<EOL seems not to use proper end of lines on windows
Jenkins for ownCloud [Mon, 15 Jul 2013 00:34:45 +0000 (02:34 +0200)]
[tx-robot] updated from transifex
Thomas Müller [Sun, 14 Jul 2013 21:56:45 +0000 (14:56 -0700)]
Merge pull request #3487 from owncloud/basic_auth_hack
Basic Auth is broken - again...
Thomas Müller [Sun, 14 Jul 2013 20:00:42 +0000 (22:00 +0200)]
Merge branch 'disable-anon-upload-master' of github.com:owncloud/core into disable-anon-upload-master
Thomas Müller [Sun, 14 Jul 2013 19:58:08 +0000 (21:58 +0200)]
No admin option to enable public upload in case encryption is enabled
No upload on pubic page if public upload is disabled
Jan-Christoph Borchardt [Sun, 14 Jul 2013 17:52:43 +0000 (10:52 -0700)]
Merge pull request #4061 from rolandgeider/master
Use transifex.com on link to translations
rolandgeider [Sun, 14 Jul 2013 09:54:39 +0000 (11:54 +0200)]
Use transifex.com on link to translations
Jenkins for ownCloud [Sun, 14 Jul 2013 00:10:41 +0000 (02:10 +0200)]
[tx-robot] updated from transifex
Frank Karlitschek [Sat, 13 Jul 2013 11:31:55 +0000 (13:31 +0200)]
Removed the preview warning. This is only a simple text change
Bart Visscher [Thu, 11 Jul 2013 16:47:19 +0000 (18:47 +0200)]
Merge branch 'master' into doctrine
Conflicts:
3rdparty
lib/db.php
lib/setup.php
tests/lib/db.php
tests/lib/dbschema.php
Jenkins for ownCloud [Sat, 13 Jul 2013 00:07:35 +0000 (02:07 +0200)]
[tx-robot] updated from transifex
Thomas Mueller [Fri, 12 Jul 2013 19:34:38 +0000 (21:34 +0200)]
change anonymous to public
Thomas Müller [Fri, 12 Jul 2013 15:51:01 +0000 (17:51 +0200)]
fixing Undefined index: publicUploadEnabled
Thomas Müller [Fri, 12 Jul 2013 15:05:58 +0000 (17:05 +0200)]
in case the encryption app is enabled we cannot yet allow anonymous upload