aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x' into 3.2.xMarc Alexander2016-12-171-9/+58
|\
| * Merge pull request #4518 from senky/ticket/14870Marc Alexander2016-12-171-9/+58
| |\ | | | | | | | | | [ticket/14870] Add events to ucp_pm_viewfolder:get_pm_from
| | * [ticket/14870] Add events to ucp_pm_viewfolder:get_pm_fromJakub Senko2016-12-161-9/+58
| | | | | | | | | | | | PHPBB3-14870
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-12-122-0/+8
|\ \ \ | |/ /
| * | Merge pull request #4520 from senky/ticket/14868Marc Alexander2016-12-123-0/+10
| |\ \ | | | | | | | | | | | | [ticket/14868] Add mcp_forum_actions_options template event
| | * | [ticket/14868] Add mcp_forum_actions_options template eventJakub Senko2016-12-043-0/+10
| | | | | | | | | | | | | | | | PHPBB3-14868
* | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-12-112-0/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | * 3.1.x: [ticket/14887] ACP profile step one lang specific event
| * | | Merge pull request #4567 from javiexin/ticket/14887Tristan Darricau2016-12-112-0/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14887] ACP profile step one lang specific event * javiexin/ticket/14887: [ticket/14887] ACP profile step one lang specific event
| | * | | [ticket/14887] ACP profile step one lang specific eventjaviexin2016-12-082-0/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-14887
* | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-12-111-0/+8
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * 3.1.x: [ticket/14889] Missing method in profile fields type interface
| * | | | Merge pull request #4558 from javiexin/ticket/14889Tristan Darricau2016-12-111-0/+8
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14889] Missing method in profile fields type interface * javiexin/ticket/14889: [ticket/14889] Missing method in profile fields type interface
| | * | | | [ticket/14889] Missing method in profile fields type interfacejaviexin2016-12-051-0/+8
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Completes the profile fields type interface by defining a missing required method for all implementations of a type. PHPBB3-14889
* | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-12-110-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * 3.1.x: [ticket/14893] Fix undefined variable on reporting PM notification
| * | | | Merge pull request #4561 from rxu/ticket/14893Tristan Darricau2016-12-111-0/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14893] Fix undefined variable on reporting PM notification * rxu/ticket/14893: [ticket/14893] Fix undefined variable on reporting PM notification
| | * | | | [ticket/14893] Fix undefined variable on reporting PM notificationrxu2016-12-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14893
* | | | | | Merge pull request #4562 from rxu/ticket/14893-3.2.xTristan Darricau2016-12-111-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14893] Fix undefined variable on reporting PM notification * rxu/ticket/14893-3.2.x: [ticket/14893] Fix undefined variable on reporting PM notification
| * | | | | | [ticket/14893] Fix undefined variable on reporting PM notificationrxu2016-12-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14893
* | | | | | | Merge pull request #4564 from VSEphpbb/ticket/14895Tristan Darricau2016-12-1122-132/+127
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14895] CLI should use SymfonyStyle * VSEphpbb/ticket/14895: [ticket/14895] Fix broken tests [ticket/14895] Fix issues in CLI classes [ticket/14895] Use SymfonyStyle in all CLI [ticket/14895] Use SymfonyIO styling [ticket/14895] CLI reparser:list should display proper list
| * | | | | | | [ticket/14895] Fix broken testsMatt Friedman2016-12-082-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14895
| * | | | | | | [ticket/14895] Fix issues in CLI classesMatt Friedman2016-12-0813-44/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14895
| * | | | | | | [ticket/14895] Use SymfonyStyle in all CLIMatt Friedman2016-12-0815-83/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14895
| * | | | | | | [ticket/14895] Use SymfonyIO stylingMatt Friedman2016-12-071-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14895
| * | | | | | | [ticket/14895] CLI reparser:list should display proper listMatt Friedman2016-12-072-2/+7
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-14895
* | | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-12-114-5/+11
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14855] Update notification and PM alert bubbles [ticket/14855] Update notification and PM alert bubbles [ticket/14855] Update notification and PM alert bubbles
| * | | | | | Merge pull request #4572 from javiexin/ticket/14855Tristan Darricau2016-12-114-5/+11
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14855] Update notification and PM alert bubbles * javiexin/ticket/14855: [ticket/14855] Update notification and PM alert bubbles [ticket/14855] Update notification and PM alert bubbles [ticket/14855] Update notification and PM alert bubbles
| | * | | | | | [ticket/14855] Update notification and PM alert bubblesjaviexin2016-12-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Alternative implementation without removing notification from the DOM, but changing the class. So that style designers might have more options (show/not show). Fix tests better. PHPBB3-14855
| | * | | | | | [ticket/14855] Update notification and PM alert bubblesjaviexin2016-12-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Alternative implementation without removing notification from the DOM, but changing the class. So that style designers might have more options (show/not show). Fix tests. PHPBB3-14855
| | * | | | | | [ticket/14855] Update notification and PM alert bubblesjaviexin2016-12-103-4/+9
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Alternative implementation without removing notification from the DOM, but changing the class. So that style designers might have more options (show/not show). PHPBB3-14855
* | | | | | | Merge pull request #4570 from Derky/ticket/14901Tristan Darricau2016-12-112-29/+35
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14901] Remove notice for extension without version check * Derky/ticket/14901: [ticket/14901] Remove notice for extension without version check
| * | | | | | | [ticket/14901] Remove notice for extension without version checkDerky2016-12-092-29/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extensions without version check should not display a notice on the details page in the ACP. PHPBB3-14901
* | | | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-12-111-1/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14906] Delete redundant sig key in user_cache_data array
| * | | | | | | Merge pull request #4573 from rxu/ticket/14906Tristan Darricau2016-12-111-1/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14906] Delete redundant sig key in user_cache_data array * rxu/ticket/14906: [ticket/14906] Delete redundant sig key in user_cache_data array
| | * | | | | | | [ticket/14906] Delete redundant sig key in user_cache_data arrayrxu2016-12-111-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14906
* | | | | | | | | Merge pull request #4576 from Crizz0/ticket/14910Tristan Darricau2016-12-111-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14910] Fixes typo PLease to Please in EXTENSION_NOT_INSTALLED * Crizz0/ticket/14910: [ticket/14910] Fixes typo PLease to Please in EXTENSION_NOT_INSTALLED
| * | | | | | | | | [ticket/14910] Fixes typo PLease to Please in EXTENSION_NOT_INSTALLEDChristian Schnegelberger2016-12-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14910
* | | | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-12-111-1/+13
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge pull request #4514 from senky/ticket/14759Marc Alexander2016-12-111-1/+13
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | [ticket/14759] Add core.mcp_main_modify_shadow_sql event
| | * | | | | | | | [ticket/14759] Add core.mcp_main_modify_shadow_sql eventJakub Senko2016-11-131-1/+13
| | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14759
* | | | | | | | | Merge pull request #4574 from Crizz0/ticket/14908Marc Alexander2016-12-101-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | [ticket/14908] Uses lang-variable instead of english text
| * | | | | | | | [ticket/14908] Uses lang-variable instead of english textChristian Schnegelberger2016-12-101-1/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14908
* | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-12-101-0/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #4513 from senky/ticket/14760Marc Alexander2016-12-101-0/+12
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | [ticket/14760] Add core.mcp_main_modify_fork_sql event
| | * | | | | | [ticket/14760] Add core.mcp_main_modify_fork_sql eventJakub Senko2016-11-131-0/+12
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-14760
* | | | | | | [3.2.x] Update version numbers to 3.2.0-RC3-devMarc Alexander2016-12-105-7/+7
| | | | | | |
* | | | | | | Merge branch 'prep-release-3.2.0-RC2' into 3.2.xMarc Alexander2016-12-108-9/+130
|\ \ \ \ \ \ \
| * | | | | | | [prep-release-3.2.0-RC2] Update changelogMarc Alexander2016-12-091-0/+4
| | | | | | | |
| * | | | | | | [prep-release-3.2.0-RC2] Update changelogMarc Alexander2016-12-091-0/+77
| | | | | | | |
| * | | | | | | [prep-release-3.2.0-RC2] Add migration file for 3.2.0-RC2Marc Alexander2016-12-091-0/+40
| | | | | | | |
| * | | | | | | [prep-release-3.2.0-RC2] Update version numbers to 3.2.0-RC2Marc Alexander2016-12-092-3/+3
| | | | | | | |
| * | | | | | | [prep-release-3.2.0-RC2] Update version numbers to 3.2.0-RC2Marc Alexander2016-12-094-6/+6
|/ / / / / / /