aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/10620] Removed extraneous quotes from attribute valuesJoshyPHP2015-06-251-6/+12
| | | | PHPBB3-10620
* [ticket/10620] Updated docblockJoshyPHP2015-06-251-1/+4
| | | | PHPBB3-10620
* [ticket/10620] Implemented quote improvementsJoshyPHP2015-06-254-18/+111
| | | | PHPBB3-10620
* Merge pull request #3579 from s9e/ticket/13803Tristan Darricau2015-06-2412-0/+817
|\ | | | | | | [ticket/13803] Implement a generic and scalable way to reparse rich text
| * [ticket/13803] Use accurate flags for generate_text_for_edit()JoshyPHP2015-05-301-5/+5
| | | | | | | | PHPBB3-13803
| * [ticket/13803] Renamed varJoshyPHP2015-05-301-4/+4
| | | | | | | | PHPBB3-13803
| * [ticket/13803] Fixed method nameJoshyPHP2015-05-301-1/+1
| | | | | | | | PHPBB3-13803
| * [ticket/13803] Renamed methodsJoshyPHP2015-05-305-10/+11
| | | | | | | | PHPBB3-13803
| * [ticket/13803] Added contact_admin_info testsJoshyPHP2015-05-301-2/+2
| | | | | | | | PHPBB3-13803
| * [ticket/13803] Rewrote the poll_option pluginJoshyPHP2015-05-301-12/+36
| | | | | | | | | | | | As it turns out, poll_option_id is not a primary key. PHPBB3-13803
| * [ticket/13803] Added get_max_id() testsJoshyPHP2015-05-301-1/+1
| | | | | | | | PHPBB3-13803
| * [ticket/13803] Moved the add_missing_fields() call to the base classJoshyPHP2015-05-302-4/+2
| | | | | | | | PHPBB3-13803
| * [ticket/13803] Added user_signature testsJoshyPHP2015-05-301-12/+15
| | | | | | | | PHPBB3-13803
| * [ticket/13803] Reordered methods [ci skip]JoshyPHP2015-05-301-5/+5
| | | | | | | | PHPBB3-13803
| * [ticket/13803] Added testsJoshyPHP2015-05-301-7/+43
| | | | | | | | PHPBB3-13803
| * [ticket/13803] Added pm_text testsJoshyPHP2015-05-302-33/+37
| | | | | | | | PHPBB3-13803
| * [ticket/13803] Added methods to detect whether a given feature is in useJoshyPHP2015-05-302-2/+67
| | | | | | | | | | | | | | They test whether a given BBCode was enabled and has been used in a text, or smilies, or magic URLs. PHPBB3-13803
| * [ticket/13803] Refactored testJoshyPHP2015-05-309-18/+18
| | | | | | | | PHPBB3-13803
| * [ticket/13803] Added tests, fixed param order in generate_text_for_storage()JoshyPHP2015-05-303-15/+62
| | | | | | | | PHPBB3-13803
| * [ticket/13803] Added pluginsJoshyPHP2015-05-3016-316/+525
| | | | | | | | PHPBB3-13803
| * [ticket/13803] Hyphenated class namesJoshyPHP2015-05-305-5/+5
| | | | | | | | PHPBB3-13803
| * [ticket/13803] WIP implementationJoshyPHP2015-05-307-0/+430
| | | | | | | | PHPBB3-13803
* | Merge pull request #3669 from s9e/ticket/13901Tristan Darricau2015-06-241-1/+4
|\ \ | | | | | | | | | [ticket/13901] Add more whitespace to long quotes for readability
| * | [ticket/13901] Add whitespace to short, multiline quotes for readabilityJoshyPHP2015-05-301-1/+1
| | | | | | | | | | | | PHPBB3-13901
| * | [ticket/13901] Add more whitespace to long quotes for readabilityJoshyPHP2015-05-301-1/+4
| |/ | | | | | | PHPBB3-13901
* | Merge branch '3.1.x'Andreas Fischer2015-06-221-7/+44
|\ \ | | | | | | | | | | | | | | | * 3.1.x: [ticket/13952] Fix docblocks [ticket/13952] Inject dispatcher dependency to the tidy search cron task
| * | [ticket/13952] Fix docblocksrxu2015-06-201-6/+40
| | | | | | | | | | | | PHPBB3-13952
| * | [ticket/13952] Inject dispatcher dependency to the tidy search cron taskrxu2015-06-201-2/+5
| | | | | | | | | | | | PHPBB3-13952
* | | Merge branch '3.1.x'Andreas Fischer2015-06-161-2/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13903] Replacing regexp path naming for container by md5. Conflicts: phpBB/phpbb/di/container_builder.php
| * | [ticket/13903] Replacing regexp path naming for container by md5.Wardormeur2015-06-161-2/+1
| | | | | | | | | | | | | | | | | | | | | Replacement of the path creation based on a blacklist by a md5 filename to support broader configurations PHPBB3-13903
* | | Merge branch '3.1.x'Marc Alexander2015-06-1610-11/+12
|\ \ \ | |/ / | | | | | | | | | Conflicts: phpBB/phpbb/user_loader.php
| * | Merge pull request #3653 from callumacrae/ticket/13882Marc Alexander2015-06-1610-11/+12
| |\ \ | | | | | | | | | | | | [ticket/13882] Lazy load the notification avatars.
| | * | [ticket/13882] Lazy load the notification avatars.Callum Macrae2015-05-2810-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves them further down the waterfall, making the page load quicker. PHPBB3-13882
* | | | Merge branch '3.1.x'Joas Schilling2015-06-141-0/+31
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/phpbb/user.php
| * | | Merge branch 'prep-release-3.1.5' into 3.1.xJoas Schilling2015-06-142-1/+32
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql
| | * | | [prep-release-3.1.5] Add migration for 3.1.5Joas Schilling2015-06-141-0/+31
| | | | |
| | * | | [ticket/13942] Check if path to language file contains language pathMarc Alexander2015-06-131-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13942
* | | | | Merge branch '3.1.x'Andreas Fischer2015-06-131-2/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * 3.1.x: [ticket/13941] Workaround to fix the bug on php 5.5 with sqlite3
| * | | | Merge pull request #3704 from Nicofuma/ticket/13941Andreas Fischer2015-06-131-2/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13941] Workaround to fix the bug on php 5.5 with sqlite3 * Nicofuma/ticket/13941: [ticket/13941] Workaround to fix the bug on php 5.5 with sqlite3
| | * | | | [ticket/13941] Workaround to fix the bug on php 5.5 with sqlite3Tristan Darricau2015-06-131-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13941
| * | | | | Merge branch 'prep-release-3.1.5' into 3.1.xJoas Schilling2015-06-111-0/+31
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| * | | | Merge pull request #3694 from marc1706/ticket/13930Andreas Fischer2015-06-094-4/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13930] Check for correct spacing between keyword & parenthesis * marc1706/ticket/13930: [ticket/13930] Add missing spaces to code [ticket/13930] Use OpeningParenthesisSniff in legacy ruleset [ticket/13930] Remove not needed return statements [ticket/13930] Add missing spaces to code [ticket/13930] Check for correct spacing between keyword & parenthesis
* | \ \ \ \ Merge branch '3.1.x'Joas Schilling2015-06-111-0/+31
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg
| * | | | | [prep-release-3.1.5] Add migration for 3.1.5-RC1Joas Schilling2015-06-091-0/+31
| |/ / / /
* | | | | Merge pull request #3696 from marc1706/ticket/13930-masterAndreas Fischer2015-06-094-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13930] Check for correct spacing between keyword & parenthesis * marc1706/ticket/13930-master: [ticket/13930] Add missing space to mssql_extractor [ticket/13930] Add missing spaces to code [ticket/13930] Use OpeningParenthesisSniff in legacy ruleset [ticket/13930] Remove not needed return statements [ticket/13930] Add missing spaces to code [ticket/13930] Check for correct spacing between keyword & parenthesis
| * | | | | [ticket/13930] Add missing space to mssql_extractorMarc Alexander2015-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13930
| * | | | | Merge branch 'ticket/13930' into ticket/13930-masterMarc Alexander2015-06-083-3/+3
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | Conflicts: phpBB/includes/acp/acp_database.php
| | * | | | [ticket/13930] Add missing spaces to codeMarc Alexander2015-06-074-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13930
* | | | | | Merge branch '3.1.x'Joas Schilling2015-06-091-4/+18
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge pull request #3551 from rxu/ticket/13779Joas Schilling2015-06-091-4/+18
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13779] Set new auth options to the role only if matching the role type