mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00
Code Issues Releases Wiki Activity
9,818 Commits 17 Branches 190 Tags
Commit Graph

9818 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Fischer
6ff403c9f8 Merge branch 'ticket/cs278/9061' into develop-olympus 
* ticket/cs278/9061:
  [ticket/9061] Simplify conditional statements by reworking the logic.
  [ticket/9061] Fixed a race condition in queue locking.
 2010-10-27 13:06:21 +02:00
Chris Smith
9819700247 [ticket/9061] Simplify conditional statements by reworking the logic. 
PHPBB3-9061
 2010-10-27 11:31:42 +01:00
Oleg Pudeyev
01ef46a510 [ticket/9061] Fixed a race condition in queue locking. 
Changed queue locking to cover all queue file operations,
in particular the check for queue file existince and
inclusion of queue file must be done under one lock.

Also refactored queue locking and unlocking into separate
methods.

PHPBB3-9061
 2010-10-27 11:31:27 +01:00
Igor Wiedler
832b09d60d Merge branches 'ticket/bantu/9101', 'ticket/bantu/9595' and 'ticket/bantu/9853' into develop-olympus 
* ticket/bantu/9101:
  [ticket/9101] Remove misleading 'below' from RECAPTCHA_EXPLAIN.

* ticket/bantu/9595:
  [ticket/9595] List min/max characters indexed by search for mysql_fulltext.

* ticket/bantu/9853:
  [ticket/9853] Change recaptcha theme from default to 'clean'.
 2010-10-25 22:08:37 +02:00
Andreas Fischer
52546e8d15 Merge branch 'ticket/naderman/9686' into develop-olympus 
* ticket/naderman/9686:
  [ticket/9686] Fix mssqlnative database data export
 2010-10-25 21:54:49 +02:00
Andreas Fischer
a5bc7c90f5 Merge branch 'ticket/rxu/9478' into develop-olympus 
* ticket/rxu/9478:
  [ticket/9478] Validate maximum number of allowed recipients per PM value.
 2010-10-25 21:52:50 +02:00
rxu
257e264af7 [ticket/9478] Validate maximum number of allowed recipients per PM value. 
Do not allow to enter the value larger than it's allowed by MySQL mediumnt(8).

PHPBB3-9478
 2010-10-25 21:47:13 +02:00
Nils Adermann
5c5b0fc4be [ticket/9686] Fix mssqlnative database data export 
We require version 1.1 of the sqlsrv extension anyway so the regular
sqlsrv_num_rows can be used instead of buffering the result. The result
buffer (class result_mssqlnative) should never automatically free the
resource it receives - we consistently close resources using sql_freeresult().

PHPBB3-9686
 2010-10-25 03:33:37 +02:00
Nils Adermann
e87a8ef02c Merge branch 'ticket/igorw/9807' into develop-olympus 
* ticket/igorw/9807:
  [ticket/9807] Update existing module permissions in database
  [ticket/9807] Hide avatar tab in UCP when avatars are disabled
 2010-10-23 14:08:38 +02:00
Andreas Fischer
294c2c63c0 [ticket/9595] List min/max characters indexed by search for mysql_fulltext. 
PHPBB3-9595
 2010-10-21 20:31:00 +02:00
Igor Wiedler
b9afa26280 [ticket/9807] Update existing module permissions in database 
PHPBB3-9807
 2010-10-21 10:22:03 +02:00
Igor Wiedler
d503272645 Merge branch 'ticket/bantu/9857' into develop-olympus 
* ticket/bantu/9857:
  [ticket/9857] Remove visible $Id$ from phpBB/docs files.
 2010-10-19 14:03:44 +02:00
Igor Wiedler
5f0f8c25be Merge branch 'ticket/igorw/9509' into develop-olympus 
* ticket/igorw/9509:
  [ticket/9509] Remove section 8 from index
  [ticket/9509] Close anchor tag in coding guidelines
  [ticket/9509] The VCS is now git
 2010-10-19 13:55:18 +02:00
Igor Wiedler
c4dfe24fec [ticket/9509] Remove section 8 from index 
Thanks Andreas.

PHPBB3-9509
 2010-10-19 13:52:00 +02:00
Igor Wiedler
5ad5930c8f [ticket/9509] Close anchor tag in coding guidelines 
Thanks Andreas.

PHPBB3-9509
 2010-10-19 13:45:50 +02:00
