aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/12335] Added generate_profile_fields _ beforePayBas2014-05-031-0/+12
| | | | PHPBB3-12335
* [ticket/12335] Documentation fix and added use_contact_fieldsPayBas2014-05-031-2/+3
| | | | PHPBB3-12335
* [ticket/12335] Fix phpBB version numberPayBas2014-05-031-2/+2
| | | | PHPBB3-12335
* [ticket/12335] Add Events to phpbb\profilefields\managerPayBas2014-05-032-1/+32
| | | | PHPBB3-12335
* Merge pull request #2267 from prototech/ticket/10737Joas Schilling2014-05-0312-21/+438
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/10737] Add live member search. * prototech/ticket/10737: [ticket/10737] Remove loading indicator. [ticket/10737] Enforce allow_live_searches setting in memberlist.php. [ticket/10737] Add config setting to disable live searches. [ticket/10737] Add loading indicator and alert box code to simple_footer.html. [ticket/10737] Load core.js and ajax.js in simple_footer.html. [ticket/10737] Set the username as the input value instead of redirecting. [ticket/10737] Drop subsilver2 changes. [ticket/10737] Add a more generic live search implementation. [ticket/10737] Clean up memberlist.php. [ticket/10737] Use dropdown for search results container. [ticket/10737] Adding delayed keyup and removing target_blank. [ticket/10737] Using UTF-8 aware alternatives in PHP code. [ticket/10737] Removing obsolete code. [ticket/10737] Avoid hard-coding table row and use case-insensitive search. [ticket/10737] Removing unnecessary/obsolete code. [ticket/10737] Using JQuery events and JSON response. [ticket/10737] Code fixes in AJAX search feature [ticket/10737] Improvements over last commit [ticket/10737] Adding username suggestions in "Find a member" using AJAX
| * [ticket/10737] Remove loading indicator.Cesar G2014-04-231-1/+1
| | | | | | | | PHPBB3-10737
| * [ticket/10737] Enforce allow_live_searches setting in memberlist.php.Cesar G2014-04-232-0/+8
| | | | | | | | PHPBB3-10737
| * [ticket/10737] Add config setting to disable live searches.Cesar G2014-04-236-3/+33
| | | | | | | | PHPBB3-10737
| * [ticket/10737] Add loading indicator and alert box code to simple_footer.html.Cesar G2014-04-231-0/+14
| | | | | | | | PHPBB3-10737
| * [ticket/10737] Load core.js and ajax.js in simple_footer.html.Cesar G2014-04-231-0/+2
| | | | | | | | PHPBB3-10737
| * [ticket/10737] Set the username as the input value instead of redirecting.Cesar G2014-04-232-6/+7
| | | | | | | | PHPBB3-10737
| * [ticket/10737] Drop subsilver2 changes.Cesar G2014-04-232-17/+1
| | | | | | | | PHPBB3-10737
| * [ticket/10737] Add a more generic live search implementation.Cesar G2014-04-232-62/+335
| | | | | | | | PHPBB3-10737
| * [ticket/10737] Clean up memberlist.php.Cesar G2014-04-231-11/+20
| | | | | | | | PHPBB3-10737
| * [ticket/10737] Use dropdown for search results container.Cesar G2014-04-233-19/+17
| | | | | | | | PHPBB3-10737
| * [ticket/10737] Adding delayed keyup and removing target_blank.Suhaib Khan2014-04-233-28/+39
| | | | | | | | PHPBB3-10737
| * [ticket/10737] Using UTF-8 aware alternatives in PHP code.Suhaib Khan2014-04-231-3/+3
| | | | | | | | PHPBB3-10737
| * [ticket/10737] Removing obsolete code.Suhaib Khan2014-04-234-12/+8
| | | | | | | | PHPBB3-10737
| * [ticket/10737] Avoid hard-coding table row and use case-insensitive search.Suhaib Khan2014-04-235-13/+36
| | | | | | | | PHPBB3-10737
| * [ticket/10737] Removing unnecessary/obsolete code.Suhaib Khan2014-04-231-2/+1
| | | | | | | | PHPBB3-10737
| * [ticket/10737] Using JQuery events and JSON response.Suhaib Khan2014-04-234-50/+33
| | | | | | | | PHPBB3-10737
| * [ticket/10737] Code fixes in AJAX search featureSuhaib Khan2014-04-233-33/+32
| | | | | | | | PHPBB3-10737
| * [ticket/10737] Improvements over last commitSuhaib Khan2014-04-233-68/+28
| | | | | | | | PHPBB3-10737
| * [ticket/10737] Adding username suggestions in "Find a member" using AJAXSuhaib Khan2014-04-235-5/+132
| | | | | | | | PHPBB3-10737
* | 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