aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/13661] bugfix: The conditional is the log_time, not log_typebrunoais2015-03-011-3/+3
| | | | | | | I mistakenly made the log_type the conditional instead of log_time. Thankfully, the automated tests helped finding this mistake. PHPBB3-13661
* [ticket/13661] Fixed the "FROM" in the built query.brunoais2015-03-011-1/+4
| | | | | | I was doing it wrong by giving a string to the FROM clause in the built query. PHPBB3-13661
* [ticket/13661] Add event to allow editing the queries used to get the logsbrunoais2015-03-011-2/+45
| | | | PHPBB3-13661
* [ticket/13661] Transform queries to get logs and log count into built queriesbrunoais2015-02-281-15/+23
| | | | PHPBB3-13661
* 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 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 #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 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
* | | | [ticket/13644] Always type hint dispatch_interfaceNicofuma2015-02-222-6/+6
| |/ / |/| | | | | | | | PHPBB3-13644
* | | 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
* | [ticket/13570] Remove unnecessary ternary condition from mysqli driverJakub Senko2015-02-161-2/+1
|/ | | | PHPBB3-13570
* [ticket/13588] Fixes wrong message in info fsockopen() disabledCrizzo2015-02-071-1/+1
| | | | PHPBB3-13588
* Merge branch 'ticket/13348-olympus' into ticket/13348Marc Alexander2015-02-031-5/+6
| | | | | Conflicts: phpBB/feed.php
* [ticket/13569] Add missing sql_freeresults and remove unneeded resultsMarc Alexander2015-02-023-1/+3
| | | | PHPBB3-13569
* [prep-release-3.1.3] Add migration for 3.1.3Joas Schilling2015-02-011-0/+31
|
* [prep-release-3.1.3] Add migration for 3.1.3-RC2Joas Schilling2015-01-311-0/+32
|
* [ticket/13553] Use defined title value in page headers tooMatt Friedman2015-01-311-1/+1
| | | | PHPBB3-13553
* [ticket/13553] Make title var accept a lang key varMatt Friedman2015-01-311-4/+4
| | | | PHPBB3-13553
* [ticket/13553] Message helper should accept a lang key varMatt Friedman2015-01-311-5/+7
| | | | PHPBB3-13553
* [ticket/13557] Add migrations for 3.0.13 and 3.0.13-PL1Joas Schilling2015-01-302-0/+74
| | | | PHPBB3-13557
* [ticket/13556] Fix exception translation with filedownloaderJoas Schilling2015-01-302-5/+6
| | | | PHPBB3-13556
* Merge pull request #3341 from brunoais/ticket/13544Joas Schilling2015-01-301-1/+2
|\ | | | | | | [ticket/13544] Fixing wrong SQL query for permission_unset() for roles
| * [ticket/13544] Use integer case because $role_id is an intbrunoais2015-01-261-1/+1
| | | | | | | | PHPBB3-13544
| * [ticket/13544] Fixing wrong SQL query for permission_unset for rolesbrunoais2015-01-261-1/+2
| | | | | | | | PHPBB3-13544
* | Merge branch 'prep-release-3.0.13' into prep-release-3.1.3Andreas Fischer2015-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.13: [prep-release-3.0.13] Correct changelog link to 3.0.13 changes. [prep-release-3.0.13] Also update version in references to files. [prep-release-3.0.13] Add changelog for 3.0.13-PL1 release. [prep-release-3.0.13] Get rid of roman numbers in CHANGELOG.html. [prep-release-3.0.13] Bump version numbers for 3.0.13-PL1 release. [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME. [ticket/12933] Handle case when * is last character of word [ticket/13554] Show feature release upgrades in blue rather than red. Conflicts: build/build.xml phpBB/adm/style/acp_update.html phpBB/docs/CHANGELOG.html phpBB/docs/INSTALL.html phpBB/includes/constants.php phpBB/includes/startup.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql tests/security/trailing_path_test.php
* | [ticket/13553] Add a method to the controller helper to display a messageJoas Schilling2015-01-291-1/+16
| | | | | | | | PHPBB3-13553
* | [prep-release-3.1.3] Add migration for 3.1.3-RC1Joas Schilling2015-01-261-0/+35
|/
* Merge pull request #3321 from marc1706/ticket/13282Joas Schilling2015-01-231-1/+9
|\ | | | | | | [ticket/13282] Use 0 as default for integer type columns in postgresql
| * [ticket/13282] Use strpos() instead of preg_match()Marc Alexander2015-01-221-1/+1
| | | | | | | | PHPBB3-13282
| * [ticket/13282] Use 0 as default for integer type columns in postgresqlMarc Alexander2015-01-221-1/+9
| | | | | | | | PHPBB3-13282
* | Merge pull request #3173 from Nicofuma/ticket/13361Nils Adermann2015-01-225-13/+199
|\ \ | |/ |/| [ticket/13361] Improve the exception listener
| * [ticket/13361] Rename exception to runtime_exceptionTristan Darricau2015-01-212-4/+4
| | | | | | | | PHPBB3-13361
| * [ticket/13361] Fix the JsonResponse in the exception listenerTristan Darricau2015-01-141-1/+1
| | | | | | | | PHPBB3-13361
| * [ticket/13361] Add testsTristan Darricau2015-01-112-5/+11
| | | | | | | | PHPBB3-13361
| * [ticket/13361] Support ajax request (send a json response)Tristan Darricau2015-01-101-9/+25
| | | | | | | | PHPBB3-13361
| * [ticket/13361] Improve the exception listenerTristan Darricau2014-11-235-4/+168
| | | | | | | | PHPBB3-13361
* | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2015-01-211-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [develop-olympus] Increment version number to 3.0.14-dev. [develop-olympus] Add changelog for 3.0.13 release. [develop-olympus] Bump version numbers for 3.0.13-RC1 release. [develop-olympus] Bumping version numbers to final for 3.0.13 releases. Conflicts: build/build.xml phpBB/docs/CHANGELOG.html phpBB/docs/INSTALL.html phpBB/includes/constants.php phpBB/install/convertors/convert_phpbb20.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/imageset/imageset.cfg phpBB/styles/prosilver/style.cfg phpBB/styles/prosilver/template/template.cfg phpBB/styles/prosilver/theme/theme.cfg phpBB/styles/subsilver2/imageset/imageset.cfg phpBB/styles/subsilver2/style.cfg phpBB/styles/subsilver2/template/template.cfg phpBB/styles/subsilver2/theme/theme.cfg