summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-12-222-4/+7
|
* Merge pull request #6262 from nickvergessen/issue/4375Frank Karlitschek2013-12-201-0/+1
|\ | | | | correctly mark app management active
| * correctly mark app management activeJoas Schilling2013-12-091-0/+1
| |
* | Merge pull request #6219 from leo-b/fix_router_deprecationAndreas Fischer2013-12-191-2/+4
|\ \ | | | | | | | | | | | | | | | | | | Symfonys addCollection() with multiple arguments is deprecated * leo-b/fix_router_deprecation: Symfonys addCollection() with multiple arguments is deprecated, fix deprecation warning
| * | Symfonys addCollection() with multiple arguments is deprecated, fix ↵Alexander Bergolth2013-12-041-2/+4
| | | | | | | | | | | | deprecation warning
* | | Merge pull request #6491 from owncloud/fix-warning-array_walk_recursive-jsonThomas Müller2013-12-191-1/+3
|\ \ \ | | | | | | | | only walk an array
| * | | only walk an arrayThomas Müller2013-12-181-1/+3
| | | |
* | | | Merge pull request #6492 from owncloud/appconfig-cacheicewind19912013-12-191-54/+89
|\ \ \ \ | | | | | | | | | | Fetch all appconfig values for an app at once and cache the results
| * | | | dont re-read the config values for an app when a non existing key is fetchedRobin Appelman2013-12-181-5/+10
| | | | |
| * | | | Fetch all appconfig values for an app at once and cache the resultsRobin Appelman2013-12-181-54/+84
| | | | |
* | | | | Merge pull request #4378 from owncloud/fixing-3417-masterThomas Müller2013-12-192-10/+22
|\ \ \ \ \ | | | | | | | | | | | | Don't use xcache in case admin auth is enabled
| * \ \ \ \ Merge remote-tracking branch 'owncloud/master' into fixing-3417-masterAndreas Fischer2013-12-1844-91/+130
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * owncloud/master: (30 commits) Added entry with ext storage info [tx-robot] updated from transifex [tx-robot] updated from transifex clarifying license remove unused method tail() reliable detect encrypted files [tx-robot] updated from transifex remove duplicated code add missing quotes + field declarations Do not use xcache variable cache if cache size is 0. always show home breadcrumb in files view Use DEBUG instead of ERROR when favourites not found. Fix #6419 update file cache for target file only remove encryption keys if a real file gets deleted, skip this method if a file outside of /data/user/files was deleted Fixed JS plural function to be per app call set password hook because it doesn't get triggered during test execution and fix paths Do not use L10n when logging exceptions Also add default to the \OCP\IConfig interface add default parameter for AllConfig->get*Value() always show 'Deleted Files' breadcrumb ... Conflicts: lib/private/memcache/xcache.php
| * | | | | Merge remote-tracking branch 'owncloud/master' into fixing-3417-masterAndreas Fischer2013-12-14399-5175/+17761
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * owncloud/master: (1989 commits) [tx-robot] updated from transifex dont try to register background jobs if we haven't upgraded yet adjust test coding style coding style On webdav sesssions, loginname was compared to username which does not need to match necessarily rely only on php DateTime to parse the db datetime string LDAP: fix method behind save button on advancend and expert tabs, fixes at least Home Folder setinng Fix webroot for update page Update 3rdparty ref update 3rdparty toggle select all checkbox remove unneeded ; in comment LDAP: the browser shall not autofill userdn and password, usually login credentials are inserted. fixes #6283 Add test for having utf8 filenames in the cache fix fallback overwriting result of getHome [tx-robot] updated from transifex fix smbclient directory listing parser cache the home folder of a User Send "SET NAMES utf8" to MySQL for PHP below 5.3.6 ... Conflicts: lib/util.php
| * | | | | | Do not mention php.ini, it may be defined in xcache.ini or so.Andreas Fischer2013-08-151-1/+1
| | | | | | |
| * | | | | | Make it clear that log message is about the XCache opcode cache.Andreas Fischer2013-08-151-1/+1
| | | | | | |
| * | | | | | xCache -> XCacheAndreas Fischer2013-08-151-1/+1
| | | | | | |
| * | | | | | Add link to XCache API in class documentation.Andreas Fischer2013-08-151-0/+4
| | | | | | |
| * | | | | | xcache_unset_by_prefix() returns feedback, return it.Andreas Fischer2013-08-151-1/+1
| | | | | | |
| * | | | | | Clear xCache OpCode cache instead of variable cache in clearOpcodeCache().Andreas Fischer2013-08-151-1/+1
| | | | | | |
| * | | | | | Allow usage of xCache variable cache if xcache_unset_by_prefix() is present.Andreas Fischer2013-08-151-2/+4
| | | | | | |
| * | | | | | Do not define xcache_unset_by_prefix() if it does not exist.Andreas Fischer2013-08-151-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The defined function is not compatible with the function provided by xcache because it does not honor the prefix parameter. Thus defining it like this is a bad idea.
| * | | | | | don't use xcache in case admin auth is enabled in php.ini - this can cause ↵Thomas Müller2013-08-091-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | issues
| * | | | | | don't call xcache_clear_cache on clearOpcodeCache() in case admin auth is ↵Thomas Müller2013-08-091-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | enabled for xcache in php.ini
* | | | | | | Merge pull request #6503 from owncloud/finally-kill-mdb2-masterVincent Petry2013-12-191-6/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Finally kill mdb2 master
| * | | | | | | fix return statementThomas Müller2013-12-191-2/+2
| | | | | | | |
| * | | | | | | kill MDB2 in PHPDocThomas Müller2013-12-191-4/+4
| | | | | | | |
* | | | | | | | Merge pull request #6502 from owncloud/core-extramimetypesFrank Karlitschek2013-12-181-2/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Added missing mime types
| * | | | | | | Added missing mime typesVincent Petry2013-12-181-2/+6
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is mostly to fix acceptance tests that have a .cc file. Also fixed typo in python mime type.
* | | | | | | Merge pull request #6476 from ogasser/dbal_precision_scaleThomas Müller2013-12-181-0/+8
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | DB: Support DECIMAL(precision,scale) syntax in XML
| * | | | | | DB: Support DECIMAL(precision,scale) syntax in XMLOliver Gasser2013-12-171-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for specifying the precision and scale of a decimal data type to the XML description language. See owncloud/core#6475
* | | | | | | Merge pull request #6295 from owncloud/files-fromlinkerrormessagefixesThomas Müller2013-12-183-4/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fixed download file from URL error messages
| * | | | | | | Fixed download file from URL error messagesVincent Petry2013-12-123-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - L10N now converted to string to make them work with json_encode - Added specific error message when server doesn't allow fopen on URLs - Fixed client side to correctly show error message in a notification - Added OCP\JSON::encode() method to encode JSON with support for the OC_L10N_String values
* | | | | | | | Merge pull request #6461 from owncloud/check-xcache-varsizeThomas Müller2013-12-181-3/+7
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | Do not use xcache variable cache if cache size is 0.
| * | | | | | | Do not use xcache variable cache if cache size is 0.Andreas Fischer2013-12-171-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is possible because it is possible to only use xcache as an opcode cache but not a variable cache.
* | | | | | | | Merge pull request #6256 from owncloud/session-preserver-thirdpartyThomas Müller2013-12-182-2/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | preserve 3rd party values in in the Session destructor
| * | | | | | | | check if a $_SESSION entry exists before we try to remove itRobin Appelman2013-12-111-1/+3
| | | | | | | | |
| * | | | | | | | preserve 3rd party values in in the Session destructorRobin Appelman2013-12-092-2/+11
| | | | | | | | |
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-172-0/+4
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Merge pull request #6436 from owncloud/allconfig-defaultsFrank Karlitschek2013-12-172-10/+29
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add default parameter to OC\AllConfig/OCP\IConfig's getValue's
| * | | | | | | | Also add default to the \OCP\IConfig interfaceRobin Appelman2013-12-162-5/+18
| | | | | | | | |
| * | | | | | | | add default parameter for AllConfig->get*Value()Robin Appelman2013-12-161-6/+12
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-1732-62/+40
| | | | | | | |
* | | | | | | | Merge pull request #6438 from owncloud/core-logexceptionfixThomas Müller2013-12-172-4/+2
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Do not use L10n when logging exceptions
| * | | | | | | Do not use L10n when logging exceptionsVincent Petry2013-12-162-4/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some specific situations, the L10N bundle isn't loadable yet (for example when there is an issue with the app_config table). In such case, we still want to be able to log the real exception. This fixes errors that say "OC_L10N_String::__toString must not throw exceptions"
* | | | | | | Use DEBUG instead of ERROR when favourites not found. Fix #6419Thomas Tanghus2013-12-161-1/+1
| | | | | | |
* | | | | | | Merge pull request #6315 from owncloud/ingroup-cacheicewind19912013-12-161-7/+18
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | cache the result from inGroup
| * | | | | | remove unneeded ; in commentRobin Appelman2013-12-121-1/+1
| | | | | | |
| * | | | | | user Group->users as assosiative arrayRobin Appelman2013-12-111-5/+3
| | | | | | |
| * | | | | | cache the result from inGroupRobin Appelman2013-12-111-7/+20
| | |/ / / / | |/| | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-131-0/+1
| | | | | |