aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'nickvergessen/ticket/11077' into developAndreas Fischer2012-11-111-6/+0
|\
| * [ticket/11077] Remove code from old global announcements systemJoas Schilling2012-11-111-6/+0
|/
* Merge remote-tracking branch 'Fyorl/ticket/10939' into developAndreas Fischer2012-11-1010-32/+94
|\
| * [ticket/10939] Added documentation for phpbb_request::fileFyorl2012-11-101-1/+2
| * [ticket/10939] Added tests for phpbb_request::fileFyorl2012-08-201-0/+17
| * [ticket/10939] Modified the default return for $request->fileFyorl2012-08-151-1/+1
| * [ticket/10939] Modified fileupload tests to deal with new behaviourFyorl2012-08-151-1/+5
| * [ticket/10939] Modified mock request class to handle deactivated $_FILESFyorl2012-08-151-1/+8
| * [ticket/10939] Modified acp_groups.php to not use $_FILESFyorl2012-08-151-2/+4
| * [ticket/10939] Modified ucp_groups.php to not use $_FILESFyorl2012-08-151-2/+3
| * [ticket/10939] Modified functions_user.php to not use $_FILESFyorl2012-08-151-4/+6
| * [ticket/10939] Modified message_parser.php to not use $_FILESFyorl2012-08-151-2/+3
| * [ticket/10939] Modified functions_upload to not use $_FILESFyorl2012-08-151-20/+25
| * [ticket/10939] Modified request test slightly to include $_FILESFyorl2012-08-151-0/+8
| * [ticket/10939] Added $_FILES handling to phpbb_requestFyorl2012-08-152-0/+14
* | Merge remote-tracking branch 'EXreaction/ticket/11189' into developAndreas Fischer2012-11-1020-54/+52
|\ \
| * | [ticket/11189] Replace DEBUG_EXTRA with DEBUGNathaniel Guse2012-11-1020-53/+51
| * | [ticket/11189] Always log critical errors when in cron or in image outputNathaniel Guse2012-11-101-1/+1
* | | Merge pull request #881 from Fyorl/ticket/10970Nils Adermann2012-11-1011-19/+83
|\ \ \
| * | | [ticket/10970] Added extra documentation to parse_dynamic_path.Fyorl2012-11-101-1/+2
| * | | [ticket/10970] Added newline in docblockFyorl2012-08-191-0/+1
| * | | [ticket/10970] Removed unused $varsFyorl2012-08-101-2/+0
| * | | [ticket/10970] Fixed a problem with prepending root pathsFyorl2012-07-241-1/+5
| * | | [ticket/10970] Added missing initialisations and modified the regexFyorl2012-07-241-2/+5
| * | | [ticket/10970] Added support for forms such as {FOO}bar.{EXT}Fyorl2012-07-083-22/+12
| * | | [ticket/10970] Paths of the form {FOO}/a/{BAR}/b parsed correctlyFyorl2012-07-0810-18/+85
* | | | Merge remote-tracking branch 'Fyorl/ticket/11187' into developAndreas Fischer2012-11-101-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | [ticket/11187] Added a blank array to fix errors in functional testsFyorl2012-11-101-1/+1
* | | | Merge remote-tracking branch 'bantu/ticket/10780' into developAndreas Fischer2012-11-101-0/+1
|\ \ \ \
| * | | | [ticket/10780] Make L_COLON available in the installer.Andreas Fischer2012-11-101-0/+1
* | | | | Merge remote-tracking branch 'igorw/ticket/11183' into developAndreas Fischer2012-11-108-125/+23
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | [ticket/11183] Remove $load_extensions and weird dl() callsIgor Wiedler2012-11-108-125/+23
* | | | | Merge PR #1045 branch 'bantu/ticket/10780' into developOleg Pudeyev2012-11-09205-1075/+1076
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | [ticket/10780] Use L_COLON on LDAP page.Andreas Fischer2012-11-101-8/+8
| * | | | [ticket/10780] Use L_COLON on search backend ACP pages.Andreas Fischer2012-11-104-13/+13
| * | | | [ticket/10780] Use L_COLON for "download all attachments".Andreas Fischer2012-11-102-3/+3
| * | | | [ticket/10780] Use colon from language in ucp_pm_compose.php where possible.Andreas Fischer2012-11-101-2/+2
| * | | | [ticket/10780] Replace colons in phpBB/adm/style/acp_ext_details.html.Andreas Fischer2012-11-101-13/+13
| * | | | [ticket/10780] Replace colon usage in adm template output with {L_COLON}Nathan Guse2012-11-1052-368/+368
| * | | | [ticket/10780] Replace colon usage in template output with {L_COLON}Nathan Guse2012-11-10146-668/+669
* | | | | Merge PR #1052 branch 'develop-olympus' into developOleg Pudeyev2012-11-091-66/+85
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge PR #1052 branch 'p/ticket/10865' into develop-olympusOleg Pudeyev2012-11-091-68/+87
| |\ \ \ \
| | * | | | [ticket/10865] Use code tags for install/database_update.php.Oleg Pudeyev2012-11-091-2/+2
| | * | | | [ticket/10865] Should have been a slash.Oleg Pudeyev2012-11-091-1/+1
| | * | | | [ticket/10865] Add .css, .js, and .htaccess to the list of ASCII mode filesPatrick Webster2012-08-031-1/+1
| | * | | | [ticket/10865] Phrase change for visiting with browserPatrick Webster2012-06-281-1/+1
| | * | | | [ticket/10865] Grammar corrections for the entire documentPatrick Webster2012-06-221-56/+56
| | * | | | [ticket/10865] Typo and phrasing changePatrick Webster2012-06-191-1/+1
| | * | | | [ticket/10865] Updates and additions to /docs/INSTALL.htmlOyabun12012-06-191-31/+50
* | | | | | Merge remote-tracking branch 'github-igorw/ticket/11181' into developNils Adermann2012-11-097-12/+12
|\ \ \ \ \ \