aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2431 from Nicofuma/ticket/12109Dhruv Goel2014-06-151-8/+16
|\ | | | | [ticket/12109] Bug when setting permissions with "Select all users"
| * [ticket/12109] Fix coding styleTristan Darricau2014-05-101-4/+4
| | | | | | | | PHPBB3-12109
| * [ticket/12109] Bug when setting permissions with "Select all users"Tristan Darricau2014-05-101-8/+16
| | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-12109 PHPBB3-12109
* | [ticket/12707] Do not try to load 3.1 DBMS driver name as 3.0 driver.Andreas Fischer2014-06-141-1/+1
| | | | | | | | PHPBB3-12707
* | Merge pull request #2570 from Nicofuma/ticket/12687Andreas Fischer2014-06-132-58/+70
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12687] Add a constant to display the load time without DEBUG * Nicofuma/ticket/12687: [ticket/12687] Remove french spaces [ticket/12687] Display the number of cached queries [ticket/12687] Don't check if memory_get_peak_usage() exists [ticket/12687] Wrap $GLOBALS['starttime'] in a if [ticket/12687] Fix the namespace of $request [ticket/12687] Update doc block [ticket/12687] Use microtime(true) [ticket/12687] Remove globals [ticket/12687] Return a string and move the displaying of the sql report [ticket/12687] Rename DISPLAY_LOAD_TIME to PHPBB_DISPLAY_LOAD_TIME [ticket/12687] Display the explain link only when DEBUG is set [ticket/12687] Add a constant to display the load time without DEBUG
| * | [ticket/12687] Remove french spacesTristan Darricau2014-06-131-3/+3
| | | | | | | | | | | | PHPBB3-12687
| * | [ticket/12687] Display the number of cached queriesTristan Darricau2014-06-131-1/+1
| | | | | | | | | | | | PHPBB3-12687
| * | [ticket/12687] Don't check if memory_get_peak_usage() existsTristan Darricau2014-06-131-7/+4
| | | | | | | | | | | | PHPBB3-12687
| * | [ticket/12687] Wrap $GLOBALS['starttime'] in a ifTristan Darricau2014-06-131-2/+5
| | | | | | | | | | | | PHPBB3-12687
| * | [ticket/12687] Fix the namespace of $requestTristan Darricau2014-06-131-2/+2
| | | | | | | | | | | | PHPBB3-12687
| * | [ticket/12687] Update doc blockTristan Darricau2014-06-121-3/+13
| | | | | | | | | | | | PHPBB3-12687
| * | [ticket/12687] Use microtime(true)Tristan Darricau2014-06-121-2/+1
| | | | | | | | | | | | PHPBB3-12687
| * | [ticket/12687] Remove globalsTristan Darricau2014-06-122-12/+8
| | | | | | | | | | | | PHPBB3-12687
| * | [ticket/12687] Return a string and move the displaying of the sql reportTristan Darricau2014-06-122-16/+22
| | | | | | | | | | | | PHPBB3-12687
| * | [ticket/12687] Rename DISPLAY_LOAD_TIME to PHPBB_DISPLAY_LOAD_TIMETristan Darricau2014-06-112-70/+59
| | | | | | | | | | | | PHPBB3-12687
| * | [ticket/12687] Display the explain link only when DEBUG is setTristan Darricau2014-06-102-12/+24
| | | | | | | | | | | | PHPBB3-12687
| * | [ticket/12687] Add a constant to display the load time without DEBUGTristan Darricau2014-06-102-6/+6
| | | | | | | | | | | | PHPBB3-12687
* | | [ticket/12694] Remove whitespace at end of line from acp_groupsMarc Alexander2014-06-111-1/+1
| | | | | | | | | | | | PHPBB3-12694
* | | Merge remote-tracking branch 'github-marc1706/ticket/12352' into ↵Nils Adermann2014-06-114-4/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-marc1706/ticket/12352: (33 commits) [ticket/12352] Do not check hashes that don't have the necessary length [ticket/12352] Update file headers to fit new format [ticket/12352] Use custom provider collection for auth providers [ticket/12352] Add checks for existing user_pass_convert to migrations [ticket/12352] Remove usages of user_pass_convert column [ticket/12352] Update schema json file [ticket/12352] Remove user_pass_convert column from database [ticket/12352] Check each newly added passwords driver in manager_test [ticket/12352] Add get_settings_only method to passwords driver base [ticket/12352] Add passwords driver for xenforo 1.0, 1.1 passwords [ticket/12352] Add tests for wcf1 and wcf2 drivers [ticket/12352] Add driver for woltlab community framework 1 passwords [ticket/12352] Add driver for woltlab community framework 2 passwords [ticket/12352] Add missing $ to md5_mybb and md5_vb driver [ticket/12352] Fix spacing in passwords tests [ticket/12352] Add passwords driver for vB passwords [ticket/12352] Use correct hashing method in md5_mybb driver [ticket/12352] Add driver for myBB md5 passwords [ticket/12352] Rename phpbb2_md5 driver to fit filenames of other drivers [ticket/12352] Add passwords driver for sha1 password hashes ...
| * | | [ticket/12352] Use custom provider collection for auth providersMarc Alexander2014-06-011-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using this custom provider collection, we can properly check whether the configured auth provider does exist. The method get_provider() has been added for returning the default auth provider or the standard db auth provider if the specified one does not exist. Additionally, the method get_provider() will throw an RuntimeException if none of the above exist. PHPBB3-12352
| * | | [ticket/12352] Remove usages of user_pass_convert columnMarc Alexander2014-06-013-3/+0
| | | | | | | | | | | | | | | | PHPBB3-12352
| * | | [ticket/12352] Revert to db auth provider if default does not existMarc Alexander2014-06-011-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will make sure that we will not encounter a non-existing auth provider. We will revert to the default db auth provider if the one set in the config does not exist in our auth provider collection. PHPBB3-12352
* | | | [ticket/12688] Correctly use web root path instead of phpbb root pathJoas Schilling2014-06-101-5/+5
| | | | | | | | | | | | | | | | PHPBB3-12688
* | | | [ticket/12508] Fix usages of the finderJoas Schilling2014-06-101-2/+2
| |/ / |/| | | | | | | | PHPBB3-12508
* | | Merge pull request #2518 from Pico88/ticket/12606Joas Schilling2014-06-101-1/+106
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12606] Add ACP group core events * Pico88/ticket/12606: [ticket/12606] Add ACP group core events
| * | | [ticket/12606] Add ACP group core eventsPico882014-06-091-1/+106
| | | | | | | | | | | | | | | | PHPBB3-12606
* | | | Merge pull request #2434 from Nicofuma/ticket/8610Joas Schilling2014-06-092-7/+35
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/8610] Merging topics does not handle bookmarks correctly * Nicofuma/ticket/8610: [ticket/8610] Use css selector instead of xPath [ticket/8610] Add functional test when two topics are merged [ticket/8610] Throw an error when the dest topic isn't set [ticket/8610] Fix bookmarks when merging all the posts of a topic [ticket/8610] Merging topics does not handle bookmarks correctly
| * | | | [ticket/8610] Throw an error when the dest topic isn't setTristan Darricau2014-05-271-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-8610
| * | | | [ticket/8610] Fix bookmarks when merging all the posts of a topicTristan Darricau2014-05-271-4/+18
| | | | | | | | | | | | | | | | | | | | PHPBB3-8610
| * | | | [ticket/8610] Merging topics does not handle bookmarks correctlyTristan Darricau2014-05-101-3/+17
| | |_|/ | |/| | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-8610 PHPBB3-8610
* | | | Merge remote-tracking branch 'github-nickvergessen/ticket/10073' into ↵Nils Adermann2014-06-0911-20/+243
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/10073: (36 commits) [ticket/10073] Fix button descriptions [ticket/10073] Do not check disable boxes by default [ticket/10073] Store values with config_text in the ACP [ticket/10073] Move config values to config_text [ticket/10073] Fix request usage [ticket/10073] Deduplicate template variable names [ticket/10073] Get service from container [ticket/10073] Fix more "Contact Us" strings [ticket/10073] Move template code into the template [ticket/10073] Make contact page available when board is disabled [ticket/10073] Change name of the ACP module [ticket/10073] Deduplicate posting buttons code in ACP [ticket/10073] Use phpbb_validate_email to verify email address [ticket/10073] Add tests for new validate_email() [ticket/10073] Split email validation from email ban and taken checks [ticket/10073] Deduplicate the if statement [ticket/10073] Fallback to board_contact when contact page is disabled [ticket/10073] Remove language string from rebase conflict [ticket/10073] Add ACP module to add bbcode text for contact admin info [ticket/10073] Add new configs to the schema ...
| * | | | [ticket/10073] Do not check disable boxes by defaultJoas Schilling2014-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10073
| * | | | [ticket/10073] Store values with config_text in the ACPJoas Schilling2014-05-291-8/+17
| | | | | | | | | | | | | | | | | | | | PHPBB3-10073
| * | | | [ticket/10073] Fix request usageJoas Schilling2014-05-291-1/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-10073
| * | | | [ticket/10073] Deduplicate template variable namesJoas Schilling2014-05-291-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-10073
| * | | | [ticket/10073] Get service from containerJoas Schilling2014-05-291-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10073
| * | | | [ticket/10073] Move template code into the templateJoas Schilling2014-05-291-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-10073
| * | | | [ticket/10073] Split email validation from email ban and taken checksJoas Schilling2014-05-294-13/+38
| | | | | | | | | | | | | | | | | | | | PHPBB3-10073
| * | | | [ticket/10073] Deduplicate the if statementJoas Schilling2014-05-294-36/+43
| | | | | | | | | | | | | | | | | | | | PHPBB3-10073
| * | | | [ticket/10073] Fallback to board_contact when contact page is disabledJoas Schilling2014-05-294-4/+38
| | | | | | | | | | | | | | | | | | | | PHPBB3-10073
| * | | | [ticket/10073] Add ACP module to add bbcode text for contact admin infoJoas Schilling2014-05-293-0/+145
| | | | | | | | | | | | | | | | | | | | PHPBB3-10073
| * | | | [ticket/10073] Remove unneccessary todos he config switch is enoughJoas Schilling2014-05-291-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10073
| * | | | [ticket/10073] Use namespaces and fix all class namesJoas Schilling2014-05-295-684/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-10073
| * | | | [ticket/10073] Replace board_contact mail with links to contact pageNils Adermann2014-05-296-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Error pages still contain the email address. PHPBB3-10073
| * | | | [ticket/10073] Add a contact administrators page and refactor email forms.Nils Adermann2014-05-296-0/+687
| | |/ / | |/| | | | | | | | | | | | | | | | | | The message to be displayed on top of the email form cannot be configured yet. PHPBB3-10073
* | | | [ticket/12668] Add subforums_row to core.display_forums_modify_template_varsrxu2014-06-091-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add subforums template data array to 'core.display_forums_modify_template_vars' event to allow extensions to modify it if needed. PHPBB3-12668
* | | | Merge pull request #2554 from rxu/ticket/12669Joas Schilling2014-06-091-0/+22
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12669] Add core event to the function display_forums() * rxu/ticket/12669: [ticket/12669] Add core event to the function display_forums()
| * | | | [ticket/12669] Add core event to the function display_forums()rxu2014-06-081-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add core event to the function display_forums() in includes/functions_display.php to allow assigning additional template data for every forum, f.e. additional forumrow subloops. PHPBB3-12669
* | | | | [ticket/12677] Replace ‘thread’ with ‘topic’ in functions_display ↵Knecht Ruprecht2014-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | comment PHPBB3-12677
* | | | | Merge branch 'develop-olympus' into develop-ascraeusDhruv2014-06-091-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer (1) and Dhruv Goel (1) * develop-olympus: [ticket/12660] Improve check for when phpinfo() is disabled.