makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
11017 commits 18 branches 192 tags 207 MiB
Commit graph

11017 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Igor Wiedler
f8384b7302 [ticket/10101] Add support for native phpass hashes 
phpass (the hashing library we use) adds a hash identifier to every
hash. By default this identifier is '$P$'. For some reason we have
changed it to '$H$'.

This patch allows both of them to be used for authentication, so that a
third party system could create users with '$P$' hashes.

PHPBB3-10101
 2011-03-17 23:59:38 +01:00
Andreas Fischer
48ba841be0 [ticket/10100] Update rand_seed_last_update before rand_seed in unique_id(). 
Update $config['rand_seed_last_update'] before updating $config['rand_seed'] in
unique_id() to mitigate a race condition and unnecessary updates on heavily
busy boards.

PHPBB3-10100
 2011-03-17 23:07:35 +01:00
Andreas Fischer
0e9b755667 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/9685] Buffer posts for search indexing when using mssqlnative.
 2011-03-15 02:00:04 +01:00
Andreas Fischer
784132d7e8 Merge branch 'ticket/naderman/9685' into develop-olympus 
* ticket/naderman/9685:
  [ticket/9685] Buffer posts for search indexing when using mssqlnative.
 2011-03-15 01:59:47 +01:00
Nils Adermann
91b3195255 [ticket/9685] Buffer posts for search indexing when using mssqlnative. 
To have a generic solution there is now a sql_buffer_nested_transaction()
which indicates that the given SQL driver requires buffering to run a
transaction while iterating over another result set.

PHPBB3-9685
 2011-03-15 01:41:16 +01:00
Andreas Fischer
7588b43526 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10096] Fixed whitespace in functions.php.
  [ticket/10078] Avoid \n in strings given to echo for portability.
  [ticket/10092] Ignore overlength comment lines in commit-msg hook.
 2011-03-14 13:58:57 +01:00
Andreas Fischer
c75b299eb1 Merge branch 'ticket/p/10096' into develop-olympus 
* ticket/p/10096:
  [ticket/10096] Fixed whitespace in functions.php.
 2011-03-14 13:58:21 +01:00
Andreas Fischer
4f1056ad72 Merge branch 'ticket/p/10092' into develop-olympus 
* ticket/p/10092:
  [ticket/10092] Ignore overlength comment lines in commit-msg hook.
 2011-03-14 13:58:19 +01:00
Andreas Fischer
4dd7b4cb8f Merge branch 'ticket/p/10078' into develop-olympus 
* ticket/p/10078:
  [ticket/10078] Avoid \n in strings given to echo for portability.
 2011-03-14 13:58:17 +01:00
Oleg Pudeyev
64657ee366 [ticket/10096] Fixed whitespace in functions.php. 
PHPBB3-10096
 2011-03-13 23:12:52 -04:00
Igor Wiedler
1d2634f0ee [ticket/9806] Script for merging pull requests 
PHPBB3-9806
 2011-03-13 16:15:24 +01:00
Oleg Pudeyev
089e3a9ff4 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/8802] Make FORUMS_MARKED more generic as it is also used for subforums.
  [ticket/8802] Rename "Mark forums read" to "Mark subforums read" for subforums.
 2011-03-12 23:33:55 -05:00
Oleg Pudeyev
4d231112b6 Merge branch 'ticket/bantu/8802' into develop-olympus 
* ticket/bantu/8802:
  [ticket/8802] Make FORUMS_MARKED more generic as it is also used for subforums.
  [ticket/8802] Rename "Mark forums read" to "Mark subforums read" for subforums.
 2011-03-12 23:32:43 -05:00
Oleg Pudeyev
8053be52e0 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/9948] Inline quicktime files won't show
 2011-03-12 19:14:04 -05:00
Oleg Pudeyev
3dd5c95b6c Merge branch 'ticket/erikfrerejean/9948' into develop-olympus 
* ticket/erikfrerejean/9948:
  [ticket/9948] Inline quicktime files won't show
 2011-03-12 19:13:55 -05:00
Igor Wiedler
d319fe1883 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10088] Also ignore DBMS versions other than MySQLi in cache mock.
 2011-03-12 18:23:47 +01:00
Igor Wiedler
388171b482 Merge branch 'ticket/bantu/10088' into develop-olympus 
* ticket/bantu/10088:
  [ticket/10088] Also ignore DBMS versions other than MySQLi in cache mock.
 2011-03-12 18:23:31 +01:00
Igor Wiedler
cfede1db83 Merge branch 'ticket/bantu/10046-develop' into develop 
* ticket/bantu/10046-develop:
  [ticket/10046] Remove register_shutdown_function() in cron.php from develop.
 2011-03-12 18:17:25 +01:00
Igor Wiedler
a27a39ebed Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10046] Do not link bots to cron.php.
  [ticket/10046] No longer change $phpbb_root_path to an absolute path for cron.
  [ticket/10046] Call flush() in cron.php
  [ticket/10046] Remove calls to register_shutdown_function() in cron.php

Conflicts:
	phpBB/cron.php
	phpBB/includes/functions.php
 2011-03-12 18:16:10 +01:00
Igor Wiedler
bc42cbd94b Merge branch 'ticket/bantu/10046' into develop-olympus 
* ticket/bantu/10046:
  [ticket/10046] Do not link bots to cron.php.
  [ticket/10046] No longer change $phpbb_root_path to an absolute path for cron.
  [ticket/10046] Call flush() in cron.php
  [ticket/10046] Remove calls to register_shutdown_function() in cron.php
 2011-03-12 18:11:47 +01:00
Andreas Fischer
7a39bdef89 [ticket/10088] Also ignore DBMS versions other than MySQLi in cache mock. 
PHPBB3-10088
 2011-03-12 15:26:09 +01:00
Andreas Fischer
a627133b15 [ticket/10046] Remove register_shutdown_function() in cron.php from develop. 
PHPBB3-10046
 2011-03-12 15:07:31 +01:00
Oleg Pudeyev
9a48045254 [ticket/10046] Do not link bots to cron.php. 
Bots, generally speaking, will not request cron.php immediately,
thus telling them to request it is pointless.

PHPBB3-10046
 2011-03-12 14:57:34 +01:00
Andreas Fischer
a8f2e79fbc [ticket/10046] No longer change $phpbb_root_path to an absolute path for cron. 
This is no longer required because we no longer call
register_shutdown_function() which made this change necessary.

PHPBB3-10046
 2011-03-12 14:57:26 +01:00