aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x'Tristan Darricau2015-06-061-2/+14
|\
| * Merge pull request #3680 from marc1706/ticket/13917Tristan Darricau2015-06-061-2/+14
| |\ | | | | | | | | | [ticket/13917] Use hash_equals() if possible in password driver helper
| | * [ticket/13917] Do not pass non-string variables to hash_equals()Marc Alexander2015-06-041-2/+8
| | | | | | | | | | | | PHPBB3-13917
| | * [ticket/13917] Use hash_equals() if it's availableMarc Alexander2015-06-041-0/+6
| | | | | | | | | | | | PHPBB3-13917
* | | Merge branch '3.1.x'Joas Schilling2015-06-043-5/+12
|\ \ \ | |/ /
| * | Merge pull request #3502 from marc1706/ticket/13564Joas Schilling2015-06-043-5/+12
| |\ \ | | |/ | |/| | | | [ticket/13564] Unlink user accounts upon deleting user
| | * [ticket/13564] Use user_id from link_data for unlinking account in oauthMarc Alexander2015-03-241-1/+4
| | | | | | | | | | | | PHPBB3-13564
| | * [ticket/13564] Allow to specify user id for retrieving auth link dataMarc Alexander2015-03-243-4/+8
| | | | | | | | | | | | PHPBB3-13564
* | | [ticket/13777] Remove module_class_not_defined_exceptionMateBartus2015-05-312-20/+0
| | | | | | | | | | | | PHPBB3-13777
* | | [ticket/13777] Reorder get_module_infos() method's argumentsMateBartus2015-05-312-8/+3
| | | | | | | | | | | | PHPBB3-13777
* | | [ticket/13777] Use module manager in phpBB core filesMateBartus2015-05-313-53/+24
| | | | | | | | | | | | PHPBB3-13777
* | | [ticket/13777] Move module management into serviceMateBartus2015-05-314-0/+627
| | | | | | | | | | | | PHPBB3-13777
* | | Merge pull request #3592 from Nicofuma/ticket/13388Nils Adermann2015-05-301-7/+124
|\ \ \ | | | | | | | | [ticket/13388] Integrate routing and di parameters resolution
| * | | [ticket/13388] Fix coding styleTristan Darricau2015-05-301-0/+1
| | | | | | | | | | | | | | | | PHPBB3-13388
| * | | [ticket/13388] Fix deprecationsTristan Darricau2015-05-291-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13388
| * | | [ticket/13388] Fix rebaseTristan Darricau2015-05-291-0/+1
| | | | | | | | | | | | | | | | PHPBB3-13388
| * | | [ticket/13388] Address commentsTristan Darricau2015-05-291-5/+4
| | | | | | | | | | | | | | | | PHPBB3-13388
| * | | [ticket/13388] Integrate routing and di parameters resolutionTristan Darricau2015-05-291-7/+123
| | | | | | | | | | | | | | | | PHPBB3-13388
* | | | [ticket/13896] Fix coding styleTristan Darricau2015-05-301-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13896
* | | | Merge branch '3.1.x'Nils Adermann2015-05-3016-17/+3
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | | | | | | | * 3.1.x: [ticket/13790] Update phpcs Conflicts: phpBB/composer.json phpBB/composer.lock
| * | Merge pull request #3560 from Nicofuma/ticket/13790Nils Adermann2015-05-3016-17/+3
| |\ \ | | | | | | | | [ticket/13790] Update phpcs
| | * | [ticket/13790] Update phpcsTristan Darricau2015-05-1916-17/+3
| | | | | | | | | | | | | | | | PHPBB3-13790
* | | | Merge pull request #3561 from s9e/ticket/10922Tristan Darricau2015-05-291-2/+13
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/10922] Added support for body and subject in email BBCode
| * | | | [ticket/10922] Replaced urlencode() with rawurlencode()JoshyPHP2015-04-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RFC-6068 asks for percent-encoding so that seems more correct. Not sure about that one. PHPBB3-10922
| * | | | [ticket/10922] Added support for body and subject in email BBCodeJoshyPHP2015-04-281-2/+13
| | | | | | | | | | | | | | | | | | | | PHPBB3-10922
* | | | | Merge pull request #3613 from nickvergessen/ticket/13844Tristan Darricau2015-05-296-15/+466
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Ticket/13844 Better FAQ language files
| * | | | | [ticket/13844] Add eventsJoas Schilling2015-05-202-11/+57
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13844
| * | | | | [ticket/13844] Remove hacky code for the help arrayJoas Schilling2015-05-172-15/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13844
| * | | | | [ticket/13844] FAQ in new controller formatJoas Schilling2015-05-161-0/+165
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13844
| * | | | | [ticket/13844] Refactor bbcode help to the new systemJoas Schilling2015-05-163-0/+251
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13844
* | | | | | Merge pull request #3616 from s9e/ticket/13847Tristan Darricau2015-05-292-0/+50
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13847] Move quote generation to text_formatter.utils
| * | | | | | [ticket/13847] Changed enquote() logic to use whichever is the shortestJoshyPHP2015-05-251-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Will enclose attribute values in single- or double- quotes depending on whichever requires the least escaping. Characters that need to be escaped are always escaped regardless. PHPBB3-13847
| * | | | | | [ticket/13847] Move quote generation to text_formatter.utilsJoshyPHP2015-05-252-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13847
* | | | | | | Merge pull request #3622 from s9e/ticket/13860Tristan Darricau2015-05-291-1/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13860] Fixed array-to-string conversion
| * | | | | | | [ticket/13860] Fixed array-to-string conversionJoshyPHP2015-05-281-1/+7
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-13860
* | | | | | | Merge pull request #3625 from s9e/ticket/11742Tristan Darricau2015-05-291-43/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11742] Remove tabs-to-space conversion in [code]
| * | | | | | | [ticket/11742] Removed tabs-to-space conversion in [code]JoshyPHP2015-05-231-43/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11742
* | | | | | | | Merge pull request #3554 from Nicofuma/ticket/13770Nils Adermann2015-05-291-245/+251
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13770] Wither interface for container_builder
| * | | | | | | | [ticket/13770] Use dummy cache driverNicofuma2015-05-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13770
| * | | | | | | | [ticket/13770] Fix testsNicofuma2015-05-141-35/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13770
| * | | | | | | | [ticket/13770] Update testsTristan Darricau2015-05-141-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13770
| * | | | | | | | [ticket/13770] Wither interface for container_builderTristan Darricau2015-05-141-257/+247
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13770
* | | | | | | | | Merge branch '3.1.x'Marc Alexander2015-05-282-3/+87
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Merge pull request #3633 from nickvergessen/ticket/13872Marc Alexander2015-05-282-3/+87
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13872] Allow template events to have a changed version
| | * | | | | | | | [ticket/13872] Allow template events to have a changed versionJoas Schilling2015-05-282-3/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13872
* | | | | | | | | | Merge branch '3.1.x'Joas Schilling2015-05-281-15/+70
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | / / / / / | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13661] BUMP version to 3.1.5-dev [ticket/13661] Brackets in their own line [ticket/13661] Re-Fixed $log_type -> $log_time [ticket/13661] Wrong event @since version [ticket/13661] Removed superfluous whitespace [ticket/13661] bugfix: The conditional is the log_time, not log_type [ticket/13661] Fixed the "FROM" in the built query. [ticket/13661] Add event to allow editing the queries used to get the logs [ticket/13661] Transform queries to get logs and log count into built queries
| * | | | | | | | Merge pull request #3457 from brunoais/ticket/13661Joas Schilling2015-05-281-15/+70
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13661] Add event to allow editing the queries used to get the logs * brunoais/ticket/13661: [ticket/13661] BUMP version to 3.1.5-dev [ticket/13661] Brackets in their own line [ticket/13661] Re-Fixed $log_type -> $log_time [ticket/13661] Wrong event @since version [ticket/13661] Removed superfluous whitespace [ticket/13661] bugfix: The conditional is the log_time, not log_type [ticket/13661] Fixed the "FROM" in the built query. [ticket/13661] Add event to allow editing the queries used to get the logs [ticket/13661] Transform queries to get logs and log count into built queries
| | * | | | | | | [ticket/13661] BUMP version to 3.1.5-devbrunoais2015-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13661
| | * | | | | | | [ticket/13661] Brackets in their own linebrunoais2015-03-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I didn't even notice that I used my own coding guidelines there... Thanks to MGaetan89 for pointing it out. PHPBB3-13661
| | * | | | | | | [ticket/13661] Re-Fixed $log_type -> $log_timebrunoais2015-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to goof for pointing it out... PHPBB3-13661
generated by cgit v1.2.1 (git 2.21.0) at 2025-08-03 02:35:47 +0000