aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | | | [ticket/14831] Compare depends_on for migrations and remove prefixless namesMarc Alexander2016-10-231-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14831
| | * | | | | | | | | | | [ticket/14831] Add migration for deduplicating entries and fix typoMarc Alexander2016-10-232-3/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14831
| | * | | | | | | | | | | [ticket/14831] Add method for getting valid migration nameMarc Alexander2016-10-231-26/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14831
| | * | | | | | | | | | | [ticket/14831] Fall back to possible migration names instead of adding prefixMarc Alexander2016-10-231-3/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of just adding the backslash as prefix if needed, this will take care of falling back to any possible migration with or without backslash no matter how the mgiration was saved in the database or called in the migrations file. This will result in a more robust migrator in regards to naming the migrations and previously run migrations. PHPBB3-14831
| | * | | | | | | | | | | [ticket/14831] Make sure migrations always start with backslashMarc Alexander2016-10-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The migration system expects every migration to start with a backslash. If depends on definitions do not supply that leading backslash, we should make sure it's added manually before calling the depends on migration. PHPBB3-14831
* | | | | | | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-132-1/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | / / / / / / / / | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Merge pull request #4488 from senky/ticket/14825Marc Alexander2016-11-132-1/+35
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Add core.auth_oauth_login_after and core.auth_oauth_link_after
| | * | | | | | | | | | [ticket/14825] Add core.auth_oauth_(login/link)_afterJakub Senko2016-11-132-1/+35
| | | |_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14825
* | | | | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-124-8/+25
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge pull request #4504 from VSEphpbb/ticket/14855Marc Alexander2016-11-124-13/+30
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14855] Update notification and PM alert bubbles
| | * | | | | | | | | | [ticket/14855] Bump font size to 10pxMatt Friedman2016-11-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14855
| | * | | | | | | | | | [ticket/14855] CSS updatesMatt Friedman2016-11-113-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14855
| | * | | | | | | | | | [ticket/14855] Update CSSMatt Friedman2016-11-112-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14855
| | * | | | | | | | | | [ticket/14855] Update the commentsMatt Friedman2016-11-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14855
| | * | | | | | | | | | [ticket/14855] Remove notification bubble on mark all readMatt Friedman2016-11-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14855
| | * | | | | | | | | | [ticket/14855] Fix responsive alert bubble CSSMatt Friedman2016-11-051-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14855
| | * | | | | | | | | | [ticket/14855] Update notification and PM alert bubblesMatt Friedman2016-11-053-7/+19
| | | |_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14855
* | | | | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | / / / / | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | Merge pull request #4505 from JimMH/patch-1Marc Alexander2016-11-121-1/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14859] Send notifications for PM reports to all users with correct permissions
| | * | | | | | | | | [ticket/14859] Notifications for PM reports send to users with correct ↵Jim Mossing Holsteyn2016-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | permissions Tracker ticket (set the ticket ID to your ticket ID): https://tracker.phpbb.com/browse/PHPBB3-14859 This addresses the problem that notifications of new PM reports were not sent out to moderators that weren't global moderators but did have the permission "Can close/delete PM reports". PHPBB3-14859
* | | | | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-122-2/+14
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge pull request #4496 from senky/ticket/14848Marc Alexander2016-11-122-2/+14
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14848] Add acp_ext_list_disabled/enabled_title_after
| | * | | | | | | | | | [ticket/14848] Add acp_ext_list_disabled/enabled_title_afterJakub Senko2016-11-022-2/+14
| | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14848
* | | | | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-121-1/+13
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge pull request #4495 from senky/ticket/14847Marc Alexander2016-11-121-1/+13
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14847] Add core.acp_attachments_config_edit_add
| | * | | | | | | | | | [ticket/14847] Add core.acp_attachments_config_edit_addJakub Senko2016-11-021-1/+13
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14847
* | | | | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-122-1/+36
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge pull request #4481 from senky/ticket/14819Marc Alexander2016-11-122-1/+36
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14819] Hide soft-deleted posts in topic review
| | * | | | | | | | | | [ticket/14819] Hide soft-deleted posts in topic reviewJakub Senko2016-10-132-1/+36
| | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14819
* | | | | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-121-7/+21
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge pull request #4472 from dsinn/ticket/14804Marc Alexander2016-11-121-7/+21
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14804] Add core event to MCP after merging topics
| | * \ \ \ \ \ \ \ \ \ [ticket/14804] Merge remote-tracking branch 'upstream/3.1.x' into ticket/14804Daniel Sinn2016-10-039-16/+109
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14804
| | * | | | | | | | | | | [ticket/14804] Fix undefined $topic_data after trying to port 3.2 changes to 3.1Daniel Sinn2016-09-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14804
| | * | | | | | | | | | | [ticket/14804] Rename event to mcp_forum_merge_topics_after; update @sinceDaniel Sinn2016-09-301-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14804
| | * | | | | | | | | | | [ticket/14804] Add core event to MCP after merging topicsDaniel Sinn2016-09-301-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed $topic_data and defined $to_topic_data in order to avoid ambiguity and to stop overwriting a variable. PHPBB3-14804
* | | | | | | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge pull request #4507 from nickvergessen/ticket-14788Marc Alexander2016-11-121-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14788] Farewell my friendz
| | * | | | | | | | | | | | [ticket/14788] FarewellJoas Schilling2016-11-121-1/+1
| | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14788
* | | | | | | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | [ticket/14860] Broken link on subscriptions page on mobile deviceslavigor2016-11-081-3/+3
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14860
* | | | | | | | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-11-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14795] Use maximum topic views instead of adding up views in merge
| * | | | | | | | | | | Merge pull request #4485 from marc1706/ticket/14795Tristan Darricau2016-11-061-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14795] Use maximum topic views instead of adding up views in merge * github.com:phpbb/phpbb: [ticket/14795] Use maximum topic views instead of adding up views in merge
| | * | | | | | | | | | | [ticket/14795] Use maximum topic views instead of adding up views in mergeMarc Alexander2016-10-161-1/+1
| | | |_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merging topics should not result in topic views being added up but rather in the highest topic view showing up for the merged topic. PHPBB3-14795
* | | | | | | | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-11-061-6/+11
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/11483] Add tests for generating user act key on force reactivate [ticket/11483] Generate user act key if database entry is empty
| * | | | | | | | | | | Merge pull request #4486 from marc1706/ticket/11483Tristan Darricau2016-11-061-6/+11
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11483] Generate user act key if database entry is empty * github.com:phpbb/phpbb: [ticket/11483] Add tests for generating user act key on force reactivate [ticket/11483] Generate user act key if database entry is empty
| | * | | | | | | | | | [ticket/11483] Generate user act key if database entry is emptyMarc Alexander2016-10-161-6/+11
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The force reactivation action in the ACP will no longer overwrite the generated activation key in case the key stored in the database is empty. It will also save the generated key back to the database to actually allow the activation by the user. PHPBB3-11483
* | | | | | | | | | | Merge remote-tracking branch 'nicofuma/ticket/14814' into 3.2.xMarc Alexander2016-11-053-8/+22
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | [ticket/14814] Fix reparser cronTristan Darricau2016-11-023-8/+22
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14814
* | | | | | | | | | [ticket/14846] Updated s9e\TextFormatterJoshyPHP2016-11-021-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14846
* | | | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-10-282-18/+13
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |