aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/12527] Fix "board’s language" vs "boards language"Joas Schilling2014-05-181-2/+2
| | | | PHPBB3-12527
* [ticket/12527] Use a proper language string on confirm screenJoas Schilling2014-05-112-4/+6
| | | | PHPBB3-12527
* [ticket/12527] Remove unnecessary language stringsJoas Schilling2014-05-111-31/+2
| | | | PHPBB3-12527
* [ticket/12527] Check whether the language existsJoas Schilling2014-05-111-0/+5
| | | | PHPBB3-12527
* [ticket/12527] Restore missing files and variables checkJoas Schilling2014-05-113-38/+112
| | | | PHPBB3-12527
* [ticket/12527] Remove editor from templateJoas Schilling2014-05-111-131/+2
| | | | PHPBB3-12527
* [ticket/12527] Remove language file editor form ACPJoas Schilling2014-05-111-1071/+4
| | | | PHPBB3-12527
* 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)
| * | | | | [ticket/12523] Add template events search_results_topic_(before/after)rxu2014-05-113-0/+20
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add template events search_results_topic_(before/after) to search_results.html. PHPBB3-12523
* | | | | Merge pull request #2306 from marc1706/ticket/12407Joas Schilling2014-05-111-13/+51
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12407] Allow changing of post_data, etc. at end of posting.php * marc1706/ticket/12407: [ticket/12407] Remove merge marker from posting.php [ticket/12407] Fix incorrect @since line in event [ticket/12407] Merge @change in doc block of event [ticket/12407] Assign template variables again after merging develop-ascraeus [ticket/12407] Add message_parser as passed variable to event [ticket/12407] Allow changing of post_data, etc. at end of posting.php
| * | | | | [ticket/12407] Remove merge marker from posting.phpMarc Alexander2014-05-111-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12407
| * | | | | [ticket/12407] Fix incorrect @since line in eventMarc Alexander2014-05-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12407
| * | | | | Merge branch 'develop-ascraeus' of github.com:phpbb/phpbb into ticket/12407Marc Alexander2014-05-08327-1913/+10487
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'develop-ascraeus' of github.com:phpbb/phpbb: (424 commits) [ticket/12428] Use the database to store the original version number [ticket/12493] Add functional test [ticket/12493] Fix sql query for selection of users that have disabled PM [ticket/12513] Add asset include support to simple header/footer in ACP [ticket/12513] Add simple_header head event with support for CSS assets calls [ticket/12511] Add missing titles for profile fields in members group view [ticket/12428] Incorrect from version in database update log entry [ticket/12510] Convert & to &amp; in build_url() when no params are stripped. [ticket/12402] CAPTCHA plugin migration fails to detect missing plugins [ticket/12440] Use a more generic approach for replacing the URL. [ticket/12507] Move the 'require' statement [ticket/12507] Add console command to purge the cache [ticket/12421] Rebase and enable tests [ticket/12421] Don't parse [attachment] tags if user can't view them [ticket/12325] Use \RecursiveDirectoryIterator [ticket/12325] Doc blocks [ticket/12440] Set browser URL to point to specific post when using view=unread [ticket/12357] Support routes in generate_smilies() function. [ticket/12459] Change language strings [ticket/12504] Use local variables where possible ... Conflicts: phpBB/posting.php
| * | | | | [ticket/12407] Merge @change in doc block of eventMarc Alexander2014-04-201-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12407
| * | | | | [ticket/12407] Assign template variables again after merging develop-ascraeusMarc Alexander2014-04-161-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12407
| * | | | | Merge branch 'develop-ascraeus' of https://github.com/phpbb/phpbb into ↵Marc Alexander2014-04-1611-34/+138
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ticket/12407 Conflicts: phpBB/posting.php
| * | | | | | [ticket/12407] Add message_parser as passed variable to eventMarc Alexander2014-04-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12407
| * | | | | | [ticket/12407] Allow changing of post_data, etc. at end of posting.phpMarc Alexander2014-04-141-4/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current event core.posting_modify_template_vars is just ran using dispatch but it doesn't pass any data from posting.php to the listener. Because of that, it's not possible to know anything from posting.php and therefore limits the use cases of this event. This will change it to allow similar actions as with the event core.modify_posting_parameters. PHPBB3-12407
* | | | | | | Merge pull request #2435 from n-aleha/ticket/12522Joas Schilling2014-05-111-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12522] Add function parameter description in guesser interface * n-aleha/ticket/12522: [ticket/12522] Add function parameter description in guesser interface
| * | | | | | | [ticket/12522] Add function parameter description in guesser interfacen-aleha2014-05-111-0/+1
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add parameter description for $file_name of the function guess in guesser_interface PHPBB3-12522
* | | | | | | Merge pull request #2428 from n-aleha/ticket/12476Joas Schilling2014-05-114-2/+9
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12476] Increase assets version on cache purge * n-aleha/ticket/12476: [ticket/12476] Label the constructor as public [ticket/12476] Increase assets also from acp_styles and phpbbcli [ticket/12476] Increase asset version on cache purge
| * | | | | | [ticket/12476] Label the constructor as publicn-aleha2014-05-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Label the the constructor as public. PHPBB3-12476
| * | | | | | [ticket/12476] Increase assets also from acp_styles and phpbbclin-aleha2014-05-093-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase assets also from "ACP > Styles > Purge Cache" and phpbbcli PHPBB3-12476
| * | | | | | [ticket/12476] Increase asset version on cache purgen-aleha2014-05-091-1/+1
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Increace the asset version when purging the cache from "ACP > General" PHPBB3-12476
* | | | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2014-05-100-0/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | * develop-olympus:
| * \ \ \ \ \ Merge pull request #2430 from nickvergessen/ticket/10839-olympusAndreas Fischer2014-05-105-83/+13
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Ticket/10839] olympus - Remove phpunit configuration files * nickvergessen/ticket/10839-olympus: [ticket/10839] Fix note about running slow tests and build task [ticket/10839] Removing phpunit.xml.all [ticket/10839] Always run functional tests by default
* | \ \ \ \ \ \ Merge pull request #2415 from nickvergessen/ticket/10839Andreas Fischer2014-05-105-86/+12
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ticket/10839 Remove phpunit configuration files * nickvergessen/ticket/10839: [ticket/10839] Remove version compare as the php minimum requirement is 5.3.3 [ticket/10839] Fix note about running slow tests and build task [ticket/10839] Removing phpunit.xml.all [ticket/10839] Always run functional tests by default
| * | | | | | | [ticket/10839] Remove version compare as the php minimum requirement is 5.3.3Joas Schilling2014-05-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10839
| * | | | | | | Merge branch 'ticket/10839-olympus' into ticket/10839Joas Schilling2014-05-095-86/+12
| |\ \ \ \ \ \ \ |/ / / / / / / / | | | _ / / / / | | | / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/10839-olympus: [ticket/10839] Fix note about running slow tests and build task [ticket/10839] Removing phpunit.xml.all [ticket/10839] Always run functional tests by default Conflicts: phpunit.xml.dist
| * | | | | | [ticket/10839] Fix note about running slow tests and build taskJoas Schilling2014-05-092-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10839
| * | | | | | [ticket/10839] Removing phpunit.xml.allJoas Schilling2014-05-091-33/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To run all tests, just append --group slow to your call PHPBB3-10839