| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-08-04 | 1 | -21/+27 |
| |\ | | | | | | | | | Conflicts: build/build.xml | ||||
| | * | Merge pull request #4400 from Elsensee/ticket/14731 | Marc Alexander | 2016-08-04 | 1 | -23/+29 |
| | |\ | | | | | | | | | | [ticket/14731] Skip composer when exporting old versions | ||||
| | | * | [ticket/14731] Skip composer when exporting old versions | Oliver Schramm | 2016-08-04 | 1 | -23/+29 |
| | |/ | | | | | | | PHPBB3-14731 | ||||
| * | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-08-03 | 2 | -0/+9 |
| |\ \ | |/ | | | | | | | Conflicts: phpBB/styles/subsilver2/template/memberlist_email.html | ||||
| | * | Merge pull request #4324 from Senky/ticket/14516 | Marc Alexander | 2016-08-03 | 3 | -0/+12 |
| | |\ | | | | | | | | | | [ticket/14516] Add memberlist_email_before event | ||||
| | | * | [ticket/14516] Add memberlist_email_before event | Jakub Senko | 2016-07-17 | 3 | -0/+12 |
| | | | | | | | | | | | | | PHPBB3-14516 | ||||
| * | | | Merge pull request #4399 from wesleyfok/ticket/14729 | Marc Alexander | 2016-08-03 | 2 | -4/+4 |
| |\ \ \ | | | | | | | | | | | | | [ticket/14729] Make reports take config base class | ||||
| | * | | | [ticket/14729] Make reports take config base class | Wesley Fok | 2016-08-03 | 2 | -4/+4 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | Make the report controller and helper classes accept the more generic phpbb/config/config base class in their constructors, instead of the specific database implementation phpbb/config/db. PHPBB3-14729 | ||||
| * | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-08-01 | 1 | -7/+17 |
| |\ \ \ | |/ / | |||||
| | * | | Merge pull request #4397 from Elsensee/ticket/14721 | Marc Alexander | 2016-08-01 | 1 | -7/+17 |
| | |\ \ | | | | | | | | | | | | | [ticket/14721] Avoid renaming deleted users | ||||
| | | * | | [ticket/14721] Avoid renaming deleted users | Oliver Schramm | 2016-08-01 | 1 | -7/+17 |
| | |/ / | | | | | | | | | | PHPBB3-14721 | ||||
| * | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-07-31 | 0 | -0/+0 |
| |\ \ \ | |/ / | | | | | | | | | | | | | Conflicts: phpBB/install/install_install.php phpBB/language/en/install.php | ||||
| | * | | Merge pull request #4301 from 3D-I/PHPBB3-14596 | Marc Alexander | 2016-07-31 | 2 | -4/+4 |
| | |\ \ | | | | | | | | | | | | | [ticket/14596] Deny installation of Ascraeus under PHP 7 | ||||
| | | * | | [ticket/14596] Deny installation of Ascraeus under PHP 7 | 3Di | 2016-07-18 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | PHPBB3-14596 | ||||
| | | * | | [ticket/14596] Deny installation of Ascraeus under PHP 7 | 3Di | 2016-04-23 | 2 | -5/+5 |
| | | | | | | | | | | | | | | | | | PHPBB3-14596 | ||||
| * | | | | Merge pull request #4395 from CHItA/ticket/14633 | Oliver Schramm | 2016-07-30 | 2 | -0/+21 |
| |\ \ \ \ | | | | | | | | | | | | | | | | [ticket/14633] Check for XML extension support on install | ||||
| | * | | | | [ticket/14633] Check for XML extension support on install | Máté Bartus | 2016-07-30 | 2 | -0/+21 |
| |/ / / / | | | | | | | | | | | | | PHPBB3-14633 | ||||
| * | | | | Merge branch '3.1.x' into 3.2.x | Andreas Fischer | 2016-07-29 | 1 | -2/+2 |
| |\ \ \ \ | |/ / / | | | | | | | | | | | | | * 3.1.x: [ticket/14652] Fix typos in core.index_modify_birthdays_list vars descriptions | ||||
| | * | | | Merge pull request #4336 from Senky/ticket/14652 | Andreas Fischer | 2016-07-29 | 1 | -2/+2 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typos in core.index_modify_birthdays_list vars descriptions * Senky/ticket/14652: [ticket/14652] Fix typos in core.index_modify_birthdays_list vars descriptions | ||||
| | | * | | | [ticket/14652] Fix typos in core.index_modify_birthdays_list vars descriptions | Jakub Senko | 2016-05-29 | 1 | -2/+2 |
| | | | |/ | | |/| | | | | | | | | | PHPBB3-14652 | ||||
| * | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-07-24 | 1 | -1/+2 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Merge pull request #4391 from VSEphpbb/ticket/14720 | Marc Alexander | 2016-07-24 | 1 | -1/+2 |
| | |\ \ \ | | | | | | | | | | | | | | | | [ticket/14720] Add "phpbb" as allowed global to jshintrc | ||||
| | | * | | | [ticket/14720] Add "phpbb" as allowed global to jshintrc | Matt Friedman | 2016-07-23 | 1 | -1/+2 |
| | |/ / / | | | | | | | | | | | | | PHPBB3-14720 | ||||
| * | | | | Merge pull request #4390 from marc1706/ticket/14717 | Máté Bartus | 2016-07-23 | 6 | -13/+13 |
| |\ \ \ \ | | | | | | | | | | | [ticket/14717] Quote strings beginning with @ or % in yaml definitions | ||||
| | * | | | | [ticket/14717] Quote strings beginning with @ or % in yaml definitions | Marc Alexander | 2016-07-23 | 6 | -13/+13 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | This type of use was deprecated in symfony 2.8 and will be dropped in 3.x. Also see: https://github.com/symfony/symfony/pull/16285 PHPBB3-14717 | ||||
| * | | | | Merge pull request #4388 from JoshyPHP/ticket/14700 | Marc Alexander | 2016-07-21 | 3 | -1/+45 |
| |\ \ \ \ | | | | | | | | | | | | | | | | [ticket/14700] Prevent an exception on duplicate smilies in text_formatter | ||||
| | * | | | | [ticket/14700] Prevent an exception on duplicate smilies in text_formatter | JoshyPHP | 2016-07-21 | 3 | -1/+45 |
| |/ / / / | | | | | | | | | | | | | PHPBB3-14700 | ||||
| * | | | | Merge pull request #4344 from Senky/ticket2/14586 | Marc Alexander | 2016-07-20 | 5 | -9/+152 |
| |\ \ \ \ | | | | | | | | | | | | | | | | [ticket/14586] Add OAuth1 support | ||||
| | * | | | | [ticket/14586] Add OAuth1 support | Jakub Senko | 2016-05-30 | 5 | -9/+152 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-14586 | ||||
| * | | | | | Merge branch '3.1.x' into 3.2.x | Máté Bartus | 2016-07-19 | 1 | -10/+8 |
| |\ \ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | | Merge pull request #4387 from marc1706/ticket/14538 | Máté Bartus | 2016-07-19 | 1 | -100/+106 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/14538] Update symfony dependencies to latest versions | ||||
| | | * | | | | [ticket/14538] Update symfony dependencies to latest versions | Marc Alexander | 2016-07-19 | 1 | -100/+106 |
| | |/ / / / | | | | | | | | | | | | | | | | PHPBB3-14538 | ||||
| * | | | | | Merge pull request #4386 from marc1706/ticket/14714 | Máté Bartus | 2016-07-19 | 1 | -159/+161 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/14714] Update dependencies to latest versions | ||||
| | * | | | | | [ticket/14714] Update dependencies to latest versions | Marc Alexander | 2016-07-18 | 1 | -159/+161 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This does include updating guzzle with the latest security update and also updating symfony to 2.8.8. PHPBB3-14714 | ||||
| * | | | | | Merge pull request #4385 from JoshyPHP/ticket/14663 | Marc Alexander | 2016-07-18 | 3 | -0/+30 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/14663] Added regression test for Unicode in custom BBCodes | ||||
| | * | | | | | [ticket/14663] Added regression test for Unicode in custom BBCodes | JoshyPHP | 2016-07-18 | 3 | -0/+30 |
| |/ / / / / | | | | | | | | | | | | | | | | PHPBB3-14663 | ||||
| * | | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-07-17 | 3 | -2/+65 |
| |\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/config/feed.yml phpBB/feed.php phpBB/phpbb/feed/base.php | ||||
| | * | | | | Merge pull request #4365 from rxu/ticket/14688 | Marc Alexander | 2016-07-17 | 3 | -2/+56 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/14688] Add core events to the feeds | ||||
| | | * | | | | [ticket/14688] Add core events to the feeds | rxu | 2016-07-17 | 3 | -2/+56 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14688 | ||||
| * | | | | | | Merge pull request #4311 from Crizz0/ticket/14620 | Marc Alexander | 2016-07-17 | 3 | -31/+32 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/14620] Change docs/ and files to 3.2.x | ||||
| | * | | | | | | [ticket/14620] Adds link to Translations forum | Crizzo | 2016-07-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14620 | ||||
| | * | | | | | | [ticket/14620] Changes specific update-support to general: <=beta to >=RC1 | Crizzo | 2016-06-21 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14620 | ||||
| | * | | | | | | [ticket/14620] Adds section update from 3.0/3.1 to 3.2 | Crizzo | 2016-06-08 | 1 | -7/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14620 | ||||
| | * | | | | | | [ticket/14620] Adds2.0 to 3.2. convert; performend convert; still up2date | Crizzo | 2016-06-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14620 | ||||
| | * | | | | | | [ticket/14620] Updates section 4.i. Full package to 3.2.0 | Crizzo | 2016-06-08 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14620 | ||||
| | * | | | | | | [ticket/14620] Section "Patch file"/"Auto update" was updated in INSTALL.html | Crizzo | 2016-05-24 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14620 | ||||
| | * | | | | | | [ticket/14620] Changes 3.1 to 3.2 links in FAQ.html | Crizzo | 2016-05-14 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14620 | ||||
| | * | | | | | | [ticket/14620] Readme.html installing phpBB, 2.i, 3.i, 5. and issues | Crizzo | 2016-05-14 | 1 | -11/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14620 | ||||
| | * | | | | | | [ticket/14620] Start to change install.html to 3.2.0 usage. | Crizzo | 2016-05-02 | 1 | -5/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14620 | ||||
| * | | | | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2016-07-17 | 3 | -508/+0 |
| |\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
