1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-16 06:36:39 +02:00
Commit Graph

9789 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
e2d57fb4da [ticket/7332] Fix post details expand link rendering on Webkit.
PHPBB3-7332
2010-10-17 12:25:20 +01:00
07a8d5a3dd [ticket/9162] Prevent notice on unset poll title
Regression from a81c857c96

PHPBB3-9162
2010-10-16 13:55:17 +02:00
940191973f [ticket/7417] Also focus search keywords and username in subsilver2.
PHPBB3-7417
2010-10-16 12:24:54 +02:00
6e9cf09adb [ticket/7417] Focus username field when prosilver login page is loaded.
PHPBB3-7417
2010-10-16 12:24:48 +02:00
105de6b637 [ticket/7417] Focus search keywords field when prosilver search page is loaded.
PHPBB3-7417
2010-10-16 12:24:37 +02:00
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
2c4c1f9257 [ticket/9664] Resolve conflict with accesskey="t", change addlitsitem to "y".
PHPBB3-9664
2010-10-15 19:14:20 +02:00
0452da2bf1 [ticket/7538] Limit user_login_attempts to prevent SQL errors.
PHPBB3-7538
2010-10-15 19:00:14 +02:00
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
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
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
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
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
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
e081531a21 Merge branch 'ticket/igorw/9804' into develop-olympus
* ticket/igorw/9804:
  [ticket/9804] Account evil3 renamed to igorw, adjust AUTHORS
2010-09-24 12:07:26 +02:00
f6700815a8 [ticket/9804] Account evil3 renamed to igorw, adjust AUTHORS
PHPBB3-9804
2010-09-21 00:53:30 +02:00
68b35b5845 [ticket/9829] Fix error in recaptcha validation.
The recaptcha plugin falsely accepted error responses by recaptcha as valid
solutions.

PHPBB3-9829
2010-09-19 16:29:12 +02:00
41245f9f7a Merge branch 'ticket/bantu/9091' into develop-olympus
* ticket/bantu/9091:
  [ticket/9091] Extract IPv4 address from addresses mapped into IPv6.
2010-09-16 23:38:50 +02:00
ed783506c6 Merge branch 'ticket/bantu/9825' into develop-olympus
* ticket/bantu/9825:
  [ticket/9825] Add unit test config and db to gitignore
  [ticket/9825] Unit tests: Use sqlite when possible and no test_config exists.
2010-09-16 23:17:29 +02:00
81d3f382a9 [ticket/9825] Add unit test config and db to gitignore
PHPBB3-9825
2010-09-16 23:16:30 +02:00
46810f8747 Merge branch 'ticket/bantu/9644' into develop-olympus
* ticket/bantu/9644:
  [ticket/9644] Check $mode before calling user_notification() from submit_post()
2010-09-16 22:42:07 +02:00
9015e03d05 Merge branch 'ticket/bantu/9613' into develop-olympus
* ticket/bantu/9613:
  [ticket/9613] Slightly update language strings.
  [ticket/9613] Fix missing database part for unread posts search load switch.
  [ticket/9613] Implement a load switch for unread posts search feature.
2010-09-16 22:34:48 +02:00
3465c5e48d Merge branch 'ticket/bantu/9785' into develop-olympus
* ticket/bantu/9785:
  [ticket/9785] Allow users to request new passwords when board is disabled.
2010-09-16 22:29:18 +02:00
6b5d5e1f63 Merge branch 'ticket/bantu/9609' into develop-olympus
* ticket/bantu/9609:
  [ticket/9609] Change header() calls setting HTTP status to send_status_line().
2010-09-16 22:24:49 +02:00
6bfae1cd1a [ticket/9830] Redirect to install directly when config.php does not exist.
PHPBB3-9830
2010-09-16 22:00:17 +02:00
ac753fa853 [ticket/9825] Unit tests: Use sqlite when possible and no test_config exists.
PHPBB3-9825
2010-09-16 00:03:52 +02:00
d874c32374 Merge branch 'ticket/evil3/9592' into develop-olympus
* ticket/evil3/9592:
  [ticket/9592] Slight adjustments to simplify db test cases
  [ticket/9592] Remove test cases for empty IN()
  [ticket/9592] Test suite does not run on SQlite
2010-09-15 16:01:12 +02:00
a4742f795e [ticket/9592] Slight adjustments to simplify db test cases
PHPBB3-9592
2010-09-15 09:50:04 +02:00
20460dc12c Merge branch 'ticket/nickvergessen/9162' into develop-olympus
* ticket/nickvergessen/9162:
  [ticket/9162] BBCode in poll options is broken, when posting without question.
2010-09-14 16:47:46 +02:00
b4b3efa45b Merge branch 'ticket/nickvergessen/9820' into develop-olympus
* ticket/nickvergessen/9820:
  [ticket/9820] phpBB Debug Error when trying to post a new topic.
2010-09-14 16:29:21 +02:00
ffd9437948 [ticket/9820] phpBB Debug Error when trying to post a new topic.
Regression from aa4519fb44

PHPBB3-9820
PHPBB3-7260
2010-09-14 15:43:05 +02:00
a81c857c96 [ticket/9162] BBCode in poll options is broken, when posting without question.
PHPBB3-9162
2010-09-14 13:20:38 +02:00
05c88bb00d Merge branch 'ticket/bantu/9804' into develop-olympus
* ticket/bantu/9804:
  [ticket/9804] Update docs/AUTHORS. Move DavidMJ, add evil<3.
2010-09-12 20:36:34 +02:00
4776952959 [ticket/9804] Update docs/AUTHORS. Move DavidMJ, add evil<3.
PHPBB3-9804
2010-09-12 19:19:30 +02:00
161be96c66 Merge branch 'ticket/bantu/9748' into develop-olympus
* ticket/bantu/9748:
  [ticket/9748] Replace <br /> before converting < and > to their entities.
2010-09-12 14:59:59 +02:00
20505ff326 [ticket/9816] Remove config.php from repository
PHPBB3-9816
2010-09-12 14:21:25 +02:00
e08395745b Merge branch 'ticket/bantu/9503' into develop-olympus
* ticket/bantu/9503:
  [ticket/9503] Show 'No subject specified' in 'Posts awaiting approval'.
2010-09-12 13:40:02 +02:00
e51e7701cd Merge branch 'ticket/bantu/9754' into develop-olympus
* ticket/bantu/9754:
  [ticket/9754] Populate S_USER_POSTED variable with correct value in search.php
2010-09-12 13:11:21 +02:00
566ddf8a4b [ticket/9592] Remove test cases for empty IN()
They failed under SQLite because SQLite accepts empty IN() syntax.

PHPBB3-9592
2010-09-12 00:51:27 +02:00
4fd45adfc5 [ticket/9592] Test suite does not run on SQlite
PHPBB3-9592
2010-09-11 23:34:14 +02:00
bef108a5cc [ticket/9609] Change header() calls setting HTTP status to send_status_line().
PHPBB3-9609
2010-09-11 22:01:31 +02:00
a235f770f6 [ticket/9810] Hide "Select All" of code bbcode on print page
PHPBB3-9810
2010-09-10 05:34:57 -07:00