summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into oc_previewThomas Müller2013-07-3085-5419/+3048
|\
| * 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
| | | |\ \ \
| | | * | | | group: only pass backends that hold that specific group to the group constructorRobin Appelman2013-07-182-2/+8
| | | * | | | reneme id to gidRobin Appelman2013-07-101-15/+15
| | | * | | | more consistent namingRobin Appelman2013-07-102-6/+6
| | | * | | | consistent namingRobin Appelman2013-07-101-6/+6
| | | * | | | search parameter is not optionalRobin Appelman2013-07-101-2/+2
| | | * | | | more consitency in hook namesRobin Appelman2013-07-102-9/+9
| | | * | | | cant use private members from closure in php <5.4Robin Appelman2013-07-101-3/+3
| | | * | | | use new group api as backend for the old apiRobin Appelman2013-07-101-127/+98
| | | * | | | update group managementRobin Appelman2013-07-105-3/+407
| | * | | | | Merge pull request #4171 from owncloud/fix-configMorris Jobke2013-07-241-5/+2
| | |\ \ \ \ \
| | | * | | | | ignore config read failuresBart Visscher2013-07-231-1/+2
| | | * | | | | Revert "fix failing master branch - Test_Config::testWriteData"Bart Visscher2013-07-231-5/+1
| | * | | | | | Merge branch 'master' into more-themable-stringsThomas Müller2013-07-2459-5257/+2246
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | | * | | | | Merge pull request #4090 from owncloud/cleanup-some-template-functionsThomas Müller2013-07-238-390/+502
| | | |\ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | | | * | | | Change to use !== and ===Bart Visscher2013-07-212-6/+6
| | | | * | | | fixing typos, PHPDoc and missing namespace \Thomas Müller2013-07-214-10/+11
| | | | * | | | Move basic template functions to their own classBart Visscher2013-07-213-165/+205
| | | | * | | | Move template functions to there own fileBart Visscher2013-07-212-112/+121
| | | | * | | | Split locating JS and CSS files to their own classBart Visscher2013-07-214-104/+166
| | | * | | | | Merge pull request #3392 from owncloud/googledriveBart Visscher2013-07-231-2/+5
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge branch 'master' into googledriveThomas Müller2013-07-12138-2412/+4777
| | | | |\ \ \ \ \
| | | | * \ \ \ \ \ Merge branch 'master' into googledriveMichael Gapczynski2013-05-3019-73/+325
| | | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge branch 'master' into googledriveMichael Gapczynski2013-05-2758-117/+578
| | | | |\ \ \ \ \ \ \