1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-30 19:24:13 +02:00

10521 Commits

Author SHA1 Message Date
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
6bba279434 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9857] Remove visible $Id$ from phpBB/docs files.
2010-10-19 14:04:22 +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
2264f88d82 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9509] Remove section 8 from index
  [ticket/9509] Close anchor tag in coding guidelines
  [ticket/9854] Revise docs/auth_api.html to add more methods
  [ticket/9509] The VCS is now git
  [ticket/9840] Display view unread posts link for guests.

Conflicts:
	phpBB/docs/coding-guidelines.html
2010-10-19 13:57:43 +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
6213188280 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [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:34 +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
d753a02ec0 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/7332] Fix post details expand link rendering on Webkit.
  [ticket/9162] Prevent notice on unset poll title
  [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.
  [ticket/9841] Change "Save" to "Save draft", "Load" to "Load draft".
  [ticket/9664] Resolve conflict with accesskey="t", change addlitsitem to "y".
  [ticket/7538] Limit user_login_attempts to prevent SQL errors.
  [ticket/9848] Add avatars, attachments and store files to .gitignore.
  [ticket/9822] Correct some style related ACP explain statements.
  [ticket/9698] Add .htaccess to the includes subdirectory.
  [ticket/9830] Redirect to install directly when config.php does not exist.
  [ticket/9816] Remove config.php from repository
  [ticket/9810] Hide "Select All" of code bbcode on print page
2010-10-17 21:47:04 +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
Igor Wiedler
b08e0d1772 [feature/request-class] Convert some remaining cookies
Convert some remaining accesses to cookie to use the
request class instead. Thanks to bantu for the note.

PHPBB3-9716
2010-10-17 13:56:16 +02:00
Igor Wiedler
de5ef675ac [feature/request-class] Adjust misleading comment
PHPBB3-9716
2010-10-17 13:56:15 +02:00
Igor Wiedler
30016a7084 [feature/request-class] Remove direct access to _REQUEST in acp_search
PHPBB3-9716
2010-10-17 13:55:45 +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
Nils Adermann
5d9aef4794 [task/phing-build] Added a build.xml configuration for phing.
The current state of the phing build script allowed the removal of
some code from the old packaging process written entirely in PHP.
Further simplifcations of the PHP code and additions to the phing
build file will follow.

PHPBB3-9849
2010-10-17 01:19:23 +02: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
9c8b210ef0 [feature/request-class] Special case of direct access to _REQUEST
PHPBB3-9716
2010-10-14 08:28:05 +02:00
Igor Wiedler
6e5e22961a Merge branch 'feature/igorw/request-class' into develop
* feature/igorw/request-class:
  [feature/request-class] Remove duplicate class loader from common.php
2010-10-13 23:16:25 +02:00
Igor Wiedler
5de4924c4b [feature/request-class] Remove duplicate class loader from common.php
PHPBB3-9716
2010-10-13 23:10:15 +02:00