summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |/ / |/| |
* | | [tx-robot] updated from transifexJenkins for ownCloud2012-11-0429-96/+135
* | | check for filename blacklist in OC_Filesystem::isValidPathRobin Appelman2012-11-032-5/+11
* | | some tests for the file blacklistRobin Appelman2012-11-031-8/+42
* | | [tx-robot] updated from transifexJenkins for ownCloud2012-11-03104-306/+422
* | | Merge pull request #220 from fmms/checkstyle02Lukas Reschke2012-11-0283-430/+430
|\ \ \
| * | | Checkstyle: many fixesFelix Moeller2012-11-0283-430/+430
* | | | fix inlude path for template testRobin Appelman2012-11-021-1/+1
* | | | fix OC_Filesystem::isValidPath when using \ instead of / in pathsRobin Appelman2012-11-021-0/+1
|/ / /
* | | Fix a typoLukas Reschke2012-11-021-1/+1
* | | Add CSRF tokenLukas Reschke2012-11-022-1/+2
* | | [tx-robot] updated from transifexJenkins for ownCloud2012-11-02124-2534/+2488
* | | Merge pull request #203 from owncloud/wording-url-linkLukas Reschke2012-11-011-1/+1
|\ \ \
| * | | Files: change wording 'From url' to 'From link'Jan-Christoph Borchardt2012-11-011-1/+1
|/ / /
* | | fix archive tar include pathRobin Appelman2012-11-011-1/+1
| | * 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
| |/ |/|
* | adapted comments to the code changesBjörn Schießle2012-11-012-2/+2
* | load logging apps for webdav connectionsBjörn Schießle2012-11-012-2/+3
* | [tx-robot] updated from transifexJenkins for ownCloud2012-11-0119-77/+92
* | Merge pull request #112 from libasys/Fix-strange-Isue-IE8Thomas Tanghus2012-10-311-17/+21
|\ \
| * | UPDATE oc-dialogs.js and Fix some small Bugs Added in the description of form...libasys2012-10-311-4/+4
| * | Fix for problems using for() function instead of $.each for arrays with IE8libasys2012-10-261-15/+19
* | | Merge pull request #155 from owncloud/token-expired-IEJörn Friedrich Dreyer2012-10-311-0/+2
|\ \ \
| * | | Change IE8 to "older IE versions"Lukas Reschke2012-10-301-1/+1
| * | | Send the requesttoken as form valueLukas Reschke2012-10-301-0/+2
| | |/ | |/|
* | | Merge pull request #152 from scambra/webdav-quotaThomas Müller2012-10-312-0/+60
|\ \ \
| * | | code style changesscambra2012-10-301-4/+6
| * | | fix checking quota in webdav, adding a sabredav pluginscambra2012-10-302-0/+58
* | | | fixing Test_TemplateFunctionsThomas Mueller2012-10-311-1/+1
* | | | [tx-robot] updated from transifexJenkins for ownCloud2012-10-3137-303/+420