aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/12475] Error in db:update console commandNicofuma2014-05-021-1/+1
| | | | PHPBB3-12475
* Merge remote-tracking branch 'github-bantu/ticket/12473' into develop-ascraeusNils Adermann2014-05-025-28/+187
|\ | | | | | | | | | | | | * 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] Add console command for database migration.Andreas Fischer2014-05-022-0/+139
| | | | | | | | PHPBB3-12473
| * [ticket/12473] Add more compatibility to phpBB Console Application.Andreas Fischer2014-05-021-0/+3
| | | | | | | | PHPBB3-12473
| * [ticket/12473] Move compatibility globals out into its own file.Andreas Fischer2014-05-022-28/+45
| | | | | | | | PHPBB3-12473
* | Merge branch 'develop-olympus' into develop-ascraeusMarc Alexander2014-05-021-0/+1
|\ \ | | | | | | | | | | | | * develop-olympus: [ticket/12120] Add Marc Alexander to AUTHORS
| * | [ticket/12120] Add Marc Alexander to AUTHORSJoas Schilling2014-05-021-0/+1
| | | | | | | | | | | | PHPBB3-12120
* | | Merge remote-tracking branch 'github-prototech/ticket/12265' into ↵Nils Adermann2014-05-0222-79/+229
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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] Ensure that dropdown is always at the very left of the containerCesar G2014-04-151-0/+1
| | | | | | | | | | | | | | | | PHPBB3-12265
| * | | [ticket/12265] Define a loop for contact icons.Cesar G2014-04-154-66/+117
| | | | | | | | | | | | | | | | PHPBB3-12265
| * | | [ticket/12265] Break the icons that aren't in loop in case extensions add moreCesar G2014-04-152-0/+12
| | | | | | | | | | | | | | | | PHPBB3-12265
| * | | [ticket/12265] Fix modulo logic.Cesar G2014-04-152-2/+2
| | | | | | | | | | | | | | | | PHPBB3-12265
| * | | [ticket/12265] Adjust alignment of AIM and Jabber icons.Cesar G2014-04-151-2/+2
| | | | | | | | | | | | | | | | PHPBB3-12265
| * | | [ticket/12265] Ensure that there's only 4 icons per row in IE & Opera.Cesar G2014-04-151-0/+4
| | | | | | | | | | | | | | | | PHPBB3-12265
| * | | [ticket/12265] Add contact icon and remove border from last row & cells.Cesar G2014-04-156-46/+70
| | | | | | | | | | | | | | | | PHPBB3-12265
| * | | [ticket/12265] Fix issue with dropdown being restricted by the width of parentCesar G2014-04-152-2/+13
| | | | | | | | | | | | | | | | PHPBB3-12265
| * | | [ticket/12265] Remove ugly logic.Cesar G2014-04-153-47/+12
| | | | | | | | | | | | | | | | PHPBB3-12265
| * | | [ticket/12265] Simplify contact icon design and move to dropdown.Cesar G2014-04-1516-66/+149
| | | | | | | | | | | | | | | | PHPBB3-12265
* | | | Merge remote-tracking branch 'github-nickvergessen/feature/sqlite3' into ↵Nils Adermann2014-05-0219-121/+757
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-022-5/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-9728
| * | | | [feature/sqlite3] Correctly recreate indexes when recreating a tableJoas Schilling2014-05-021-82/+135
| | | | | | | | | | | | | | | | | | | | PHPBB3-9728
| * | | | [feature/sqlite3] Fix sql_index_drop() for sqlite3Joas Schilling2014-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-9728
| * | | | [feature/sqlite3] Remove trailing comma from column listJoas Schilling2014-05-021-1/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-9728
| * | | | [feature/sqlite3] Update docblocks and function visibilityPatrick Webster2014-05-021-23/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added missing docblock annotations and added visibility identifiers. PHPBB3-9728
| * | | | [feature/sqlite3] Add support for SQLite 3Patrick Webster2014-05-0219-55/+610
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-prototech/ticket/11508' into ↵Nils Adermann2014-05-023-61/+131
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-prototech/ticket/11508: [ticket/11508] Fix build_url test. [ticket/11508] Add functional test for jumpbox. [ticket/11508] Use $phpbb_path_helper. [ticket/11508] Allow equal sign in parameter value. [ticket/11508] Remove unnecessary implode. [ticket/11508] Remove unnecessary isset check. [ticket/11508] Fix build_url test. [ticket/11508] Curly brace should be on its own line... [ticket/11508] The question mark is expected even if there are no parameters. [ticket/11508] Add tests. [ticket/11508] Do not add the '?' unless there are parameters. [ticket/11508] Change separator parameter to a simple true|false $is_amp. [ticket/11508] Move helper functions to path_helper class. [ticket/11508] Move the stripping param code to separate function as well. [ticket/11508] Build the jumpbox hidden fields using the _form action_ [ticket/11508] Split parts of build_url() into reusable functions.
| * | | | [ticket/11508] Use $phpbb_path_helper.Cesar G2014-04-222-8/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-11508
| * | | | [ticket/11508] Allow equal sign in parameter value.Cesar G2014-04-221-4/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-11508
| * | | | [ticket/11508] Remove unnecessary implode.Cesar G2014-04-221-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11508
| * | | | [ticket/11508] Remove unnecessary isset check.Cesar G2014-04-221-4/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11508
| * | | | [ticket/11508] Curly brace should be on its own line...Cesar G2014-04-221-1/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11508
| * | | | [ticket/11508] The question mark is expected even if there are no parameters.Cesar G2014-04-221-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11508
| * | | | [ticket/11508] Do not add the '?' unless there are parameters.Cesar G2014-04-221-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11508
| * | | | [ticket/11508] Change separator parameter to a simple true|false $is_amp.Cesar G2014-04-222-9/+10
| | | | | | | | | | | | | | | | | | | | PHPBB3-11508
| * | | | [ticket/11508] Move helper functions to path_helper class.Cesar G2014-04-223-118/+126
| | | | | | | | | | | | | | | | | | | | PHPBB3-11508
| * | | | [ticket/11508] Move the stripping param code to separate function as well.Cesar G2014-04-221-19/+37
| | | | | | | | | | | | | | | | | | | | PHPBB3-11508
| * | | | [ticket/11508] Build the jumpbox hidden fields using the _form action_Cesar G2014-04-222-6/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-11508
| * | | | [ticket/11508] Split parts of build_url() into reusable functions.Cesar G2014-04-221-28/+72
| | | | | | | | | | | | | | | | | | | | PHPBB3-11508
* | | | | Merge remote-tracking branch 'github-exreaction/ticket/8323' into ↵Nils Adermann2014-05-026-25/+150
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | [ticket/8323] Cache auth requestNathan Guse2013-09-051-2/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-8323
| * | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/8323Nathan Guse2013-09-05633-20256/+39967
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| * | | | | [ticket/8323] Combine into a single queryNathaniel Guse2013-05-011-30/+28
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8323
| * | | | | [ticket/8323] CommentsNathan Guse2012-12-071-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8323
| * | | | | [ticket/8323] CommentsNathan Guse2012-12-072-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8323
| * | | | | [ticket/8323] Comments for inactive reasons in constants.phpNathan Guse2012-12-071-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copied from language output PHPBB3-8323
| * | | | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/8323Nathan Guse2012-12-07462-3987/+15410
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/viewtopic.php
| * | | | | | [ticket/8323] Only disable administrative deactivated accounts from ↵Nathan2012-07-105-8/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | receiving PMs Allow other types of inactive accounts to receive PMs. Remove the banned PM error message and use the string saying they do not have permission (less translation) PHPBB3-8323
| * | | | | | [ticket/8323] Allow temporarily banned users to receive PMs, but not a ↵Nathan2012-07-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | notification PHPBB3-8323
| * | | | | | [ticket/8323] Correct PM notification settings (only notify those who can ↵Nathan2012-07-104-31/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | receive them) Also correcting the way it was setup for users to be able to receive PMs (do not allow administrators/moderators to send to banned, inactive, or non-standard users, that just doesn't make sense) PHPBB3-8323
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 18:09:33 +0000