Commit Graph

4063 Commits

Author SHA1 Message Date
icewind1991 e09ffb6f57 Merge pull request #2395 from owncloud/cache
Seperate the memory based cache and file based cache in OC_Cache
2013-07-16 13:25:07 -07:00
Bart Visscher 285f288cf3 Merge pull request #3959 from owncloud/buildNotExistingFileNameForView
Fix renaming using parenthesis
2013-07-16 12:06:53 -07:00
Robin Appelman dc1a17b6f4 memcache: also switch factory to prefix 2013-07-16 16:08:37 +02:00
Robin Appelman 504089940d mamcache: implement the ArrayAccess interface 2013-07-16 16:06:00 +02:00
Robin Appelman 69048ab71f memchache: use prefix string instead of global flag 2013-07-16 15:42:40 +02:00
Robin Appelman d82c1dfcab split out memcache factory from base class 2013-07-16 15:34:22 +02:00
Robin Appelman 0ae8eb4f5e Merge branch 'master' into cache 2013-07-16 15:22:47 +02:00
VicDeo feb01847e7 Merge pull request #4076 from owncloud/fix_typos_kondou
Fix some typos
2013-07-16 01:23:16 -07:00
kondou d9c697534d Fix some typos 2013-07-16 06:01:26 +02:00
Bart Visscher 1a2db491af Merge pull request #3962 from owncloud/move-error-handlers
Move error handlers from OC_Log to OC\Log\ErrorHandler
2013-07-15 09:23:37 -07:00
Thomas Müller 6f5b0af67f Merge pull request #3487 from owncloud/basic_auth_hack
Basic Auth is broken - again...
2013-07-14 14:56:45 -07:00
icewind1991 3abe68176f Merge pull request #3270 from owncloud/convert-oc_config
Convert OC_Config to object so it can be used for DI
2013-07-11 18:21:08 -07:00
Thomas Müller d18bd17eb7 - eventsource.php: in case of potential CSRF attack we send an error message from the EventSource to the browser
- eventsource.js: handle undefined data on event
- update.js: in case of error we close the event source - advise the user to reload the page
- update.php: EventSource initialization is now done before we enter the maintenance mode in order to allow browser reload in case of possible CSRF attack
2013-07-11 00:27:21 +02:00
icewind1991 d134ba9a82 Merge pull request #3978 from owncloud/forwarding-emitter
add forwarding emitter for agregating multiple emitters
2013-07-10 10:38:28 -07:00
Morris Jobke e2a5af4b9e Merge pull request #3985 from owncloud/cookie-past2
apply @LukasReschke's cookie changes, hopefully finally fix #854
2013-07-10 09:08:01 -07:00
Jörn Friedrich Dreyer 6a50848a6e Merge pull request #3994 from owncloud/fix_oracle_setup
General setup fixes for Oracle
2013-07-10 01:02:52 -07:00
Jenkins for ownCloud 7ec6f3bde9 [tx-robot] updated from transifex 2013-07-10 02:20:59 +02:00
Victor Dubiniuk 194ab11322 General fixes 2013-07-10 00:49:05 +03:00
mvn23 40879c6327 Merge pull request #3787 from mvn23/patch-1
Thanks @bartv2 and @bantu, merged and closed.
2013-07-09 08:21:07 -07:00
Thomas Tanghus 9e9c323acd Set path in cookie. 2013-07-09 16:46:35 +02:00
Victor Dubiniuk 5a3fce12a4 Implement encodePath 2013-07-09 17:46:11 +03:00
Jan-Christoph Borchardt d70d4f435e apply @LukasReschke's cookie changes, hopefully finally fix #854 2013-07-09 15:00:36 +02:00
Michael Gapczynski 4feff3456b Only emit permissions hook for files and and include path 2013-07-08 17:28:18 -04:00
icewind1991 af1c3dd4ce Merge pull request #3963 from owncloud/update-logic-split
Move the upgrade logic to \OC\Updater
2013-07-08 12:38:39 -07:00
Robin Appelman a0d5ba1167 fix typo 2013-07-08 21:13:31 +02:00
Bart Visscher e7b882a4fc stupid namespace 2013-07-08 18:29:43 +02:00
Bart Visscher 4a6803ef9d Check if logger is set, also no need to return true 2013-07-08 18:26:11 +02:00
Bart Visscher abe9abab99 Add constructor documentation 2013-07-08 18:01:32 +02:00
Bart Visscher 52553c64ed Merge branch 'master' into convert-oc_config
Conflicts:
	lib/config.php
