summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-11-124-15/+51
|\| | | | | |
| * | | | | | Update all to use OCP\PERMISSION_* instead of OCP\Share::PERMISSION_*Thomas Tanghus2012-11-112-13/+9
| * | | | | | Added CRUDS permissions to the OCP namespace. Implements issue #345Thomas Tanghus2012-11-112-2/+42
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-11-1111-54/+103
|\| | | | |
| * | | | | Fixed new checkstyle issues in util.php from build #1341.Diederik de Haas2012-11-101-2/+2
| * | | | | Fixed new checkstyle issues in migrate.php from build #1341.Diederik de Haas2012-11-101-2/+2
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-11-101-1/+24
| * | | | | Merge pull request #340 from butonic/fix_quota_zero_cornercaseThomas Müller2012-11-091-8/+8
| |\ \ \ \ \
| | * | | | | fix quota off by one errorJörn Friedrich Dreyer2012-11-091-8/+8
| | |/ / / /
| * / / / / Fix WebDAV (and Android Client) not being able to authorize on Debian Squeeze...Stefan Seidel2012-11-092-1/+13
| |/ / / /
| * | | | Merge pull request #330 from owncloud/check_connectionThomas Müller2012-11-091-0/+27
| |\ \ \ \
| | * | | | add a check and a warning if the ownClodu server is not able to establish htt...Frank Karlitschek2012-11-081-0/+27
| | | |_|/ | | |/| |
| * / | | [tx-robot] updated from transifexJenkins for ownCloud2012-11-091-0/+1
| |/ / /
| * | | Migration: Allow for no app data cases; handle file copying betterTom Needham2012-11-081-7/+5
| * | | Migration: On import of user accounts only import folders in home dir, use OC...Tom Needham2012-11-082-35/+13
| * | | normalize filepaths in OC_Files::getFileInfoRobin Appelman2012-11-071-0/+1
| * | | check if $path is a empty stringBjörn Schießle2012-11-071-1/+1
| * | | Merge pull request #307 from owncloud/etag-function-overwriteicewind19912012-11-071-2/+14
| |\ \ \
| | * | | Allow changing the way etags are generatedRobin Appelman2012-11-071-2/+14
| * | | | backport from approved patch in stable45:Björn Schießle2012-11-071-4/+1
* | | | | 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