aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4530 from senky/ticket/14557Marc Alexander2017-03-261-0/+12
|\ | | | | | | [ticket/14557] Simplify updating overloaded events for extensions
| * [ticket/14557] Rename $offset to $subarrayJakub Senko2016-12-271-5/+5
| | | | | | | | PHPBB3-14557
| * [ticket/14557] Don't return $valueJakub Senko2016-12-271-2/+1
| | | | | | | | PHPBB3-14557
| * [ticket/14557] Simplify updating overloaded events for extensionsJakub Senko2016-12-261-0/+13
| | | | | | | | PHPBB3-14557
* | Merge pull request #4762 from Nicofuma/ticket/15137Marc Alexander2017-03-251-2/+2
|\ \ | | | | | | | | | [ticket/15137] Global Announcements shouldn't always be never ending
| * | [ticket/15137] Global Announcements shouldn't always be never endingTristan Darricau2017-03-251-2/+2
| | | | | | | | | | | | PHPBB3-15137
* | | Merge pull request #4750 from rubencm/ticket/15134Marc Alexander2017-03-251-4/+12
|\ \ \ | | | | | | | | | | | | [ticket/15134] Replace php native functions for filesystem service methods
| * | | [ticket/15134] Return false if errorRubén Calvo2017-03-201-2/+3
| | | | | | | | | | | | | | | | PHPBB3-15134
| * | | [ticket/15134] Follow coding guidelinessRubén Calvo2017-03-191-1/+4
| | | | | | | | | | | | | | | | PHPBB3-15134
| * | | [ticket/15134] Replace php native functions for filesystem service methodsRubén Calvo2017-03-191-3/+7
| | | | | | | | | | | | | | | | PHPBB3-15134
* | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-03-242-9/+6
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | * 3.1.x: [ticket/15143] Fix display of version update in ACP
| * | | Merge pull request #4757 from VSEphpbb/ticket/15143Tristan Darricau2017-03-242-9/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15143] Fix display of version update in ACP * github.com:phpbb/phpbb: [ticket/15143] Fix display of version update in ACP
| | * | | [ticket/15143] Fix display of version update in ACPMatt Friedman2017-03-222-9/+6
| |/ / / | | | | | | | | | | | | PHPBB3-15143
* | | | Merge pull request #4751 from marc1706/ticket/15135Tristan Darricau2017-03-242-5/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15135] Parse language files in acp_extensions instead of md manager * github.com:phpbb/phpbb: [ticket/15135] Correctly pass exception arguments and add back link again [ticket/15135] Parse language files in acp_extensions instead of md manager
| * | | | [ticket/15135] Correctly pass exception arguments and add back link againMarc Alexander2017-03-232-4/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-15135
| * | | | [ticket/15135] Parse language files in acp_extensions instead of md managerMarc Alexander2017-03-192-4/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-15135
* | | | | Merge pull request #4752 from nomind60s/ticket/15137Tristan Darricau2017-03-212-4/+4
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15137] Global Announcements shouldn't always be never ending * github.com:phpbb/phpbb: [ticket/15137] Missed one language string change [ticket/15137] Global announcements can stick for a non-zero number of days fixes #4752
| * | | | [ticket/15137] Missed one language string changenomind60s2017-03-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change STICKY_ANNOUNCE_TIME_LIMIT for consistency PHPBB3-15137
| * | | | [ticket/15137] Global announcements can stick for a non-zero number of daysnomind60s2017-03-203-5/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To be consistent with Sticky and Announcements topic types, Global announcements can now stick for a non-zero number of days, i.e. they are no longer never ending. Before this change, if the topic type was Global and a non-zero number of days where set to stick topic, the number was silently ignored and a Global announcement was always never ending. PHPBB3-15137
* | | | Merge pull request #4711 from javiexin/ticket/15102Tristan Darricau2017-03-191-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15102] Missing parameter calling version_check * github.com:phpbb/phpbb: [ticket/15102] Missing parameter calling version_check
| * | | | [ticket/15102] Missing parameter calling version_checkjaviexin2017-02-241-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-15102
* | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-03-191-1/+1
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * 3.1.x: [ticket/14758] Improve the ACP Parameter wording
| * | | | Merge branch 'mukeshkharita-ticket/14758' into 3.1.xTristan Darricau2017-03-191-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * mukeshkharita-ticket/14758: [ticket/14758] Improve the ACP Parameter wording fixes #4724
| | * | | | [ticket/14758] Improve the ACP Parameter wordingMukesh Kumar Kharita2017-03-191-1/+1
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-14758
* | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-03-191-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * 3.1.x: [ticket/14806] Fix ACP test emails authentication failure
| * | | | Merge pull request #4734 from rxu/ticket/14806Tristan Darricau2017-03-191-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14806] Fix ACP test emails authentication failure * github.com:phpbb/phpbb: [ticket/14806] Fix ACP test emails authentication failure
| | * | | | [ticket/14806] Fix ACP test emails authentication failurerxu2017-03-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14806
* | | | | | Merge branch 'ticket/14928' into 3.2.xTristan Darricau2017-03-191-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/14928: [ticket/14928] fixing valid stability %s
| * | | | | | [ticket/14928] fixing valid stability %sRishabh04-022017-03-191-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | PHPBB3-14928
* | | | | | Merge pull request #4736 from rubencm/ticket/15123Tristan Darricau2017-03-193-0/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15123] Check if extension was enabled/disabled before enable or disable * rubencm/ticket/15123: [ticket/15123] modified return error codes [ticket/15123] modified language strings [ticket/15123] modified language string [ticket/15123] removed blank spaces [ticket/15123] add check before enable or disable extension
| * | | | | | [ticket/15123] modified return error codesRubén Calvo2017-03-132-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15123
| * | | | | | [ticket/15123] modified language stringsRubén Calvo2017-03-133-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15123
| * | | | | | [ticket/15123] modified language stringRubén Calvo2017-03-133-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15123
| * | | | | | [ticket/15123] removed blank spacesRubén Calvo2017-03-132-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15123
| * | | | | | [ticket/15123] add check before enable or disable extensionRubén Calvo2017-03-133-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15123
* | | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-03-191-0/+134
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/15122] Add cache driver for memcached
| * | | | | | Merge pull request #4737 from marc1706/ticket/15122Tristan Darricau2017-03-191-0/+134
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15122] Add cache driver for memcached * marc1706/ticket/15122: [ticket/15122] Add cache driver for memcached
| | * | | | | | [ticket/15122] Add cache driver for memcachedMarc Alexander2017-03-121-0/+134
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | PHPBB3-15122
* | | | | | | Merge pull request #4740 from rubencm/ticket/14974Tristan Darricau2017-03-192-1/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14974] Make cookie notice configurable via language files * rubencm/ticket/14974: [ticket/14974] make cookie notice configurable via language files
| * | | | | | | [ticket/14974] make cookie notice configurable via language filesRubén Calvo2017-03-132-1/+3
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | PHPBB3-14974
* | | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-03-194-1/+54
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13558] Change options prefix and add settings precautions. [ticket/13558] Make SSL context specific options more SMTP general [ticket/13558] Add smtp SSL context configuration options
| * | | | | | Merge pull request #4745 from rxu/ticket/13558Tristan Darricau2017-03-194-1/+54
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13558] Add smtp SSL context configuration options * rxu/ticket/13558: [ticket/13558] Change options prefix and add settings precautions. [ticket/13558] Make SSL context specific options more SMTP general [ticket/13558] Add smtp SSL context configuration options
| | * | | | | | [ticket/13558] Change options prefix and add settings precautions.rxu2017-03-194-16/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13558
| | * | | | | | [ticket/13558] Make SSL context specific options more SMTP generalrxu2017-03-181-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13558
| | * | | | | | [ticket/13558] Add smtp SSL context configuration optionsrxu2017-03-174-0/+54
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | PHPBB3-13558
* | | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-03-192-2/+10
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | | * 3.1.x: [ticket/14844] Add CSS classes for strong and italics text to BBCodes
| * | | | | Merge pull request #4749 from marc1706/ticket/14844Tristan Darricau2017-03-192-2/+10
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14844] Add CSS classes for strong and italics text to BBCodes * marc1706/ticket/14844: [ticket/14844] Add CSS classes for strong and italics text to BBCodes
| | * | | | | [ticket/14844] Add CSS classes for strong and italics text to BBCodesMarc Alexander2017-03-192-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14844
* | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-03-191-15/+47
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #4578 from javiexin/ticket/14849Marc Alexander2017-03-191-15/+47
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14849] Add core.acp_extensions_run_action