Andreas Fischer
435636e626 Merge branch 'ticket/jellydoughnut/9854' into develop-olympus 
* ticket/jellydoughnut/9854:
  [ticket/9854] Revise docs/auth_api.html to add more methods
 2010-10-19 12:32:09 +02:00
Josh Woody
9950fa34c6 [ticket/9854] Revise docs/auth_api.html to add more methods 
Notably, the auth_admin class is still missing documentation.

PHPBB3-9854
 2010-10-19 12:31:18 +02:00
Andreas Fischer
b27b69cf37 [ticket/9857] Remove visible $Id$ from phpBB/docs files. 
PHPBB3-9857
 2010-10-19 12:22:07 +02:00
Nils Adermann
b6a60d4d64 [ticket/9509] The VCS is now git 
Partially cherry-picked from 163a0974.

PHPBB3-9509
 2010-10-18 13:17:16 +02:00
Andreas Fischer
acabe5a013 Merge branch 'ticket/rxu/9840' into develop-olympus 
* ticket/rxu/9840:
  [ticket/9840] Display view unread posts link for guests.
 2010-10-18 11:50:51 +02:00
Andreas Fischer
6236cfc9fa [ticket/9101] Remove misleading 'below' from RECAPTCHA_EXPLAIN. 
Remove misleading 'below' from RECAPTCHA_EXPLAIN because recaptcha is actually
displayed to the side.

PHPBB3-9101
 2010-10-18 11:24:04 +02:00
Andreas Fischer
d6aa25ede1 [ticket/9853] Change recaptcha theme from default to 'clean'. 
Change recaptcha theme to 'clean' to better coordinate with the color schemes
of prosilver and subsilver2. The default red theme doesn't really fit prosilver
and subsilver2.

PHPBB3-9853
 2010-10-18 10:59:00 +02:00
Igor Wiedler
6eb061ef0c Merge branch 'ticket/naderman/9855' into develop-olympus 
* ticket/naderman/9855:
  [ticket/9855] Do not include the PHPUnit Framework manually on 3.5+.
  [ticket/9855] Make tests run under PHPUnit 3.5.
 2010-10-17 23:36:09 +02:00
Nils Adermann
d56bf3b060 [ticket/9855] Do not include the PHPUnit Framework manually on 3.5+. 
PHPBB3-9855
 2010-10-17 23:32:57 +02:00
Nils Adermann
e195c91b1d [ticket/9855] Make tests run under PHPUnit 3.5. 
PHPBB3-9855
 2010-10-17 23:10:49 +02:00
Igor Wiedler
642f940bc8 Merge branch 'ticket/bantu/9848' into develop-olympus 
* ticket/bantu/9848:
  [ticket/9848] Add avatars, attachments and store files to .gitignore.
 2010-10-17 21:43:29 +02:00
Igor Wiedler
1722c1c819 Merge branch 'ticket/bantu/9841' into develop-olympus 
* ticket/bantu/9841:
  [ticket/9841] Change "Save" to "Save draft", "Load" to "Load draft".
 2010-10-17 21:38:38 +02:00
Igor Wiedler
2e26f86f02 Merge branch 'ticket/bantu/9822' into develop-olympus 
* ticket/bantu/9822:
  [ticket/9822] Correct some style related ACP explain statements.
 2010-10-17 21:35:41 +02:00
Igor Wiedler
8ac0efce65 Merge branch 'ticket/bantu/9698' into develop-olympus 
* ticket/bantu/9698:
  [ticket/9698] Add .htaccess to the includes subdirectory.
 2010-10-17 21:34:31 +02:00
Igor Wiedler
f6db95914b Merge branch 'ticket/bantu/9664' into develop-olympus 
* ticket/bantu/9664:
  [ticket/9664] Resolve conflict with accesskey="t", change addlitsitem to "y".
 2010-10-17 21:33:45 +02:00
Igor Wiedler
2895ade566 Merge branch 'ticket/bantu/7538' into develop-olympus 
* ticket/bantu/7538:
  [ticket/7538] Limit user_login_attempts to prevent SQL errors.
 2010-10-17 21:32:20 +02:00
Igor Wiedler
6582455e5d Merge branch 'ticket/bantu/7417' into develop-olympus 
* ticket/bantu/7417:
  [ticket/7417] Also focus search keywords and username in subsilver2.
  [ticket/7417] Focus username field when prosilver login page is loaded.
  [ticket/7417] Focus search keywords field when prosilver search page is loaded.
 2010-10-17 21:30:40 +02:00
