aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/15179] Replace spaces with a tabMarc Alexander2017-06-031-1/+1
| | | | PHPBB3-15179
* Merge branch 'ticket/15178' into ticket/15179Marc Alexander2017-05-314-187/+209
|\
| * [ticket/15178] Run update againMarc Alexander2017-05-311-13/+15
| | | | | | | | PHPBB3-15178
| * [ticket/15178] Update dependencies for 3.1.xMarc Alexander2017-04-172-64/+76
| | | | | | | | PHPBB3-15178
* | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-05-302-0/+7
|\ \
| * \ Merge pull request #4690 from javiexin/ticket/15081Marc Alexander2017-05-302-0/+7
| |\ \ | | | | | | | | | | | | [ticket/15081] Add acp_ext_details_notice template event
| | * \ Merge branch '3.1.x' into ticket/15081javiexin2017-03-0519-70/+385
| | |\ \
| | * \ \ Merge branch '3.1.x' into ticket/15081javiexin2017-02-1074-384/+900
| | |\ \ \
| | * | | | [ticket/15081] Add acp_ext_details_notice template eventjaviexin2017-02-102-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15081
* | | | | | Merge remote-tracking branch 'javiexin/ticket/15068' into 3.2.xMarc Alexander2017-05-294-0/+157
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'ticket/15068' of https://github.com/javiexin/phpbb into ↵javiexin2017-05-211670-47102/+77760
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ticket/15068
| | * \ \ \ \ \ Merge branch '3.2.x' into ticket/15068javiexin2017-03-091670-47102/+77760
| | |\ \ \ \ \ \
| * | | | | | | | [ticket/15068] Add template vars retrieval from the template objectjaviexin2017-05-211-0/+31
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added tests. PHPBB3-15068
| * | | | | | | [ticket/15068] Add template vars retrieval from the template objectjaviexin2017-03-092-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add possibility to retrieve full block of vars PHPBB3-15068
| * | | | | | | [ticket/15068] Add template vars retrieval from the template objectjaviexin2017-02-053-0/+110
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | PHPBB3-15068
* | | | | | | Merge pull request #4841 from DavidIQ/ticket/14992Marc Alexander2017-05-254-3/+54
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14992] Add temp index migration for removing duplicates
| * | | | | | | [ticket/14992] Add temp index migration for removing duplicatesDavid Colón2017-05-254-3/+54
|/ / / / / / /
* | | | | | | Merge pull request #4701 from DavidIQ/ticket/14992Marc Alexander2017-05-258-14/+336
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14992] Improve user_notifications table performance
| * | | | | | | [ticket/14992] Reduce notification table col sizesDavid Colón2017-05-252-1/+49
| | | | | | | |
| * | | | | | | [ticket/14992] 'method' is needed for the unique indexDavid Colón2017-05-241-1/+1
| | | | | | | |
| * | | | | | | [ticket/14992] Remove temp index migrationDavid Colón2017-05-233-52/+1
| | | | | | | |
| * | | | | | | [ticket/14992] Make unit tests run more verboseMarc Alexander2017-05-213-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14992
| * | | | | | | [ticket/14992] Correctly remove table name and prefix from keysMarc Alexander2017-05-211-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14992
| * | | | | | | [ticket/14992] Shorten index name for user_id and item_idMarc Alexander2017-05-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14992
| * | | | | | | [ticket/14992] Check index name length in a more proper wayDavid Colón2017-03-017-17/+181
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14992] Add indexes to user_notifications table
| * | | | | | | [ticket/14992] Add indexes to user_notifications tableDavid Colón2017-03-014-8/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14992] Change how index length is checked [ticket/14992] Remove duplicates from user_notifications table [ticket/14992] Add unique index to user_notifications table [ticket/14992] Shorten unique index name [ticket/14992] Shorten another index for user notifications
* | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-05-251-1/+3
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge pull request #4717 from rmcgirr83/ticket/15107Marc Alexander2017-05-251-1/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15107] Add message_parser to event
| | * | | | | | | [ticket/15107] Add message_parser to eventRichard McGirr2017-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-15107 PHPBB3-15107
| | * | | | | | | [ticket/15107] Add message_parser to eventRMcGirr832017-03-021-1/+3
| | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-15107 PHPBB3-15107
* | | | | | | | Merge pull request #4822 from Louis7777/ticket/15212Marc Alexander2017-05-211-5/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15212] Fix code box double horizontal scrollbars
| * | | | | | | | [ticket/15212] Fix code box double horizontal scrollbarsLouis77772017-05-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code box has two overflow properties set, one on the code element and one on the parent div container, causing double horizontal scrollbars. PHPBB3-15212
| * | | | | | | | [ticket/15212] Fix code box double horizontal scrollbarsLouis77772017-05-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code box has two overflow properties set, one on the code element and one on the parent div container, causing double horizontal scrollbars. PHPBB3-15212
| * | | | | | | | [ticket/15212] Fix code box double horizontal scrollbarsLouis77772017-05-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code box has two overflow properties set, one on the code element and one on the parent div container, causing double horizontal scrollbars. PHPBB3-15212
| * | | | | | | | Update content.cssLouis77772017-05-031-1/+1
| | | | | | | | |
| * | | | | | | | [ticket/15212] Fix code box double horizontal scrollbarsLouis77772017-05-031-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code box has two overflow properties set, one on the code element and one on the parent div container, causing double horizontal scrollbars. PHPBB3-15212
* | | | | | | | | Merge pull request #4834 from senky/ticket/15056Marc Alexander2017-05-211-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15056] Update subforum icons with Mark forums read
| * | | | | | | | | [ticket/15056] Update subforum icons with Mark forums readJakub Senko2017-05-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15056
* | | | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-05-212-0/+16
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge pull request #4838 from marc1706/ticket/15020Marc Alexander2017-05-212-0/+16
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15020] Add Event for mcp_topic_postrow_post_subject
| | * | | | | | | | | [ticket/15020] Add Event for mcp_topic_postrow_post_subjectDaniel Mota2017-05-212-0/+16
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add 2 events: mcp_topic_postrow_post_subject_before mcp_topic_postrow_post_subject_after PHPBB3-15020
* | | | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-05-212-0/+8
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge pull request #4837 from marc1706/ticket/14996Marc Alexander2017-05-212-0/+8
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14996] Add Event for search_results_topic_title_after
| | * | | | | | | | | [ticket/14996] Add Event for search_results_topic_title_afterDaniel Mota2017-05-212-0/+8
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14996
* | | | | | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-05-121-0/+51
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/15226] Add index for latest topics to topics table
| * | | | | | | | | Merge pull request #4832 from marc1706/ticket/15226Tristan Darricau2017-05-121-0/+51
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15226] Add index for latest topics to topics table * github.com:phpbb/phpbb: [ticket/15226] Add index for latest topics to topics table
| | * | | | | | | | | [ticket/15226] Add index for latest topics to topics tableMarc Alexander2017-05-111-0/+51
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15226
* | | | | | | | | | Merge pull request #4828 from hubaishan/ticket/15221Tristan Darricau2017-05-081-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15221] add missing commas * github.com:phpbb/phpbb: [ticket/15221] add missing commas
| * | | | | | | | | | [ticket/15221] add missing commashubaishan2017-05-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in language/en/install.php PHPBB3-15221
* | | | | | | | | | | Merge pull request #4829 from rxu/ticket/15222Tristan Darricau2017-05-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15222] Fix a typo in generate_text_for_display_test.php * github.com:phpbb/phpbb: [ticket/15222] Fix a typo in generate_text_for_display_test.php