aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2012-10-022-3/+3
|\ | | | | | | | | | | | | | | * develop-olympus: [ticket/11112] updating links to phpbb.com to use SSL Conflicts: phpBB/adm/index.php
| * Merge remote-tracking branch 'Senky/ticket/11112' into develop-olympusAndreas Fischer2012-10-022-3/+3
| |\ | | | | | | | | | | | | * Senky/ticket/11112: [ticket/11112] updating links to phpbb.com to use SSL
| | * [ticket/11112] updating links to phpbb.com to use SSLSenky2012-10-012-3/+3
| |/ | | | | | | PHPBB3-11112
* | Merge branch 'develop-olympus' into developAndreas Fischer2012-09-291-7/+8
|\ \ | |/ | | | | | | * develop-olympus: [ticket/11122] Move Acyd Burn, Arty and Toonarmy to former contributors
| * Merge remote-tracking branch 'nickvergessen/ticket/11122' into develop-olympusAndreas Fischer2012-09-291-7/+8
| |\ | | | | | | | | | | | | * nickvergessen/ticket/11122: [ticket/11122] Move Acyd Burn, Arty and Toonarmy to former contributors
| | * [ticket/11122] Move Acyd Burn, Arty and Toonarmy to former contributorsJoas Schilling2012-09-271-7/+8
| |/ | | | | | | PHPBB3-11122
* | Merge remote-tracking branch 'EXreaction/ticket/11021' into developAndreas Fischer2012-09-156-9/+9
|\ \ | | | | | | | | | | | | * EXreaction/ticket/11021: [ticket/11021] Fix the language changes that were lost previously
| * | [ticket/11021] Fix the language changes that were lost previouslyNathan Guse2012-09-156-9/+9
| | | | | | | | | | | | | | | | | | Change U_HOME to U_SITE_HOME PHPBB3-11021
* | | Merge remote-tracking branch 'EXreaction/ticket/11021' into developAndreas Fischer2012-09-159-36/+52
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11021: [ticket/11021] Remove unnecessary line spacing in functions.php [ticket/11021] Use L_SITE_HOME instead of L_HOME [ticket/11021] Better language strings for site home url/text [ticket/11021] subsilver2 support [ticket/11021] Add the option to specify a Site home URL and text
| * | [ticket/11021] Remove unnecessary line spacing in functions.phpNathan Guse2012-09-151-29/+29
| | | | | | | | | | | | PHPBB3-11021
| * | [ticket/11021] Use L_SITE_HOME instead of L_HOMENathan Guse2012-09-154-6/+6
| | | | | | | | | | | | | | | | | | Check site home url against !== '', not empty PHPBB3-11021
| * | [ticket/11021] Better language strings for site home url/textNathan Guse2012-09-153-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | Correct the logo title to be {L_HOME} if {U_HOME} is used. Check if the Home text is instead of just equal to false when outputting it to the template PHPBB3-11021
| * | [ticket/11021] subsilver2 supportNathan Guse2012-07-222-2/+2
| | | | | | | | | | | | PHPBB3-11021
| * | [ticket/11021] Add the option to specify a Site home URL and textNathan Guse2012-07-227-3/+19
| | | | | | | | | | | | PHPBB3-11021
* | | Merge remote-tracking branch 'imkingdavid/ticket/11086' into developAndreas Fischer2012-09-141-13/+33
|\ \ \ | | | | | | | | | | | | | | | | | | | | * imkingdavid/ticket/11086: [ticket/11086] Move DI processing below $request definition [ticket/11086] Fix database_update.php to use Dependency Injection Container
| * | | [ticket/11086] Move DI processing below $request definitionDavid King2012-09-131-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | As per PR #991 (ticket/11101). PHPBB3-11086
| * | | [ticket/11086] Fix database_update.php to use Dependency Injection ContainerDavid King2012-09-131-13/+34
| | | | | | | | | | | | | | | | PHPBB3-11086
* | | | Merge remote-tracking branch 'igorw/ticket/11101' into developAndreas Fischer2012-09-143-15/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * igorw/ticket/11101: [ticket/11101] Delay execution of container processors
| * | | | [ticket/11101] Delay execution of container processorsIgor Wiedler2012-09-083-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix the name of the ext processor service. PHPBB3-11101
* | | | | Merge remote-tracking branch 'bantu/ticket/11109' into developAndreas Fischer2012-09-141-2/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/11109: [ticket/11109] Re-add file conflict checks to compress class
| * | | | | [ticket/11109] Re-add file conflict checks to compress classFyorl2012-09-141-2/+13
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-11109
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-09-1411-0/+166
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11045] Removed file conflict tests for compress class [ticket/11045] Replaced __DIR__ with dirname(__FILE__) [ticket/11045] Opening brace on its own line [ticket/11045] Explicitely check for zlib and bz2 [ticket/11045] Added tests for file conflicts [ticket/11045] Added unit tests for the compress class
| * | | Merge remote-tracking branch 'Fyorl/ticket/11045' into develop-olympusAndreas Fischer2012-09-1411-0/+166
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fyorl/ticket/11045: [ticket/11045] Removed file conflict tests for compress class [ticket/11045] Replaced __DIR__ with dirname(__FILE__) [ticket/11045] Opening brace on its own line [ticket/11045] Explicitely check for zlib and bz2 [ticket/11045] Added tests for file conflicts [ticket/11045] Added unit tests for the compress class
| | * | | [ticket/11045] Removed file conflict tests for compress classFyorl2012-09-111-13/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11045
| | * | | [ticket/11045] Replaced __DIR__ with dirname(__FILE__)Fyorl2012-09-011-8/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-11045
| | * | | [ticket/11045] Opening brace on its own lineFyorl2012-08-281-1/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11045
| | * | | [ticket/11045] Explicitely check for zlib and bz2Fyorl2012-08-281-2/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11045
| | * | | [ticket/11045] Added tests for file conflictsFyorl2012-08-281-5/+21
| | | | | | | | | | | | | | | | | | | | PHPBB3-11045
| | * | | [ticket/11045] Added unit tests for the compress classFyorl2012-08-2811-0/+161
| | | | | | | | | | | | | | | | | | | | PHPBB3-11045
* | | | | Merge remote-tracking branch 'nickvergessen/ticket/10876' into developDavid King2012-09-081-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | [ticket/10876] Update regex to a version which still matches our testsJoas Schilling2012-08-211-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10876
| * | | | [ticket/10876] Revert "add newline after php tag"-regex back to 3.0 versionJoas Schilling2012-08-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old regex just results in some additional new lines in the output. So this is only beautifying and considered unworthy in respect to the dying php servers we observed on windows. PHPBB3-10876
* | | | | Merge remote-tracking branch 'EXreaction/ticket/11092' into developAndreas Fischer2012-09-082-2/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11092: [ticket/11092] phpbb_gen_download_links strict standards errors
| * | | | | [ticket/11092] phpbb_gen_download_links strict standards errorsNathan Guse2012-09-072-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two strict standards errors in phpbb_gen_download_links PHPBB3-11092
* | | | | | Merge remote-tracking branch 'unknownbliss/ticket/10631' into developDavid King2012-09-0125-6/+1945
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [ticket/10631] Removing un-needed TODOs that are no longer needed.Unknown Bliss2012-09-011-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| * | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10631Unknown Bliss2012-09-0147-284/+1168
| |\ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/common.php phpBB/download/file.php
* | | | | | Merge pull request #962 from imkingdavid/feature/add_eventsNils Adermann2012-09-015-5/+206
|\ \ \ \ \ \ | | | | | | | | | | | | | | Feature/add events
| * | | | | | [feature/add_events] Added core.posting_modify_template_varsDavid King2012-08-261-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Can be used to set template variables and such, as the template assignment methods are not available to the modify_posting_paramters event. PHPBB3-9550
| * | | | | | [feature/add_events] Added note in modify_posting_parametersDavid King2012-08-251-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The template assignment methods do not work until $user->setup() has been run. This event is called before it, so extensions requiring template methods must put such calls in a later event. PHPBB3-9550
| * | | | | | [feature/add_events] Add more parameters to core.modify_posting_parametersDavid King2012-08-231-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
| * | | | | | [feature/add_events] Put globals on one lineDavid King2012-08-221-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
| * | | | | | [feature/add_events] Remove $allow_bbcode and $allow_smiliesDavid King2012-08-221-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upon testing it was discovered that these did not work as originally intended. PHPBB3-9550
| * | | | | | [feature/add_events] Globalize event dispatcher object in some functionsDavid King2012-08-222-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
| * | | | | | [feature/add_events] Event to modify the data array for when a user is addedDavid King2012-08-211-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
| * | | | | | [feature/add_events] Before and after events for generate_text_for_* functionsDavid King2012-08-211-8/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
| * | | | | | [feature/add_events] Added events for modifying generate_text_for_display()David King2012-08-211-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The events allow you to perform extra functions on the text before nad/or after it has been parsed for BBCode and Smilies. PHPBB3-9550
| * | | | | | [feature/add_events] core.posting_refresh -> core.modify_posting_paramtersDavid King2012-08-211-10/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The event now lets extensions modify the posting paramters, not just refresh PHPBB3-9550
| * | | | | | [feature/add_events] Fixed docs, added _profile_cache to event parametersDavid King2012-08-211-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
| * | | | | | [feature/add_events] Change alter -> modify in event nameDavid King2012-08-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550