1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00

11094 Commits

Author SHA1 Message Date
Oleg Pudeyev
f08880e2c4 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10137] Remove unintended space at end of PHP_URL_FOPEN_SUPPORT_EXPLAIN.
2011-04-22 00:16:37 -04:00
Oleg Pudeyev
0a8893498d Merge branch 'ticket/bantu/10137' into develop-olympus
* ticket/bantu/10137:
  [ticket/10137] Remove unintended space at end of PHP_URL_FOPEN_SUPPORT_EXPLAIN.
2011-04-22 00:16:21 -04:00
Oleg Pudeyev
2a566b0863 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10105] Update AIM express link.
  [ticket/10105] Update AIM application download link.
2011-04-22 00:04:51 -04:00
Oleg Pudeyev
ff5274181c Merge branch 'ticket/bantu/10105' into develop-olympus 2011-04-22 00:03:02 -04:00
Andreas Fischer
8c3cfbb40e [ticket/10105] Update AIM express link.
PHPBB3-10105
2011-04-22 00:42:49 +02:00
Andreas Fischer
78fa3a3b03 [ticket/10105] Update AIM application download link.
PHPBB3-10105
2011-04-22 00:41:55 +02:00
Andreas Fischer
6ee6245e5b [ticket/10137] Remove unintended space at end of PHP_URL_FOPEN_SUPPORT_EXPLAIN.
PHPBB3-10137
2011-04-22 00:30:13 +02:00
Oleg Pudeyev
37b38abec6 Merge branch 'ticket/bantu/10139' into develop 2011-04-21 04:43:27 -04:00
Andreas Fischer
2701a587ac [ticket/10139] Make signatures of set_atomic() consistent by using $new_value.
PHPBB3-10139
2011-04-19 10:17:18 +02:00
Andreas Fischer
9241aa79ff [ticket/10139] Rename $cache to $use_cache to avoid confusion with cache object
PHPBB3-10139
2011-04-19 10:13:18 +02:00
Oleg Pudeyev
8fe75aefbb Merge branch 'ticket/erikfrerejean/10006' into develop 2011-04-19 00:28:21 -04:00
Andreas Fischer
dcfab4e507 Merge branch 'ticket/p/7252' into develop
* ticket/p/7252:
  [ticket/7252] Removed an outdated comment pertaining to PHP 4.x.
2011-04-18 17:06:04 +02:00
Erik Frèrejean
27bbfde243 [ticket/10006] Remove unneeded if statements
Remove some of the additional `if (isset)` checks

PHPBB3-10006
2011-04-18 12:28:47 +02:00
Erik Frèrejean
f93ac340a2 [ticket/10006] Remove return values
Remove some unneeded return values

PHPBB3-10006
2011-04-18 12:28:47 +02:00
Erik Frèrejean
503b87da48 [ticket/10006] More testing
Change the DB test to test agains new cache/config mock objects

PHPBB3-10006
2011-04-18 12:28:47 +02:00
Erik Frèrejean
7b1638c37f [ticket/10006] Tweak the tests a bit
PHPBB3-10006
2011-04-18 12:28:47 +02:00
Erik Frèrejean
2f67ade05a [ticket/10006] Add phpbb_config::delete
Add the missing `phpbb_config::delete` method to the config class

PHPBB3-10006
2011-04-18 12:28:47 +02:00
Oleg Pudeyev
9a8a8d41d3 [ticket/7252] Removed an outdated comment pertaining to PHP 4.x.
PHPBB3-7252
2011-04-17 18:41:18 -04:00
Oleg Pudeyev
8c5a9979ad Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10109] Fix "Undefined Index" errors when copying a topic.
2011-04-17 11:09:17 -04:00
Oleg Pudeyev
32bc980ca0 Merge branch 'ticket/nickvergessen/10109' into develop-olympus
* ticket/nickvergessen/10109:
  [ticket/10109] Fix "Undefined Index" errors when copying a topic.
2011-04-17 03:20:22 -04:00
Oleg Pudeyev
76bc4c24a5 Merge branch 'ticket/rxu/10117' into develop-olympus
* 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.
2011-04-17 00:31:24 -04:00
Oleg Pudeyev
d4e938b25b Merge branch 'ticket/rxu/10115' into develop-olympus
* 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.
2011-04-17 00:12:40 -04:00
Igor Wiedler
6dd0e40d02 Merge remote-tracking branch 'p/ticket/10136' into develop
* p/ticket/10136:
  [ticket/10136] Added missing $request globalizations in functions.php.
