Commit Graph

4292 Commits

Author SHA1 Message Date
Bart Visscher 5caa7576d4 Revert "fix failing master branch - Test_Config::testWriteData"
This reverts commit 8f93490ac4.
2013-07-23 17:36:08 +02:00
Jörn Friedrich Dreyer f7422ad132 Merge pull request #4150 from owncloud/better-error-handling
Better error handling
2013-07-23 08:30:02 -07:00
Jenkins for ownCloud a94c55be98 [tx-robot] updated from transifex 2013-07-23 02:03:19 -04:00
Bart Visscher 179b42c56d Fixed review issues 2013-07-22 23:04:14 +02:00
Robin Appelman 499a01f179 use === 2013-07-22 17:41:33 +02:00
Jörn Friedrich Dreyer cb4cf3e2f7 need to use \OC_Image to escape OCP namespace 2013-07-22 17:25:55 +02:00
Kondou bc86ce00cf Merge pull request #4154 from owncloud/return-ocl10n
return result from getL10N
2013-07-22 08:05:32 -07:00
Robin Appelman b073a34e77 add support for the <primary/> element within field definitions 2013-07-22 16:25:07 +02:00
Robin Appelman dc272e6e20 db: cast default values for boolean fields to booleans 2013-07-22 16:24:46 +02:00
Robin Appelman d509a0c403 return result from getL10N 2013-07-22 15:52:02 +02:00
Georg Ehrke f1e939e1a3 Merge branch 'master' into fix_return_value_search_principals 2013-07-22 15:30:57 +02:00
Bart Visscher be7c613993 Fix errors from unit tests 2013-07-21 23:17:37 +02:00
Bart Visscher b66c9098bd Correct namespace of OC_ classes 2013-07-21 23:17:37 +02:00
Bart Visscher 000b5a801f Move building error string to connection 2013-07-21 23:17:37 +02:00
Bart Visscher de83bf98c7 Group database connection and schema function 2013-07-21 23:17:37 +02:00
Bart Visscher 013333fe6a Cleanup: remove code for multiple database backends 2013-07-21 23:17:37 +02:00
Bart Visscher 3e0e2cfa19 Use $connection for schema changes 2013-07-21 23:17:37 +02:00
Bart Visscher 8a332cdc94 Simplify OC_DB transaction functions 2013-07-21 23:17:37 +02:00
Bart Visscher 19b9c89634 Move insertIfNotExist to Connection wrapper
Real implementation is in DB\Adapter* classes
2013-07-21 23:17:37 +02:00
Bart Visscher 58991150ab Move query statement fixup handling to Connection wrapper 2013-07-21 23:17:37 +02:00
Bart Visscher 1d5d23a1de Move limit/offset handling to Connection wrapper 2013-07-21 23:17:37 +02:00
Bart Visscher a48e9c488b Move prepared query cache handling to Connection wrapper 2013-07-21 23:17:36 +02:00
Bart Visscher e3c5fea989 Move lastInsertId to adapter classes 2013-07-21 23:17:36 +02:00
Bart Visscher cd98ff1eaf Move db prefix handling to Connection wrapper 2013-07-21 23:17:36 +02:00
Bart Visscher 66a215651b Create DB Connection wrapper and DB\Adapter* classes 2013-07-21 23:17:36 +02:00
Bart Visscher 62ce3a5613 Only close db connection when disconnecting, keep the connection object 2013-07-21 23:17:36 +02:00
Bart Visscher 25e3c9cbeb Only display call trace in debug mode 2013-07-21 22:56:21 +02:00
Bart Visscher aa22194a09 In debug mode uncaught exceptions should display a nice page 2013-07-21 22:40:35 +02:00
Bart Visscher 8c5df31c49 DRY use OC_Template::printErrorPage 2013-07-21 22:30:32 +02:00
Bart Visscher df8ad46dae Change exit calls to throwing an exception
This way the error won't be fatal in a unit test
2013-07-21 22:29:50 +02:00
Bart Visscher 6d39e0ad6f Change to use !== and === 2013-07-21 21:42:42 +02:00
Thomas Müller 01c39cf2be fixing typos, PHPDoc and missing namespace \ 2013-07-21 21:42:42 +02:00
Bart Visscher 3de8570e35 Move basic template functions to their own class 2013-07-21 21:42:42 +02:00
Bart Visscher 2593395561 Move template functions to there own file 2013-07-21 21:37:25 +02:00
Bart Visscher 5965f3ecea Split locating JS and CSS files to their own class 2013-07-21 21:36:15 +02:00
Bart Visscher 37a731bcad Merge pull request #4131 from owncloud/scanner-split
Remove scanner logic from ajax file and place it in it's own class
2013-07-21 11:32:11 -07:00
Bart Visscher 639097db59 Merge pull request #4092 from owncloud/base-better-errors
Generate better errors in base.php
2013-07-21 11:20:30 -07:00
Bart Visscher 9bf12da750 Merge pull request #3880 from owncloud/code-checker
Add classes replaced by the public api to the code checker
2013-07-21 11:19:20 -07:00
Morris Jobke 8f93490ac4 fix failing master branch - Test_Config::testWriteData 2013-07-21 11:13:29 +02:00
Morris Jobke 05c83a163a add proper deprecated tag 2013-07-21 10:30:00 +02:00
Morris Jobke 647e0a0cba Merge pull request #4118 from owncloud/remove-size-experiment
finally remove the file size obfuscation as it had more disadvantages.
2013-07-21 01:25:39 -07:00
Jan-Christoph Borchardt 48267b6e6c add back public API function, but mark as deprecated 2013-07-20 01:15:12 +02:00
Bart Visscher 11f28d7880 Result of && if not the part 2013-07-19 17:37:42 +02:00
Bart Visscher cbe1c22b5f Correct casing of OC_User and pass through the params to getUsers 2013-07-19 17:32:31 +02:00
Robin Appelman 2b89b7c880 Split scanning logic from ajax file 2013-07-19 16:44:47 +02:00
Robin Appelman b397df2022 add option to get the mountmanager from the filesystem 2013-07-19 16:33:00 +02:00
Robin Appelman 02cdd52fb0 Make Cache\Scanner an emitter 2013-07-19 16:32:43 +02:00
Bart Visscher a22940d3cd Add OC_L10N to public api 2013-07-19 11:40:11 +02:00
Bart Visscher 9379cbf602 Add OC_Image to public api 2013-07-19 11:23:47 +02:00
Jenkins for ownCloud ae82f7fd17 [tx-robot] updated from transifex 2013-07-19 02:03:14 -04:00
Robin Appelman a945ce908b style fix 2013-07-19 02:23:57 +02:00
Bart Visscher 084cf0c202 Merge pull request #2221 from owncloud/doctrine
OC6: Implement Doctrine as the backend for OC_DB
2013-07-18 14:24:27 -07:00
Jan-Christoph Borchardt 48948ccf5f finally remove the file size obfuscation as it had more disadvantages. I was wrong, sorry. 2013-07-18 22:15:26 +02:00
Bart Visscher e2b6781cf9 Tweaks to the MDB2SchemaReader 2013-07-18 21:07:56 +02:00
Robin Appelman e3ea3ed3c5 group: only pass backends that hold that specific group to the group constructor 2013-07-18 12:15:34 +02:00
Thomas Müller 3c6b205e37 Merge pull request #4099 from owncloud/fixing-unix-timestamp-mssql-master
fixing UNIX_TIMESTAMP() for mssql
2013-07-17 13:57:43 -07:00
Markus Goetz 3fd4ff79ee Merge pull request #4042 from guruz/webdav_auth_check_existing
WebDAV Auth Connector: Check if already logged in
2013-07-17 05:00:59 -07:00
Markus Goetz bf7514f76a WebDAV Auth Connector: Check if already logged in 2013-07-17 13:51:15 +02:00
Thomas Mueller 24283425a6 fixing UNIX_TIMESTAMP() for mssql 2013-07-17 13:18:46 +02:00
Bart Visscher 5b60fad467 Display the exception error backtrace preformatted 2013-07-16 22:42:09 +02:00
Bart Visscher 971a3fd124 Early errors (in base.php) don't have session available 2013-07-16 22:37:32 +02:00
Bart Visscher 49fca86f3c Cleanup error generation in base.php 2013-07-16 22:36:39 +02:00
Bart Visscher 7d86e262e1 Use autoloader for Patchwork/PHP/Shim/Normalizer 2013-07-16 22:32:04 +02:00
Jakob Sack fb97600091 Fix an error jenkins found 2013-07-16 22:27:55 +02:00
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
Jakob Sack bb0c5bff5f Add multiple plural forms to the php part 2013-07-16 22:16:53 +02: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
Georg Ehrke 63791e2d8d return empty array instead of 0 2013-07-15 16:58:30 +02: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
kondou 0d604a6c9a Include $defaults 2013-07-13 18:44:36 +02:00
Bart Visscher 5549c77ec5 Merge branch 'master' into doctrine
Conflicts:
	3rdparty
	lib/db.php
	lib/setup.php
	tests/lib/db.php
	tests/lib/dbschema.php
