aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'bantu/ticket/10154' into develop-olympusOleg Pudeyev2011-05-091-6/+6
|\
| * [ticket/10154] Move "copy permissions from" to below "parent" on forum creationAndreas Fischer2011-05-091-6/+6
* | [ticket/9999] SEARCH_USER_POSTS is also used on viewtopic. Move to common.Andreas Fischer2011-05-092-1/+1
* | [ticket/9999] Remove broken and unused L_FORUM_FOLDER_ALT variable.Andreas Fischer2011-05-091-1/+0
|/
* Merge branch 'ticket/p/10003' into develop-olympusNils Adermann2011-05-051-4/+258
|\
| * [ticket/10003] Delete EOL at EOF for the benefit of 3.0 modifications.Oleg Pudeyev2011-04-291-1/+1
| * [ticket/10003] Ported 1802b9ff9286a7fc24493e71b3432816cbdbfcd8 to db_tools.Oleg Pudeyev2011-04-291-2/+2
| * [ticket/10003] Ported 5553cfc2ed81ba9eb571804c431def962720b39e to db_tools.Oleg Pudeyev2011-04-291-4/+12
| * [ticket/10003] Ported 023760c8b2402418310a3717db8349cac0342e42 to db_tools.Oleg Pudeyev2011-04-291-6/+137
| * [ticket/10003] Ported 54c22ae52a0e18232cac8fed342ea52f2e2a793d to db_tools.Oleg Pudeyev2011-04-291-1/+109
| * [ticket/10003] Ported 96a30afcca3ebd832c9b3083bb5c9a9f2a2dc54b to db_tools.Oleg Pudeyev2011-04-291-2/+4
| * [ticket/10003] Ported d7d96223e7bae7cd60b13c6e7896d95838c3633c to db_tools.Oleg Pudeyev2011-04-291-2/+7
* | Merge remote-tracking branch 'erikfrerejean/ticket/9954' into develop-olympusOleg Pudeyev2011-05-031-1/+1
|\ \
| * | [ticket/9954] Remove unneeded never permissionErik Frèrejean2010-12-211-1/+1
* | | Merge branch 'erikfrerejean/ticket/9961' into develop-olympusOleg Pudeyev2011-04-301-0/+7
|\ \ \ | |_|/ |/| |
| * | [ticket/9961] Create log entries when users are activated.Erik Frèrejean2011-04-191-0/+7
* | | Merge remote branch 'bantu/ticket/10145' into develop-olympusIgor Wiedler2011-04-261-1/+1
|\ \ \
| * | | [ticket/10145] Always recompile all templates when DEBUG_EXTRA is defined.Andreas Fischer2011-04-261-1/+1
* | | | Merge remote branch 'p/ticket/7941' into develop-olympusAndreas Fischer2011-04-261-0/+3
|\ \ \ \ | |/ / / |/| | |
| * | | [ticket/7941] Added @return to generate_board_url docstring.Oleg Pudeyev2011-04-171-0/+3
| |/ /
* | | Merge branch 'ticket/p/10147' into develop-olympusAndreas Fischer2011-04-231-1/+1
|\ \ \
| * | | [ticket/10147] Corrected a typo in includes/functions_template.php.Oleg Pudeyev2011-04-231-1/+1
* | | | Merge branch 'ticket/p/10141' into develop-olympusAndreas Fischer2011-04-221-1/+11
|\ \ \ \ | |/ / / |/| | |
| * | | [ticket/10141] Save a hash lookup when value is not in cache.Oleg Pudeyev2011-04-211-3/+7
| * | | [ticket/10141] Split double-assignment into conditional and unconditional part.Andreas Fischer2011-04-221-7/+5
| * | | [ticket/10141] Use a cache in $auth->_fill_acl() for better performance.Bart van Bragt2011-04-211-2/+10
| |/ /
* | | Merge branch 'ticket/bantu/10137' into develop-olympusOleg Pudeyev2011-04-221-1/+1
|\ \ \
| * | | [ticket/10137] Remove unintended space at end of PHP_URL_FOPEN_SUPPORT_EXPLAIN.Andreas Fischer2011-04-221-1/+1
| |/ /
* | | [ticket/10105] Update AIM express link.Andreas Fischer2011-04-222-2/+2
* | | [ticket/10105] Update AIM application download link.Andreas Fischer2011-04-222-2/+2
|/ /
* | Merge branch 'ticket/nickvergessen/10109' into develop-olympusOleg Pudeyev2011-04-171-25/+26
|\ \
| * | [ticket/10109] Fix "Undefined Index" errors when copying a topic.Joas Schilling2011-04-071-25/+26
* | | Merge branch 'ticket/rxu/10117' into develop-olympusOleg Pudeyev2011-04-171-2/+7
|\ \ \
| * | | [ticket/10117] Add one more missed 'u' modifier, add code commentrxu2011-04-031-1/+6
| * | | [ticket/10117] Make smilies to be correctly parsed within unicode text.rxu2011-04-031-2/+2
* | | | Merge branch 'ticket/rxu/10115' into develop-olympusOleg Pudeyev2011-04-171-13/+13
|\ \ \ \
| * | | | [ticket/10115] Switch UTF-8 mode on for the rest of BBCodesrxu2011-04-031-6/+6
| * | | | [ticket/10115] Make some text oriented BBCodes to properly handle unicode.rxu2011-04-021-7/+7
| |/ / /
* | | | Merge branch 'ticket/bantu/10128' into develop-olympusOleg Pudeyev2011-04-101-6/+6
|\ \ \ \
| * | | | [ticket/10128] Pass E_USER_WARNING to trigger_error() calls from user_ban().Andreas Fischer2011-04-111-6/+6
* | | | | Merge branch 'ticket/bantu/10123' into develop-olympusOleg Pudeyev2011-04-101-3/+3
|\ \ \ \ \
| * | | | | [ticket/10123] Change "smilie" to "smiley" as per our coding guidelines.Andreas Fischer2011-04-081-3/+3
| |/ / / /
* | | | | Merge branch 'ticket/erikfrerejean/9581' into develop-olympusOleg Pudeyev2011-04-103-12/+43
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | [ticket/9581] Fix missing indexErik Frèrejean2011-03-241-1/+1
| * | | | [ticket/9581] Slightly tweaked queriesErik Frèrejean2011-03-041-14/+35
| * | | | [ticket/9581] Make banlist table select optionalErik Frèrejean2011-03-041-2/+2
| * | | | [ticket/9581] Mass e-mail to banned usersErik Frèrejean2011-03-043-10/+20
* | | | | [ticket/10084] Add smilie/icon errors out when file is missingJoas Schilling2011-04-072-1/+6
| |_|/ / |/| | |
* | | | [ticket/10121] Fix missing urlencode() for ICQ-number in viewtopic.phpJoas Schilling2011-04-031-1/+1
* | | | [ticket/10121] Fix ICQ profile link, leading to a dead web-messenger.Joas Schilling2011-04-033-3/+3
| |/ / |/| |