aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5296 from MikelAlejoBR/ticket/15622Marc Alexander2018-10-082-6/+56
|\ | | | | | | [ticket/15622] Fix quoting in PMs when BBCodes are disabled
| * [ticket/15622] Rename function to avoid potential future conflictsMikelAlejoBR2018-09-162-2/+2
| | | | | | | | PHPBB3-15622
| * [ticket/15622] Remove "since" tag as it belongs to eventsMikelAlejoBR2018-09-161-1/+0
| | | | | | | | PHPBB3-15622
| * [ticket/15622] Refactor message link concatenationMikelAlejoBR2018-08-011-12/+5
| | | | | | | | PHPBB3-15622
| * [ticket/15622] Correct code styleMikelAlejoBR2018-08-011-2/+2
| | | | | | | | PHPBB3-15622
| * [ticket/15622] Fix message link generationMikelAlejoBR2018-08-011-1/+10
| | | | | | | | | | | | | | Now the message link is generated in different formats depending on whether BBCodes are allowed or not in the site. PHPBB3-15622
| * [ticket/15622] Extract duplicated codeMikelAlejoBR2018-07-312-23/+53
| | | | | | | | PHPBB3-15622
| * [ticket/15622] Fix quoting in PMs when BBCodes are disabledMikelAlejoBR2018-07-221-1/+20
| | | | | | | | | | | | | | | | | | Before parsing the private message to be loaded a simple BBCode status check is done to verify that BBCodes are enabled. Depending on that option the quote will be formated as BBCode or as plain text, similarly to what is done in posting.php. PHPBB3-15622
* | Merge pull request #5220 from senky/ticket/15662Marc Alexander2018-10-081-0/+4
|\ \ | | | | | | | | | [ticket/15662] Add $this->template to core.modify_notification_message
| * | [ticket/15662] Add templateJakub Senko2018-09-161-0/+4
| | | | | | | | | | | | PHPBB3-15662
* | | Merge pull request #5152 from senky/ticket/15579Marc Alexander2018-10-081-2/+40
|\ \ \ | | | | | | | | | | | | [ticket/15579] Add ucp_front events
| * | | [ticket/15579] Add ucp_front eventsJakub Senko2018-09-161-2/+40
| | | | | | | | | | | | | | | | PHPBB3-15579
* | | | Merge pull request #5292 from rubencm/ticket/15723Marc Alexander2018-09-171-8/+21
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/15723] Rewrite gen_rand_string() and gen_rand_string_friendly()
| * | | | [ticket/15723] Rewrite unique_id tooRubén Calvo2018-08-081-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-15723
| * | | | [ticket/15723] Rewrite gen_rand_string() and gen_rand_string_friendly()Rubén Calvo2018-07-141-7/+20
| | |_|/ | |/| | | | | | | | | | PHPBB3-15723
* | | | Merge pull request #5309 from Zoddo/ticket/15737Marc Alexander2018-09-161-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/15737] Add $user_rows to core.delete_user_before
| * | | | [ticket/15737] Add $user_rows to core.delete_user_beforeZoddo2018-07-301-1/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | It was added to core.delete_user_after in GH-4905 PHPBB3-15737
* | | | Merge pull request #5305 from MikelAlejoBR/ticket/15733Marc Alexander2018-09-161-4/+2
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/15733] Remove unused code related to deprecated flood control
| * | | | [ticket/15733] Fix undeclared variable concatenationMikelAlejoBR2018-07-291-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-15733
| * | | | [ticket/15697] Remove unused variable and corresponding input fieldMikelAlejoBR2018-07-281-2/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-15697
| * | | | [ticket/15697] Remove hard coded time check when sending PMsMikelAlejoBR2018-07-231-1/+1
| |/ / / | | | | | | | | | | | | PHPBB3-15697
* | | | Merge pull request #5160 from kasimi/ticket/15590Marc Alexander2018-09-161-1/+35
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/15590] Add events core.acp_bbcodes_(modify_create|delete)_after
| * | | | [ticket/15590] Add events core.acp_bbcodes_(modify_create|delete)_afterkasimi2018-07-081-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-15590
| * | | | [ticket/15590] Add events core.acp_bbcodes_(modify_create|delete)_afterkasimi2018-03-161-1/+35
| | | | | | | | | | | | | | | | | | | | PHPBB3-15590
* | | | | Merge pull request #5349 from rubencm/ticket/15566Derky2018-09-141-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/15566] Set category to none if extension don't exist
| * | | | | [ticket/15566] Add missing variable signrubencm2018-09-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15566
| * | | | | [ticket/15566] Set category to none if extension don't existrubencm2018-09-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15566
* | | | | | [3.2.x] Update verions for 3.2.4-devMarc Alexander2018-08-021-1/+1
| | | | | |
* | | | | | Merge branch 'prep-release-3.2.3' into 3.2.xMarc Alexander2018-08-021-1/+1
|\ \ \ \ \ \
| * | | | | | [prep-release-3.2.3] Update version numbers for 3.2.3-RC2Marc Alexander2018-07-301-1/+1
| | | | | | |
* | | | | | | Merge branch 'prep-release-3.2.3' into 3.2.xMarc Alexander2018-07-301-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | |
| * | | | | [ticket/15731] Fix language string parametersRubén Calvo2018-07-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15731
* | | | | | Merge pull request #5253 from senky/ticket/15618Tristan Darricau2018-07-081-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15618] Display The team link only to users with permission * github.com:/phpbb/phpbb: [ticket/15618] Display The team link only to users with permission
| * | | | | | [ticket/15618] Display The team link only to users with permissionJakub Senko2018-06-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15618
* | | | | | | Merge pull request #5277 from ghostal/ticket/15717Tristan Darricau2018-07-081-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15717] Using correct variable for log entry * github.com:/phpbb/phpbb: [ticket/15717] Using correct variable for log entry
| * | | | | | | [ticket/15717] Using correct variable for log entryAlex Miles2018-07-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15717
* | | | | | | | Merge pull request #5217 from Zoddo/ticket/15656Tristan Darricau2018-07-081-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15656] Add "View post" link in the mod logs on the ACP * github.com:/phpbb/phpbb: [ticket/15656] Add "View post" link in the mod logs on the ACP
| * | | | | | | | [ticket/15656] Add "View post" link in the mod logs on the ACPZoddo2018-05-011-1/+1
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This link was added to the MCP view in GH-3870 (PHPBB3-9485) but I completely forgot the ACP… Consistency is back! PHPBB3-15656
* | | | | | | | Merge branch 'prep-release-3.2.3' into 3.2.xTristan Darricau2018-07-081-2/+26
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | / / / / | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.2.3: [ticket/15676] Use paragraphs and classes as suggested by hanakin [ticket/15676] Use twig syntax [ticket/15676] Simplify link text and use privacy link in cookie notice [ticket/15676] Display privacy notice in footer & allow overriding U_PRIVACY
| * | | | | | Merge pull request #5231 from marc1706/ticket/15676Tristan Darricau2018-07-081-2/+26
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15676] Display privacy notice in footer & allow overriding U_PRIVACY * github.com:/phpbb/phpbb: [ticket/15676] Use paragraphs and classes as suggested by hanakin [ticket/15676] Use twig syntax [ticket/15676] Simplify link text and use privacy link in cookie notice [ticket/15676] Display privacy notice in footer & allow overriding U_PRIVACY
| | * | | | | | [ticket/15676] Simplify link text and use privacy link in cookie noticeMarc Alexander2018-05-311-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15676
| | * | | | | | [ticket/15676] Display privacy notice in footer & allow overriding U_PRIVACYMarc Alexander2018-05-311-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15676
* | | | | | | | [ticket/15695] Fix gen_rand_string returning less characters than expectedRubén Calvo2018-06-181-4/+6
| |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | PHPBB3-15695
* | | | | | | Merge pull request #5245 from rubencm/ticket/15693Marc Alexander2018-06-171-2/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | [ticket/15693] Fix get_rand_string()
| * | | | | | [ticket/15693] Update tests to reflect changes to gen_rand_string()Marc Alexander2018-06-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15693
| * | | | | | [ticket/15693] Fix get_rand_string()Rubén Calvo2018-06-151-2/+2
| | |/ / / / | |/| | | | | | | | | | | | | | | | PHPBB3-15693
* | | | | | Merge pull request #5218 from senky/ticket/15657Marc Alexander2018-06-171-2/+43
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | [ticket/15657] Add MCP queue events
| * | | | | [ticket/15657] Add MCP queue eventsJakub Senko2018-05-031-2/+43
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-15657
* | | | | [3.2.x] Update version numbers to 3.2.4-devMarc Alexander2018-03-261-1/+1
|/ / / /
* | | | [prep-release-3.2.3] Update version numbers for 3.2.3-RC1Marc Alexander2018-02-281-1/+1
| |/ / |/| |