2011-04-11 07:01:57 +02:00
Oleg Pudeyev
716f514ee9 Merge branch 'ticket/nickvergessen/9684' into develop
* 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
2011-04-11 00:04:19 -04:00
Oleg Pudeyev
6bb55e80a4 [ticket/10136] Added missing $request globalizations in functions.php.
PHPBB3-10136
2011-04-10 23:50:56 -04:00
Oleg Pudeyev
00a69b4372 Merge branch 'develop-olympus' into develop
* 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.
2011-04-10 19:52:58 -04:00
Oleg Pudeyev
bdb84452f5 Merge branch 'ticket/bantu/10128' into develop-olympus
* ticket/bantu/10128:
  [ticket/10128] Pass E_USER_WARNING to trigger_error() calls from user_ban().
2011-04-10 19:52:06 -04:00
Oleg Pudeyev
5f05899588 Merge branch 'ticket/bantu/10123' into develop-olympus
* ticket/bantu/10123:
  [ticket/10123] Change "smilie" to "smiley" as per our coding guidelines.
2011-04-10 19:52:04 -04:00
Andreas Fischer
259929ad4e [ticket/10128] Pass E_USER_WARNING to trigger_error() calls from user_ban().
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
2011-04-11 00:29:48 +02:00
Oleg Pudeyev
2d3dcd43c5 Merge branch 'develop-olympus' into develop
* 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
2011-04-10 14:17:56 -04:00
Oleg Pudeyev
d3b5df2548 Merge branch 'ticket/erikfrerejean/9581' into develop-olympus
* 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
2011-04-10 11:58:29 -04:00
Andreas Fischer
5798c8f02e [ticket/10123] Change "smilie" to "smiley" as per our coding guidelines.
PHPBB3-10123
2011-04-08 12:31:56 +02:00
Andreas Fischer
8a54d88509 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10084] Add smilie/icon errors out when file is missing
2011-04-08 12:24:59 +02:00
Andreas Fischer
c910ce1cc6 Merge branch 'ticket/nickvergessen/10084' into develop-olympus
* ticket/nickvergessen/10084:
  [ticket/10084] Add smilie/icon errors out when file is missing
2011-04-08 12:23:24 +02:00
Joas Schilling
851bb9fcd8 [ticket/10084] Add smilie/icon errors out when file is missing
PHPBB3-10084
2011-04-07 20:36:11 +02:00
Joas Schilling
a72fe8acaf [ticket/10109] Fix "Undefined Index" errors when copying a topic.
PHPBB3-10109
2011-04-07 14:53:47 +02:00
Joas Schilling
ad81637300 [ticket/9684] Also display forum-name in subsilver2 template
PHPBB3-9684
2011-04-07 13:48:20 +02:00
Joas Schilling
a9ad99302a [ticket/9684] Move currently existing GAs to a selectable forum while updating.
PHPBB3-9684
2011-04-07 13:48:18 +02:00
Joas Schilling
0b85dded29 [ticket/9684] View origin-forumname for GAs in topic-list
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
2011-04-07 13:47:10 +02:00
Joas Schilling
712a51caea [ticket/9684] Fix Forum/Topic-Tracking for global announcements
Should be ready for intensive testing now.

PHPBB3-9684
2011-04-07 13:47:08 +02:00
Joas Schilling
9265ffbcd5 [ticket/9684] Fix a SQL-Error in the posting.php
PHPBB3-9684
2011-04-07 13:47:07 +02:00
Joas Schilling
27fdcb4c7e [ticket/9684] Remove code in some more files especially includes/
Topic-Tracking is still missing.

PHPBB3-9684
2011-04-07 13:47:06 +02:00
Joas Schilling
3352141264 [ticket/9684] Remove code for global announcement in root-files
PHPBB3-9684
2011-04-07 13:45:44 +02:00
Andreas Fischer
7074d19c40 Merge branch 'develop-olympus' into develop
* 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.
2011-04-05 00:31:42 +02:00
Andreas Fischer
df622a1fab Merge branch 'ticket/nickvergessen/10121' into develop-olympus
* 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.
2011-04-05 00:31:33 +02:00
Joas Schilling
f96cb431a9 [ticket/10121] Fix missing urlencode() for ICQ-number in viewtopic.php
PHPBB3-10121
2011-04-03 22:14:26 +02:00
Joas Schilling
59d75c1ae6 [ticket/10121] Fix ICQ profile link, leading to a dead web-messenger.
PHPBB3-10121
2011-04-03 22:11:13 +02:00
rxu
b8adad0d48 [ticket/10117] Add one more missed 'u' modifier, add code comment
PHPBB3-10117
2011-04-03 15:28:00 +08:00
rxu
6ddb92c41e [ticket/10115] Switch UTF-8 mode on for the rest of BBCodes
PHPBB3-10115
2011-04-03 08:33:33 +08:00
rxu
25ae46b8df [ticket/10117] Make smilies to be correctly parsed within unicode text.
PHPBB3-10117
2011-04-03 00:53:00 +08:00