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
11238 commits 18 branches 192 tags 207 MiB
Commit graph

11238 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andreas Fischer
19439b86b8 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/7057] Use GET for quicksearch and add session id to hidden fields
  [ticket/7057] Remove trailing whitespace in functions.php
 2011-06-09 13:10:48 +02:00
Andreas Fischer
b64159c001 Merge remote-tracking branch 'naderman/ticket/7057' into develop-olympus 
* naderman/ticket/7057:
  [ticket/7057] Use GET for quicksearch and add session id to hidden fields
  [ticket/7057] Remove trailing whitespace in functions.php
 2011-06-09 13:10:48 +02:00
Andreas Fischer
7d5438eb03 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/8138] Add autocomplete="off" to acp_board and ldap settings
  [ticket/8138] Add autocomplete="off" to a user and forum ACP.

Conflicts:
	phpBB/adm/index.php
 2011-06-09 13:00:39 +02:00
Andreas Fischer
c6e946c65f Merge remote-tracking branch 'naderman/ticket/8138' into develop-olympus 
* naderman/ticket/8138:
  [ticket/8138] Add autocomplete="off" to acp_board and ldap settings
  [ticket/8138] Add autocomplete="off" to a user and forum ACP.
 2011-06-09 12:55:04 +02:00
Andreas Fischer
c49dce2be3 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10005] Add description to test cases
  [ticket/10005] Add validation of dropdown custom profile field values
 2011-06-09 12:47:27 +02:00
Andreas Fischer
f7578e29b3 Merge remote-tracking branch 'naderman/ticket/10005' into develop-olympus 
* naderman/ticket/10005:
  [ticket/10005] Add description to test cases
  [ticket/10005] Add validation of dropdown custom profile field values
 2011-06-09 12:47:26 +02:00
Andreas Fischer
d64ec4f765 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10204] Detect binary file changes in dirs with names containing dots
 2011-06-09 12:45:11 +02:00
Andreas Fischer
60811a507e Merge remote-tracking branch 'naderman/ticket/10204' into develop-olympus 
* naderman/ticket/10204:
  [ticket/10204] Detect binary file changes in dirs with names containing dots
 2011-06-09 12:45:10 +02:00
Nils Adermann
3c60cfd863 [ticket/10204] Detect binary file changes in dirs with names containing dots 
PHPBB3-10204
 2011-06-09 05:58:38 +02:00
Andreas Fischer
b87fcf70c0 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10203] Fix quotations and hyphen in language strings for PHPBB3-10067
 2011-06-09 01:22:45 +02:00
Andreas Fischer
a7258fc6ce Merge remote-tracking branch 'nickvergessen/ticket/10203' into develop-olympus 
* nickvergessen/ticket/10203:
  [ticket/10203] Fix quotations and hyphen in language strings for PHPBB3-10067
 2011-06-09 01:19:08 +02:00
Joas Schilling
d2b5d77b2c [ticket/10203] Fix quotations and hyphen in language strings for PHPBB3-10067 
PHPBB3-10203
 2011-06-09 00:33:27 +02:00
Andreas Fischer
ad90f262ff Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10067] Add separator to h_radio to place options on individual lines

Conflicts:
	phpBB/adm/index.php
 2011-06-06 11:06:01 +02:00
Andreas Fischer
759f8d5c2c Merge remote-tracking branch 'naderman/ticket/10067' into develop-olympus 
* naderman/ticket/10067:
  [ticket/10067] Add separator to h_radio to place options on individual lines
 2011-06-06 10:58:05 +02:00
Nils Adermann
26e052bb26 [ticket/10067] Add separator to h_radio to place options on individual lines 
The previous mechanism for account activation resulted in two h_radio calls
with identical id attributes for two elements.

PHPBB3/10067
 2011-06-05 09:52:17 +02:00
Nils Adermann
b55bfb459e Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10042] GD CAPTCHA: Call phpbb_mt_rand() where required.
  [ticket/10042] GD CAPTCHA: Round offset to the next pixel.
  [ticket/10042] Add mt_rand() wrapper which allows swapping $min and $max.
 2011-06-05 03:22:40 +02:00
