aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ticket/p/7252' into developAndreas Fischer2011-04-181-1/+0
|\ | | | | | | | | * ticket/p/7252: [ticket/7252] Removed an outdated comment pertaining to PHP 4.x.
| * [ticket/7252] Removed an outdated comment pertaining to PHP 4.x.Oleg Pudeyev2011-04-171-1/+0
|/ | | | PHPBB3-7252
* Merge branch 'develop-olympus' into developOleg Pudeyev2011-04-171-25/+26
|\ | | | | | | | | * develop-olympus: [ticket/10109] Fix "Undefined Index" errors when copying a topic.
| * Merge branch 'ticket/nickvergessen/10109' into develop-olympusOleg Pudeyev2011-04-171-25/+26
| |\ | | | | | | | | | | | | * ticket/nickvergessen/10109: [ticket/10109] Fix "Undefined Index" errors when copying a topic.
| | * [ticket/10109] Fix "Undefined Index" errors when copying a topic.Joas Schilling2011-04-071-25/+26
| | | | | | | | | | | | PHPBB3-10109
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2007-01-031-15/+20
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10117] Add one more missed 'u' modifier, add code comment [ticket/10115] Switch UTF-8 mode on for the rest of BBCodes [ticket/10117] Make smilies to be correctly parsed within unicode text. [ticket/10115] Make some text oriented BBCodes to properly handle unicode.
| * | Merge branch 'ticket/rxu/10117' into develop-olympusOleg Pudeyev2011-04-171-2/+7
| |\ \ | | | | | | | | | | | | | | | | | | | | * ticket/rxu/10117: [ticket/10117] Add one more missed 'u' modifier, add code comment [ticket/10117] Make smilies to be correctly parsed within unicode text.
| | * | [ticket/10117] Add one more missed 'u' modifier, add code commentrxu2011-04-031-1/+6
| | | | | | | | | | | | | | | | PHPBB3-10117
| | * | [ticket/10117] Make smilies to be correctly parsed within unicode text.rxu2011-04-031-2/+2
| | | | | | | | | | | | | | | | PHPBB3-10117
| * | | Merge branch 'ticket/rxu/10115' into develop-olympusOleg Pudeyev2011-04-171-13/+13
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/rxu/10115: [ticket/10115] Switch UTF-8 mode on for the rest of BBCodes [ticket/10115] Make some text oriented BBCodes to properly handle unicode.
| | * | | [ticket/10115] Switch UTF-8 mode on for the rest of BBCodesrxu2011-04-031-6/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-10115
| | * | | [ticket/10115] Make some text oriented BBCodes to properly handle unicode.rxu2011-04-021-7/+7
| | |/ / | | | | | | | | | | | | | | | | | | | | [quote], [b], [i], [size], [color], [u], [list] are affected. PHPBB3-10115
* | | | Merge remote-tracking branch 'p/ticket/10136' into developIgor Wiedler2011-04-111-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * p/ticket/10136: [ticket/10136] Added missing $request globalizations in functions.php.
| * | | | [ticket/10136] Added missing $request globalizations in functions.php.Oleg Pudeyev2011-04-101-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10136
* | | | | Merge branch 'ticket/nickvergessen/9684' into developOleg Pudeyev2011-04-1126-900/+387
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9684: [ticket/9684] Also display forum-name in subsilver2 template [ticket/9684] Move currently existing GAs to a selectable forum while updating. [ticket/9684] View origin-forumname for GAs in topic-list [ticket/9684] Fix Forum/Topic-Tracking for global announcements [ticket/9684] Fix a SQL-Error in the posting.php [ticket/9684] Remove code in some more files especially includes/ [ticket/9684] Remove code for global announcement in root-files
| * | | | | [ticket/9684] Also display forum-name in subsilver2 templateJoas Schilling2011-04-072-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9684
| * | | | | [ticket/9684] Move currently existing GAs to a selectable forum while updating.Joas Schilling2011-04-072-0/+141
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9684
| * | | | | [ticket/9684] View origin-forumname for GAs in topic-listJoas Schilling2011-04-072-19/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct some links using ['forum_id'] instead of $forum_id. Correctly handle from "sort by day"-viewforum when there are global announcements displayed in the forum. PHPBB3-9684
| * | | | | [ticket/9684] Fix Forum/Topic-Tracking for global announcementsJoas Schilling2011-04-075-98/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Should be ready for intensive testing now. PHPBB3-9684
| * | | | | [ticket/9684] Fix a SQL-Error in the posting.phpJoas Schilling2011-04-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9684
| * | | | | [ticket/9684] Remove code in some more files especially includes/Joas Schilling2011-04-0713-351/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Topic-Tracking is still missing. PHPBB3-9684
| * | | | | [ticket/9684] Remove code for global announcement in root-filesJoas Schilling2011-04-0710-429/+52
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9684
* | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-04-102-9/+9
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | | | | | | | * develop-olympus: [ticket/10128] Pass E_USER_WARNING to trigger_error() calls from user_ban(). [ticket/10123] Change "smilie" to "smiley" as per our coding guidelines.
| * | | | Merge branch 'ticket/bantu/10128' into develop-olympusOleg Pudeyev2011-04-101-6/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/10128: [ticket/10128] Pass E_USER_WARNING to trigger_error() calls from user_ban().
| | * | | | [ticket/10128] Pass E_USER_WARNING to trigger_error() calls from user_ban().Andreas Fischer2011-04-111-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The user_ban() function is shared by the MCP and the ACP. Mark trigger_error() calls as errors by passing E_USER_WARNING to make the error message appear on red background (instead of green background) in the ACP. PHPBB3-10128
| * | | | | Merge branch 'ticket/bantu/10123' into develop-olympusOleg Pudeyev2011-04-101-3/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/10123: [ticket/10123] Change "smilie" to "smiley" as per our coding guidelines.
| | * | | | | [ticket/10123] Change "smilie" to "smiley" as per our coding guidelines.Andreas Fischer2011-04-081-3/+3
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-10123
* | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-04-103-12/+43
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9581] Fix missing index [ticket/9581] Slightly tweaked queries [ticket/9581] Make banlist table select optional [ticket/9581] Mass e-mail to banned users
| * | | | | Merge branch 'ticket/erikfrerejean/9581' into develop-olympusOleg Pudeyev2011-04-103-12/+43
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/erikfrerejean/9581: [ticket/9581] Fix missing index [ticket/9581] Slightly tweaked queries [ticket/9581] Make banlist table select optional [ticket/9581] Mass e-mail to banned users
| | * | | | [ticket/9581] Fix missing indexErik Frèrejean2011-03-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `u.user_lang` to the select statement to prevent "undefined index" errors. PHPBB3-9581
| | * | | | [ticket/9581] Slightly tweaked queriesErik Frèrejean2011-03-041-14/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the queries based upon comments by Oleg and Nick, this should return the expected result in every case. PHPBB3-9581
| | * | | | [ticket/9581] Make banlist table select optionalErik Frèrejean2011-03-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per Nick, only set the `BANLIST_TABLE` in the select statement if the `$sql_ban_where` variable is set. PHPBB3-9581
| | * | | | [ticket/9581] Mass e-mail to banned usersErik Frèrejean2011-03-043-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement the suggestion made by Adam in the ticket, this will add an additional checkbox to the mass e-mail page. By checking this the mass e-mail shall also be send to banned users. By default banned users however are excluded from the mass e-mail. PHPBB3-9581
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-04-082-1/+6
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | | * develop-olympus: [ticket/10084] Add smilie/icon errors out when file is missing
| * | | | Merge branch 'ticket/nickvergessen/10084' into develop-olympusAndreas Fischer2011-04-082-1/+6
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | * ticket/nickvergessen/10084: [ticket/10084] Add smilie/icon errors out when file is missing
| | * | | [ticket/10084] Add smilie/icon errors out when file is missingJoas Schilling2011-04-072-1/+6
| |/ / / | | | | | | | | | | | | PHPBB3-10084
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-04-053-3/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10121] Fix missing urlencode() for ICQ-number in viewtopic.php [ticket/10121] Fix ICQ profile link, leading to a dead web-messenger.
| * | | Merge branch 'ticket/nickvergessen/10121' into develop-olympusAndreas Fischer2011-04-053-3/+3
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | * ticket/nickvergessen/10121: [ticket/10121] Fix missing urlencode() for ICQ-number in viewtopic.php [ticket/10121] Fix ICQ profile link, leading to a dead web-messenger.
| | * | [ticket/10121] Fix missing urlencode() for ICQ-number in viewtopic.phpJoas Schilling2011-04-031-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10121
| | * | [ticket/10121] Fix ICQ profile link, leading to a dead web-messenger.Joas Schilling2011-04-033-3/+3
| |/ / | | | | | | | | | PHPBB3-10121
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-04-012-14/+93
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9751] Add shortcut logic for pass_complex == PASS_TYPE_ANY. [ticket/9751] Compare $password with empty string instead of casting it to bool [ticket/9751] Use a switch/case block without break for password complexity. [ticket/9751] Password requirement "Must contain letters and numbers" fails
| * | Merge branch 'ticket/bantu/9751' into develop-olympusAndreas Fischer2011-04-012-14/+93
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9751: [ticket/9751] Add shortcut logic for pass_complex == PASS_TYPE_ANY. [ticket/9751] Compare $password with empty string instead of casting it to bool [ticket/9751] Use a switch/case block without break for password complexity. [ticket/9751] Password requirement "Must contain letters and numbers" fails
| | * | [ticket/9751] Add shortcut logic for pass_complex == PASS_TYPE_ANY.Andreas Fischer2011-04-011-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add shortcut logic for pass_complex because this is the default value phpBB ships with and there is nothing to do in that function in that case. PHPBB3-9751
| | * | [ticket/9751] Compare $password with empty string instead of casting it to boolAndreas Fischer2011-04-011-1/+1
| | | | | | | | | | | | | | | | PHPBB3-9751
| | * | [ticket/9751] Use a switch/case block without break for password complexity.Andreas Fischer2011-04-011-11/+13
| | | | | | | | | | | | | | | | PHPBB3-9751
| | * | [ticket/9751] Password requirement "Must contain letters and numbers" failsrxu2011-04-012-4/+83
| | | | | | | | | | | | | | | | PHPBB3-9751
* | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-03-312-28/+28
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/10112] Replaced a couple occurrences of count() with sizeof()
| * | | Merge remote branch 'callumacrae/ticket/10112' into develop-olympusIgor Wiedler2011-03-312-28/+28
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * callumacrae/ticket/10112: [ticket/10112] Replaced a couple occurrences of count() with sizeof()
| | * | | [ticket/10112] Replaced a couple occurrences of count() with sizeof()Callum Macrae2011-03-302-28/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per the coding guidlines, sizeof() should be used instead of count(). PHPBB3-10112
* | | | | Merge remote branch 'haklop/feature/redis' into developIgor Wiedler2011-03-311-0/+150
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * haklop/feature/redis: [feature/redis] Add Redis cache driver using phpredis extension
generated by cgit v1.2.1 (git 2.21.0) at 2026-05-18 20:12:19 +0000