aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | [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
| * | | | | Merge pull request #4346 from lavigor/ticket/14661Marc Alexander2016-06-081-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/14661] Fix a typo in twig.php
| | * | | | | [ticket/14661] Fix a typo in twig.phplavigor2016-06-051-1/+1
| | | |/ / / | | |/| | | | | | | | | | | | | | | PHPBB3-14661
* | | | | | [prep-release-3.2.0-RC1] Add migrationTristan Darricau2016-06-191-0/+40
| | | | | |
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-06-081-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | |
| * | | | [ticket/14664] Fix PHPDoc comment in cron managerlavigor2016-06-071-1/+1
| |/ / / | | | | | | | | | | | | PHPBB3-14664
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-05-271-2/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: phpBB/phpbb/notification/manager.php
| * | | [ticket/11446] Make get_notification_type_ids work with string tooJakub Senko2016-05-271-2/+7
| | | | | | | | | | | | | | | | PHPBB3-11446
| * | | [ticket/11446] Use sql_in_set properly in phpbb_notification_managerJakub Senko2016-05-231-12/+10
| |/ / | | | | | | | | | PHPBB3-11446
* | | [ticket/14648] Remove whitespace at the end of a lineMark Shaw2016-05-251-1/+1
| | | | | | | | | | | | PHPBB3-14648
* | | [ticket/14648] Fix bug where default notifications stop working if another ↵Mark Shaw2016-05-251-8/+31
| | | | | | | | | | | | | | | | | | | | | | | | setting is set. When a new user signs up, they have an email preference set but no board notification preference set. The default board preference should work. Also when a user checks the email box for any notification preference, the default board preference should still work. PHPBB3-14648
* | | Merge pull request #4325 from DavidIQ/ticket/14591Marc Alexander2016-05-241-3/+3
|\ \ \ | | | | | | | | | | | | [ticket/14591] Use the correct delimiter for MSSQL
| * | | [ticket/14591] Use the correct delimiter for MSSQLDavid Colón2016-05-181-3/+3
| | | | | | | | | | | | PHPBB3-14591
* | | | [ticket/14645] Language pack not reconised when using a symlinkPaul Sohier2016-05-211-0/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | Symfony finder does not follow symlinks by default. With this change it does, so a user is able to have the language pack outside the phpBB directory, and linked with a symlink into phpBB/language/ PHPBB3-14645
* | | Merge pull request #4315 from Nicofuma/ticket/14628Marc Alexander2016-05-161-4/+5
|\ \ \ | | | | | | | | | | | | [ticket/14628] Supports translatable error messages in the CLI installer
| * | | [ticket/14628] Supports translatable error messages in the CLI installerTristan Darricau2016-05-051-4/+5
| | | | | | | | | | | | | | | | PHPBB3-14628
* | | | [ticket/14595] Added smtp_port where places where smtp_host exists.Derek Held2016-05-143-0/+12
| | | | | | | | | | | | | | | | PHPBB3-14595
* | | | [ticket/14595] Added SMTP port to getConfigTreeBuilderDerek Held2016-05-141-0/+3
| | | | | | | | | | | | | | | | PHPBB3-14595
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-05-121-5/+9
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | [ticket/14610] Implement lavigor methodRichard McGirr2016-05-091-10/+9
| | | | | | | | | | | | PHPBB3-14610
| * | [ticket/14610] Remove whitespaceRichard McGirr2016-05-081-1/+1
| | | | | | | | | | | | PHPBB3-14610