summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-11-0627-59/+1675
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2012-11-0624-55/+1666
| * Merge pull request #267 from owncloud/improve_files_updateThomas Müller2012-11-051-2/+2
| |\
| | * prepare SQL query only once, that's what prepared statements are for. Should ...Arthur Schiwon2012-11-051-2/+2
| * | Merge pull request #269 from owncloud/fix_fe_mkdir_warningThomas Müller2012-11-051-1/+6
| |\ \
| | * | Fix mkdir and opendir warnings when path does not existArthur Schiwon2012-11-051-1/+6
| | |/
| * | Merge pull request #268 from owncloud/fixing_template_testLukas Reschke2012-11-051-1/+1
| |\ \ | | |/ | |/|
| | * fixes #266Thomas Mueller2012-11-051-1/+1
| |/
* | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-11-054-3/+45
|\|
| * support string values ('true' and 'false') for configuring the secure paramet...Robin Appelman2012-11-054-3/+45
* | VCategories: Closing brace must be on a line by itself.Thomas Tanghus2012-11-051-2/+2
* | VCategories: Line too long.Thomas Tanghus2012-11-051-1/+4
* | VCategories: Line too long.Thomas Tanghus2012-11-051-1/+3
* | Remove unused variable.Thomas Tanghus2012-11-051-1/+1
* | Check DB result.Thomas Tanghus2012-11-051-1/+7
* | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-11-055-26/+23
|\|
| * Merge pull request #245 from owncloud/fileactionsThomas Müller2012-11-051-16/+10
| |\
| | * remove debug statementsRobin Appelman2012-11-051-2/+0
| | * this line shouldn't be hereRobin Appelman2012-11-041-1/+0
| | * some more code reuse for fileactionsRobin Appelman2012-11-041-16/+13
| * | Merge pull request #252 from owncloud/fix_user_webdavauthFrank Karlitschek2012-11-054-10/+13
| |\ \
| | * | fix the webdavauth appFrank Karlitschek2012-11-053-4/+8
| | * | fix the webdav user backend. still not completel working but a frist stepFrank Karlitschek2012-11-052-6/+5
* | | | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-11-05135-1069/+950
|\| | |
| * | | Merge pull request #242 from fmms/checkstyle05Thomas Müller2012-11-0541-638/+632
| |\ \ \
| | * | | Style: The last two spacesFelix Moeller2012-11-042-2/+2
| | * | | Style: Remove all the dangling white spacesFelix Moeller2012-11-0421-58/+58
| | * | | Style: Different line endings in one file are bad for sureFelix Moeller2012-11-041-42/+42
| | * | | Checkstyle: Fix the last two InvalidEOLCharFelix Moeller2012-11-042-500/+500
| | * | | Checkstyle: Fix last six NewlineBeforeOpenBraceFelix Moeller2012-11-045-12/+6
| | * | | Checkstyle: fix the last NoSpaceAfterEqualsFelix Moeller2012-11-041-1/+1
| | * | | Checkstyle: Fix the last 25 NoSpaceAfterCommaFelix Moeller2012-11-0414-25/+25
| | * | | Checkstyle: Fix the last two SpaceBeforeOpenBraceFelix Moeller2012-11-042-2/+2
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2012-11-059-31/+31
| | |/ / | |/| |
| * | | add a link to the contribution guidelines to make it easier for new peopleFrank Karlitschek2012-11-041-1/+2
| | |/ | |/|
| * | Merge pull request #200 from owncloud/ldapLukas Reschke2012-11-041-6/+6
| |\ \ | | |/ | |/|
| | * merge from masterArthur Schiwon2012-11-04271-3597/+3632
| | |\ | | |/ | |/|
| * | Merge pull request #238 from fmms/checkstyle04Thomas Müller2012-11-0495-297/+297
| |\ \
| | * | Checkstyle fixes: NoSpaceAfterCommaFelix Moeller2012-11-0484-251/+251
| | * | Checkstyle fixes for SpaceBeforeOpenBraceFelix Moeller2012-11-0423-46/+46
| * | | Merge pull request #178 from owncloud/JustOneCSRFTokenPerSessionLukas Reschke2012-11-0410-129/+14
| |\ \ \
| | * | | Change the requesttoken back to OC.EventSource.requesttokenLukas Reschke2012-10-311-1/+1
| | * | | Create only one CSRF token per sessionLukas Reschke2012-10-319-128/+13
| * | | | Remove uneeded debug outputLukas Reschke2012-11-041-1/+0
| | |/ / | |/| |
| | | * code styleArthur Schiwon2012-11-021-1/+1
| | | * LDAP: clear the cache not only when TTL changes, but with every settings upda...Arthur Schiwon2012-11-011-6/+6
* | | | Swap expected and actual.Thomas Tanghus2012-11-041-1/+1
* | | | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-11-04239-3281/+3444
|\| | |
| * | | [tx-robot] updated from transifexJenkins for ownCloud2012-11-0429-96/+135
| * | | check for filename blacklist in OC_Filesystem::isValidPathRobin Appelman2012-11-032-5/+11