aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | * | | [ticket/13661] Wrong event @since versionbrunoais2015-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13661
| | * | | [ticket/13661] Removed superfluous whitespacebrunoais2015-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13661
| | * | | [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 branch '3.1.x'Marc Alexander2015-05-221-5/+3
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | Conflicts: phpBB/phpbb/db/migration/data/v310/style_update_p1.php
| * | | Merge pull request #3624 from VSEphpbb/ticket/13861Marc Alexander2015-05-221-3/+3
| |\ \ \ | | | | | | | | | | | | | | | [ticket/13861] Fix undefined variables in style update migration
| | * | | [ticket/13861] Fix undefined variables in style update migrationMatt Friedman2015-05-211-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-13861
* | | | | Merge pull request #3608 from Nicofuma/ticket/13829Marc Alexander2015-05-201-22/+37
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13829] Don't fail if the cache isn't writeable
| * | | | | [ticket/13829] Don't fail if the cache isn't writeableNicofuma2015-05-141-22/+37
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13829
* | | | | | Merge pull request #3621 from Nicofuma/ticket/13849Marc Alexander2015-05-201-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13849] Fix development environment
| * | | | | | [ticket/13849] Fix development environmentNicofuma2015-05-191-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13849
* | | | | | | Merge pull request #3586 from s9e/ticket/13680Nicofuma2015-05-203-12/+52
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13680] Updated quote notifications
| * | | | | | | [ticket/13680] Renamed get_quote_authors to get_outermost_quote_authorsJoshyPHP2015-05-153-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13680
| * | | | | | | [ticket/13680] Updated quote notificationsJoshyPHP2015-05-153-12/+52
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added get_quote_authors() to text_formatter.utils service to retrieve the names used in first-level quotes PHPBB3-13680
* | | | | | | [ticket/13801] Updated event description [ci skip]JoshyPHP2015-05-181-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13801
* | | | | | | [ticket/13801] Updated comments for clarityJoshyPHP2015-05-182-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13801
* | | | | | | [ticket/13801] Removed user dependency from text_formatter.s9e.parserJoshyPHP2015-05-181-19/+8
| |/ / / / / |/| | | | | | | | | | | | | | | | | PHPBB3-13801
* | | | | | Merge branch '3.1.x'Nicofuma2015-05-171-3/+23
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #3601 from nickvergessen/ticket/13827Nicofuma2015-05-171-3/+23
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13827] Correctly return JSON instead of HTML when valled from AJAX
| | * | | | | [ticket/13827] Use JsonResponse instead of our hacky json_response with exit()Joas Schilling2015-05-141-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13827
| | * | | | | [ticket/13827] Correctly return JSON instead of HTML when valled from AJAXJoas Schilling2015-05-091-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13827
* | | | | | | Merge branch '3.1.x'Joas Schilling2015-05-166-9/+19
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | [ticket/13838] Fix coding styleNicofuma2015-05-146-9/+19
| | |_|/ / / | |/| | | | | | | | | | | | | | | | PHPBB3-13838
* | | | | | Merge pull request #3591 from Nicofuma/ticket/12632Oliver Schramm2015-05-163-1/+17
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | [ticket/12632] Add twig.debug and twig.auto_reload in config.yml
| * | | | | [ticket/12632] Add twig.debug and twig.auto_reload in config.ymlTristan Darricau2015-05-043-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13206 PHPBB3-12632
* | | | | | Merge pull request #3581 from MateBartus/ticket/13804Nicofuma2015-05-142-3/+38
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13804] Make template's user dependency optional
| * | | | | | [ticket/13804] Remove unnecessary array_mergeMateBartus2015-05-111-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13804
| * | | | | | [ticket/13804] Make template's user dependency optionalMateBartus2015-05-052-3/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13804
* | | | | | | Merge pull request #3577 from MateBartus/ticket/13800Nicofuma2015-05-141-7/+10
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | [ticket/13800] Make router's extension manager dependency optional
| * | | | | | [ticket/13800] Make router's extension manager dependency optionalMateBartus2015-05-021-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13800
* | | | | | | Merge branch '3.1.x'Marc Alexander2015-05-081-1/+2
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
generated by cgit v1.2.1 (git 2.21.0) at 2025-08-03 04:49:11 +0000