aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | Merge pull request #3444 from naderman/ticket/13617-ascraeusJoas Schilling2015-02-271-1/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13617] Enforce column size limit for session_forum_id
| | * | | | | | [ticket/13617] Document magic number for forum_idNils Adermann2015-02-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13617
| | * | | | | | [ticket/13617] Use request->variable instead of request_varNils Adermann2015-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13617
| | * | | | | | Merge branch 'ticket/13617' into ticket/13617-ascraeusNils Adermann2015-02-251-1/+4
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/13617: [ticket/13617] Enforce column size limit for session_forum_id Conflicts: phpBB/phpbb/session.php
* | | | | | | Merge branch '3.1.x'Marc Alexander2015-02-271-2/+33
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3384 from brunoais/ticket/13592Marc Alexander2015-02-271-2/+33
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | [ticket/13592] Allow changing get_visibility_sql's result
| | * | | | | [ticket/13592] The name didn't make proper sensebrunoais2015-02-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13592
| | * | | | | [ticket/13592] Empty line before event comment block.brunoais2015-02-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I had forgotten this one PHPBB3-13592
| | * | | | | [ticket/13592] Removed unwanted space in self line.brunoais2015-02-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13592
| | * | | | | [ticket/13592] Allow full override of get_visibility_sql()brunoais2015-02-091-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13592
| | * | | | | [ticket/13592] Allow changing get_visibility_sql's resultbrunoais2015-02-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13592
| | * | | | | [ticket/13592] Allow changing get_visibility_sql's resultbrunoais2015-02-081-2/+22
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | PHPBB3-13592
* | | | | | Merge pull request #3303 from Nicofuma/ticket/13513Marc Alexander2015-02-262-13/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13513] Use paths relative to the phpBB root in the router
| * | | | | | [ticket/13513] Use paths relative to the phpBB root in the routerTristan Darricau2015-01-172-13/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13513
* | | | | | | Merge branch '3.1.x'Andreas Fischer2015-02-221-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | / / / | |_|_|/ / / |/| | | | | * 3.1.x: [ticket/13643] Change the priority of kernel_terminate_subscriber to PHP_INT_MIN
| * | | | | Merge pull request #3433 from Nicofuma/ticket/13643Andreas Fischer2015-02-221-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13643] Change the priority of kernel_terminate_subscriber to -10000 * Nicofuma/ticket/13643: [ticket/13643] Change the priority of kernel_terminate_subscriber to PHP_INT_MIN
| | * | | | | [ticket/13643] Change the priority of kernel_terminate_subscriber to PHP_INT_MINNicofuma2015-02-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHP_INT_MIN isn't a defined constant but it can be calculed by ~PHP_INT_MAX (two's complement of PHP_INT_MAX) PHPBB3-13643
* | | | | | | Merge branch '3.1.x'Andreas Fischer2015-02-221-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13551] Fix incorrectly named template variable: AUTH_LDAP_DN
| * | | | | | Merge pull request #3427 from prototech/ticket/13551Andreas Fischer2015-02-221-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13551] Fix incorrectly named template variable: AUTH_LDAP_DN * prototech/ticket/13551: [ticket/13551] Fix incorrectly named template variable: AUTH_LDAP_DN
| | * | | | | | [ticket/13551] Fix incorrectly named template variable: AUTH_LDAP_DNCesar G2015-02-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13551
* | | | | | | | Merge branch '3.1.x'Andreas Fischer2015-02-222-6/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | / / | |_|_|_|_|/ / |/| | | | | | * 3.1.x: [ticket/13644] Always type hint dispatch_interface
| * | | | | | [ticket/13644] Always type hint dispatch_interfaceNicofuma2015-02-222-6/+6
| | |/ / / / | |/| | | | | | | | | | | | | | | | PHPBB3-13644
* | | | | | Merge branch '3.1.x'Joas Schilling2015-02-201-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3418 from brunoais/ticket/13631Joas Schilling2015-02-201-2/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | [ticket/13631] Fix wrong variable in get_global_visibility_sql()'s event
| | * | | | [ticket/13631] Better, more explicit comment explanationbrunoais2015-02-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13631
| | * | | | [ticket/13631] Fix wrong variable in get_global_visibility_sql()'s eventbrunoais2015-02-181-2/+2
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | I don't get this... I was positive I, at some point, had it right... I don't get what happened... PHPBB3-13631
* | | | | Merge branch '3.1.x'Andreas Fischer2015-02-171-2/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * 3.1.x: [ticket/13570] Remove unnecessary ternary condition from mysqli driver
| * | | | [ticket/13570] Remove unnecessary ternary condition from mysqli driverJakub Senko2015-02-161-2/+1
| |/ / / | | | | | | | | | | | | PHPBB3-13570
* | | | [ticket/10748] Split postgres DB tools into it's own classJoas Schilling2015-02-134-277/+637
| | | | | | | | | | | | | | | | PHPBB3-10748
* | | | [ticket/10748] Overwrite the type map correctlyJoas Schilling2015-02-072-1/+4
| | | | | | | | | | | | | | | | PHPBB3-10748
* | | | [ticket/10748] Replace direct creations of tools();Joas Schilling2015-02-072-8/+7
| | | | | | | | | | | | | | | | PHPBB3-10748
* | | | [ticket/10748] Split MS SQL from the db tools file into it's ownJoas Schilling2015-02-073-574/+859
| | | | | | | | | | | | | | | | PHPBB3-10748
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-02-071-1/+1
|\ \ \ \ | |/ / /
| * | | [ticket/13588] Fixes wrong message in info fsockopen() disabledCrizzo2015-02-071-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13588
* | | | Merge pull request #3207 from Nicofuma/ticket/13407Andreas Fischer2015-02-041-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13407] Update Symfony to 2.7.*@dev * Nicofuma/ticket/13407: [ticket/13407] Update composer.lock file [ticket/13407] Bump minimal version to php 5.3.9 [ticket/13407] Introduce a request_stack service [ticket/13407] Remove the last occurence of pattern in routing files [ticket/13407] Update Symfony to 2.7.*@dev
| * | | | [ticket/13407] Bump minimal version to php 5.3.9Nicofuma2015-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13407
* | | | | Merge pull request #3257 from MGaetan89/ticket/13455Andreas Fischer2015-02-049-47/+53
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13455] Change request_var() calls with $request->variable() * MGaetan89/ticket/13455: [ticket/13455] Remove `request_var()` references from comments [ticket/13455] Remove unnecessary calls to `utf8_normalize_nfc()` [ticket/13455] Update calls to `request_var()`
| * | | | [ticket/13455] Remove `request_var()` references from commentsGaëtan Muller2015-02-033-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-13455
| * | | | [ticket/13455] Remove unnecessary calls to `utf8_normalize_nfc()`Gaëtan Muller2015-02-031-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-13455
| * | | | [ticket/13455] Update calls to `request_var()`Gaëtan Muller2015-02-036-44/+50
| | | | | | | | | | | | | | | | | | | | PHPBB3-13455
* | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2015-02-031-5/+6
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | * develop-ascraeus: [ticket/13348] Remove unnecessary global $cache [ticket/13348] Use close method to free query result handle
| * | | Merge branch 'ticket/13348-olympus' into ticket/13348Marc Alexander2015-02-031-5/+6
| | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/feed.php
* | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2015-02-033-1/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-ascraeus: [ticket/13569] Add missing sql_freeresults and remove unneeded results
| * | | [ticket/13569] Add missing sql_freeresults and remove unneeded resultsMarc Alexander2015-02-023-1/+3
| | | | | | | | | | | | | | | | PHPBB3-13569
* | | | [ticket/13139] Fix testsNicofuma2015-02-031-0/+7
| | | | | | | | | | | | | | | | PHPBB3-13139
* | | | [ticket/13494] Update calls to `set_config()`Gaëtan Muller2015-02-0212-22/+29
| | | | | | | | | | | | | | | | PHPBB3-13494
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-02-011-0/+31
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: build/build.xml
| * | | [prep-release-3.1.3] Add migration for 3.1.3Joas Schilling2015-02-011-0/+31
| | | |
* | | | Merge pull request #3352 from VSEphpbb/ticket/10388Marc Alexander2015-01-312-4/+5
|\ \ \ \ | | | | | | | | | | | | | | | Ticket/10388 Use Twig's JS escape filter instead of addslashes on LA_ keys
| * | | | [ticket/10388] Update deprecation commentMatt Friedman2015-01-311-1/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10388