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
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
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
Oleg Pudeyev
c53c255c64
Merge branch 'ticket/igorw/10107' into develop-olympus
...
* ticket/igorw/10107:
[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:14 -04:00
Igor Wiedler
0793b49212
[ticket/10107] Add cache to the enumeration, make statement more generic
...
PHPBB3-10107
2011-03-24 00:40:56 +01:00
Igor Wiedler
03017a8946
[ticket/10107] Make it clear that provided httpd samples are not perfect
...
PHPBB3-10107
2011-03-24 00:35:05 +01:00
Igor Wiedler
c63676e802
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10033] "Disallow usernames" does not check already disallowed names.
2011-03-23 23:21:36 +01:00
Igor Wiedler
2f6b046f4b
Merge remote branch 'nickvergessen/ticket/10033' into develop-olympus
...
* nickvergessen/ticket/10033:
[ticket/10033] "Disallow usernames" does not check already disallowed names.
2011-03-23 23:21:23 +01:00
Igor Wiedler
ae8131077e
[ticket/10107] Add a webserver section to docs/INSTALL.html
...
Explain what to do with lighttpd and nginx after installing phpBB on
one of those webservers.
PHPBB3-10107
2011-03-23 23:13:52 +01:00
Joas Schilling
1564c01c38
[ticket/10033] "Disallow usernames" does not check already disallowed names.
...
PHPBB3-10033
2011-03-23 22:48:22 +01:00
Oleg Pudeyev
352ed5acf8
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10101] Add test case for native phpass hashes
[ticket/10101] Add support for native phpass hashes
2011-03-22 21:25:14 -04:00
Oleg Pudeyev
200c7e3c44
Merge branch 'ticket/igorw/10101' into develop-olympus
...
* ticket/igorw/10101:
[ticket/10101] Add test case for native phpass hashes
[ticket/10101] Add support for native phpass hashes
2011-03-22 21:25:00 -04:00
Igor Wiedler
5cc8617128
Merge branch 'ticket/10021-develop' into develop
...
* ticket/10021-develop:
[ticket/10021] Adjust ticket/10021 for develop
2011-03-20 23:12:48 +01:00
Igor Wiedler
634392aa1b
[ticket/10021] Adjust ticket/10021 for develop
...
Ascraeus is PHP5.2+, so we no longer need to check for -1.
PHPBB3-10021
2011-03-20 23:09:24 +01:00
Igor Wiedler
ce92724514
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10021] Add comment explaining why we can check -1 as an error value.
[ticket/10021] Check whether gmmktime() returns false before putting it in SQL.
2011-03-20 23:06:23 +01:00
Igor Wiedler
51fb493edc
Merge remote branch 'bantu/ticket/10021' into develop-olympus
...
* bantu/ticket/10021:
[ticket/10021] Add comment explaining why we can check -1 as an error value.
[ticket/10021] Check whether gmmktime() returns false before putting it in SQL.
2011-03-20 23:06:10 +01:00
Igor Wiedler
4c3cc152c8
[ticket/10101] Add test case for native phpass hashes
...
PHPBB3-10101
2011-03-20 22:52:31 +01:00
Igor Wiedler
30daee12f9
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10102] Correct member.S_PENDING_SET to S_PENDING_SET in if statement.
2011-03-20 22:42:51 +01:00
Igor Wiedler
5586bcf813
Merge remote branch 'bantu/ticket/10102' into develop-olympus
...
* bantu/ticket/10102:
[ticket/10102] Correct member.S_PENDING_SET to S_PENDING_SET in if statement.
2011-03-20 22:42:43 +01:00
Igor Wiedler
3d8f438b76
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/9806] Script for merging pull requests
2011-03-20 22:31:29 +01:00
Igor Wiedler
cd9355e4dd
Merge remote branch 'igorw/ticket/9806' into develop-olympus
...
* igorw/ticket/9806:
[ticket/9806] Script for merging pull requests
2011-03-20 22:31:14 +01:00
Andreas Fischer
d36f78b9f1
[ticket/10082] session_id is CHAR(32) not VARCHAR(32), so give them a CHAR(32).
...
This fixes session unit tests on PostgreSQL in particular.
PHPBB3-10082
2011-03-19 23:20:41 +01:00
Andreas Fischer
087e7642e7
[ticket/10102] Correct member.S_PENDING_SET to S_PENDING_SET in if statement.
...
There is no member.S_PENDING_SET variable.
This fixes an XHTML error when managing groups with both approved and pending
users from the UCP.
PHPBB3-10102
2011-03-19 14:56:56 +01:00
Andreas Fischer
c24408f6ed
[ticket/10021] Add comment explaining why we can check -1 as an error value.
...
PHPBB3-10021
2011-03-18 02:51:43 +01:00
Igor Wiedler
df8b852709
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10100] Update rand_seed_last_update before rand_seed in unique_id().
2011-03-18 00:06:53 +01:00
Igor Wiedler
a3e8f74f72
Merge remote branch 'bantu/ticket/10100' into develop-olympus
...
* bantu/ticket/10100:
[ticket/10100] Update rand_seed_last_update before rand_seed in unique_id().
2011-03-18 00:06:44 +01:00