aboutsummaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |_|/ / | |/| | |
* | | | | Merge pull request #4216 from owncloud/clean_php55_opcacheThomas Müller2013-07-291-0/+4
|\ \ \ \ \
| * | | | | Also clean PHP 5.5 opcachekondou2013-07-281-0/+4
* | | | | | Move check so the variable will never be undefinedMichael Gapczynski2013-07-281-3/+3
| |_|_|/ / |/| | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-283-0/+11
|/ / / /
* / / / [tx-robot] updated from transifexJenkins for ownCloud2013-07-2713-0/+49
|/ / /
* | | functions in OCP should be staticRobin Appelman2013-07-251-1/+1
* | | Merge pull request #3887 from owncloud/apc_user_cacheAndreas Fischer2013-07-252-1/+31
|\ \ \
| * | | Add ACPu memory cacheBart Visscher2013-07-242-1/+31
* | | | Merge pull request #4183 from owncloud/fix-group-idicewind19912013-07-241-1/+1
|\ \ \ \
| * | | | Fix group id naming fid->gidBart Visscher2013-07-241-1/+1
| |/ / /
* | | | Merge pull request #3898 from owncloud/sabre-objecttreeicewind19912013-07-242-1/+102
|\ \ \ \
| * | | | Merge branch 'master' into sabre-objecttreeRobin Appelman2013-07-24136-5573/+3463
| |\| | |
| * | | | style fixRobin Appelman2013-07-191-1/+1
| * | | | improved copy operation for objecttreeRobin Appelman2013-06-301-0/+29
| * | | | improved move operation for sabre's objecttreeRobin Appelman2013-06-301-0/+24
| * | | | make use of the fact that rmdir is already recursiveRobin Appelman2013-06-301-1/+0
| * | | | overwrite Sabre_DAV_ObjectTree with a faster getNodeForPathRobin Appelman2013-06-301-0/+49
* | | | | merge masterJan-Christoph Borchardt2013-07-2417-529/+1036
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #4177 from owncloud/move_defaults_to_template_constructorBjörn Schießle2013-07-242-2/+6
| |\ \ \ \
| | * | | | initialize OC_Defaults in template constructorXBjörn Schießle2013-07-242-2/+6
| * | | | | Merge pull request #3995 from owncloud/groupsicewind19912013-07-246-130/+511
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge branch 'master' into groupsThomas Müller2013-07-248-390/+502
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into groupsRobin Appelman2013-07-2358-4887/+1866
| | |\ \ \ \ \