aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developAndreas Fischer2014-08-214-19/+0
|\ | | | | | | | | * develop-ascraeus: [ticket/12999] Remove @author tags
| * Merge pull request #2894 from Nicofuma/ticket/12999Andreas Fischer2014-08-214-19/+0
| |\ | | | | | | | | | | | | | | | | | | [ticket/12999] Remove @author tags * Nicofuma/ticket/12999: [ticket/12999] Remove @author tags
| | * [ticket/12999] Remove @author tagsTristan Darricau2014-08-194-19/+0
| | | | | | | | | | | | PHPBB3-12999
* | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-2112-86/+86
|\ \ \ | |/ /
| * | Merge pull request #2885 from Nicofuma/ticket/12990Marc Alexander2014-08-2112-86/+86
| |\ \ | | | | | | | | | | | | [ticket/12990] Use the full services name for the notification's types
| | * | [ticket/12990] Use protected instead of privateTristan Darricau2014-08-171-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12990
| | * | [ticket/12990] Use the full services name for the notification's typesTristan Darricau2014-08-1612-87/+87
| | |/ | | | | | | | | | PHPBB3-12990
* | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-201-2/+2
|\ \ \ | |/ /
| * | [ticket/12998] Fix use of $lang in mcp_warn.phpTristan Darricau2014-08-191-2/+2
| |/ | | | | | | PHPBB3-12998
* | [ticket/12974] Update nightly build version to 3.2.0-a1-devJoas Schilling2014-08-121-1/+1
| | | | | | | | PHPBB3-12974
* | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-121-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [prep-release-3.1.0-RC3] Update phpBB Version for RC4 development [prep-release-3.1.0-RC3] Add changelog for 3.1.0-RC3 [prep-release-3.1.0-RC3] Prepare Changelog [prep-release-3.1.0-RC3] Add migration for 3.1.0-RC3 [prep-release-3.1.0-RC3] Update version to 3.1.0-RC3 Conflicts: phpBB/styles/subsilver2/style.cfg
| * [prep-release-3.1.0-RC3] Update phpBB Version for RC4 developmentJoas Schilling2014-08-121-1/+1
| |
| * [prep-release-3.1.0-RC3] Update version to 3.1.0-RC3Joas Schilling2014-08-111-1/+1
| |
* | Merge branch 'develop-ascraeus' into developNils Adermann2014-08-114-77/+84
|\ \ | |/ | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12822] Fix test runs of avatar manager_test [ticket/12822] Add method for deleting avatars and use confirm_box [ticket/12822] Remove "None" option from avatar select boxes Conflicts: phpBB/styles/subsilver2/template/ucp_groups_manage.html phpBB/styles/subsilver2/template/ucp_profile_avatar.html
| * Merge remote-tracking branch 'github-marc1706/ticket/12822' into ↵Nils Adermann2014-08-114-77/+84
| |\ | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-marc1706/ticket/12822: [ticket/12822] Fix test runs of avatar manager_test [ticket/12822] Add method for deleting avatars and use confirm_box [ticket/12822] Remove "None" option from avatar select boxes
| | * [ticket/12822] Add method for deleting avatars and use confirm_boxMarc Alexander2014-08-074-77/+84
| | | | | | | | | | | | | | | | | | | | | | | | The method will take care of the actual deletion process in the avatar manager. Additionally, we'll be using a confirm box while deleting the avatar to prevent users from accidentally deleting their avatars. PHPBB3-12822
* | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-1115-6000/+14
|\ \ \ | |/ / | | | | | | | | | Conflicts: phpBB/config/services.yml
| * | Merge pull request #2842 from Nicofuma/ticket/11854Marc Alexander2014-08-1115-6000/+14
| |\ \ | | | | | | | | | | | | [ticket/11854] Move captchas to phpbb/ and use DI for plugins
| | * | [ticket/11854] Rename captchas.factory service to captcha.factoryTristan Darricau2014-08-115-6/+6
| | | | | | | | | | | | | | | | PHPBB3-11854
| | * | [ticket/11854] Move captcha stuff to phpbb/ and use DI for pluginsTristan Darricau2014-08-1115-6000/+14
| | | | | | | | | | | | | | | | PHPBB3-11854
* | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-111-1/+22
|\ \ \ \ | |/ / /
| * | | Merge pull request #2845 from rxu/ticket/12942Marc Alexander2014-08-111-1/+22
| |\ \ \ | | | | | | | | | | | | | | | [ticket/12942] Add core.add_form_key core event
| | * | | [ticket/12942] Add core.add_form_key core eventrxu2014-08-111-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add core.add_form_key core event to allow extensions modifying form key. PHPBB3-12942
* | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-111-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #2867 from prototech/ticket/12967Marc Alexander2014-08-111-0/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/12967] Fix undefined variable phpbb_dispatcher error.
| | * | | | [ticket/12967] Fix undefined variable phpbb_dispatcher error.Cesar G2014-08-111-0/+1
| | | |/ / | | |/| | | | | | | | | | | | PHPBB3-12967
* | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-111-1/+12
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #2863 from rxu/ticket/12944Marc Alexander2014-08-111-1/+12
| |\ \ \ \ | | |/ / / | |/| | | | | | | | [ticket/12944] Add core.login_forum_box core event
| | * | | [ticket/12944] Add core.login_forum_box core eventrxu2014-08-111-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add core.login_forum_box core event to allow extensions performing additional actions on forum login. PHPBB3-12944
* | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-101-10/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #2864 from rxu/ticket/12931Marc Alexander2014-08-101-10/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/12931] Fix general error on user registration
| | * | | | [ticket/12931] Fix general error on user registrationrxu2014-08-101-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix "Illegal use of $_SERVER" general error on user registration when $config['server_name'] is not set. PHPBB3-12931
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-101-2/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12932] Remove set_datetime_class method from user class [ticket/12932] Fix tests and calls to create_datetime [ticket/12932] Add method for getting the datetime class and allow overriding Conflicts: phpBB/config/services.yml
| * | | | | Merge pull request #2862 from marc1706/ticket/12932Joas Schilling2014-08-101-2/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12932] Add method for allowing override of \phpbb\datetime class * marc1706/ticket/12932: [ticket/12932] Remove set_datetime_class method from user class [ticket/12932] Fix tests and calls to create_datetime [ticket/12932] Add method for getting the datetime class and allow overriding
| | * | | | [ticket/12932] Fix tests and calls to create_datetimeMarc Alexander2014-08-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12932
| | * | | | [ticket/12932] Add method for getting the datetime class and allow overridingMarc Alexander2014-08-101-2/+2
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An extension can now override the datetime class by overwriting the datetime.class parameter in their own yml file. PHPBB3-12932
* | | | | Merge branch 'develop-ascraeus' into developDhruv2014-08-102-16/+42
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By omniError # Via Dhruv Goel (1) and omniError (1) * develop-ascraeus: [ticket/12831] fix CS [ticket/12831] simplified code, upd event block [ticket/12831] reimplemented headers as array [ticket/12831] Optn to prevent setting HTTP headers
| * | | | Merge pull request #2730 from omniError/ticket/12831Dhruv Goel2014-08-102-16/+42
| |\ \ \ \ | | |/ / / | |/| | | [ticket/12831] Allow events in page_header functions to prevent the setting of HTTP headers
| | * | | [ticket/12831] fix CSomniError2014-08-092-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-12831 PHPBB3-12831
| | * | | [ticket/12831] simplified code, upd event blockomniError2014-08-092-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-12831 PHPBB3-12831
| | * | | [ticket/12831] reimplemented headers as arrayomniError2014-08-092-29/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-12831 PHPBB3-12831
| | * | | [ticket/12831] Optn to prevent setting HTTP headersomniError2014-08-012-15/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-12831 PHPBB3-12831
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-102-3/+15
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12943] Add core.phpbb_generate_debug_output core event
| * | | | Merge pull request #2846 from rxu/ticket/12943Joas Schilling2014-08-102-3/+15
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12943] Add core.phpbb_generate_debug_output core event * rxu/ticket/12943: [ticket/12943] Add core.phpbb_generate_debug_output core event
| | * | | | [ticket/12943] Add core.phpbb_generate_debug_output core eventrxu2014-08-092-3/+15
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Add core.phpbb_generate_debug_output core event to allow extensions outputting additional debug info. PHPBB3-12943
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-103-66/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12938] Remove functional tests for 'Download all attachments'. [ticket/12938] Remove the 'Download all attachments' feature.
| * | | | Merge pull request #2852 from bantu/ticket/12938Joas Schilling2014-08-103-66/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12938] Remove the 'Download all attachments' feature. * bantu/ticket/12938: [ticket/12938] Remove functional tests for 'Download all attachments'. [ticket/12938] Remove the 'Download all attachments' feature.
| | * | | | [ticket/12938] Remove the 'Download all attachments' feature.Andreas Fischer2014-08-093-66/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12938
* | | | | | [ticket/12957] Update the constructions of the template engineTristan Darricau2014-08-102-4/+37
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12957
* | | | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-08-101-0/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12941] Fix remaining Sami complaints. [ticket/12941] Check for Sami parse errors on Travis CI. [ticket/12941] Add sami.conf.php for Travis CI.
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-11 19:28:45 +0000