aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'github-vse/ticket/10521' into develop-ascraeusNils Adermann2014-05-031-1/+1
|\ | | | | | | | | * github-vse/ticket/10521: [ticket/10521] Update docblock of set_cookie for new HttpOnly param
| * [ticket/10521] Update docblock of set_cookie for new HttpOnly paramMatt Friedman2014-05-021-1/+1
| | | | | | | | PHPBB3-10521
* | Merge branch 'develop-olympus' into develop-ascraeusNils Adermann2014-05-031-9/+47
|\ \ | | | | | | | | | | | | * develop-olympus: [ticket/11860] htaccess: Support for Apache 2.4's "Require" syntax.
| * \ Merge remote-tracking branch 'github-bantu/ticket/11860' into develop-olympusNils Adermann2014-05-031-9/+47
| |\ \ | | | | | | | | | | | | | | | | * github-bantu/ticket/11860: [ticket/11860] htaccess: Support for Apache 2.4's "Require" syntax.
| | * | [ticket/11860] htaccess: Support for Apache 2.4's "Require" syntax.Andreas Fischer2013-09-231-9/+47
| | | | | | | | | | | | | | | | PHPBB3-11860
* | | | Merge pull request #2391 from naderman/ticket/12382Joas Schilling2014-05-031-4/+11
|\ \ \ \ | | | | | | | | | | [ticket/12382] Allow nested loops in included files.
| * | | | [ticket/12382] Allow nested loops in included files.Nils Adermann2014-05-031-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They have to reference the fully qualified loop name in BEGIN and END. PHPBB3-12382
* | | | | Merge remote-tracking branch 'github-vse/ticket/10521' into develop-ascraeusNils Adermann2014-05-032-5/+14
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | * github-vse/ticket/10521: [ticket/10521] Allow language switching by URL parameter
| * | | [ticket/10521] Allow language switching by URL parameterMatt Friedman2014-05-022-5/+14
| | | | | | | | | | | | | | | | PHPBB3-10521
* | | | [ticket/12482] Fixed undefined variable: data.Cesar G2014-05-021-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12482
* | | | Merge pull request #2385 from prototech/ticket/12478Joas Schilling2014-05-023-1/+20
|\ \ \ \ | | | | | | | | | | Add contact field before/after events.
| * | | | [ticket/12478] Add contact field events to viewtopic_body.html.Cesar G2014-05-022-0/+18
| | | | | | | | | | | | | | | | | | | | PHPBB3-12478
| * | | | [ticket/12478] Re-add contact field events in ucp_pm_viewmessage.html.Cesar G2014-05-021-1/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-12478
* | | | | Merge pull request #2388 from nickvergessen/ticket/12480Andreas Fischer2014-05-021-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12480] Only load config/routing.yml from extensions route * nickvergessen/ticket/12480: [ticket/12480] Remove unused use statements [ticket/12480] Add subfolder/config/routing.yml which should not be found [ticket/12480] Only load config/routing.yml from extensions route
| * | | | | [ticket/12480] Only load config/routing.yml from extensions routeJoas Schilling2014-05-021-1/+1
| | |/ / / | |/| | | | | | | | | | | | | PHPBB3-12480
* | | | | Merge pull request #2384 from prototech/ticket/12477Andreas Fischer2014-05-022-3/+3
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12477] Fix logic to prevent admin-deactivated users from getting PM's. * prototech/ticket/12477: [ticket/12477] Tab instead of spaces. [ticket/12477] Fix logic to prevent admin-deactivated users from getting PM's.
| * | | | [ticket/12477] Tab instead of spaces.Cesar G2014-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12477
| * | | | [ticket/12477] Fix logic to prevent admin-deactivated users from getting PM's.Cesar G2014-05-022-2/+2
| |/ / / | | | | | | | | | | | | PHPBB3-12477
* | | | Merge remote-tracking branch 'github-bantu/ticket/12429-ascraeus' into ↵Nils Adermann2014-05-022-89/+374
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-bantu/ticket/12429-ascraeus: [ticket/12429] Update PHPUnit to 4.1, update DBUnit to 1.3.
| * \ \ \ Merge branch 'ticket/12429' into ticket/12429-developAndreas Fischer2014-05-022-89/+374
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/12429: [ticket/12429] Update PHPUnit to 4.1, update DBUnit to 1.3. Conflicts: phpBB/composer.json phpBB/composer.lock
| | * | | [ticket/12429] Update PHPUnit to 4.1, update DBUnit to 1.3.Andreas Fischer2014-05-022-80/+376
| | | | | | | | | | | | | | | | | | | | PHPBB3-12429
* | | | | Merge remote-tracking branch 'github-vse/ticket/12254' into develop-ascraeusNils Adermann2014-05-026-12/+31
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-vse/ticket/12254: [ticket/12254] Add subsilver2 support for cookie storage instead of SID [ticket/12254] Use a cookie instead of SID to store language selection [ticket/12254] No longer need to add change_lang to the URL params [ticket/12254] Use 'language' instead of 'set_lang' as the variable name [ticket/12254] Persist set_lang after reg only if changed from default [ticket/12254] Add set_lang var changes to subsilver2 files [ticket/12254] Use new set_lang var to avoid conflict with change_lang [ticket/12254] Stop using deprecated request_var in user class [ticket/12254] Better language switching on registration page
| * | | | [ticket/12254] Add subsilver2 support for cookie storage instead of SIDMatt Friedman2014-05-022-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-12254
| * | | | [ticket/12254] Use a cookie instead of SID to store language selectionMatt Friedman2014-05-024-10/+13
| | | | | | | | | | | | | | | | | | | | PHPBB3-12254
| * | | | [ticket/12254] No longer need to add change_lang to the URL paramsMatt Friedman2014-04-111-5/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-12254
| * | | | [ticket/12254] Use 'language' instead of 'set_lang' as the variable nameMatt Friedman2014-04-116-9/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-12254
| * | | | [ticket/12254] Persist set_lang after reg only if changed from defaultMatt Friedman2014-04-071-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-12254
| * | | | [ticket/12254] Add set_lang var changes to subsilver2 filesMatt Friedman2014-04-072-0/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-12254
| * | | | [ticket/12254] Use new set_lang var to avoid conflict with change_langMatt Friedman2014-04-074-6/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-12254
| * | | | [ticket/12254] Stop using deprecated request_var in user classMatt Friedman2014-04-071-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-12254
| * | | | [ticket/12254] Better language switching on registration pageMatt Friedman2014-04-062-3/+16
| | | | | | | | | | | | | | | | | | | | PHPBB3-12254
* | | | | [ticket/12475] Tabs, spaces, ...Nils Adermann2014-05-021-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-12475
* | | | | [ticket/12475] Load extension migrations on cli updater tooNils Adermann2014-05-021-1/+2
| |/ / / |/| | | | | | | | | | | PHPBB3-12475
* | | | Merge pull request #2381 from Nicofuma/ticket/12475Andreas Fischer2014-05-021-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12475] Undefined variable $log in db:migrate console command * Nicofuma/ticket/12475: [ticket/12475] Error in db:update console command
| * | | | [ticket/12475] Error in db:update console commandNicofuma2014-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12475
* | | | | [ticket/12474] Error messages should be displayed with <error> tagNicofuma2014-05-021-1/+1
|/ / / / | | | | | | | | | | | | PHPBB3-12474
* | | | Merge remote-tracking branch 'github-bantu/ticket/12473' into develop-ascraeusNils Adermann2014-05-025-28/+187
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-bantu/ticket/12473: [ticket/12473] Add console command for database migration. [ticket/12473] Add more compatibility to phpBB Console Application. [ticket/12473] Move compatibility globals out into its own file.
| * | | | [ticket/12473] Add console command for database migration.Andreas Fischer2014-05-022-0/+139
| | | | | | | | | | | | | | | | | | | | PHPBB3-12473
| * | | | [ticket/12473] Add more compatibility to phpBB Console Application.Andreas Fischer2014-05-021-0/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-12473
| * | | | [ticket/12473] Move compatibility globals out into its own file.Andreas Fischer2014-05-022-28/+45
| | | | | | | | | | | | | | | | | | | | PHPBB3-12473
* | | | | Merge branch 'develop-olympus' into develop-ascraeusMarc Alexander2014-05-021-0/+1
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * develop-olympus: [ticket/12120] Add Marc Alexander to AUTHORS
| * | | | [ticket/12120] Add Marc Alexander to AUTHORSJoas Schilling2014-05-021-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12120
* | | | | Merge remote-tracking branch 'github-prototech/ticket/12265' into ↵Nils Adermann2014-05-0222-79/+229
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-prototech/ticket/12265: [ticket/12265] Actually use $u_pm. [ticket/12265] Ensure that dropdown is always at the very left of the container [ticket/12265] Define a loop for contact icons. [ticket/12265] Break the icons that aren't in loop in case extensions add more [ticket/12265] Fix modulo logic. [ticket/12265] Adjust alignment of AIM and Jabber icons. [ticket/12265] Ensure that there's only 4 icons per row in IE & Opera. [ticket/12265] Add contact icon and remove border from last row & cells. [ticket/12265] Fix issue with dropdown being restricted by the width of parent [ticket/12265] Remove ugly logic. [ticket/12265] Simplify contact icon design and move to dropdown. Conflicts: phpBB/viewtopic.php
| * | | | | [ticket/12265] Actually use $u_pm.Cesar G2014-04-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12265
| * | | | | [ticket/12265] Ensure that dropdown is always at the very left of the containerCesar G2014-04-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12265
| * | | | | [ticket/12265] Define a loop for contact icons.Cesar G2014-04-154-66/+117
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12265
| * | | | | [ticket/12265] Break the icons that aren't in loop in case extensions add moreCesar G2014-04-152-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12265
| * | | | | [ticket/12265] Fix modulo logic.Cesar G2014-04-152-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12265
| * | | | | [ticket/12265] Adjust alignment of AIM and Jabber icons.Cesar G2014-04-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12265
| * | | | | [ticket/12265] Ensure that there's only 4 icons per row in IE & Opera.Cesar G2014-04-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12265
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-23 07:25:00 +0000