aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/12509] Add an option to set the path of custom file for extensionsTristan Darricau2014-05-131-1/+4
| | | | | | https://tracker.phpbb.com/browse/PHPBB3-12509 PHPBB3-12509
* [ticket/12526] Fix undefined index: filesize when editing PM with attachments.Cesar G2014-05-111-1/+1
| | | | PHPBB3-12526
* 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-113-7/+10
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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-091-1/+1
| | | | | | | | | | | | PHPBB3-9388
| * | [ticket/9388] Display only the settings for the selected search backend.Cesar G2014-05-081-4/+6
| | | | | | | | | | | | PHPBB3-9388
| * | [ticket/9388] Display only the settings for the auth method that's selected.Cesar G2014-05-081-2/+2
| | | | | | | | | | | | PHPBB3-9388
| * | [ticket/9388] Add support for making <select> options able to toggle settings.Cesar G2014-05-081-1/+2
| | | | | | | | | | | | PHPBB3-9388
* | | [ticket/12476] Increase assets also from acp_styles and phpbbclin-aleha2014-05-091-0/+1
| | | | | | | | | | | | | | | | | | 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 pull request #2363 from Elsensee/ticket/12451Joas Schilling2014-05-081-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [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-2/+2
| | | | | | | | | | | | PHPBB3-12451
| * | [ticket/12451] Use new line to concatenate stringsOliver Schramm2014-05-031-2/+2
| | | | | | | | | | | | PHPBB3-12451
| * | [ticket/12451] Split TOO_MANY_CHARS vars for pluralsOliver Schramm2014-05-031-1/+1
| | | | | | | | | | | | PHPBB3-12451
| * | [ticket/12451] Split TOO_FEW_CHARS_LIMIT for pluralsOliver Schramm2014-05-031-1/+1
| | | | | | | | | | | | PHPBB3-12451
* | | Merge pull request #2419 from prototech/ticket/12510Joas Schilling2014-05-081-0/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12510] Convert & to &amp; in build_url() when no params are stripped. * prototech/ticket/12510: [ticket/12510] Convert & to &amp; in build_url() when no params are stripped.
| * | | [ticket/12510] Convert & to &amp; in build_url() when no params are stripped.Cesar G2014-05-061-0/+4
| | | | | | | | | | | | | | | | PHPBB3-12510
* | | | Merge pull request #2421 from n-aleha/ticket/12493Joas Schilling2014-05-081-8/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12493] Fix sql query for selection of users that have disabled PM * n-aleha/ticket/12493: [ticket/12493] Add functional test [ticket/12493] Fix sql query for selection of users that have disabled PM
| * | | | [ticket/12493] Fix sql query for selection of users that have disabled PMn-aleha2014-05-071-8/+7
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug where a user A could not send a PM to user B when both users allowed other users to send them a PM. More precisely, it fixes the selection of users that either are inactive or have disabled private messages. PHPBB3-12493
* | | | Merge pull request #2413 from prototech/ticket/12357Joas Schilling2014-05-071-2/+2
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | [ticket/12357] Support routes in generate_smilies() function. * prototech/ticket/12357: [ticket/12357] Support routes in generate_smilies() function.
| * | | [ticket/12357] Support routes in generate_smilies() function.Cesar G2014-05-051-2/+2
| | | | | | | | | | | | | | | | PHPBB3-12357
* | | | Merge pull request #2397 from Nicofuma/ticket/11497Joas Schilling2014-05-061-10/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11497] Remove 'ext.finder' from services' list * Nicofuma/ticket/11497: [ticket/11497] Rename set_ext_finder in find_routing_files [ticket/11497] Change the date in the package declaration [ticket/11497] Fix pagination tests [ticket/11497] Use a mock object to define the root folder for the finder [ticket/11497] Generate the list of the routes in controller_helper [ticket/11497] Fix the path for the finder in controller_provider [ticket/11497] Fix tests [ticket/11497] Update pagination test [ticket/11497] Remove 'ext.finder' from services' list
| * | | | [ticket/11497] Rename set_ext_finder in find_routing_filesTristan Darricau2014-05-051-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11497
| * | | | [ticket/11497] Remove 'ext.finder' from services' listNicofuma2014-05-031-10/+12
| | |_|/ | |/| | | | | | | | | | PHPBB3-11497
* | | | Merge remote-tracking branch 'VSEphpbb/ticket/12332' into develop-ascraeusCesar G2014-05-051-1/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * VSEphpbb/ticket/12332: [ticket/12332] Add missing semicolon to inline styling [ticket/12332] Adjust size of mark column where too wide [ticket/12332] Adjust column widths for responsive changes [ticket/12332] Restore some changes back to original state [ticket/12332] Add break-word to fixed width table CSS [ticket/12332] Accomplish all word creaking in template and CSS [ticket/12332] Remove width sizing, as it is already set [ticket/12332] Fix displaying attachments with long file names
| * | | [ticket/12332] Restore some changes back to original stateMatt Friedman2014-04-262-2/+2
| | | | | | | | | | | | | | | | PHPBB3-12332
| * | | [ticket/12332] Accomplish all word creaking in template and CSSMatt Friedman2014-04-262-3/+3
| | | | | | | | | | | | | | | | PHPBB3-12332
| * | | [ticket/12332] Fix displaying attachments with long file namesMatt Friedman2014-04-252-2/+2
| | | | | | | | | | | | | | | | PHPBB3-12332
* | | | [ticket/12491] Fix clashing USERNAME_FULL template variable.Cesar G2014-05-041-3/+3
| |_|/ |/| | | | | | | | | | | | | | The user notes and user warn pages have a variable with the same name. PHPBB3-12491
* | | [prep-release-3.1.0-b3] Update phpBB Version for b4 developmentJoas Schilling2014-05-041-1/+1
| | |
* | | [prep-release-3.1.0-b3] Update version to 3.1.0-b3Joas Schilling2014-05-041-1/+1
| | |
* | | Merge pull request #2267 from prototech/ticket/10737Joas Schilling2014-05-031-0/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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] Add config setting to disable live searches.Cesar G2014-04-231-0/+1
| | | | | | | | | | | | PHPBB3-10737
* | | Merge remote-tracking branch 'github-vse/ticket/12254' into develop-ascraeusNils Adermann2014-05-021-9/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-vse/ticket/12254: [ticket/12254] Add subsilver2 support for cookie storage instead of SID [ticket/12254] Use a cookie instead of SID to store language selection [ticket/12254] No longer need to add change_lang to the URL params [ticket/12254] Use 'language' instead of 'set_lang' as the variable name [ticket/12254] Persist set_lang after reg only if changed from default [ticket/12254] Add set_lang var changes to subsilver2 files [ticket/12254] Use new set_lang var to avoid conflict with change_lang [ticket/12254] Stop using deprecated request_var in user class [ticket/12254] Better language switching on registration page
| * | | [ticket/12254] Use a cookie instead of SID to store language selectionMatt Friedman2014-05-021-2/+9
| | | | | | | | | | | | | | | | PHPBB3-12254
| * | | [ticket/12254] No longer need to add change_lang to the URL paramsMatt Friedman2014-04-111-5/+4
| | | | | | | | | | | | | | | | PHPBB3-12254
| * | | [ticket/12254] Use 'language' instead of 'set_lang' as the variable nameMatt Friedman2014-04-111-2/+2
| | | | | | | | | | | | | | | | PHPBB3-12254
| * | | [ticket/12254] Persist set_lang after reg only if changed from defaultMatt Friedman2014-04-071-2/+2
| | | | | | | | | | | | | | | | PHPBB3-12254
| * | | [ticket/12254] Use new set_lang var to avoid conflict with change_langMatt Friedman2014-04-071-3/+3
| | | | | | | | | | | | | | | | PHPBB3-12254
| * | | [ticket/12254] Better language switching on registration pageMatt Friedman2014-04-061-1/+0
| | | | | | | | | | | | | | | | PHPBB3-12254
* | | | Merge remote-tracking branch 'github-bantu/ticket/12473' into develop-ascraeusNils Adermann2014-05-021-0/+44
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-bantu/ticket/12473: [ticket/12473] Add console command for database migration. [ticket/12473] Add more compatibility to phpBB Console Application. [ticket/12473] Move compatibility globals out into its own file.
| * | | | [ticket/12473] Move compatibility globals out into its own file.Andreas Fischer2014-05-021-0/+44
| | | | | | | | | | | | | | | | | | | | PHPBB3-12473
* | | | | Merge remote-tracking branch 'github-prototech/ticket/12265' into ↵Nils Adermann2014-05-021-2/+49
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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] Actually use $u_pm.Cesar G2014-04-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12265
| * | | | | [ticket/12265] Define a loop for contact icons.Cesar G2014-04-151-2/+49
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12265
* | | | | | Merge remote-tracking branch 'github-nickvergessen/feature/sqlite3' into ↵Nils Adermann2014-05-029-4/+144
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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] Remove unneeded ORDER BY type from sqlite_master queriesJoas Schilling2014-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9728
| * | | | | | [feature/sqlite3] Add support for SQLite 3Patrick Webster2014-05-029-4/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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