aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2464 from nickvergessen/ticket/11163Andreas Fischer2014-05-151-0/+10
|\ | | | | | | | | | | | | [ticket/11163] Add ext/index.htm * nickvergessen/ticket/11163: [ticket/11163] Add ext/index.htm
| * [ticket/11163] Add ext/index.htmJoas Schilling2014-05-151-0/+10
| | | | | | | | PHPBB3-11163
* | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2014-05-152-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12540] Fix broken placeholders in language files Conflicts: phpBB/language/en/common.php phpBB/language/en/posting.php phpBB/language/en/ucp.php
| * \ Merge pull request #2454 from nickvergessen/ticket/12540Andreas Fischer2014-05-153-3/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12540] Fix broken placeholders in language files * nickvergessen/ticket/12540: [ticket/12540] Fix broken placeholders in language files
| | * | [ticket/12540] Fix broken placeholders in language filesJoas Schilling2014-05-133-3/+3
| |/ / | | | | | | | | | PHPBB3-12540
* | | Merge pull request #2456 from Nicofuma/ticket/12435Andreas Fischer2014-05-141-8/+21
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12435] purge_notifications() fails for unused notifications * Nicofuma/ticket/12435: [ticket/12435] Update the comment [ticket/12435] purge_notifications() fails for unused notifications
| * | | [ticket/12435] Update the commentTristan Darricau2014-05-141-4/+6
| | | | | | | | | | | | | | | | PHPBB3-12435
| * | | [ticket/12435] purge_notifications() fails for unused notificationsTristan Darricau2014-05-141-8/+19
| | |/ | |/| | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-12435 PHPBB3-12435
* | | Merge pull request #2457 from prototech/ticket/12544Andreas Fischer2014-05-141-8/+8
|\ \ \ | |/ / |/| | | | | | | | | | | | | | [ticket/12544] Update Plupload to 2.1.2. * prototech/ticket/12544: [ticket/12544] Update Plupload to 2.1.2.
| * | [ticket/12544] Update Plupload to 2.1.2.Cesar G2014-05-131-8/+8
|/ / | | | | | | PHPBB3-12544
* | Merge pull request #2452 from n-aleha/ticket/12519Joas Schilling2014-05-131-1/+1
|\ \ | | | | | | | | | | | | | | | | | | [ticket/12519] Restore m_approve language description * n-aleha/ticket/12519: [ticket/12519] Restore m_approve language description
| * | [ticket/12519] Restore m_approve language descriptionn-aleha2014-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | | Restore acl_m_approve language description to: "Can approve and restore posts" PHPBB3-12519
* | | Merge remote-tracking branch 'nickvergessen/ticket/12534' into develop-ascraeusMarc Alexander2014-05-124-10/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/12534: [ticket/12534] Fix filter for functional tests [ticket/12534] Do not use errorbox for multi steps [ticket/12534] Do not abuse errorbox for en/disable confirmation of extensions
| * | | [ticket/12534] Fix filter for functional testsJoas Schilling2014-05-121-2/+2
| | | | | | | | | | | | | | | | PHPBB3-12534
| * | | [ticket/12534] Do not use errorbox for multi stepsJoas Schilling2014-05-122-2/+2
| | | | | | | | | | | | | | | | PHPBB3-12534
| * | | [ticket/12534] Do not abuse errorbox for en/disable confirmation of extensionsJoas Schilling2014-05-123-6/+10
| | | | | | | | | | | | | | | | PHPBB3-12534
* | | | Merge pull request #2446 from nickvergessen/ticket/12518Andreas Fischer2014-05-122-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12518] Apply De Morgan to make the conditions easier reasable * nickvergessen/ticket/12518: [ticket/12518] Apply De Morgan to make the conditions easier to read
| * | | | [ticket/12518] Apply De Morgan to make the conditions easier to readJoas Schilling2014-05-112-3/+3
|/ / / / | | | | | | | | | | | | PHPBB3-12518
* | | | Merge remote-tracking branch 'nickvergessen/ticket/12518' into develop-ascraeusMarc Alexander2014-05-112-26/+93
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | * nickvergessen/ticket/12518: [ticket/12518] Add event to overwrite the cannot edit condition in posting.php [ticket/12518] Add event to overwrite the allow edit and delete conditions
| * | | [ticket/12518] Add event to overwrite the cannot edit condition in posting.phpJoas Schilling2014-05-111-11/+38
| | | | | | | | | | | | | | | | PHPBB3-12518
| * | | [ticket/12518] Add event to overwrite the allow edit and delete conditionsJoas Schilling2014-05-111-15/+55
|/ / / | | | | | | | | | PHPBB3-12518
* | | Merge pull request #2442 from Elsensee/ticket/12451-2Joas Schilling2014-05-111-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12451] Fix whitespace in posting.php lang file * Elsensee/ticket/12451-2: [ticket/12451] Fix whitespace in posting.php lang file
| * | | [ticket/12451] Fix whitespace in posting.php lang fileOliver Schramm2014-05-111-1/+1
|/ / / | | | | | | | | | PHPBB3-12451
* | | Merge pull request #2438 from marc1706/ticket/12517Joas Schilling2014-05-112-2/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12517] Correctly call $log->add in prune shadow topics * marc1706/ticket/12517: [ticket/12517] Correctly call $log->add in prune shadow topics
| * | | [ticket/12517] Correctly call $log->add in prune shadow topicsMarc Alexander2014-05-112-2/+9
| | | | | | | | | | | | | | | | PHPBB3-12517
* | | | Merge pull request #2439 from prototech/ticket/12526Joas Schilling2014-05-111-1/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | [ticket/12526] Fix undefined index: filesize when editing PM with attachments. * prototech/ticket/12526: [ticket/12526] Fix undefined index: filesize when editing PM with attachments.
| * | | [ticket/12526] Fix undefined index: filesize when editing PM with attachments.Cesar G2014-05-111-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12526
* | | | Merge pull request #2441 from Nicofuma/ticket/12529Joas Schilling2014-05-113-6/+15
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | [ticket/12529] Use root_path in controller\resolver to check the template dir * Nicofuma/ticket/12529: [ticket/12529] Move $phpbb_root_path to the end of the constructor [ticket/12529] Use root_path in controller\resolver to check the template dir
| * | | [ticket/12529] Move $phpbb_root_path to the end of the constructorTristan Darricau2014-05-113-6/+7
| | | | | | | | | | | | | | | | PHPBB3-12529
| * | | [ticket/12529] Use root_path in controller\resolver to check the template dirTristan Darricau2014-05-113-3/+11
| | | | | | | | | | | | | | | | PHPBB3-12529
* | | | Merge pull request #2412 from prototech/ticket/12501Joas Schilling2014-05-111-2/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12501] Fix improper display of inline attachments in post report page * prototech/ticket/12501: [ticket/12501] Only select attachments uploaded before the post was reported. [ticket/12501] Parse the reported post message before its attachments.
| * | | | [ticket/12501] Only select attachments uploaded before the post was reported.Cesar G2014-05-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The post text displayed to the user is the same as when it was reported, even if the post was edited afterwards, thus it follows that the attachments would be the same. This also addresses an issue where the index in the attachment bbcode no longer matches that of its corresponding attachment when new attachments are uploaded after the post is reported. PHPBB3-12501
| * | | | [ticket/12501] Parse the reported post message before its attachments.Cesar G2014-05-051-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that the empty lines from attachment.html aren't converted into <br />. PHPBB3-12501
* | | | | Merge pull request #2420 from prototech/ticket/9388Joas Schilling2014-05-1117-119/+102
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/9388] Only display the settings for the selected method in the auth and search ACP pages. * prototech/ticket/9388: [ticket/9388] Use "togglable" instead of "toggable" [ticket/9388] Do not nest the <fieldset> tags in the OAuth settings. [ticket/9388] Reopen <fieldset> after auth templates. [ticket/9388] Fix unit tests. [ticket/9388] Use the new toggle function for the avatar type <select>. [ticket/9388] Display only the settings for the selected search backend. [ticket/9388] Display only the settings for the auth method that's selected. [ticket/9388] Add support for making <select> options able to toggle settings.
| * | | | | [ticket/9388] Use "togglable" instead of "toggable"Cesar G2014-05-097-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9388
| * | | | | [ticket/9388] Do not nest the <fieldset> tags in the OAuth settings.Cesar G2014-05-081-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9388
| * | | | | [ticket/9388] Reopen <fieldset> after auth templates.Cesar G2014-05-081-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9388
| * | | | | [ticket/9388] Fix unit tests.Cesar G2014-05-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9388
| * | | | | [ticket/9388] Use the new toggle function for the avatar type <select>.Cesar G2014-05-087-61/+8
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9388
| * | | | | [ticket/9388] Display only the settings for the selected search backend.Cesar G2014-05-082-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9388
| * | | | | [ticket/9388] Display only the settings for the auth method that's selected.Cesar G2014-05-085-48/+55
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9388
| * | | | | [ticket/9388] Add support for making <select> options able to toggle settings.Cesar G2014-05-082-1/+27
| | |/ / / | |/| | | | | | | | | | | | | PHPBB3-9388
* | | | | Merge pull request #2437 from rxu/ticket/12524Joas Schilling2014-05-111-0/+24
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12524] Add search.php core event to modify search results rowset * rxu/ticket/12524: [ticket/12524] Add search.php core event to modify search results rowset
| * | | | | [ticket/12524] Add search.php core event to modify search results rowsetrxu2014-05-111-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently it is possible to change search results within the search row scope, but it should be possible to modify/unset every individual row within the rowset. PHPBB3-12524
* | | | | | Merge pull request #2340 from PayBas/ticket/12431Joas Schilling2014-05-117-0/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12431] Add has_poll icon to topiclists * PayBas/ticket/12431: [ticket/12431] Lang full sentence [ticket/12431] Add topic poll icon. [ticket/12431] Add has_poll icon to topiclists
| * | | | | | [ticket/12431] Lang full sentencePayBas2014-05-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12431
| * | | | | | Merge pull request #4 from prototech/ticket/12431PayBas2014-05-042-3/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | [ticket/12431] Add topic poll icon.
| | * | | | | | [ticket/12431] Add topic poll icon.Cesar G2014-05-042-3/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-12431
| * | | | | | [ticket/12431] Add has_poll icon to topiclistsPayBas2014-05-026-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12431
* | | | | | | Merge pull request #2436 from rxu/ticket/12523Joas Schilling2014-05-113-0/+20
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12523] Add template events search_results_topic_(before/after) * rxu/ticket/12523: [ticket/12523] Add template events search_results_topic_(before/after)
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-13 13:06:10 +0000