aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developNils Adermann2014-11-166-30/+57
|\
| * Merge remote-tracking branch 'github-nicofuma/ticket/13280' into develop-ascr...Nils Adermann2014-11-166-30/+57
| |\
| | * [ticket/13280] Output escaping for the symfony request objectTristan Darricau2014-11-166-24/+59
| | * [ticket/13280] Revert "Merge pull request #3107 from marc1706/ticket/13280"Tristan Darricau2014-11-122-12/+4
* | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-11-161-3/+3
|\ \ \ | |/ /
| * | Merge pull request #3136 from marc1706/ticket/13332Tristan Darricau2014-11-161-3/+3
| |\ \
| | * | [ticket/13332] Remove useless $result assignmentMarc Alexander2014-11-111-1/+1
| | * | [ticket/13332] Pass user row to passwords manager check methodMarc Alexander2014-11-111-2/+2
| | |/
* | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-132-2/+14
|\ \ \ | |/ /
| * | Merge pull request #3137 from prototech/ticket/13209Marc Alexander2014-11-132-2/+14
| |\ \ | | |/ | |/|
| | * [ticket/13209] Gather language field values for boolean CPF's in all steps.Cesar G2014-11-111-1/+1
| | * [ticket/13209] Fix expected request value of CPF language fields.Cesar G2014-11-111-1/+13
* | | Merge pull request #1880 from nicolas-grekas/developTristan Darricau2014-11-112-22/+20
|\ \ \
| * | | [feature/patchwork-utf8] Remove utf8_str_replaceNicolas Grekas2014-11-081-4/+4
| * | | [feature/patchwork-utf8] Normalize with intl, use patchwork/utf8 as fallbackNicolas Grekas2014-11-081-18/+16
* | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-091-10/+18
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #3113 from prototech/ticket/13251Marc Alexander2014-11-091-10/+18
| |\ \ \
| | * | | [ticket/13251] Escape container parameters defined from config.php.Cesar G2014-11-071-10/+18
* | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-091-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3120 from Elsensee/ticket/13301Marc Alexander2014-11-091-2/+2
| |\ \ \ \
| | * | | | [ticket/13301] Fix called function in apche auth moduleOliver Schramm2014-11-091-2/+2
| | | |_|/ | | |/| |
* | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-091-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/13243] Validate announcement entry for existence in version_helperOliver Schramm2014-11-091-1/+1
| |/ / /
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-091-0/+1
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Merge pull request #3110 from Elsensee/ticket/13242Joas Schilling2014-11-091-0/+1
| |\ \
| | * | [ticket/13242] Fix HTML validityOliver Schramm2014-11-051-0/+1
* | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-11-071-0/+31
|\ \ \ \ | |/ / /
| * | | Merge pull request #3118 from prototech/ticket/13270Tristan Darricau2014-11-071-0/+31
| |\ \ \
| | * | | [ticket/13270] Make m_softdelete perm global for boards updated from 3.0.12.Cesar G2014-11-071-0/+31
| | | |/ | | |/|
* | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-11-071-1/+9
|\ \ \ \ | |/ / /
| * | | [ticket/13303] Speed up migration dependency calculation.Cesar G2014-11-071-1/+9
| |/ /
* | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-11-072-4/+12
|\ \ \ | |/ /
| * | [ticket/13280] Only run sanitizer for server superglobal and modify testsMarc Alexander2014-11-041-3/+3
| * | [ticket/13280] Seperate server sanitizer call and add commentMarc Alexander2014-11-041-0/+2
| * | [ticket/13280] Add additional sanitizer for ampersands in server superglobalMarc Alexander2014-11-031-0/+6
| * | [ticket/13280] Properly format the current page and add sanitizer to testsMarc Alexander2014-11-031-3/+3
| |/
* | Merge branch 'develop-ascraeus' into developNils Adermann2014-11-028-10/+183
|\ \ | |/
| * Merge branch 'prep-release-3.1.1' into develop-ascraeusNils Adermann2014-11-028-10/+183
| |\
| | * Merge remote-tracking branch 'github-security/ticket/security-164-alt' into p...Nils Adermann2014-11-022-1/+4
| | |\
| | | * [ticket/security-164] Correctly format page_nameMarc Alexander2014-11-011-1/+1
| | | * [ticket/security-164] Sanitize all global variables in symfony_request classMarc Alexander2014-11-011-0/+3
| | * | Merge branch 'ticket/13271' into prep-release-3.1.1Nils Adermann2014-11-021-1/+1
| | |\ \
| | | * | [ticket/13271] Disable CC sender feature for anonymous usersNils Adermann2014-11-021-1/+1
| | | |/
| | * | [prep-release-3.1.1] Add 3.1.1 migration fileNils Adermann2014-11-021-0/+32
| | * | Merge remote-tracking branch 'github-marc1706/ticket/13263' into prep-release...Nils Adermann2014-11-011-0/+136
| | |\ \
| | | * | [ticket/13263] Make sure default style exists and clean up codeMarc Alexander2014-11-011-47/+12
| | | * | [ticket/13263] Only install/set prosilver if no style availableMarc Alexander2014-11-011-28/+24
| | | * | [ticket/13263] Use prosilver as default style if user's style doesn't existMarc Alexander2014-11-011-0/+175
| | | |/
| | * | [ticket/13248] Correctly pass provider nameMarc Alexander2014-11-011-1/+1
| | * | [ticket/13248] Allow specifying different auth provider in provider collectionMarc Alexander2014-11-011-3/+5