aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/14636] Restore BC with request_varOliver Schramm2016-08-201-0/+2
| | | | PHPBB3-14636
* Merge branch '3.1.x' into 3.2.xMarc Alexander2016-08-161-1/+1
|\
| * Merge pull request #4413 from wesleyfok/ticket/14745Marc Alexander2016-08-161-1/+1
| |\ | | | | | | | | | [ticket/14745] Removed unneeded HTML ampersand
| | * [ticket/14745] Removed unneeded HTML ampersandWesley Fok2016-08-151-1/+1
| | | | | | | | | | | | | | | | | | | | | Changed the HTML ampersand entity in U_NOTIFICATION_SETTINGS into a bare ampersand character. PHPBB3-14745
* | | Merge pull request #4404 from JoshyPHP/ticket/14740Marc Alexander2016-08-161-5/+5
|\ \ \ | | | | | | | | | | | | [ticket/14740] Added support for quoted attributes in BBCode definitions
| * | | [ticket/14740] Added support for quoted attributes in BBCode definitionsJoshyPHP2016-08-101-5/+5
| | | | | | | | | | | | | | | | PHPBB3-14740
* | | | [ticket/14742] Further improve progress bar in db updaterOliver Schramm2016-08-121-9/+15
| | | | | | | | | | | | | | | | PHPBB3-14742
* | | | Merge branch 'ticket/14742' into ticket/14742-32xOliver Schramm2016-08-121-15/+58
|\ \ \ \ | | |/ / | |/| |
| * | | [ticket/14742] Enhance measured time for migrationsOliver Schramm2016-08-121-5/+24
| | | | | | | | | | | | | | | | PHPBB3-14742
| * | | [ticket/14742] Improve verbosity of migrator outputOliver Schramm2016-08-121-2/+6
| | | | | | | | | | | | | | | | PHPBB3-14742
* | | | [ticket/14742] Fix progress bar in database updaterOliver Schramm2016-08-112-3/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Because of the new way, schema update steps are handled, the already misleading progress bar was even more misleading. This should fix it. PHPBB3-14742
* | | | Merge branch 'ticket/14742' into ticket/14742-32xOliver Schramm2016-08-111-2/+28
|\ \ \ \ | |/ / /
| * | | [ticket/14742] Avoid loop while reverting schemaOliver Schramm2016-08-111-2/+7
| | | | | | | | | | | | | | | | PHPBB3-14742
| * | | [ticket/14742] Make $last_run_migration protectedOliver Schramm2016-08-112-8/+14
| | | | | | | | | | | | | | | | PHPBB3-14742
| * | | [ticket/14742] Fix schema updateOliver Schramm2016-08-111-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | First make it work, then avoid a loop PHPBB3-14742
* | | | [ticket/14742] Display message if reverting schema is in progressOliver Schramm2016-08-112-4/+9
| | | | | | | | | | | | | | | | PHPBB3-14742
* | | | Merge branch 'ticket/14742' into ticket/14742-32xOliver Schramm2016-08-117-18/+77
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | [ticket/14742] Small fixes to migratorOliver Schramm2016-08-111-4/+2
| | | | | | | | | | | | PHPBB3-14742
| * | [ticket/14742] Avoid loop while reverting dataOliver Schramm2016-08-116-12/+63
| | | | | | | | | | | | | | | | | | This combines reverted updata_data and revert_data into a single array. PHPBB3-14742
| * | [ticket/14742] Pause after each schema changeOliver Schramm2016-08-112-2/+12
| | | | | | | | | | | | | | | | | | It is certainly better than running them all at once PHPBB3-14742
* | | [ticket/14735] Update composer dependencies to latest versionsMarc Alexander2016-08-052-101/+103
| | | | | | | | | | | | | | | | | | | | | This will update Symfony to 2.8.9, fast-image-size to 1.1.1, and text-formatter to 0.6.1. PHPBB3-14735
* | | [ticket/14734] Use SVG emojiJoshyPHP2016-08-051-0/+1
| | | | | | | | | | | | PHPBB3-14734
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-08-032-0/+9
|\ \ \ | |/ / | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/memberlist_email.html
| * | Merge pull request #4324 from Senky/ticket/14516Marc Alexander2016-08-033-0/+12
| |\ \ | | |/ | |/| | | | [ticket/14516] Add memberlist_email_before event
| | * [ticket/14516] Add memberlist_email_before eventJakub Senko2016-07-173-0/+12
| | | | | | | | | | | | PHPBB3-14516
* | | [ticket/14729] Make reports take config base classWesley Fok2016-08-032-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.xMarc Alexander2016-08-011-7/+17
|\ \ \ | |/ /
| * | [ticket/14721] Avoid renaming deleted usersOliver Schramm2016-08-011-7/+17
| | | | | | | | | | | | PHPBB3-14721
| * | Merge pull request #4301 from 3D-I/PHPBB3-14596Marc Alexander2016-07-312-4/+4
| |\ \ | | | | | | | | | | | | [ticket/14596] Deny installation of Ascraeus under PHP 7
| | * | [ticket/14596] Deny installation of Ascraeus under PHP 73Di2016-07-181-2/+2
| | | | | | | | | | | | | | | | PHPBB3-14596
| | * | [ticket/14596] Deny installation of Ascraeus under PHP 73Di2016-04-232-5/+5
| | | | | | | | | | | | | | | | PHPBB3-14596
* | | | [ticket/14633] Check for XML extension support on installMáté Bartus2016-07-302-0/+21
| | | | | | | | | | | | | | | | PHPBB3-14633
* | | | Merge branch '3.1.x' into 3.2.xAndreas Fischer2016-07-291-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * 3.1.x: [ticket/14652] Fix typos in core.index_modify_birthdays_list vars descriptions
| * | | Merge pull request #4336 from Senky/ticket/14652Andreas Fischer2016-07-291-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 descriptionsJakub Senko2016-05-291-2/+2
| | | |/ | | |/| | | | | | | | | PHPBB3-14652
* | | | [ticket/14717] Quote strings beginning with @ or % in yaml definitionsMarc Alexander2016-07-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | [ticket/14700] Prevent an exception on duplicate smilies in text_formatterJoshyPHP2016-07-211-1/+1
| | | | | | | | | | | | | | | | PHPBB3-14700
* | | | Merge pull request #4344 from Senky/ticket2/14586Marc Alexander2016-07-205-9/+152
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/14586] Add OAuth1 support
| * | | | [ticket/14586] Add OAuth1 supportJakub Senko2016-05-305-9/+152
| | | | | | | | | | | | | | | | | | | | PHPBB3-14586
* | | | | Merge branch '3.1.x' into 3.2.xMáté Bartus2016-07-191-10/+8
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | [ticket/14538] Update symfony dependencies to latest versionsMarc Alexander2016-07-191-100/+106
| | | | | | | | | | | | | | | | | | | | PHPBB3-14538
* | | | | [ticket/14714] Update dependencies to latest versionsMarc Alexander2016-07-181-159/+161
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This does include updating guzzle with the latest security update and also updating symfony to 2.8.8. PHPBB3-14714
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-07-173-2/+65
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/config/feed.yml phpBB/feed.php phpBB/phpbb/feed/base.php
| * | | | Merge pull request #4365 from rxu/ticket/14688Marc Alexander2016-07-173-2/+56
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14688] Add core events to the feeds
| | * | | | [ticket/14688] Add core events to the feedsrxu2016-07-173-2/+56
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14688
* | | | | | Merge pull request #4311 from Crizz0/ticket/14620Marc Alexander2016-07-173-31/+32
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/14620] Change docs/ and files to 3.2.x
| * | | | | | [ticket/14620] Adds link to Translations forumCrizzo2016-07-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14620
| * | | | | | [ticket/14620] Changes specific update-support to general: <=beta to >=RC1Crizzo2016-06-211-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14620
| * | | | | | [ticket/14620] Adds section update from 3.0/3.1 to 3.2Crizzo2016-06-081-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14620
| * | | | | | [ticket/14620] Adds2.0 to 3.2. convert; performend convert; still up2dateCrizzo2016-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14620