summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Style fixesBart Visscher2013-08-074-6/+8
* merge master into doctrine-objectRobin Appelman2013-08-068-82/+99
|\
| * Merge pull request #4291 from owncloud/schemaBart Visscher2013-08-052-59/+81
| |\
| | * Use function to create schema managerBart Visscher2013-08-021-20/+35
| | * remove invalid type hinting and cleanup namespaces a bitRobin Appelman2013-08-021-5/+8
| | * Rename \OC\DB\Schema to \OC\DB\MDB2SchemaManagerBart Visscher2013-08-022-7/+7
| | * Change OC_DB_Schema to use DI for db connection objectBart Visscher2013-08-022-51/+55
| * | use isset to prevent undefined indexThomas Müller2013-08-051-1/+1
| * | Merge pull request #4293 from owncloud/config-dateThomas Müller2013-08-041-4/+6
| |\ \
| | * | fixing PHPDocThomas Müller2013-08-041-3/+3
| | * | make log date configurable, default to iso 8601Bernhard Posselt2013-08-021-1/+3
| | |/
| * | Merge pull request #4308 from owncloud/fix-4194Thomas Müller2013-08-041-3/+6
| |\ \
| | * | fixing PHPDocThomas Müller2013-08-041-1/+1
| | * | Port log level filtering from OC_Log_Owncloud to OC_Log_Syslog.Andreas Fischer2013-08-041-2/+5
| * | | Merge pull request #4228 from owncloud/fix-3836Thomas Müller2013-08-041-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | app migrate: Use = instead of LIKE as described in the comment above.Andreas Fischer2013-07-291-1/+1
| * | | add reveal mimetypeRobin Appelman2013-08-031-1/+2
| * | | Merge pull request #4299 from owncloud/simplify-db-transactionThomas Müller2013-08-021-10/+0
| |\ \ \
| | * | | Simplify OC_DB transaction functionsBart Visscher2013-08-021-10/+0
| | | |/ | | |/|
* | | | merge master into doctrine-objectRobin Appelman2013-08-0262-699/+1559
|\| | |
| * | | Merge pull request #4287 from Takuto88/language-configThomas Müller2013-08-021-0/+6
| |\ \ \
| | * | | Make default language configurable via config.phpLennart Rosam2013-08-021-0/+6
| | |/ /
| * / / Don't throw a fatal, if is_file() parameter isn'tkondou2013-08-011-1/+1
| |/ /
| * | Merge pull request #4221 from owncloud/fix-3698Jörn Friedrich Dreyer2013-08-011-19/+19
| |\ \
| | * | Use query to calculate folder sizeMichael Gapczynski2013-07-291-10/+13
| | * | Fix calculating size for empty foldersMichael Gapczynski2013-07-281-19/+16
| * | | cancel sharing if some users doesn't have a working encryption set-up.Bjoern Schiessle2013-08-011-2/+20
| * | | Merge pull request #4155 from owncloud/mdb2schemareader-booleansMorris Jobke2013-08-013-69/+151
| |\ \ \
| | * | | make MDB2Schema reader non staticRobin Appelman2013-07-292-72/+143
| | * | | add function to get config object from OC_ConfigRobin Appelman2013-07-291-0/+4
| | * | | use ===Robin Appelman2013-07-221-1/+1
| | * | | add support for the <primary/> element within field definitionsRobin Appelman2013-07-221-0/+4
| | * | | db: cast default values for boolean fields to booleansRobin Appelman2013-07-221-0/+3
| * | | | Merge pull request #4208 from owncloud/scanner-php53Morris Jobke2013-08-011-6/+7
| |\ \ \ \
| | * | | | remove unneeded 'use'Robin Appelman2013-07-291-1/+0
| | * | | | dont need to explicitly pass by referenceRobin Appelman2013-07-291-2/+2
| | * | | | fix scanner hooks, cant use inside closures in php 5.3Robin Appelman2013-07-261-5/+7
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-011-0/+4
| * | | | | Merge pull request #3982 from owncloud/test_lastinsertidMorris Jobke2013-07-311-2/+2
| |\ \ \ \ \
| | * | | | | always return intJörn Friedrich Dreyer2013-07-291-2/+2
| | | |_|/ / | | |/| | |
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-311-0/+4
| * | | | | Merge pull request #4227 from owncloud/fixing-testGetById-masterThomas Müller2013-07-302-1/+8
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' into fixing-testGetById-masterThomas Müller2013-07-3066-5101/+2365
| | |\ \ \ \ \
| | * | | | | | adding unit tests for OC_Util::basenameThomas Müller2013-07-291-0/+1
| | * | | | | | implement a platform independent version of basenameThomas Mueller2013-07-292-1/+7
| * | | | | | | fixes #4026Thomas Müller2013-07-301-0/+3
| * | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-301-0/+4
| | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #4213 from owncloud/scanning-performanceicewind19912013-07-291-3/+4
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | better variable namingRobin Appelman2013-07-291-3/+3
| | * | | | | Cache: don't check if the parent exists in the cache if we are already sure i...Robin Appelman2013-07-271-3/+4
| | | |_|/ / | | |/| | |