summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into decrypt_files_againBjoern Schiessle2013-08-17109-1018/+1679
|\
| * remove ru_RU - fixes #3135Thomas Müller2013-08-171-6/+0
| * Merge pull request #4314 from owncloud/css-fixesJan-Christoph Borchardt2013-08-161-1/+1
| |\
| | * merge master into css-fixesJan-Christoph Borchardt2013-08-16109-1008/+1661
| | |\
| | * | change long couldn't be determined string to question mark againJan-Christoph Borchardt2013-08-041-1/+1
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-168-29/+34
| | |/ | |/|
| * | fixing all broken translation filesThomas Müller2013-08-1578-312/+312
| * | Cache OC_Util::checkServer() result in sessionMarkus Goetz2013-08-151-0/+7
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-08-1578-339/+357
| * | Merge pull request #4376 from owncloud/use_pluralsJörn Friedrich Dreyer2013-08-141-6/+4
| |\ \
| | * | Use plural translationskondou2013-08-091-6/+4
| * | | Scanner: correctly pass trough reuse options when doing a recursive scanRobin Appelman2013-08-121-1/+1
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-1166-67/+1
| * | | Changing elseif statement to what the PEAR coding guidelines say.Andreas Fischer2013-08-091-2/+1
| * | | Do not pass numeric strings to strtotime() when formatting dates.Andreas Fischer2013-08-091-1/+1
| |/ /
| * | Merge pull request #4344 from owncloud/appmgmt-in-navigationJan-Christoph Borchardt2013-08-091-9/+1
| |\ \
| | * | show 'More apps' link to app administration directly in app navigationJan-Christoph Borchardt2013-08-071-9/+1
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-0972-71/+280
| * | | Merge pull request #4271 from owncloud/plural_translationsOwen Winkler2013-08-082-9/+198
| |\ \ \
| | * | | initialize $plural_form_string with English defaultThomas Müller2013-08-031-1/+1
| | * | | unit tests for plural translations addedThomas Müller2013-08-022-6/+36
| | * | | PHPDoc comments adjusted *partially* - fixing call to createPluralFormFunctionThomas Müller2013-08-021-11/+18
| | * | | Fix syntax error.Jakob Sack2013-08-011-1/+2
| | * | | Fix copy and paste errors in l10n.phpJakob Sack2013-08-012-2/+2
| | * | | Create plural functions on the flyJakob Sack2013-08-012-7/+86
| | * | | Update l10n.php to read plural_forms stringJakob Sack2013-08-011-8/+22
| | * | | Fix an error jenkins foundJakob Sack2013-07-161-1/+1
| | * | | Add multiple plural forms to the php partJakob Sack2013-07-162-5/+38
| | * | | make l10n libs capable of handling plural translationsJakob Sack2013-07-072-3/+28
| * | | | Merge pull request #4151 from owncloud/doctrine-objectJörn Friedrich Dreyer2013-08-089-335/+488
| |\ \ \ \
| | * | | | More style fixesBart Visscher2013-08-072-15/+15
| | * | | | Fix stupid bugBart Visscher2013-08-071-1/+2
| | * | | | Move query processing after the check for prepared statement cacheBart Visscher2013-08-071-4/+4
| | * | | | Style fixesBart Visscher2013-08-074-6/+8
| | * | | | merge master into doctrine-objectRobin Appelman2013-08-068-82/+99
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | merge master into doctrine-objectRobin Appelman2013-08-0262-699/+1559
| | |\ \ \ \
| | * | | | | Make DB connection available to use for dependency injectionBart Visscher2013-07-261-0/+5
| | * | | | | Fix lastInsertId for OCI8 adapterBart Visscher2013-07-231-2/+1
| | * | | | | Add documentation to OC\DB\adapter classBart Visscher2013-07-231-0/+18
| | * | | | | Fix errors from unit testsBart Visscher2013-07-212-4/+3
| | * | | | | Correct namespace of OC_ classesBart Visscher2013-07-212-6/+6
| | * | | | | Move building error string to connectionBart Visscher2013-07-212-9/+18
| | * | | | | Group database connection and schema functionBart Visscher2013-07-211-27/+27
| | * | | | | Cleanup: remove code for multiple database backendsBart Visscher2013-07-211-55/+14
| | * | | | | Use $connection for schema changesBart Visscher2013-07-211-12/+13
| | * | | | | Simplify OC_DB transaction functionsBart Visscher2013-07-211-10/+0
| | * | | | | Move insertIfNotExist to Connection wrapperBart Visscher2013-07-214-53/+81
| | * | | | | Move query statement fixup handling to Connection wrapperBart Visscher2013-07-217-50/+39
| | * | | | | Move limit/offset handling to Connection wrapperBart Visscher2013-07-212-67/+8
| | * | | | | Move prepared query cache handling to Connection wrapperBart Visscher2013-07-212-21/+34