aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | [ticket/11366] Update FILE_NOT_FOUND language stringTristan Darricau2014-05-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This var is always used with a colon. PHPBB3-11366
| * | | | | | | [ticket/11366] Align language stringsTristan Darricau2014-05-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11366
| * | | | | | | [ticket/11366] Coding styleTristan Darricau2014-05-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11366
| * | | | | | | [ticket/11366] Correct a sentenceTristan Darricau2014-05-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11366
| * | | | | | | [ticket/11366] Remove unused langage entryTristan Darricau2014-05-281-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11366
| * | | | | | | [ticket/11366] Moving to \phpbb\version_helperNicofuma2014-05-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + bug fix (missing exception) + Using \phpbb\version_helper So, now, the version file have a new format : { "stable": { "<branch>": { "current": "<version>", [ "announcement": "<announcement link>", ] [ "download": "<download link>", ] }, "<branch>": { ... } }, "unstable": { } } PHPBB3-11366
| * | | | | | | [ticket/11366] Extension's version's checkNicofuma2014-05-281-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a feature to check automatically the version of the installed extensions. The informations are cached for 24 hours (like for the global update check on the main page of the acp). The informations about the versions are display both on the global list and on the detailled page. To do this the developper has to to let the composer.json of the latest version available and add some informations into it : "extra": { "version-check": { "host": "<the host>", "directory": "<the directory containing the file>", "filename": "<the composer.json of the latest version>" } } He can also add two extra informations which will be displayed if a new version is available : "extra": { "download": "<download link>", "annoucement": "<announcement link>", } Currently a notice is displayed when the "extra.version-check" informations are missing. Ticket: https://tracker.phpbb.com/browse/PHPBB3-11366 Signed-off-by: Nicofuma <github@nicofuma.fr> PHPBB3-11366
| * | | | | | | [ticket/12594] Replace phpBB Group with phpBB LimitedYuriy Rusko2014-05-283-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12594
| * | | | | | | Merge remote-tracking branch 'upstream/develop-ascraeus' into ticket/12594Yuriy Rusko2014-05-271-34/+8
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/docs/hook_system.html
| | * \ \ \ \ \ \ Merge pull request #2440 from nickvergessen/ticket/12527Andreas Fischer2014-05-271-34/+8
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12527] Remove translation editor from ACP * nickvergessen/ticket/12527: [ticket/12527] Fix "board’s language" vs "boards language" [ticket/12527] Use a proper language string on confirm screen [ticket/12527] Remove unnecessary language strings [ticket/12527] Check whether the language exists [ticket/12527] Restore missing files and variables check [ticket/12527] Remove editor from template [ticket/12527] Remove language file editor form ACP
| | | * | | | | | | [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-111-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12527
| | | * | | | | | | [ticket/12527] Remove unnecessary language stringsJoas Schilling2014-05-111-31/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12527
| | | * | | | | | | [ticket/12527] Restore missing files and variables checkJoas Schilling2014-05-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12527
| * | | | | | | | | [ticket/12594] Remove @package tags and update file headersYuriy Rusko2014-05-2739-158/+237
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12594
| * | | | | | | | Merge pull request #2429 from Nicofuma/ticket/12074Joas Schilling2014-05-261-0/+4
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12074] Managing extensions doesn't produce any log entry * Nicofuma/ticket/12074: [ticket/12074] Update the visibility of the constructor [ticket/12074] Don't log errors [ticket/12074] Managing extensions doesn't produce any log entry
| | * | | | | | | [ticket/12074] Don't log errorsTristan Darricau2014-05-091-15/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12074
| | * | | | | | | [ticket/12074] Managing extensions doesn't produce any log entryTristan Darricau2014-05-091-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12074
| * | | | | | | | Merge remote-tracking branch 'n-aleha/ticket/12525' into develop-ascraeusCesar G2014-05-161-2/+3
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * n-aleha/ticket/12525: [ticket/12525] Add string argument to contact and email user language variables
| | * | | | | | | | [ticket/12525] Add string argument to contact and email user language variablesn-aleha2014-05-171-2/+3
| | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In language/en/common.php: * Introduce a new language variable 'CONTACT' => 'Contact' * Add a string argument to lang var 'CONTACT_USER' to avoid an appended '{USERNAME}' in template. * Add a string argument to lang var 'SEND_EMAIL_USER' to avoid an appended '{USERNAME}' in template. Also fix typos. PHPBB3-12525
| * | | | | | | | Merge pull request #2463 from nickvergessen/ticket/12433Andreas Fischer2014-05-151-0/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12433] Use a different message when nesting of quotes is not allowed * nickvergessen/ticket/12433: [ticket/12433] Use a different message when nesting of quotes is not allowed
| | * | | | | | | | [ticket/12433] Use a different message when nesting of quotes is not allowedJoas Schilling2014-05-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12433
| * | | | | | | | | 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 #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
| * | | | | | | | | [ticket/12451] Fix whitespace in posting.php lang fileOliver Schramm2014-05-111-1/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12451
| * | | | | | | | Merge pull request #2420 from prototech/ticket/9388Joas Schilling2014-05-111-0/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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] Display only the settings for the auth method that's selected.Cesar G2014-05-081-0/+1
| | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9388
| * | | | | | | | Merge pull request #2340 from PayBas/ticket/12431Joas Schilling2014-05-111-0/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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
| | * | | | | | | [ticket/12431] Add has_poll icon to topiclistsPayBas2014-05-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12431
| * | | | | | | | Merge pull request #2363 from Elsensee/ticket/12451Joas Schilling2014-05-081-7/+12
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12451] Split lang vars in posting.php for plurals * Elsensee/ticket/12451: [ticket/12451] Remove duplicated lang var [ticket/12451] Use new line to concatenate strings [ticket/12451] Split TOO_MANY_CHARS vars for plurals [ticket/12451] Split TOO_FEW_CHARS_LIMIT for plurals
| | * | | | | | | | [ticket/12451] Remove duplicated lang varOliver Schramm2014-05-031-10/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12451
| | * | | | | | | | [ticket/12451] Split TOO_MANY_CHARS vars for pluralsOliver Schramm2014-05-031-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12451
| | * | | | | | | | [ticket/12451] Split TOO_FEW_CHARS_LIMIT for pluralsOliver Schramm2014-05-031-2/+6
| | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12451
| * | | | | | | | Merge pull request #2373 from Nicofuma/ticket/12459Joas Schilling2014-05-061-3/+6
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12459] Unapproved posts/topics are not correctly handled in feeds * Nicofuma/ticket/12459: [ticket/12459] Change language strings [ticket/12459] Enable related tests [ticket/12459] Fix: Differentiating unapproved and deleted posts [ticket/12459] Fix: Soft deleted topics should appear in feeds [ticket/12459] Fix: the posts were always marked as unapproved
| | * | | | | | | | [ticket/12459] Change language stringsTristan Darricau2014-05-051-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12459
| | * | | | | | | | [ticket/12459] Fix: Soft deleted topics should appear in feedsTristan Darricau2014-05-041-0/+1
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As for the posts, a soft deleted topic should appear (with a corresponding message) in topic's based feeds. PHPBB3-12459
| * | | | | | | | Merge remote-tracking branch 'MGaetan89/ticket/12415' into develop-ascraeusCesar G2014-05-041-2/+2
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * MGaetan89/ticket/12415: [ticket/12415] Use private message instead of "pm" accronym
| | * | | | | | | | [ticket/12415] Use private message instead of "pm" accronymGaëtan Muller2014-05-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-12415 PHPBB3-12415
| * | | | | | | | | [ticket/12455] Remove unused language strings from common.php and app.phpn-aleha2014-05-042-5/+0
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the following unused language strings from common.php: EXTENSION_CONTROLLER_MISSING EXTENSION_CLASS_WRONG_TYPE Removed the following unused language strings from app.php: CONTROLLER_NOT_FOUND CONTROLLER_SERVICE_NOT_GIVEN CONTROLLER_RETURN_TYPE_INVALID PHPBB3-12455
| * | | | | | | | Merge pull request #2267 from prototech/ticket/10737Joas Schilling2014-05-032-0/+3
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/10737] Add live member search. * prototech/ticket/10737: [ticket/10737] Remove loading indicator. [ticket/10737] Enforce allow_live_searches setting in memberlist.php. [ticket/10737] Add config setting to disable live searches. [ticket/10737] Add loading indicator and alert box code to simple_footer.html. [ticket/10737] Load core.js and ajax.js in simple_footer.html. [ticket/10737] Set the username as the input value instead of redirecting. [ticket/10737] Drop subsilver2 changes. [ticket/10737] Add a more generic live search implementation. [ticket/10737] Clean up memberlist.php. [ticket/10737] Use dropdown for search results container. [ticket/10737] Adding delayed keyup and removing target_blank. [ticket/10737] Using UTF-8 aware alternatives in PHP code. [ticket/10737] Removing obsolete code. [ticket/10737] Avoid hard-coding table row and use case-insensitive search. [ticket/10737] Removing unnecessary/obsolete code. [ticket/10737] Using JQuery events and JSON response. [ticket/10737] Code fixes in AJAX search feature [ticket/10737] Improvements over last commit [ticket/10737] Adding username suggestions in "Find a member" using AJAX
| | * | | | | | | [ticket/10737] Enforce allow_live_searches setting in memberlist.php.Cesar G2014-04-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10737
| | * | | | | | | [ticket/10737] Add config setting to disable live searches.Cesar G2014-04-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10737
| * | | | | | | | Merge remote-tracking branch 'github-prototech/ticket/12265' into ↵Nils Adermann2014-05-022-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-prototech/ticket/12265: [ticket/12265] Actually use $u_pm. [ticket/12265] Ensure that dropdown is always at the very left of the container [ticket/12265] Define a loop for contact icons. [ticket/12265] Break the icons that aren't in loop in case extensions add more [ticket/12265] Fix modulo logic. [ticket/12265] Adjust alignment of AIM and Jabber icons. [ticket/12265] Ensure that there's only 4 icons per row in IE & Opera. [ticket/12265] Add contact icon and remove border from last row & cells. [ticket/12265] Fix issue with dropdown being restricted by the width of parent [ticket/12265] Remove ugly logic. [ticket/12265] Simplify contact icon design and move to dropdown. Conflicts: phpBB/viewtopic.php
| | * | | | | | | | [ticket/12265] Simplify contact icon design and move to dropdown.Cesar G2014-04-152-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12265
| * | | | | | | | | Merge remote-tracking branch 'github-nickvergessen/feature/sqlite3' into ↵Nils Adermann2014-05-021-1/+4
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/feature/sqlite3: [feature/sqlite3] Add sqlite3 database to .gitignore [feature/sqlite3] Use SQLite3 by default [feature/sqlite3] Remove invalid comment [feature/sqlite3] Remove unneeded ORDER BY type from sqlite_master queries [feature/sqlite3] Correctly recreate indexes when recreating a table [feature/sqlite3] Fix sql_index_drop() for sqlite3 [feature/sqlite3] Remove trailing comma from column list [feature/sqlite3] Update docblocks and function visibility [feature/sqlite3] Add support for SQLite 3
| | * | | | | | | | [feature/sqlite3] Add support for SQLite 3Patrick Webster2014-05-021-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minimum version requirement is 3.6.15 as that's what ships with PHP 5.3.0 when support for SQLite 3 was added. PHPBB3-9728
| * | | | | | | | | Merge remote-tracking branch 'github-exreaction/ticket/8323' into ↵Nils Adermann2014-05-021-0/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-exreaction/ticket/8323: [ticket/8323] Cache auth request [ticket/8323] Combine into a single query [ticket/8323] Comments on phpbb_get_banned_user_ids input for test [ticket/8323] More readability in test case [ticket/8323] Comments [ticket/8323] dataProvider for the test; better test data [ticket/8323] Comments [ticket/8323] Unit test for phpbb_get_banned_user_ids [ticket/8323] Comments for inactive reasons in constants.php [ticket/8323] Only disable administrative deactivated accounts from receiving PMs [ticket/8323] Allow temporarily banned users to receive PMs, but not a notification [ticket/8323] Correct PM notification settings (only notify those who can receive them) [ticket/8323] Cleanup viewtopic code (not sure how this mess happened) [ticket/8323] Allow sending PMs to temporarily banned users [ticket/8323] Do not allow sending PMs to Inactive users [ticket/8323] Hide the Send PM link if users cannot receive the PM [ticket/8323] Correcting the comment [ticket/8323] Do not allow sending of Private Messages to users who are banned [ticket/8323] Remove code used for testing [ticket/8323] Do not allow sending of Private Messages to users who do not have permission to read private messages Conflicts: phpBB/language/en/ucp.php
| | * | | | | | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/8323Nathan Guse2013-09-0549-242/+679
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling (613) and others # Via Andreas Fischer (214) and others * 'develop' of github.com:phpbb/phpbb3: (2494 commits) [ticket/11825] Move schema_data.php into includes/ instead of phpbb/ [ticket/11215] Remove unnecessary comment [ticket/11755] MySQL upgrader out of date [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release. [prep-release-3.0.12] Bumping version number for 3.0.12-RC3. [ticket/11823] Set up nginx server to match PHP files with characters after .php [ticket/11812] Fix empty define [ticket/11818] Update Symfony dependencies to 2.3.* [ticket/11791] Load adm/ events from styles/adm/event/ [ticket/11215] Fix helper_url_test.php tests [ticket/11215] Add newline back to .htaccess, fix wording [ticket/11215] Update comment in .htaccess [ticket/11215] Uncomment rewrite rules in .htaccess [ticket/11215] Make controller helper url() method use correct format [ticket/11215] Add commented-out URL rewrite capability to .htaccess [ticket/11821] Fix comma usage next to "You are receiving this notification". [ticket/11769] Allow using 0 as poster name [ticket/11769] Allow '0' as username [ticket/11215] Use new URL structure for controllers [ticket/11215] Everything appears to be working... ... Conflicts: phpBB/includes/functions_privmsgs.php
generated by cgit v1.2.1 (git 2.21.0) at 2026-04-05 19:57:31 +0000