aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x'Dhruv2015-04-141-2/+2
|\
| * [ticket/13756] Fix resize after upload with pluploadOliver Schramm2015-04-111-2/+2
| | | | | | | | PHPBB3-13756
* | Merge branch '3.1.x'Joas Schilling2015-04-101-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.4] Add migration for 3.1.4-RC1Joas Schilling2015-04-091-0/+31
| |
* | Merge branch '3.1.x'Joas Schilling2015-04-061-0/+6
|\ \ | |/
| * Merge pull request #3392 from marc1706/ticket/13493Joas Schilling2015-04-061-0/+6
| |\ | | | | | | | | | [ticket/13493] Append page name to base url if it doesn't contain it
| | * [ticket/13493] Append page name to base url if it doesn't contain itMarc Alexander2015-02-111-0/+6
| | | | | | | | | | | | PHPBB3-13493
* | | Merge branch '3.1.x'Joas Schilling2015-04-061-1/+23
|\ \ \ | |/ /
| * | Merge pull request #3437 from marc1706/ticket/12368Joas Schilling2015-04-061-1/+23
| |\ \ | | | | | | | | | | | | [ticket/12368] Correctly check if avatars migration is installed
| | * | [ticket/12368] Fix comment in docblockMarc Alexander2015-03-261-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12368
| | * | [ticket/12368] Correctly check if avatars migration is installedMarc Alexander2015-02-241-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Try to set the avatar type to string value to check if new avatar types are supported. PHPBB3-12368
* | | | Merge branch '3.1.x'Joas Schilling2015-04-061-3/+3
|\ \ \ \ | |/ / /
| * | | Merge pull request #3402 from brunoais/ticket/13621Joas Schilling2015-04-061-3/+3
| |\ \ \ | | | | | | | | | | | | | | | [ticket/13621] Prepend $where_sql and postpend closing bracket on statements with return
| | * | | [ticket/13621] Prepend $where_sql and postpend closing parentheses on returnbrunoais2015-02-151-3/+3
| | | |/ | | |/| | | | | | | | | | | | | | | | | Prepend $where_sql and postpend closing parentheses on statements with return PHPBB3-13621
* | | | Merge branch '3.1.x'Joas Schilling2015-04-061-30/+30
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: phpBB/phpbb/captcha/plugins/qa.php
| * | | Merge pull request #3333 from marc1706/ticket/13522Joas Schilling2015-04-061-31/+31
| |\ \ \ | | | | | | | | | | | | | | | [ticket/13522] Remove empty answers from possible answers in Q&A
| | * | | [ticket/13522] Remove unneeded variables and correctly output input on errorMarc Alexander2015-02-211-9/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-13522
| | * | | [ticket/13522] Use acp_get_question_input() for retrieving input dataMarc Alexander2015-02-211-12/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-13522
| | * | | [ticket/13522] Trim array elements before processing furtherMarc Alexander2015-02-211-3/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-13522
| | * | | [ticket/13522] Remove unused variables and unexpected returnsMarc Alexander2015-01-241-10/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-13522
| | * | | [ticket/13522] Remove empty answers from possible answers in Q&AMarc Alexander2015-01-241-2/+11
| | | | | | | | | | | | | | | | | | | | PHPBB3-13522
* | | | | Merge pull request #3461 from s9e/ticket/11768Tristan Darricau2015-04-059-0/+1857
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [3.2][ticket/11768] Integrate s9e\TextFormatter
| * | | | | [ticket/11768] Stylistic change. No functional change intendedJoshyPHP2015-04-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11768
| * | | | | [ticket/11768] Added some default template parametersJoshyPHP2015-04-021-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11768
| * | | | | [ticket/11768] Moved the routine that replaces tabs with spacesJoshyPHP2015-04-021-16/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...to its own method. Also added a quick stripos() check for performance. PHPBB3-11768
| * | | | | [ticket/11768] Renamed service varsJoshyPHP2015-04-022-18/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The name of the variable that holds the service instance is now consistent across events. PHPBB3-11768
| * | | | | [ticket/11768] Restored get_parser() / get_renderer()JoshyPHP2015-04-022-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11768
| * | | | | [ticket/11768] Moved parser/renderer setup eventsJoshyPHP2015-04-022-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved down the setup events to make them happen after the service is configured and ready to be used PHPBB3-11768
| * | | | | [ticket/11768] Updated s9e\TextFormatterJoshyPHP2015-04-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11768
| * | | | | [ticket/11768] Updated utils serviceJoshyPHP2015-04-022-34/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated docblocks. Removed remove_formatting() because it overlaps with clean_formatting() PHPBB3-11768
| * | | | | [ticket/11768] Added parser eventsJoshyPHP2015-04-022-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added core.text_formatter_s9e_parse_before and core.text_formatter_s9e_parse_after PHPBB3-11768
| * | | | | [ticket/11768] Added renderer eventsJoshyPHP2015-04-021-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added core.text_formatter_s9e_render_before and core.text_formatter_s9e_render_after PHPBB3-11768
| * | | | | [ticket/11768] Added core.text_formatter_s9e_renderer_setup eventJoshyPHP2015-04-021-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11768
| * | | | | [ticket/11768] Added core.text_formatter_s9e_parser_setup eventJoshyPHP2015-04-021-4/+29
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11768
| * | | | | [ticket/11768] Removed get_parser() / get_renderer() accessorsJoshyPHP2015-04-022-20/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no need to access the s9e\TextFormatter objects outside of events. PHPBB3-11768
| * | | | | [ticket/11768] Updated the text_formatter.s9e.utils serviceJoshyPHP2015-04-021-14/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Made it use s9e\TextFormatter\Utils. Refactored some tests to make them more readable. PHPBB3-11768
| * | | | | [ticket/11768] Removed superfluous whitespace [ci skip]JoshyPHP2015-04-021-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11768
| * | | | | [ticket/11768] Preserve comments in custom BBCodesJoshyPHP2015-04-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11768
| * | | | | [ticket/11768] Added configurator eventsJoshyPHP2015-04-021-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11768
| * | | | | [ticket/11768] Updated merge_templates(). No functional change intendedJoshyPHP2015-04-021-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11768
| * | | | | [ticket/11768] Updated merge_templates(). No functional change intendedJoshyPHP2015-04-021-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11768
| * | | | | [ticket/11768] Updated various annotationsJoshyPHP2015-04-025-28/+24
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11768
| * | | | | [ticket/11768] Replaced array access with call to $user->lang()JoshyPHP2015-04-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11768
| * | | | | [ticket/11768] Renamed utilsJoshyPHP2015-04-022-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11768
| * | | | | [ticket/11768] Made capturing code blocks a bit more flexibleJoshyPHP2015-04-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11768
| * | | | | [ticket/11768] Whitespace [ci skip]JoshyPHP2015-04-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11768
| * | | | | [ticket/11768] Renamed interfacesJoshyPHP2015-04-028-137/+129
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11768
| * | | | | [ticket/11768] Added support for creating unsafe BBCodesJoshyPHP2015-04-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11768
| * | | | | [ticket/11768] Replaced extract() callsJoshyPHP2015-04-023-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11768
| * | | | | [ticket/11768] Replaced some referencesJoshyPHP2015-04-021-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11768