| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch '3.1.x' | Dhruv | 2015-04-14 | 1 | -2/+2 |
| |\ | |||||
| | * | [ticket/13756] Fix resize after upload with plupload | Oliver Schramm | 2015-04-11 | 1 | -2/+2 |
| | | | | | | | | | PHPBB3-13756 | ||||
| * | | Merge branch '3.1.x' | Joas Schilling | 2015-04-10 | 1 | -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-RC1 | Joas Schilling | 2015-04-09 | 1 | -0/+31 |
| | | | |||||
| * | | Merge branch '3.1.x' | Joas Schilling | 2015-04-06 | 1 | -0/+6 |
| |\ \ | |/ | |||||
| | * | Merge pull request #3392 from marc1706/ticket/13493 | Joas Schilling | 2015-04-06 | 1 | -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 it | Marc Alexander | 2015-02-11 | 1 | -0/+6 |
| | | | | | | | | | | | | | PHPBB3-13493 | ||||
| * | | | Merge branch '3.1.x' | Joas Schilling | 2015-04-06 | 1 | -1/+23 |
| |\ \ \ | |/ / | |||||
| | * | | Merge pull request #3437 from marc1706/ticket/12368 | Joas Schilling | 2015-04-06 | 1 | -1/+23 |
| | |\ \ | | | | | | | | | | | | | [ticket/12368] Correctly check if avatars migration is installed | ||||
| | | * | | [ticket/12368] Fix comment in docblock | Marc Alexander | 2015-03-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | PHPBB3-12368 | ||||
| | | * | | [ticket/12368] Correctly check if avatars migration is installed | Marc Alexander | 2015-02-24 | 1 | -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 Schilling | 2015-04-06 | 1 | -3/+3 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Merge pull request #3402 from brunoais/ticket/13621 | Joas Schilling | 2015-04-06 | 1 | -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 return | brunoais | 2015-02-15 | 1 | -3/+3 |
| | | | |/ | | |/| | | | | | | | | | | | | | | | | | Prepend $where_sql and postpend closing parentheses on statements with return PHPBB3-13621 | ||||
| * | | | | Merge branch '3.1.x' | Joas Schilling | 2015-04-06 | 1 | -30/+30 |
| |\ \ \ \ | |/ / / | | | | | | | | | | | | | Conflicts: phpBB/phpbb/captcha/plugins/qa.php | ||||
| | * | | | Merge pull request #3333 from marc1706/ticket/13522 | Joas Schilling | 2015-04-06 | 1 | -31/+31 |
| | |\ \ \ | | | | | | | | | | | | | | | | [ticket/13522] Remove empty answers from possible answers in Q&A | ||||
| | | * | | | [ticket/13522] Remove unneeded variables and correctly output input on error | Marc Alexander | 2015-02-21 | 1 | -9/+5 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-13522 | ||||
| | | * | | | [ticket/13522] Use acp_get_question_input() for retrieving input data | Marc Alexander | 2015-02-21 | 1 | -12/+9 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-13522 | ||||
| | | * | | | [ticket/13522] Trim array elements before processing further | Marc Alexander | 2015-02-21 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-13522 | ||||
| | | * | | | [ticket/13522] Remove unused variables and unexpected returns | Marc Alexander | 2015-01-24 | 1 | -10/+9 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-13522 | ||||
| | | * | | | [ticket/13522] Remove empty answers from possible answers in Q&A | Marc Alexander | 2015-01-24 | 1 | -2/+11 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-13522 | ||||
| * | | | | | Merge pull request #3461 from s9e/ticket/11768 | Tristan Darricau | 2015-04-05 | 9 | -0/+1857 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | [3.2][ticket/11768] Integrate s9e\TextFormatter | ||||
| | * | | | | | [ticket/11768] Stylistic change. No functional change intended | JoshyPHP | 2015-04-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11768 | ||||
| | * | | | | | [ticket/11768] Added some default template parameters | JoshyPHP | 2015-04-02 | 1 | -2/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11768 | ||||
| | * | | | | | [ticket/11768] Moved the routine that replaces tabs with spaces | JoshyPHP | 2015-04-02 | 1 | -16/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...to its own method. Also added a quick stripos() check for performance. PHPBB3-11768 | ||||
| | * | | | | | [ticket/11768] Renamed service vars | JoshyPHP | 2015-04-02 | 2 | -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() | JoshyPHP | 2015-04-02 | 2 | -0/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11768 | ||||
| | * | | | | | [ticket/11768] Moved parser/renderer setup events | JoshyPHP | 2015-04-02 | 2 | -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\TextFormatter | JoshyPHP | 2015-04-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11768 | ||||
| | * | | | | | [ticket/11768] Updated utils service | JoshyPHP | 2015-04-02 | 2 | -34/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated docblocks. Removed remove_formatting() because it overlaps with clean_formatting() PHPBB3-11768 | ||||
| | * | | | | | [ticket/11768] Added parser events | JoshyPHP | 2015-04-02 | 2 | -2/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added core.text_formatter_s9e_parse_before and core.text_formatter_s9e_parse_after PHPBB3-11768 | ||||
| | * | | | | | [ticket/11768] Added renderer events | JoshyPHP | 2015-04-02 | 1 | -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 event | JoshyPHP | 2015-04-02 | 1 | -3/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11768 | ||||
| | * | | | | | [ticket/11768] Added core.text_formatter_s9e_parser_setup event | JoshyPHP | 2015-04-02 | 1 | -4/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11768 | ||||
| | * | | | | | [ticket/11768] Removed get_parser() / get_renderer() accessors | JoshyPHP | 2015-04-02 | 2 | -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 service | JoshyPHP | 2015-04-02 | 1 | -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] | JoshyPHP | 2015-04-02 | 1 | -3/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11768 | ||||
| | * | | | | | [ticket/11768] Preserve comments in custom BBCodes | JoshyPHP | 2015-04-02 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11768 | ||||
| | * | | | | | [ticket/11768] Added configurator events | JoshyPHP | 2015-04-02 | 1 | -2/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11768 | ||||
| | * | | | | | [ticket/11768] Updated merge_templates(). No functional change intended | JoshyPHP | 2015-04-02 | 1 | -5/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11768 | ||||
| | * | | | | | [ticket/11768] Updated merge_templates(). No functional change intended | JoshyPHP | 2015-04-02 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11768 | ||||
| | * | | | | | [ticket/11768] Updated various annotations | JoshyPHP | 2015-04-02 | 5 | -28/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11768 | ||||
| | * | | | | | [ticket/11768] Replaced array access with call to $user->lang() | JoshyPHP | 2015-04-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11768 | ||||
| | * | | | | | [ticket/11768] Renamed utils | JoshyPHP | 2015-04-02 | 2 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11768 | ||||
| | * | | | | | [ticket/11768] Made capturing code blocks a bit more flexible | JoshyPHP | 2015-04-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11768 | ||||
| | * | | | | | [ticket/11768] Whitespace [ci skip] | JoshyPHP | 2015-04-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11768 | ||||
| | * | | | | | [ticket/11768] Renamed interfaces | JoshyPHP | 2015-04-02 | 8 | -137/+129 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11768 | ||||
| | * | | | | | [ticket/11768] Added support for creating unsafe BBCodes | JoshyPHP | 2015-04-02 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11768 | ||||
| | * | | | | | [ticket/11768] Replaced extract() calls | JoshyPHP | 2015-04-02 | 3 | -4/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11768 | ||||
| | * | | | | | [ticket/11768] Replaced some references | JoshyPHP | 2015-04-02 | 1 | -5/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11768 | ||||