2013-07-13 12:01:14 +02:00
Thomas Müller 24b4806af4 Merge branch 'master' into googledrive 2013-07-12 09:43:04 +02: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
Jan-Christoph Borchardt aacca494c5 introduce shortname themable string and split from title, use for image alt text 2013-07-11 16:38:07 +02: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
Robin Appelman 63df8f3500 reneme id to gid 2013-07-10 17:52:34 +02: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
Robin Appelman 065bc96b02 more consistent naming 2013-07-10 02:17:24 +02:00
Robin Appelman db14775536 consistent naming 2013-07-10 02:09:42 +02:00
Robin Appelman 4de5e292e5 search parameter is not optional 2013-07-10 02:01:34 +02:00
Robin Appelman cc2818ba13 more consitency in hook names 2013-07-10 01:59:59 +02:00
Robin Appelman c2bff656ff cant use private members from closure in php <5.4 2013-07-10 01:55:38 +02:00
Robin Appelman 912b151561 use new group api as backend for the old api 2013-07-10 00:07:46 +02:00
Robin Appelman a735105a22 update group management 2013-07-10 00:06:22 +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
Jakob Sack 560839195e make l10n libs capable of handling plural translations 2013-07-07 20:06:14 +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 ab2037ab5d Only change integer type when the length is set 2013-07-05 22:05:16 +02:00
Bart Visscher b8a7e97301 Add comment to column definition 2013-07-05 21:42:37 +02: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
Bart Visscher 424ec94680 Make buildNotExistingFileName testable and write unittests 2013-07-05 13:03:01 +02:00
Jenkins for ownCloud 955646c461 [tx-robot] updated from transifex 2013-07-05 02:21:23 +02:00
Bart Visscher ad9458e85d Merge branch 'master' into convert-oc_config
Conflicts:
	lib/config.php
