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

4369 Commits

Author SHA1 Message Date
Thomas Müller afc8ee721d Merge pull request #4299 from owncloud/simplify-db-transaction 
Simplify OC_DB transaction functions
 2013-08-02 12:32:41 -07:00
Robin Appelman 2af27434a4 merge master into doctrine-object 2013-08-02 19:53:04 +02:00
Bart Visscher fd317f599b Simplify OC_DB transaction functions 2013-08-02 16:12:34 +02:00
Bart Visscher 5ffb8fac24 Use function to create schema manager 2013-08-02 16:02:33 +02:00
Thomas Müller 821a99b937 Merge pull request #4287 from Takuto88/language-config 
Make default language configurable via config.php
 2013-08-02 06:49:54 -07:00
Robin Appelman 258e54182a remove invalid type hinting and cleanup namespaces a bit 2013-08-02 15:09:50 +02:00
Bernhard Posselt f5c3a346b0 make log date configurable, default to iso 8601 2013-08-02 13:34:20 +02:00
Bart Visscher 59c5529a2b Rename \OC\DB\Schema to \OC\DB\MDB2SchemaManager 2013-08-02 13:19:27 +02:00
Bart Visscher 9432885428 Change OC_DB_Schema to use DI for db connection object 2013-08-02 13:14:18 +02:00
Lennart Rosam 79351d064f Make default language configurable via config.php 2013-08-02 09:41:31 +02:00
Jakob Sack 2f17dcdba8 Fix syntax error. 2013-08-01 21:46:52 +02:00
Jakob Sack eee2c369d9 Fix copy and paste errors in l10n.php 2013-08-01 21:36:33 +02:00
Jakob Sack 9673a563b5 Create plural functions on the fly 2013-08-01 21:25:14 +02:00
kondou 1b567b2ad1 Don't throw a fatal, if is_file() parameter isn't 
a 'valid path', but only a data/base64-string.

Related to #4283
 2013-08-01 21:01:26 +02:00
Jakob Sack 495e44e76c Update l10n.php to read plural_forms string 2013-08-01 19:54:51 +02:00
Jörn Friedrich Dreyer eed63ae512 Merge pull request #4221 from owncloud/fix-3698 
Fix calculating size for empty folders
 2013-08-01 08:05:19 -07:00
Bjoern Schiessle 9253627327 cancel sharing if some users doesn't have a working encryption set-up. 2013-08-01 13:04:55 +02:00
Morris Jobke 30963d60bc Merge pull request #4155 from owncloud/mdb2schemareader-booleans 
Fix boolean support for xml schema definitions
 2013-08-01 02:09:01 -07:00
Morris Jobke 0d69feb12e Merge pull request #4208 from owncloud/scanner-php53 
Fix scanner hooks throwing errors
 2013-08-01 00:05:56 -07:00
Jenkins for ownCloud b037f2dc6e [tx-robot] updated from transifex 2013-08-01 01:57:04 -04:00
Bjoern Schiessle 99354f9a28 fix searchUsers() call in group.php 2013-07-31 11:34:22 +02:00
Morris Jobke 50101a85a6 Merge pull request #3982 from owncloud/test_lastinsertid 
test lastinsertid
 2013-07-31 00:03:29 -07:00
Jenkins for ownCloud 761f40328c [tx-robot] updated from transifex 2013-07-31 02:01:45 -04:00
Thomas Müller f35aadb576 Merge pull request #4227 from owncloud/fixing-testGetById-master 
implement a platform independent version of basename
 2013-07-30 08:39:53 -07:00
Thomas Müller 17c36b5074 fixes #4026 2013-07-30 10:26:42 +02:00
Jenkins for ownCloud 88e1ccbce3 [tx-robot] updated from transifex 2013-07-30 01:57:50 -04:00
Thomas Müller f658852276 Merge branch 'master' into fixing-testGetById-master 2013-07-30 00:37:05 +02:00
Thomas Müller 085fdfec2f adding unit tests for OC_Util::basename 2013-07-29 23:32:03 +02:00
icewind1991 7c6246fa45 Merge pull request #4213 from owncloud/scanning-performance 
Cache: don't check if the parent exists in the cache if we are already sure it does
 2013-07-29 13:08:23 -07:00
Andreas Fischer 89f8f8e42d app migrate: Use = instead of LIKE as described in the comment above. 
The LIKE operator is not defined on integers (probably any non-text) columns
on PostgreSQL.
 2013-07-29 18:41:22 +02:00
Robin Appelman 74c54587ec better variable naming 2013-07-29 18:27:19 +02:00
Thomas Mueller e2d3225e5a implement a platform independent version of basename 2013-07-29 18:24:05 +02:00
Robin Appelman dea3472ad7 remove unneeded 'use' 2013-07-29 17:04:28 +02:00
Robin Appelman 64774f30ba dont need to explicitly pass by reference 2013-07-29 17:03:57 +02:00
Robin Appelman d6c56b584a make MDB2Schema reader non static 2013-07-29 16:33:00 +02:00
Robin Appelman fbbe0ebe77 add function to get config object from OC_Config 2013-07-29 16:32:37 +02:00
Michael Gapczynski 1faac6108c Use query to calculate folder size 2013-07-29 10:22:44 -04:00
Thomas Müller 954b5d9019 Merge pull request #4216 from owncloud/clean_php55_opcache 
Also clean PHP 5.5 opcache
 2013-07-29 04:40:01 -07:00