Andreas Fischer
0aecbfa806 Merge branch 'ticket/cs278/7332' into develop-olympus 
* ticket/cs278/7332:
  [ticket/7332] Fix post details expand link rendering on Webkit.
 2010-10-17 18:33:29 +02:00
Andreas Fischer
003fe87080 Merge branch 'ticket/igorw/9162' into develop-olympus 
* ticket/igorw/9162:
  [ticket/9162] Prevent notice on unset poll title
 2010-10-17 18:30:59 +02:00
Chris Smith
e2d57fb4da [ticket/7332] Fix post details expand link rendering on Webkit. 
PHPBB3-7332
 2010-10-17 12:25:20 +01:00
rxu
880bace355 [ticket/9840] Display view unread posts link for guests. 
Display view unread posts link for guests if applicable.

PHPBB3-9840
 2010-10-16 20:46:38 +08:00
Igor Wiedler
07a8d5a3dd [ticket/9162] Prevent notice on unset poll title 
Regression from a81c857c96ee1a2a9be559ff3c9b71ca9514287e

PHPBB3-9162
 2010-10-16 13:55:17 +02:00
Oleg Pudeyev
940191973f [ticket/7417] Also focus search keywords and username in subsilver2. 
PHPBB3-7417
 2010-10-16 12:24:54 +02:00
Oleg Pudeyev
6e9cf09adb [ticket/7417] Focus username field when prosilver login page is loaded. 
PHPBB3-7417
 2010-10-16 12:24:48 +02:00
Oleg Pudeyev
105de6b637 [ticket/7417] Focus search keywords field when prosilver search page is loaded. 
PHPBB3-7417
 2010-10-16 12:24:37 +02:00
Andreas Fischer
931bd25e34 [ticket/9841] Change "Save" to "Save draft", "Load" to "Load draft". 
This has confused people that are less familiar with phpBB or web applications
in general. "Save draft" should make it clear that a draft is being saved, but
it is still short enough to be used in a button.

PHPBB3-9841
 2010-10-15 19:42:29 +02:00
Andreas Fischer
2c4c1f9257 [ticket/9664] Resolve conflict with accesskey="t", change addlitsitem to "y". 
PHPBB3-9664
 2010-10-15 19:14:20 +02:00
Andreas Fischer
0452da2bf1 [ticket/7538] Limit user_login_attempts to prevent SQL errors. 
PHPBB3-7538
 2010-10-15 19:00:14 +02:00
Andreas Fischer
32ee8955b2 [ticket/9848] Add avatars, attachments and store files to .gitignore. 
PHPBB3-9848
 2010-10-15 18:08:43 +02:00
Andreas Fischer
59e62d271c [ticket/9822] Correct some style related ACP explain statements. 
Remove "Additionally, if you have permission you can elect to remove the set
from the filesystem." because that functionality is not implemented.

Also remove unnecessary "When the imageset is deleted it is gone for good."
statement, "It is recommended that you first export your set for possible
future use." should be clear enough.

PHPBB3-9822
 2010-10-15 17:57:43 +02:00
Andreas Fischer
d485664404 [ticket/9698] Add .htaccess to the includes subdirectory. 
Add .htaccess to the includes folder to prevent full path disclosure when
running PHP 5.3. When the error_reporting setting in php.ini contains the
E_DEPRECATED error level, the PHP parser throws an error message containing
the local filesystem path when accessing one of the captcha plugins directly.
This is because the captcha plugins return explicit references for PHP 4
compatibility.

PHPBB3-9698
 2010-10-15 16:47:21 +02:00
Andreas Fischer
b8f37a5024 Merge branch 'ticket/igorw/9816' into develop-olympus 
* ticket/igorw/9816:
  [ticket/9816] Remove config.php from repository

Conflicts:
	.gitignore
 2010-10-15 15:39:36 +02:00
Andreas Fischer
7ac8838b69 Merge branch 'ticket/igorw/9830' into develop-olympus 
* ticket/igorw/9830:
  [ticket/9830] Redirect to install directly when config.php does not exist.
 2010-10-15 15:33:27 +02:00
Igor Wiedler
c439cdc618 Merge branch 'ticket/marc1706/9810' into develop-olympus 
* ticket/marc1706/9810:
  [ticket/9810] Hide "Select All" of code bbcode on print page
 2010-10-04 20:27:00 +02:00
Igor Wiedler
8e7f2e179e Merge branch 'ticket/bantu/9829' into develop-olympus 
* ticket/bantu/9829:
  [ticket/9829] Fix error in recaptcha validation.
 2010-10-04 17:17:09 +02:00