summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixed apps loading orderVincent Petry2013-12-204-6/+21
| | | | | | | | | | On SQLite the app order can be arbitrary and cause strange bugs. On MySQL, the app order seems to be always alphabetical. This fix enforces alphabetical order to make sure that all environments behave the same and to reduce bugs related to app loading order. Fixes #6442
* Merge pull request #6262 from nickvergessen/issue/4375Frank Karlitschek2013-12-202-1/+2
|\ | | | | correctly mark app management active
| * correctly mark app management activeJoas Schilling2013-12-092-1/+2
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-12-20294-2303/+2319
| |
* | Merge pull request #6507 from owncloud/enc_fix_getUserBjörn Schießle2013-12-193-1/+44
|\ \ | | | | | | [encryption] fix getUser Helper
| * | tests addedBjoern Schiessle2013-12-193-1/+44
| | |
| * | we can also have a path user/cache/...Bjoern Schiessle2013-12-191-1/+1
| | |
* | | Merge pull request #6517 from owncloud/fix_6510Björn Schießle2013-12-192-19/+45
|\ \ \ | | | | | | | | [encryption] fix rename of shared files
| * | | check if the old owner and the old path is availableBjoern Schiessle2013-12-191-3/+10
| | | |
| * | | fix rename of shared filesBjoern Schiessle2013-12-192-19/+38
| |/ /
* | | 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 #6512 from owncloud/master-failingoracletestsVincent Petry2013-12-192-31/+19
|\ \ \ \ | | | | | | | | | | Removed numRows usage from encryption app
| * | | | Removed numRows usage from encryption appVincent Petry2013-12-192-31/+19
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | numRows on Oracle always seem to return 0. This fix removes numRows usage from the encryption and sharing app. This fixes unit tests and potentially the encryption app itself (migration status) when running on Oracle
* | | | Merge pull request #6495 from owncloud/enc_fseek_fallbackBjörn Schießle2013-12-195-10/+159
|\ \ \ \ | |/ / / |/| | | Added fseek fallback to the encryption app
| * | | add test for the stream wrapper to read encrypted files from the system ↵Bjoern Schiessle2013-12-181-0/+39
| | | | | | | | | | | | | | | | folder /tmp
| * | | test for isEncryptedPath()Bjoern Schiessle2013-12-181-0/+35
| | | |
| * | | extend the encryption stream wrapper to handle local files and add a fall ↵Bjoern Schiessle2013-12-183-8/+60
| | | | | | | | | | | | | | | | back for file size calculation if the storage doesn't support fseek
| * | | implement ftell stream wrapper and fix return value from fseek stream wrapperBjoern Schiessle2013-12-181-1/+12
| | | |
| * | | fall back to getLocalFile if storage doesn't support fseekBjoern Schiessle2013-12-171-2/+14
| | | |
* | | | 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-193-55/+97
|\ \ \ \ \ | | | | | | | | | | | | 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
| | | | | |
| * | | | | Add index on oc_appconfig for appidRobin Appelman2013-12-182-1/+8
| | | | | |
| * | | | | 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-18192-2638/+5683
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-142623-82052/+208868
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-192-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
| | | | | | | | |
| * | | | | | | | Updating to latest master of 3rdparty - once more :-(Thomas Müller2013-12-191-0/+0
| | | | | | | | |
* | | | | | | | | 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.
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-19113-455/+1297
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #6476 from ogasser/dbal_precision_scaleThomas Müller2013-12-186-3/+51
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | DB: Support DECIMAL(precision,scale) syntax in XML
| * | | | | | | Add unit tests for decimal type usageOliver Gasser2013-12-183-2/+33
| | | | | | | |
| * | | | | | | Increment number of columns by oneOliver Gasser2013-12-181-1/+1
| | | | | | | |
| * | | | | | | Typo fixedOliver Gasser2013-12-171-1/+1
| | | | | | | |