aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | [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-113-4/+38
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | [ticket/14742] Add test for (not) reverting ifOliver Schramm2016-08-112-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14742
| | * | | | | | | | [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-118-18/+133
| |\ \ \ \ \ \ \ \ \ |/ / / / / / / / / / | | _ / / / / / / / | | / / / / / / /
| * | | | | | | | [ticket/14742] Add test for reverse_update_data()Oliver Schramm2016-08-111-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14742
| * | | | | | | | [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
* | | | | | | | Merge pull request #4402 from marc1706/ticket/14735Máté Bartus2016-08-053-101/+106
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14735] Update composer dependencies to latest versions
| * | | | | | | | [ticket/14735] Add php nightly to travis build configMarc Alexander2016-08-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14735
| * | | | | | | | [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
* | | | | | | | Merge pull request #4401 from JoshyPHP/ticket/14734Marc Alexander2016-08-052-1/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14734] Use SVG emoji
| * | | | | | | | [ticket/14734] Use SVG emojiJoshyPHP2016-08-052-1/+2
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14734
* | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-08-041-21/+27
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml
| * | | | | | | Merge pull request #4400 from Elsensee/ticket/14731Marc Alexander2016-08-041-23/+29
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14731] Skip composer when exporting old versions
| | * | | | | | | [ticket/14731] Skip composer when exporting old versionsOliver Schramm2016-08-041-23/+29
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14731
* | | | | | | | 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
* | | | | | | Merge pull request #4399 from wesleyfok/ticket/14729Marc Alexander2016-08-032-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14729] Make reports take config base class
| * | | | | | | [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
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #4397 from Elsensee/ticket/14721Marc Alexander2016-08-011-7/+17
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | [ticket/14721] Avoid renaming deleted users
| | * | | | | [ticket/14721] Avoid renaming deleted usersOliver Schramm2016-08-011-7/+17
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-14721
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-07-310-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/install/install_install.php phpBB/language/en/install.php
| * | | | | 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
* | | | | | | Merge pull request #4395 from CHItA/ticket/14633Oliver Schramm2016-07-302-0/+21
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14633] Check for XML extension support on install
| * | | | | | | [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
* | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-07-241-1/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #4391 from VSEphpbb/ticket/14720Marc Alexander2016-07-241-1/+2
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | [ticket/14720] Add "phpbb" as allowed global to jshintrc
| | * | | | | [ticket/14720] Add "phpbb" as allowed global to jshintrcMatt Friedman2016-07-231-1/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-14720
* | | | | | Merge pull request #4390 from marc1706/ticket/14717Máté Bartus2016-07-236-13/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ticket/14717] Quote strings beginning with @ or % in yaml definitions
| * | | | | | [ticket/14717] Quote strings beginning with @ or % in yaml definitionsMarc Alexander2016-07-236-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/14700Marc Alexander2016-07-213-1/+45
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/14700] Prevent an exception on duplicate smilies in text_formatter
| * | | | | | [ticket/14700] Prevent an exception on duplicate smilies in text_formatterJoshyPHP2016-07-213-1/+45
|/ / / / / / | | | | | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #4387 from marc1706/ticket/14538Máté Bartus2016-07-191-100/+106
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14538] Update symfony dependencies to latest versions
| | * | | | | | [ticket/14538] Update symfony dependencies to latest versionsMarc Alexander2016-07-191-100/+106
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-14538