Nils Adermann
893d0ae96f Merge branch 'ticket/bantu/10042' into develop-olympus 
* ticket/bantu/10042:
  [ticket/10042] GD CAPTCHA: Call phpbb_mt_rand() where required.
  [ticket/10042] GD CAPTCHA: Round offset to the next pixel.
  [ticket/10042] Add mt_rand() wrapper which allows swapping $min and $max.
 2011-06-05 03:22:09 +02:00
Nils Adermann
0a1e7ca02b Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/9922] Link post subject to the post's anchor in subsilver2.
 2011-06-05 03:06:31 +02:00
Nils Adermann
ffc137986f Merge branch 'ticket/bantu/9922' into develop-olympus 
* ticket/bantu/9922:
  [ticket/9922] Link post subject to the post's anchor in subsilver2.
 2011-06-05 03:00:56 +02:00
Nils Adermann
cc14f4b9e0 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10067] Clarify language for user activation options in ACP.
 2011-06-05 02:50:17 +02:00
Nils Adermann
a9f4e00234 Merge branch 'ticket/p/10067' into develop-olympus 
* ticket/p/10067:
  [ticket/10067] Clarify language for user activation options in ACP.
 2011-06-05 02:49:35 +02:00
Nils Adermann
a30ec6e052 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10158] Remove some code duplication from generating the message.
  [ticket/10195] Return false in session::check_dnsbl() when IPv6 is passed.
  [ticket/10158] Only view "Return to" links if they are useful.
  [ticket/10158] Add return-link to folder, when the user replied from a folder.
  [ticket/10158] Add "Return to Inbox"-link to "PM send"-message.
 2011-06-05 01:58:52 +02:00
Nils Adermann
27e1f1319f Merge branch 'ticket/nickvergessen/10158' into develop-olympus 
* ticket/nickvergessen/10158:
  [ticket/10158] Remove some code duplication from generating the message.
  [ticket/10158] Only view "Return to" links if they are useful.
  [ticket/10158] Add return-link to folder, when the user replied from a folder.
  [ticket/10158] Add "Return to Inbox"-link to "PM send"-message.
 2011-06-05 01:58:37 +02:00
Nils Adermann
6b6705b852 [ticket/10158] Remove some code duplication from generating the message. 
PHPBB3-10158
 2011-06-05 01:58:03 +02:00
Nils Adermann
b1ae6f6407 Merge branch 'ticket/bantu/10195' into develop-olympus 
* ticket/bantu/10195:
  [ticket/10195] Return false in session::check_dnsbl() when IPv6 is passed.
 2011-06-05 01:30:26 +02:00
Nils Adermann
f11ef89c65 [ticket/8138] Add autocomplete="off" to acp_board and ldap settings 
PHPBB3-8138
 2011-06-03 19:06:12 +02:00
Nils Adermann
4ddd116cd4 [ticket/8138] Add autocomplete="off" to a user and forum ACP. 
PHPBB3-8138
 2011-06-03 18:59:24 +02:00
Andreas Fischer
c504888f03 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10149] Skip foreach over GLOBALS cookie values if cookie is scalar
 2011-06-03 12:54:37 +02:00
Andreas Fischer
116744d4e5 Merge remote-tracking branch 'naderman/ticket/10149' into develop-olympus 
* naderman/ticket/10149:
  [ticket/10149] Skip foreach over GLOBALS cookie values if cookie is scalar
 2011-06-03 12:53:50 +02:00
Andreas Fischer
ab366a18ba Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/9950] Use actual language instead of user's language in overall header
 2011-06-03 11:00:26 +02:00
Andreas Fischer
7a2fb9f123 Merge remote-tracking branch 'naderman/ticket/9950' into develop-olympus 
* naderman/ticket/9950:
  [ticket/9950] Use actual language instead of user's language in overall header
 2011-06-03 10:58:18 +02:00
Nils Adermann
a2b6605ce8 [ticket/10005] Add description to test cases 
PHPBB3-10005
 2011-06-03 03:12:13 +02:00
