aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 parentheses on returnbrunoais2015-02-151-3/+3
* | | Merge branch '3.1.x'Joas Schilling2015-04-062-30/+124
|\ \ \ | |/ /
| * | Merge pull request #3333 from marc1706/ticket/13522Joas Schilling2015-04-062-31/+125
| |\ \
| | * | [ticket/13522] Fix QA tests for request_var() useMarc Alexander2015-02-211-1/+4
| | * | [ticket/13522] Add captcha to test file class nameMarc Alexander2015-02-211-1/+1
| | * | [ticket/13522] Remove unneeded variables and correctly output input on errorMarc Alexander2015-02-211-9/+5
| | * | [ticket/13522] Add tests for acp_get_question_input and set/get nameMarc Alexander2015-02-211-1/+46
| | * | [ticket/13522] Add test file for Q&A captchaMarc Alexander2015-02-211-0/+46
| | * | [ticket/13522] Use acp_get_question_input() for retrieving input dataMarc Alexander2015-02-211-12/+9
| | * | [ticket/13522] Trim array elements before processing furtherMarc Alexander2015-02-211-3/+2
| | * | [ticket/13522] Remove unused variables and unexpected returnsMarc Alexander2015-01-241-10/+9
| | * | [ticket/13522] Remove empty answers from possible answers in Q&AMarc Alexander2015-01-241-2/+11
* | | | Merge branch '3.1.x'Joas Schilling2015-04-062-25/+117
|\ \ \ \ | |/ / /
| * | | Merge pull request #3284 from Elsensee/ticket/13469Joas Schilling2015-04-062-25/+117
| |\ \ \
| | * | | [ticket/13469] Extract test to new methodOliver Schramm2015-04-021-5/+29
| | * | | [ticket/13469] Add testsOliver Schramm2015-03-221-21/+86
| | * | | [ticket/13469] Fall back to soft_delete if no permissions for deleteOliver Schramm2015-01-111-3/+6
* | | | | Merge pull request #3461 from s9e/ticket/11768Tristan Darricau2015-04-0581-140/+6458
|\ \ \ \ \
| * | | | | [ticket/11768] Updated s9e\TextFormatterJoshyPHP2015-04-021-4/+4
| * | | | | [ticket/11768] Stylistic change. No functional change intendedJoshyPHP2015-04-021-1/+1
| * | | | | [ticket/11768] Added some default template parametersJoshyPHP2015-04-021-2/+7
| * | | | | [ticket/11768] Updated s9e\TextFormatterJoshyPHP2015-04-021-4/+4
| * | | | | [ticket/11768] Moved the routine that replaces tabs with spacesJoshyPHP2015-04-021-16/+28
| * | | | | [ticket/11768] Renamed service varsJoshyPHP2015-04-024-32/+26
| * | | | | [ticket/11768] Restored get_parser() / get_renderer()JoshyPHP2015-04-024-0/+34
| * | | | | [ticket/11768] Moved parser/renderer setup eventsJoshyPHP2015-04-022-11/+11
| * | | | | [ticket/11768] Updated s9e\TextFormatterJoshyPHP2015-04-022-5/+5
| * | | | | [ticket/11768] Updated utils serviceJoshyPHP2015-04-023-63/+29
| * | | | | [ticket/11768] Added parser eventsJoshyPHP2015-04-023-2/+82
| * | | | | [ticket/11768] Added renderer eventsJoshyPHP2015-04-022-3/+81
| * | | | | [ticket/11768] Added core.text_formatter_s9e_renderer_setup eventJoshyPHP2015-04-024-6/+61
| * | | | | [ticket/11768] Updated s9e\TextFormatterJoshyPHP2015-04-021-4/+4
| * | | | | [ticket/11768] Fixed service configJoshyPHP2015-04-021-0/+1
| * | | | | [ticket/11768] Added core.text_formatter_s9e_parser_setup eventJoshyPHP2015-04-023-9/+76
| * | | | | [ticket/11768] Removed get_parser() / get_renderer() accessorsJoshyPHP2015-04-024-34/+0
| * | | | | [ticket/11768] Updated the text_formatter.s9e.utils serviceJoshyPHP2015-04-022-38/+16
| * | | | | [ticket/11768] Updated s9e\TextFormatterJoshyPHP2015-04-021-4/+4
| * | | | | [ticket/11768] Removed superfluous whitespace [ci skip]JoshyPHP2015-04-021-3/+0
| * | | | | [ticket/11768] Preserve comments in custom BBCodesJoshyPHP2015-04-023-0/+47
| * | | | | [ticket/11768] Updated s9e\TextFormatterJoshyPHP2015-04-021-4/+4
| * | | | | [ticket/11768] Added configurator eventsJoshyPHP2015-04-024-4/+84
| * | | | | [ticket/11768] Removed whitespaceJoshyPHP2015-04-021-4/+0
| * | | | | [ticket/11768] Updated s9e\TextFormatterJoshyPHP2015-04-021-4/+4
| * | | | | [ticket/11768] Updated annotation [ci skip]JoshyPHP2015-04-021-1/+1
| * | | | | [ticket/11768] Updated merge_templates(). No functional change intendedJoshyPHP2015-04-021-5/+10
| * | | | | [ticket/11768] Reverted change to bbcode_uidJoshyPHP2015-04-021-1/+1
| * | | | | [ticket/11768] Updated merge_templates(). No functional change intendedJoshyPHP2015-04-021-3/+3
| * | | | | [ticket/11768] Updated s9e\TextFormatterJoshyPHP2015-04-021-4/+4