summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove all uses of numRows().Andreas Fischer2013-12-213-14/+13
* Remove OC_DB_StatementWrapper::numRows().Andreas Fischer2013-12-211-19/+0
* [tx-robot] updated from transifexJenkins for ownCloud2013-12-2122-59/+77
* Merge pull request #6262 from nickvergessen/issue/4375Frank Karlitschek2013-12-202-1/+2
|\
| * 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
|\ \
| * | 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
|\ \ \
| * | | 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, fix deprecati...Alexander Bergolth2013-12-041-2/+4
* | | | Merge pull request #6512 from owncloud/master-failingoracletestsVincent Petry2013-12-192-31/+19
|\ \ \ \
| * | | | Removed numRows usage from encryption appVincent Petry2013-12-192-31/+19
| | |/ / | |/| |
* | | | Merge pull request #6495 from owncloud/enc_fseek_fallbackBjörn Schießle2013-12-195-10/+159
|\ \ \ \ | |/ / / |/| | |
| * | | add test for the stream wrapper to read encrypted files from the system folde...Bjoern Schiessle2013-12-181-0/+39
| * | | test for isEncryptedPath()Bjoern Schiessle2013-12-181-0/+35
| * | | extend the encryption stream wrapper to handle local files and add a fall bac...Bjoern Schiessle2013-12-183-8/+60
| * | | 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 arrayThomas Müller2013-12-181-1/+3
* | | | | Merge pull request #6492 from owncloud/appconfig-cacheicewind19912013-12-193-55/+97
|\ \ \ \ \
| * | | | | 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
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'owncloud/master' into fixing-3417-masterAndreas Fischer2013-12-18192-2638/+5683
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Merge remote-tracking branch 'owncloud/master' into fixing-3417-masterAndreas Fischer2013-12-142623-82052/+208868
| |\ \ \ \ \ \
| * | | | | | | 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
| * | | | | | | don't use xcache in case admin auth is enabled in php.ini - this can cause is...Thomas Müller2013-08-091-4/+9
| * | | | | | | don't call xcache_clear_cache on clearOpcodeCache() in case admin auth is ena...Thomas Müller2013-08-091-1/+5
* | | | | | | | Merge pull request #6503 from owncloud/finally-kill-mdb2-masterVincent Petry2013-12-192-6/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | 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 typesVincent Petry2013-12-181-2/+6
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | [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
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Add unit tests for decimal type usageOliver Gasser2013-12-183-2/+33