summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-11-073-13/+16
|\
| * Fix quoting problem in fs mount. give Big DB error at least in PGBrice Maron2012-11-071-4/+4
| * fix user specific mount configurationRobin Appelman2012-11-071-2/+2
| * Return empty array if file does not exist inside Shared folder, fixes issue #91Michael Gapczynski2012-11-051-7/+10
* | Check DB result.Thomas Tanghus2012-11-051-1/+7
* | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-11-0551-227/+204
|\|
| * Style: Remove all the dangling white spacesFelix Moeller2012-11-046-14/+14
| * Style: Different line endings in one file are bad for sureFelix Moeller2012-11-041-42/+42
| * Checkstyle: Fix last six NewlineBeforeOpenBraceFelix Moeller2012-11-043-8/+4
| * Checkstyle: fix the last NoSpaceAfterEqualsFelix Moeller2012-11-041-1/+1
| * Checkstyle: Fix the last 25 NoSpaceAfterCommaFelix Moeller2012-11-0410-20/+20
| * Checkstyle: Fix the last two SpaceBeforeOpenBraceFelix Moeller2012-11-041-1/+1
| * Merge pull request #238 from fmms/checkstyle04Thomas Müller2012-11-0446-146/+146
| |\
| | * Checkstyle fixes: NoSpaceAfterCommaFelix Moeller2012-11-0441-118/+118
| | * Checkstyle fixes for SpaceBeforeOpenBraceFelix Moeller2012-11-0414-28/+28
| * | Merge pull request #178 from owncloud/JustOneCSRFTokenPerSessionLukas Reschke2012-11-043-27/+6
| |\ \ | | |/ | |/|
| | * Create only one CSRF token per sessionLukas Reschke2012-10-313-27/+6
* | | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-11-0452-206/+209
|\| |
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-11-041-0/+1
| * | check for filename blacklist in OC_Filesystem::isValidPathRobin Appelman2012-11-031-5/+10
| * | Merge pull request #220 from fmms/checkstyle02Lukas Reschke2012-11-0251-196/+196
| |\ \
| | * | Checkstyle: many fixesFelix Moeller2012-11-0251-196/+196
| * | | fix OC_Filesystem::isValidPath when using \ instead of / in pathsRobin Appelman2012-11-021-0/+1
| |/ /
| * | fix archive tar include pathRobin Appelman2012-11-011-1/+1
* | | VCategories: Make $categories non-static again.Thomas Tanghus2012-11-041-27/+27
* | | Added some more error checking on db queries.Thomas Tanghus2012-10-311-5/+37
* | | Cast object ids to integers.Thomas Tanghus2012-10-311-2/+2
* | | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-314-1/+65
|\| |
| * | Merge pull request #152 from scambra/webdav-quotaThomas Müller2012-10-311-0/+59
| |\ \
| | * | code style changesscambra2012-10-301-4/+6
| | * | fix checking quota in webdav, adding a sabredav pluginscambra2012-10-301-0/+57
| * | | [tx-robot] updated from transifexJenkins for ownCloud2012-10-312-0/+2
| * | | check for database error in userExistsJörn Friedrich Dreyer2012-10-301-1/+4
| |/ /
* | | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-3039-555/+1145
|\| |
| * | Merge pull request #147 from owncloud/htaccess-upgrade-checkSam Tuke2012-10-291-0/+10
| |\ \
| | * | Don't use OC_Setup as it will show up the installerLukas Reschke2012-10-291-1/+5
| | * | Generate .htaccess when upgrading from old versionsLukas Reschke2012-10-291-0/+6
| | |/
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-10-302-0/+2
| * | Merge pull request #133 from fmms/checkstyle02Lukas Reschke2012-10-294-52/+52
| |\ \ | | |/ | |/|
| | * NoSpaceAfterCommaFelix Moeller2012-10-284-52/+52
| * | Generate only one CSRF tokenLukas Reschke2012-10-291-31/+19
| * | Fix a typoLukas Reschke2012-10-291-1/+1
| * | Move loading setting routing to OC_RouterBart Visscher2012-10-291-1/+3
| * | Remove subnavigation key, not usedBart Visscher2012-10-291-3/+0
| * | Add ETag caching for Javascript routesBart Visscher2012-10-291-11/+36
| * | Move generating cache key from files from OC_Minimizer to OC_CacheBart Visscher2012-10-292-6/+12
| * | Fix MySQL install, bug fix for issue 132Michael Gapczynski2012-10-281-2/+2
| * | Check if error_report() is equal to 0, so suppressed errors aren't logged e.g...Michael Gapczynski2012-10-281-0/+3
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-10-294-2/+4
| |/
| * NoSpaceAfterCommaFelix Moeller2012-10-282-59/+59