2013-07-08 17:59:50 +02:00
Michael Gapczynski 5c2a0325ba Add update permissions hook to sharing 2013-07-08 11:40:10 -04:00
Robin Appelman 4a4e139c83 forward previously registerd hooks 2013-07-08 16:54:26 +02:00
Robin Appelman 925d09cb0e add forwarding emitter for agregating multiple emitters 2013-07-08 16:45:19 +02:00
Thomas Müller 02d2e41e04 Merge pull request #3954 from owncloud/update_insertifnotexist_and_test
fix insertIfNotExist return value, update doc and corresponding test
2013-07-08 07:17:45 -07:00
Thomas Müller 0365d244e0 Merge pull request #3946 from owncloud/fixing-3942-master
handle anonymous upload to reshared folder
2013-07-08 02:27:21 -07:00
Björn Schießle 9b9ea7cd8e Merge https://github.com/owncloud/core/pull/3827
Squashed commit of the following:

commit eed4b49cebcbcc252a75ed85097730b73213b0da
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 8 10:03:23 2013 +0200

    initialize OC_Defaults only once

commit bf6f07ccc8fb87535a069ca341789a590cb187ee
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 8 10:02:48 2013 +0200

    link to doc in error messages

commit ea61ee60e06ee98f2671aec1fdaff666c50f47c2
Merge: e41af3d 3c1308f
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jul 4 11:10:56 2013 +0200

    Merge branch 'master' into better-messages

commit e41af3d7bad26aa5ca9ab21ec7dcbadd3cfe5d4f
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jul 4 11:10:41 2013 +0200

    move to non-static defaults.php

commit 9e4258b1905244bdf34943a825421f041cbed43d
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Tue Jul 2 10:32:13 2013 +0200

    no sprintf here, lets t() handle it

commit fe1df349e248667a137f70d78b04225e5b42a111
Merge: d8f6859 cb5811b
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 1 11:13:38 2013 +0200

    Merge branch 'master' into better-messages

commit d8f68595df2dc0e0917d916cbde511ec5333010b
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 1 11:10:57 2013 +0200

    use document base url from defaults.php

commit 6c5403748a45717125a2aa375550f05646317d72
Merge: bea6b1c 7b0e3e6
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 1 11:00:15 2013 +0200

    Merge branch 'master' into better-messages

commit bea6b1c8a0968846065b9153e0a3f46a4e3245ee
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date:   Mon Jun 24 16:21:12 2013 +0200

    link to docs in WebDAV message, ref #3791

commit 3119b364a1094769e711283d1ce9014505f64ab9
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date:   Mon Jun 24 16:10:21 2013 +0200

    link to docs in error messages, fix #3819
2013-07-08 10:07:57 +02:00
Jenkins for ownCloud 3cb4a72960 [tx-robot] updated from transifex 2013-07-08 02:09:41 +02:00
Robin Appelman 9cd7ecd502 Updater: pass update url as argument to update check 2013-07-06 17:05:38 +02:00
Robin Appelman 58f473d734 split upgrade logic from ajax file 2013-07-06 17:00:00 +02:00
Jenkins for ownCloud c8ad3df1fa [tx-robot] updated from transifex 2013-07-06 02:08:38 +02:00
Thomas Müller 98da4bf704 removing unused getSharedItem() 2013-07-06 00:04:01 +02:00
Thomas Müller dad91c156f Merge branch 'master' into fixing-3942-master
Conflicts:
	apps/files/ajax/upload.php
2013-07-06 00:02:11 +02:00
Thomas Müller bc1c776642 Merge pull request #3951 from owncloud/fixing-3936-master
get the real physical folder name for anonymous upload
2013-07-05 14:43:47 -07:00
Bart Visscher 2db839c4d3 Move error handlers from OC_Log to OC\Log\ErrorHandler 2013-07-05 19:28:10 +02:00
Thomas Müller e159cbf527 on reshares we now recursively move to the root of all reshares - therefore some code has been refactured and added as a new public function 2013-07-05 17:39:41 +02:00
Thomas Müller f8dae11a23 Merge pull request #3957 from owncloud/config-glob-fail
OC_Config: handle failure of glob('*.config.php')
2013-07-05 07:38:04 -07:00
Jörn Friedrich Dreyer 212ea0508d update comment 2013-07-05 15:39:57 +02:00
Bart Visscher 22c29eb64b Fix renaming using parenthesis 2013-07-05 15:38:09 +02:00
Robin Appelman c1cf829b9d OC_Config: handle failure of glob('*.config.php') 2013-07-05 15:07:15 +02:00
Jörn Friedrich Dreyer 00987feda1 fix insertIfNotExist return value, update doc and corresponding test 2013-07-05 14:05:42 +02:00
Thomas Müller 352c1415be proper fix for getting the shared item if no user is logged in 2013-07-05 13:45:21 +02:00