Jörn Friedrich Dreyer 05fa55f2eb always return int 2013-07-29 02:17:09 +02:00
Michael Gapczynski dd4e33fe6b Fix calculating size for empty folders 2013-07-28 16:14:49 -04:00
Michael Gapczynski c8e60900fc Move check so the variable will never be undefined 2013-07-28 15:32:48 -04:00
kondou 8cd671c207 Also clean PHP 5.5 opcache 2013-07-28 16:33:03 +02:00
Jenkins for ownCloud 48621115c1 [tx-robot] updated from transifex 2013-07-28 01:58:28 -04:00
Robin Appelman e1e7b6a940 Cache: don't check if the parent exists in the cache if we are already sure it does 2013-07-27 11:36:27 +02:00
Jenkins for ownCloud fa35650e0a [tx-robot] updated from transifex 2013-07-27 02:03:03 -04:00
Bart Visscher d7916363e1 Make DB connection available to use for dependency injection 2013-07-26 20:36:48 +02:00
Robin Appelman 59bdba9bac fix scanner hooks, cant use inside closures in php 5.3 2013-07-26 15:43:10 +02:00
Robin Appelman 88cc2ccb3b use renamed constants 2013-07-25 16:14:46 +02:00
Robin Appelman e2f04b3b42 use storage wrapper for quota instead of a filesystem proxy 2013-07-25 16:01:37 +02:00
Robin Appelman 5209cff371 add conveince function to wrap all storages 2013-07-25 16:01:05 +02:00
Robin Appelman d042c8f166 use renamed constants 2013-07-25 16:00:48 +02:00
Robin Appelman f4b6a8aa08 add option to wrap existing mounts 2013-07-25 16:00:24 +02:00
Robin Appelman 4e490b0688 fix getPermissionsCache for storage wrapper 2013-07-25 15:59:57 +02:00
Robin Appelman 1b50154c95 functions in OCP should be static 2013-07-25 15:25:17 +02:00
Andreas Fischer 75e93d041d Merge pull request #3887 from owncloud/apc_user_cache 
The APC User Cache doesn't return the cache_list anymore

* owncloud/apc_user_cache:
  Add ACPu memory cache
 2013-07-25 03:48:26 +02:00
Robin Appelman cd8f0c21ce add quota storage wrapper 2013-07-25 00:31:51 +02:00
Robin Appelman 10d3e63ce5 add quota streamwrapper that limits the amount of data that can be written to a stream 2013-07-25 00:31:51 +02:00
Robin Appelman 94560c68ba rename constants 2013-07-25 00:29:27 +02:00
Bart Visscher 25003fb213 Add ACPu memory cache 2013-07-24 21:50:15 +02:00
icewind1991 ff86b6f134 Merge pull request #4183 from owncloud/fix-group-id 
Fix group id naming fid->gid
 2013-07-24 11:09:47 -07:00
icewind1991 1986416248 Merge pull request #3898 from owncloud/sabre-objecttree 
WebDAV performance improvements
 2013-07-24 10:46:27 -07:00
Bart Visscher 4e3bfd8ddd Fix group id naming fid->gid 2013-07-24 17:54:31 +02:00
Jan-Christoph Borchardt 9b1866f1ac merge master 2013-07-24 16:31:01 +02:00
Robin Appelman ad266a4253 Merge branch 'master' into sabre-objecttree 2013-07-24 15:53:48 +02:00
Björn Schießle 651479322b Merge pull request #4177 from owncloud/move_defaults_to_template_constructor 
Move defaults to template constructor
 2013-07-24 06:42:52 -07:00
icewind1991 98858e6f00 Merge pull request #3995 from owncloud/groups 
Refactoring of group management code
 2013-07-24 06:13:05 -07:00
Björn Schießle 75fd6d4fde initialize OC_Defaults in template constructorX 2013-07-24 11:51:21 +02:00
Morris Jobke 2622839fcf Merge pull request #4171 from owncloud/fix-config 
Fix config
 2013-07-24 00:48:43 -07:00
Thomas Müller 1a73e607bd Merge branch 'master' into more-themable-strings 
Conflicts:
	lib/template.php
 2013-07-24 09:35:33 +02:00
Thomas Müller 60ce492fac Merge branch 'master' into groups 2013-07-24 01:11:12 +02:00
Thomas Müller 5fc0535f1b Merge pull request #4090 from owncloud/cleanup-some-template-functions 
Cleanup some template functions
 2013-07-23 15:53:43 -07:00
Bart Visscher 793ff0fec9 Fix lastInsertId for OCI8 adapter 2013-07-23 22:16:04 +02:00
Robin Appelman fb40d9e1e6 Merge branch 'master' into groups 2013-07-23 22:06:03 +02:00
Bart Visscher 7ad38535e5 Merge pull request #3392 from owncloud/googledrive 
Switch to using Google Drive SDK, closes #2047
 2013-07-23 12:23:08 -07:00
Jan-Christoph Borchardt 93b227d803 shorten wording on config directory errors 2013-07-23 18:41:00 +02:00
Bart Visscher 3eb5fff02a Add documentation to OC\DB\adapter class 2013-07-23 18:09:42 +02:00
Bart Visscher 485e8ab0a5 ignore config read failures 2013-07-23 17:38:37 +02:00
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