aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x' into 3.2.xMarc Alexander2016-03-071-8/+5
|\
| * [ticket/14514] Don't skip users when converting passwordsOliver Schramm2016-03-061-8/+5
| | | | | | | | PHPBB3-14514
* | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-03-051-1/+1
|\ \ | |/
| * Merge pull request #4200 from RMcGirr83/ticket_14508Marc Alexander2016-03-051-1/+1
| |\ | | | | | | | | | [ticket/14508] Change language notice on account activation
| | * [ticket/14508] Adjust account inactive languageRichard McGirr2016-03-031-1/+1
| | | | | | | | | | | | PHPBB3-14508
| | * [ticket/14508] Change language notice on account activationRichard McGirr2016-03-021-1/+1
| | | | | | | | | | | | PHPBB3-14508
* | | [ticket/14510] Prevent infinite loop in add_bots taskMáté Bartus2016-03-021-0/+1
| | | | | | | | | | | | PHPBB3-14510
* | | Merge pull request #4196 from CHItA/ticket/14487Marc Alexander2016-03-019-9/+209
|\ \ \ | | | | | | | | | | | | [ticket/14487] Try to handle connection timeouts
| * | | [ticket/14487] Add missing use statementMáté Bartus2016-02-291-0/+1
| | | | | | | | | | | | | | | | PHPBB3-14487
| * | | [ticket/14487] Add loading indicator while polling statusMáté Bartus2016-02-291-0/+2
| | | | | | | | | | | | | | | | PHPBB3-14487
| * | | [ticket/14487] Update javascriptMáté Bartus2016-02-291-54/+50
| | | | | | | | | | | | | | | | PHPBB3-14487
| * | | [ticket/14487] Try to handle connection timeoutsMáté Bartus2016-02-288-9/+210
| | | | | | | | | | | | | | | | PHPBB3-14487
* | | | Merge pull request #4194 from Nicofuma/ticket/14499Marc Alexander2016-02-2912-25/+510
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/14499] Add command to update the board from CLI
| * | | | [ticket/14499] Fix wording and commentsTristan Darricau2016-02-293-2/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-14499
| * | | | [ticket/14499] Add missing config settingsTristan Darricau2016-02-282-2/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-14499
| * | | | [ticket/14499] Add command to update the board from CLITristan Darricau2016-02-2512-25/+506
| | | | | | | | | | | | | | | | | | | | PHPBB3-14499
* | | | | [ticket/14503] Enable superglobals in cliMarc Alexander2016-02-281-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is for example needed for outputting help on commands. PHPBB3-14503
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-02-282-6/+8
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge pull request #4153 from gn36/ticket/14443Marc Alexander2016-02-282-6/+8
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14443] Introduce additional parameter to messenger
| | * | | | [ticket/14443] substr($var, 0, 1) -> $var[0]Martin Beckmann2016-02-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14443
| | * | | | [ticket/14443] Avoid duplicate slashesMartin Beckmann2016-02-021-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14443
| | * | | | [ticket/14443] Introduce additional parameter to messengerMartin Beckmann2016-02-012-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14443
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-02-271-1/+27
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/functions_content.php
| * | | | | Merge pull request #4086 from rxu/ticket/14366Marc Alexander2016-02-271-1/+27
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/14366] Add core events to the function decode_message()
| | * | | | | [ticket/14366] Add core events to the function decode_message()rxu2016-02-271-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove match/replace vars, use alternative var for the message var, update the target phpBB version. PHPBB3-14366
| | * | | | | [ticket/14366] Add core events to the function decode_message()rxu2015-12-171-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add core event to the function decode_message() in includes/functions_content.php to allow extensions performing additional message handling before/after decoding. PHPBB3-14366
* | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-02-271-0/+26
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #4085 from rxu/ticket/14365Marc Alexander2016-02-271-0/+26
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14365] Add core event to the function topic_review()
| | * | | | | | [ticket/14365] Fix a typo in the docblock.rxu2016-02-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14365
| | * | | | | | [ticket/14365] Add core event to the function topic_review()rxu2015-12-171-0/+26
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add core event to the function topic_review() in includes/functions_posting.php to allow modifying posts list to review. PHPBB3-14365
* | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-02-272-0/+48
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | | | | | | | | Conflicts: phpBB/docs/events.md phpBB/styles/subsilver2/template/memberlist_view.html
| * | | | | Merge pull request #4049 from rxu/ticket/14316Marc Alexander2016-02-273-0/+60
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/14316] Add events before/after the custom/zebra fields in pfile view
| | * | | | | [ticket/14316] Add events before/after the custom/zebra fields in profile viewrxu2016-02-273-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14316
* | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-02-261-1/+37
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | |
| * | | | | [ticket/14189] Add core.gen_sort_selects_after eventJakub Senko2016-02-261-1/+37
| | |_|_|/ | |/| | | | | | | | | | | | | PHPBB3-14189
* | | | | Merge pull request #4188 from marc1706/ticket/13842Tristan Darricau2016-02-221-0/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13842] Prevent internal server errors without rewrite module on IIS * marc1706/ticket/13842: [ticket/13842] Prevent internal server errors without rewrite module on IIS
| * | | | | [ticket/13842] Prevent internal server errors without rewrite module on IISMarc Alexander2016-02-191-0/+7
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-13842
* | | | | [ticket/14489] Fix bug where extension custom compiler pass cannot be found.Mark Shaw2016-02-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is returning an extra / on my machine which throws off the next code block, and then the class can't be found. PHPBB3-14489
* | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-02-183-0/+20
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * 3.1.x: [ticket/13681] Invalidate and reset opcache where necessary
| * | | | Merge pull request #4185 from marc1706/ticket/13681Tristan Darricau2016-02-183-0/+20
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13681] Invalidate and reset opcache where necessary * marc1706/ticket/13681: [ticket/13681] Invalidate and reset opcache where necessary
| | * | | | [ticket/13681] Invalidate and reset opcache where necessaryMarc Alexander2016-02-183-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13681
* | | | | | Merge pull request #4165 from Nicofuma/ticket/14457Marc Alexander2016-02-187-46/+76
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/14457] Uses a random placeholder to inject css and js
| * | | | | | [ticket/14457] Replaces unique_id implementation by random_bytes()Tristan Darricau2016-02-183-19/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14457
| * | | | | | [ticket/14457] Set the config values related to the RNG in the installer configTristan Darricau2016-02-181-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14457
| * | | | | | [ticket/14457] Handle the case where there isn't any 'definition' bagTristan Darricau2016-02-181-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14457
| * | | | | | [ticket/14457] Don't set CSS to JS and JS to CSSTristan Darricau2016-02-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14457
| * | | | | | [ticket/14457] CSTristan Darricau2016-02-181-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14457
| * | | | | | [ticket/14457] Fix twig/twig::assign_displayTristan Darricau2016-02-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14457
| * | | | | | [ticket/14457] Uses a random placeholder to inject css and jsTristan Darricau2016-02-182-26/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14457
* | | | | | | Merge pull request #4166 from marc1706/ticket/14315Tristan Darricau2016-02-184-31/+70
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14315] Correctly set permission roles for multiple groups * marc1706/ticket/14315: [ticket/14315] Properly get sid from cookies and simplify take_screenshot [ticket/14315] Use proper ID selectors in ui test [ticket/14315] Add logout to ui tests and use in permissions role test [ticket/14315] Add functional tests for permission roles and fix non-js [ticket/14315] Add tests for setting permission roles using javascript [ticket/14315] Add more functionality to ui test cases [ticket/14315] Add back roles select for disable javascript [ticket/14315] Tweak location of drop-down [ticket/14315] Apply roles options format for multiple forums too [ticket/14315] Build role options for each permission group [ticket/14315] Correctly set default values and reset values [ticket/14315] Only add role options specified for each group