mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-26 13:04:24 +01:00
Code Issues Releases Wiki Activity
11,119 Commits 17 Branches 190 Tags
Commit Graph

11119 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
rxu
646d3e10d2 [ticket/10115] Make some text oriented BBCodes to properly handle unicode. 
[quote], [b], [i], [size], [color], [u], [list] are affected.

PHPBB3-10115
 2011-04-02 19:19:30 +08:00
Andreas Fischer
ebc338b9f3 Merge branch 'develop-olympus' into develop 
* 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
 2011-04-01 15:11:55 +02:00
Andreas Fischer
f392f55d9b Merge branch 'ticket/bantu/9751' into develop-olympus 
* 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
 2011-04-01 15:11:10 +02:00
Andreas Fischer
4dce53628c [ticket/9751] Add shortcut logic for pass_complex == PASS_TYPE_ANY. 
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
 2011-04-01 15:10:29 +02:00
Andreas Fischer
7cc32d3843 [ticket/9751] Compare $password with empty string instead of casting it to bool 
PHPBB3-9751
 2011-04-01 15:10:29 +02:00
Andreas Fischer
dba8cf12fd [ticket/9751] Use a switch/case block without break for password complexity. 
PHPBB3-9751
 2011-04-01 15:10:29 +02:00
rxu
a835189823 [ticket/9751] Password requirement "Must contain letters and numbers" fails 
PHPBB3-9751
 2011-04-01 15:10:29 +02:00
Igor Wiedler
a40bc114c0 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10112] Replaced a couple occurrences of count() with sizeof()
 2011-03-31 20:32:11 +02:00
Igor Wiedler
564ce6c7f6 Merge remote branch 'callumacrae/ticket/10112' into develop-olympus 
* callumacrae/ticket/10112:
  [ticket/10112] Replaced a couple occurrences of count() with sizeof()
 2011-03-31 20:31:58 +02:00
Igor Wiedler
d70927e5de Merge remote branch 'haklop/feature/redis' into develop 
* haklop/feature/redis:
  [feature/redis] Add Redis cache driver using phpredis extension
 2011-03-31 20:24:35 +02:00
Igor Wiedler
87ed48f21b [ticket/10110] Remove redis acm driver from develop-olympus 
PHPBB3-10110
 2011-03-31 20:24:25 +02:00
Igor Wiedler
10784439ed Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10110] Remove tab from empty lines
  [ticket/10110] Enable the serialization and add a constant for defined the database
  [ticket/10110] Update comments with a link to the phpredis extension
  [ticket/10110] Add Redis ACM backend
 2011-03-31 20:24:11 +02:00
Igor Wiedler
ec5ca9df6b Merge branch 'ticket/haklop/10110' into develop-olympus 
* ticket/haklop/10110:
  [ticket/10110] Remove tab from empty lines
  [ticket/10110] Enable the serialization and add a constant for defined the database
  [ticket/10110] Update comments with a link to the phpredis extension
  [ticket/10110] Add Redis ACM backend
 2011-03-31 20:23:30 +02:00
Eric
ddda094d3a [ticket/10110] Remove tab from empty lines 
PHPBB3-10110
 2011-03-31 20:16:53 +02:00
Eric
9891f5a8d2 [ticket/10110] Enable the serialization and add a constant for 
defined the database

PHPBB3-10110
 2011-03-31 20:16:53 +02:00
Eric
f18d93756c [ticket/10110] Update comments with a link to the phpredis extension 
PHPBB3-10110
 2011-03-31 20:16:53 +02:00
Eric
fad7333e72 [ticket/10110] Add Redis ACM backend 
PHPBB3-10110
 2011-03-31 20:16:52 +02:00
Callum Macrae
657971754b [ticket/10112] Replaced a couple occurrences of count() with sizeof() 
As per the coding guidlines, sizeof() should be used instead of count().

PHPBB3-10112
 2011-03-30 11:30:27 +01:00
Eric
30193fdc7e [feature/redis] Add Redis cache driver using phpredis extension 
PHPBB3-10110
 2011-03-30 11:29:11 +08:00
Erik Frèrejean
83ca730544 [ticket/9581] Fix missing index 
Add `u.user_lang` to the select statement to prevent "undefined
index" errors.

PHPBB3-9581
 2011-03-24 10:44:36 +01:00
Andreas Fischer
3a0a18ee25 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/9946] Allow storage of data >4kB on Oracle again
 2011-03-24 09:22:36 +01:00
Andreas Fischer
6ac93d8a00 Merge branch 'ticket/jellydoughnut/9946' into develop-olympus 
* ticket/jellydoughnut/9946:
  [ticket/9946] Allow storage of data >4kB on Oracle again
 2011-03-24 09:22:12 +01:00
Oleg Pudeyev
1312e5b965 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10082] session_id is CHAR(32) not VARCHAR(32), so give them a CHAR(32).
 2011-03-23 20:32:03 -04:00
Oleg Pudeyev
df6ce22fa3 Merge branch 'ticket/bantu/10082' into develop-olympus 
* ticket/bantu/10082:
  [ticket/10082] session_id is CHAR(32) not VARCHAR(32), so give them a CHAR(32).
 2011-03-23 20:30:23 -04:00
Oleg Pudeyev
6b671176ed Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10107] Add cache to the enumeration, make statement more generic
  [ticket/10107] Make it clear that provided httpd samples are not perfect
  [ticket/10107] Add a webserver section to docs/INSTALL.html
 2011-03-23 20:12:25 -04:00