2013-07-04 18:23:47 +02:00
Björn Schießle 3c1308fb6d eddition string should be empty by default 2013-07-04 10:12:07 +02:00
Björn Schießle 6cfa016c39 add public api 2013-07-04 10:11:55 +02:00
Björn Schießle 3c691c9ec9 move to non-static OC_Defaults
Conflicts:

	lib/mail.php
2013-07-04 10:11:16 +02:00
Björn Schießle d46e62886a Add init funtion to OC_Defaults to be able to wrap translatable strings 2013-07-04 10:09:28 +02:00
Bart Visscher 20be58bfdc Merge pull request #3888 from owncloud/ocs_api_fixes
Ocs api fixes
2013-07-03 12:33:04 -07:00
Thomas Mueller 32d69f6889 Merge branch 'master' into convert-oc_config 2013-07-03 17:03:47 +02:00
kondou aa7d8edd14 Suppress warning in setup if config doesn't exist 2013-07-03 16:00:23 +02:00
Björn Schießle 690323092e don't run hooks for .part files 2013-07-03 10:11:50 +02:00
Björn Schießle 04e4d9580f if a part file gets renamed to a real file, that this was the second step of a write operation, hence emit a write signal 2013-07-03 10:11:37 +02:00
Björn Schießle 4d4484fac1 Merge pull request #3870 from owncloud/reset_migration_status
introduce pre-disable-app hook and first usage in files_encryption
2013-07-02 07:26:48 -07:00
Thomas Müller e789e05675 on unit test use @expectedException
some phpdoc added
2013-07-02 00:15:42 +02:00
Thomas Müller fbdf46b76e Merge pull request #3748 from owncloud/fixing-3740-master
in case $_SERVER['HTTP_HOST']) is not set let's return localhost - bette...
2013-07-01 15:08:08 -07:00
Thomas Müller 7d7a2ce317 use $_SERVER['SERVER_NAME'] in case $_SERVER['HTTP_HOST'] is not set 2013-07-01 23:51:43 +02:00
Thomas Müller bb07dde988 Merge branch 'master' into convert-oc_config 2013-07-01 23:43:00 +02:00
Thomas Müller c777026506 Merge pull request #3775 from owncloud/test_fixes_for_dbschema
use executeAudited, add table name to assert message, skip schema changi...
2013-07-01 14:38:28 -07:00
Thomas Müller bf901eb52f Merge pull request #3793 from owncloud/remove_unnecessary_exception_catch_block
remove unnecessary try catch blocks
2013-07-01 14:37:09 -07:00