aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x' into 3.2.xMarc Alexander2016-08-281-1/+1
|\
| * Merge pull request #3659 from Elsensee/ticket/12230Marc Alexander2016-08-281-1/+1
| |\ | | | | | | | | | [ticket/12230] Disable newly registered group when post limit is set to 0
| | * [ticket/12230] Remove users from new users group when post limit is 0Oliver Schramm2016-05-171-1/+1
| | | | | | | | | | | | PHPBB3-12230
* | | [ticket/14742] Increase user feedback by improving progress barOliver Schramm2016-08-202-5/+20
| | | | | | | | | | | | | | | | | | | | | We now count and display each step that was done by increasing the task count. PHPBB3-14742
* | | Merge branch 'ticket/14742' into ticket/14742-32xOliver Schramm2016-08-206-59/+55
|\ \ \ | |/ / | | | | | | | | | Conflicts: phpBB/phpbb/db/migrator.php
| * | [ticket/14742] Reset migration_data_state before revertingOliver Schramm2016-08-201-1/+4
| | | | | | | | | | | | PHPBB3-14742
| * | [ticket/14742] Change constants to use Symfony valuesOliver Schramm2016-08-201-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | This is to avoid errors when comparing verbosity levels in a CLI output handler that is using Symfony's OutputInterface for example. PHPBB3-14742
| * | [ticket/14742] Pause after each update_data step tooOliver Schramm2016-08-201-50/+34
| | | | | | | | | | | | | | | | | | | | | Rewriting process_data_step() to remove the now useless foreach() loop. PHPBB3-14742
| * | [ticket/14742] Improve readability of the codeOliver Schramm2016-08-201-0/+4
| | | | | | | | | | | | PHPBB3-14742
| * | [ticket/14742] Fix comments in migratorOliver Schramm2016-08-205-5/+6
| | | | | | | | | | | | PHPBB3-14742
* | | 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
* | | | [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-111-1/+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-111-4/+8
| | | | | | | | | | | | | | | | PHPBB3-14742
* | | | Merge branch 'ticket/14742' into ticket/14742-32xOliver Schramm2016-08-116-18/+76
|\ \ \ \ | |/ / /
| * | | [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-111-2/+11
| |/ / | | | | | | | | | | | | | | | It is certainly better than running them all at once PHPBB3-14742
* | | [ticket/14734] Use SVG emojiJoshyPHP2016-08-051-0/+1
| | | | | | | | | | | | PHPBB3-14734
* | | [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
* | | [ticket/14633] Check for XML extension support on installMáté Bartus2016-07-301-0/+19
| | | | | | | | | | | | PHPBB3-14633
* | | [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-203-9/+143
|\ \ \ | | | | | | | | | | | | [ticket/14586] Add OAuth1 support
| * | | [ticket/14586] Add OAuth1 supportJakub Senko2016-05-303-9/+143
| | | | | | | | | | | | | | | | PHPBB3-14586
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-07-172-2/+57
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Conflicts: phpBB/config/feed.yml phpBB/feed.php phpBB/phpbb/feed/base.php
| * | | Merge pull request #4365 from rxu/ticket/14688Marc Alexander2016-07-171-2/+35
| |\ \ \ | | | | | | | | | | | | | | | [ticket/14688] Add core events to the feeds
| | * | | [ticket/14688] Add core events to the feedsrxu2016-07-171-2/+35
| | | | | | | | | | | | | | | | | | | | PHPBB3-14688
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-07-171-46/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #4378 from Crizz0/ticket/14704Marc Alexander2016-07-171-46/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14704] Removes unused function and language files in base.php
| | * | | | [ticket/14704] Removes unused function and language files in base.phpCrizzo2016-07-031-46/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14704
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-07-172-4/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #4321 from Senky/ticket/14615Marc Alexander2016-07-172-4/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/14615] Fix HTML5 validation errors on avatar deletion
| | * | | | | [ticket/14615] Fix HTML5 validation errors on avatar deletionJakub Senko2016-05-162-4/+4
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | PHPBB3-14615
* | | | | | Merge pull request #4380 from JoshyPHP/ticket/14706Marc Alexander2016-07-141-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/14706] Updated [list] BBCode to automatically create a list item
| * | | | | | [ticket/14706] Updated [list] BBCode to automatically create a list itemJoshyPHP2016-07-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes issues with missing list items. Produces valid HTML. PHPBB3-14706
* | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-07-141-0/+10
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #4347 from Senky/ticket/14631Marc Alexander2016-07-141-0/+10
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | [ticket/14631] Load truncate_string() if needed
| | * | | | | [ticket/14631] Load truncate_string() if neededJakub Senko2016-06-071-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14631
* | | | | | | Merge pull request #4349 from marc1706/ticket/14665Andreas Fischer2016-07-101-1/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14665] Remove invalid syntax in report_id_auto_increment migration * marc1706/ticket/14665: [ticket/14665] Remove invalid syntax in report_id_auto_increment migration
| * | | | | | [ticket/14665] Remove invalid syntax in report_id_auto_increment migrationMarc Alexander2016-06-081-1/+2
| | |_|_|_|/ | |/| | | | | | | | | | PHPBB3-14665
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-07-071-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/install/install_install.php phpBB/language/en/install.php