aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.2.x' into 3.3.xMarc Alexander2019-07-290-0/+0
|\
| * Merge pull request #5638 from marc1706/ticket/16112Marc Alexander2019-07-292-55/+56
| |\ | | | | | | | | | [ticket/16112] Update composer dependencies for 3.2.x
* | \ Merge pull request #5639 from marc1706/ticket/16112-3.3.xMarc Alexander2019-07-292-166/+171
|\ \ \ | | | | | | | | | | | | [ticket/16112] Update composer dependencies for 3.3.x
| * \ \ Merge branch 'ticket/16112' into ticket/16112-3.3.xMarc Alexander2019-07-282-166/+171
| |\ \ \ | | | |/ | | |/|
| | * | [ticket/16112] Update composer dependencies for 3.2.xMarc Alexander2019-07-282-55/+56
| | | | | | | | | | | | | | | | PHPBB3-16112
* | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-07-291-0/+32
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge pull request #5627 from senky/ticket/16097Marc Alexander2019-07-291-0/+32
| |\ \ \ | | |_|/ | |/| | | | | | [ticket/16097] Add core.viewtopic_gen_sort_selects_before
| | * | [ticket/16097] Correctly classify sort_days as intJakub Senko2019-07-291-1/+1
| | | | | | | | | | | | | | | | PHPBB3-16097
| | * | [ticket/16097] Add core.viewtopic_gen_sort_selects_beforeJakub Senko2019-07-081-0/+32
| | | | | | | | | | | | | | | | PHPBB3-16097
* | | | Merge pull request #5636 from marc1706/ticket/15886Marc Alexander2019-07-292-3/+3
|\ \ \ \ | |_|_|/ |/| | | | | | | [ticket/15886] Use getMockBuilder instead of removed getMock()
| * | | [ticket/15886] Use getMockBuilder instead of removed getMock()Marc Alexander2019-07-282-3/+3
|/ / / | | | | | | | | | PHPBB3-15886
* | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-07-281-7/+7
|\ \ \ | |/ /
| * | Merge pull request #5494 from mrgoldy/ticket/15885Marc Alexander2019-07-281-7/+7
| |\ \ | | | | | | | | | | | | [ticket/15885] Display group rank on memberlist_body
| | * | [ticket/15885] Display group rank on memberlist_bodymrgoldy2019-01-021-7/+7
| | | | | | | | | | | | | | | | PHPBB3-15885
* | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-07-2810-74/+595
|\ \ \ \ | |/ / /
| * | | Merge pull request #5459 from mrgoldy/ticket/15886Marc Alexander2019-07-2810-74/+595
| |\ \ \ | | | | | | | | | | | | | | | [ticket/15886] Group helper functions
| | * | | [ticket/15886] Fix minor code style issuesMarc Alexander2019-07-281-9/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-15886
| | * | | [ticket/15886] Appropriate HTML docsmrgoldy2019-03-102-2/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-15886
| | * | | [ticket/15886] Add @html doc for group/user stringsmrgoldy2019-03-092-0/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-15886
| | * | | [ticket/15886] Move append_sid from constructormrgoldy2019-01-071-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-15886
| | * | | [ticket/15886] Capital Y in arraYmrgoldy2019-01-021-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-15886
| | * | | [ticket/15886] No profile url for BOTS groupmrgoldy2019-01-022-6/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-15886
| | * | | [ticket/15886] Mock path helper in group helper testsmrgoldy2019-01-021-10/+10
| | | | | | | | | | | | | | | | | | | | PHPBB3-15886
| | * | | [ticket/15886] Change phpbb_get_group_avatar variable namesmrgoldy2018-12-301-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-15886
| | * | | [ticket/15886] Clean up servicesmrgoldy2018-12-294-154/+144
| | | | | | | | | | | | | | | | | | | | PHPBB3-15886
| | * | | [ticket/15886] Class variable, comment splitting, events since tag, class namesmrgoldy2018-12-291-35/+52
| | | | | | | | | | | | | | | | | | | | PHPBB3-15886
| | * | | [ticket/15886] Arguments for path_helpermrgoldy2018-11-291-1/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-15886
| | * | | [ticket/15886] Fix notification_group_request_testmrgoldy2018-11-291-1/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-15886
| | * | | [ticket/15886] Group helper functionsmrgoldy2018-11-296-91/+332
| | | | | | | | | | | | | | | | | | | | PHPBB3-15886
| | * | | [ticket/15886] Enhance group helpermrgoldy2018-11-292-2/+247
| | | | | | | | | | | | | | | | | | | | PHPBB3-15886
* | | | | Merge pull request #5557 from senky/ticket/15088Marc Alexander2019-07-282-97/+55
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/15088] Avoid code repetitions in extension manager
| * | | | | [ticket/15088] Ensure phpBB version is set in testsMarc Alexander2019-07-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15088
| * | | | | [ticket/15088] Avoid code repetitions in extension managerJakub Senko2019-07-271-96/+54
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15088
* | | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-07-282-21/+25
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Merge pull request #5575 from rubencm/ticket/14459Marc Alexander2019-07-282-21/+25
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14459] Check language input for group and fix template logic
| | * | | | [ticket/14459] Use language propertyrubencm2019-07-271-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14459
| | * | | | [ticket/14459] Rename variablerubencm2019-07-271-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14459
| | * | | | [ticket/14459] Fixrubencm2019-06-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14459
| | * | | | [ticket/14459] Uppercase string to try to match language keysrubencm2019-06-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14459
| | * | | | [ticket/14459] Uppercase string to try to match language keysrubencm2019-06-251-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14459
| | * | | | [ticket/14459] Remove unused coderubencm2019-06-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14459
| | * | | | [ticket/14459] Use twigrubencm2019-06-251-16/+15
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14459
| | * | | | [ticket/14459] Remove unused variablesrubencm2019-06-251-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14459
| | * | | | [ticket/14459] Remove inline cssrubencm2019-06-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14459
| | * | | | [ticket/14459] Fix template logicrubencm2019-06-212-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14459
| | * | | | [ticket/14459] Fix rebaserubencm2019-06-201-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14459
| | * | | | [ticket/14459] Check language input for grouprubencm2019-06-201-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14459
* | | | | | Merge pull request #5566 from JoshyPHP/ticket/16017Marc Alexander2019-07-274-0/+44
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/16017] Add support for Argon2id as default password hashing
| * | | | | | [ticket/16017] Add missing passwords.driver tag to argon2idMarc Alexander2019-07-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16017
| * | | | | | [ticket/16017] Add support for Argon2id as default password hashingJoshyPHP2019-07-234-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16017