Nils Adermann
57eb02bf2c [ticket/10149] Skip foreach over GLOBALS cookie values if cookie is scalar 
PHPBB3-10149
 2011-06-03 02:39:00 +02:00
Andreas Fischer
672c333ace Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/9685] Test for databases that are able to nest transactions
  [ticket/9685] Consistently name the new sql_buffer_nested_transactions function
 2011-06-02 23:32:12 +02:00
Andreas Fischer
b1a4de3166 Merge remote-tracking branch 'naderman/ticket/9685' into develop-olympus 
* naderman/ticket/9685:
  [ticket/9685] Test for databases that are able to nest transactions
  [ticket/9685] Consistently name the new sql_buffer_nested_transactions function
 2011-06-02 23:30:09 +02:00
Nils Adermann
6e8b59dce3 [ticket/7057] Use GET for quicksearch and add session id to hidden fields 
Without sid a GET form logs a user out if they have cookies disabled.

PHPBB3-7057
 2011-06-02 10:10:42 +02:00
Nils Adermann
d270f736e3 [ticket/7057] Remove trailing whitespace in functions.php 
PHPBB3-7057
 2011-06-02 10:09:40 +02:00
Nils Adermann
7b10f859de [ticket/10005] Add validation of dropdown custom profile field values 
PHPBB3-10005
 2011-06-02 08:49:59 +02:00
Nils Adermann
324c913ac9 [ticket/9950] Use actual language instead of user's language in overall header 
PHPBB3-9950
 2011-06-02 06:24:28 +02:00
Nils Adermann
f0287f7e57 [ticket/9685] Test for databases that are able to nest transactions 
If a database is unable to nest transactions the dbal should implement
sql_buffer_nested_transactions to signal that buffering of the outer
results and closing of the outer transaction is required to open the
inner transaction.

PHPBB3-9685
 2011-06-02 06:09:21 +02:00
Nils Adermann
ed95c7195f Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10039] Added mssqlnative cases to phpBB 2.0 converter.
 2011-06-02 04:53:48 +02:00
Nils Adermann
2159e4f285 Merge branch 'ticket/p/10039' into develop-olympus 
* ticket/p/10039:
  [ticket/10039] Added mssqlnative cases to phpBB 2.0 converter.
 2011-06-02 04:52:30 +02:00
Nils Adermann
ebe83769e6 [ticket/9685] Consistently name the new sql_buffer_nested_transactions function 
PHPBB3-9685
 2011-06-02 01:52:25 +02:00
Andreas Fischer
83dfe0d22c [ticket/10195] Return false in session::check_dnsbl() when IPv6 is passed. 
There is no support for IPv6 addresses in the blacklists we check right now.

PHPBB3-10195
 2011-05-26 10:56:46 +02:00
Andreas Fischer
9c04aef153 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10192] Add missing semicolon
 2011-05-23 23:59:56 +02:00
Andreas Fischer
7da88f9103 Merge remote-tracking branch 'erikfrerejean/ticket/10192' into develop-olympus 
* erikfrerejean/ticket/10192:
  [ticket/10192] Add missing semicolon
 2011-05-23 23:59:45 +02:00
Andreas Fischer
09776d2302 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/9630] Make language for moving posts clearer in quickmod/mcp.
 2011-05-23 23:56:55 +02:00
Andreas Fischer
e0ce73e3b8 Merge remote-tracking branch 'p/ticket/9630' into develop-olympus 
* p/ticket/9630:
  [ticket/9630] Make language for moving posts clearer in quickmod/mcp.
 2011-05-23 23:56:31 +02:00
Joas Schilling
67449f8f1b [ticket/10158] Only view "Return to" links if they are useful. 
PHPBB3-10158
 2011-05-23 12:03:04 +02:00
Erik Frèrejean
b5e5ed0033 [ticket/10192] Add missing semicolon 
if the index has to be recreated it will run into the private message
table query.

PHPBB3-10192
 2011-05-23 11:00:58 +02:00