aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge branch 'develop-olympus' into developAndreas Fischer2011-04-231-1/+1
|\ | | | | | | | | * develop-olympus: [ticket/10147] Corrected a typo in includes/functions_template.php.
| * Merge branch 'ticket/p/10147' into develop-olympusAndreas Fischer2011-04-231-1/+1
| |\ | | | | | | | | | | | | * ticket/p/10147: [ticket/10147] Corrected a typo in includes/functions_template.php.
| | * [ticket/10147] Corrected a typo in includes/functions_template.php.Oleg Pudeyev2011-04-231-1/+1
| | | | | | | | | | | | PHPBB3-10147
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-04-221-1/+11
|\ \ \ | |/ / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10141] Save a hash lookup when value is not in cache. [ticket/10141] Split double-assignment into conditional and unconditional part. [ticket/10141] Use a cache in $auth->_fill_acl() for better performance.
| * | Merge branch 'ticket/p/10141' into develop-olympusAndreas Fischer2011-04-221-1/+11
| |\ \ | | |/ | |/| | | | | | | | | | | | | * ticket/p/10141: [ticket/10141] Save a hash lookup when value is not in cache. [ticket/10141] Split double-assignment into conditional and unconditional part. [ticket/10141] Use a cache in $auth->_fill_acl() for better performance.
| | * [ticket/10141] Save a hash lookup when value is not in cache.Oleg Pudeyev2011-04-211-3/+7
| | | | | | | | | | | | PHPBB3-10141
| | * [ticket/10141] Split double-assignment into conditional and unconditional part.Andreas Fischer2011-04-221-7/+5
| | | | | | | | | | | | PHPBB3-10141
| | * [ticket/10141] Use a cache in $auth->_fill_acl() for better performance.Bart van Bragt2011-04-211-2/+10
| | | | | | | | | | | | | | | | | | | | | Many sequences being converted are the same. Use a local cache to convert each sequence once, speeding up the function. PHPBB3-10141
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-04-221-1/+1
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/10137] Remove unintended space at end of PHP_URL_FOPEN_SUPPORT_EXPLAIN.
| * | Merge branch 'ticket/bantu/10137' into develop-olympusOleg Pudeyev2011-04-221-1/+1
| |\ \ | | | | | | | | | | | | | | | | * ticket/bantu/10137: [ticket/10137] Remove unintended space at end of PHP_URL_FOPEN_SUPPORT_EXPLAIN.
| | * | [ticket/10137] Remove unintended space at end of PHP_URL_FOPEN_SUPPORT_EXPLAIN.Andreas Fischer2011-04-221-1/+1
| | |/ | | | | | | | | | PHPBB3-10137
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-04-222-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | * develop-olympus: [ticket/10105] Update AIM express link. [ticket/10105] Update AIM application download link.
| * | Merge branch 'ticket/bantu/10105' into develop-olympusOleg Pudeyev2011-04-222-2/+2
| |\ \ | | |/ | |/|
| | * [ticket/10105] Update AIM express link.Andreas Fischer2011-04-222-2/+2
| | | | | | | | | | | | PHPBB3-10105
| | * [ticket/10105] Update AIM application download link.Andreas Fischer2011-04-222-2/+2
| |/ | | | | | | PHPBB3-10105
* | Merge branch 'ticket/bantu/10139' into developOleg Pudeyev2011-04-212-34/+34
|\ \
| * | [ticket/10139] Make signatures of set_atomic() consistent by using $new_value.Andreas Fischer2011-04-191-3/+3
| | | | | | | | | | | | PHPBB3-10139
| * | [ticket/10139] Rename $cache to $use_cache to avoid confusion with cache objectAndreas Fischer2011-04-192-32/+32
|/ / | | | | | | PHPBB3-10139
* | Merge branch 'ticket/erikfrerejean/10006' into developOleg Pudeyev2011-04-194-0/+57
|\ \
| * | [ticket/10006] Remove unneeded if statementsErik Frèrejean2011-04-182-10/+0
| | | | | | | | | | | | | | | | | | Remove some of the additional `if (isset)` checks PHPBB3-10006
| * | [ticket/10006] Remove return valuesErik Frèrejean2011-04-182-11/+4
| | | | | | | | | | | | | | | | | | Remove some unneeded return values PHPBB3-10006
| * | [ticket/10006] More testingErik Frèrejean2011-04-181-2/+5
| | | | | | | | | | | | | | | | | | Change the DB test to test agains new cache/config mock objects PHPBB3-10006
| * | [ticket/10006] Tweak the tests a bitErik Frèrejean2011-04-182-2/+5
| | | | | | | | | | | | PHPBB3-10006
| * | [ticket/10006] Add phpbb_config::deleteErik Frèrejean2011-04-184-0/+68
| | | | | | | | | | | | | | | | | | Add the missing `phpbb_config::delete` method to the config class PHPBB3-10006
* | | 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.
generated by cgit v1.2.1 (git 2.21.0) at 2025-02-10 05:30:06 +0000