1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00

11407 Commits

Author SHA1 Message Date
Oleg Pudeyev
4ab178f3ef [ticket/11202] Add a heuristic function to check for response success.
This tries to account for php sending fatal errors with 200 status code.

PHPBB3-11202
2012-11-15 08:24:27 -05:00
Andreas Fischer
8b156c3d83 Merge remote-tracking branch 'marc1706/ticket/10879' into develop-olympus
* marc1706/ticket/10879:
  [ticket/10879] Remove arrow icon from attachment link in editor
2012-11-13 20:35:50 +01:00
Marc Alexander
170967c48a [ticket/10879] Remove arrow icon from attachment link in editor
If you upload a file with a long filename the filename will partially
cover the arrow icon background image. Remove the icon as it's not needed
anyways.

PHPBB3-10879
2012-11-13 20:26:49 +01:00
Andreas Fischer
c699b88bc5 [ticket/11192] Add Tebibyte to get_formatted_filesize().
PHPBB3-11192
2012-11-11 14:35:31 +01:00
Fyorl
e3b0e1a8a2 [ticket/11190] Functional tests purge cache before running.
Added functions to get and purge cache to functional framework also.

PHPBB3-11190
2012-11-11 10:44:47 +00:00
Joas Schilling
f7f21fa692 [ticket/11186] Database unit tests fail on windows using sqlite2
The problem is, that we try to recreate the db and reconnect to it, while the
old connection is still hold. To resolve this, we just drop all tables and
recreate the tables instead of the hole db.

PHPBB3-11186
2012-11-10 14:34:52 +01:00
Oleg Pudeyev
3ebabc8da2 Merge PR #1052 branch 'p/ticket/10865' into develop-olympus
* p/ticket/10865:
  [ticket/10865] Use code tags for install/database_update.php.
  [ticket/10865] Should have been a slash.
  [ticket/10865] Add .css, .js, and .htaccess to the list of ASCII mode files
  [ticket/10865] Phrase change for visiting with browser
  [ticket/10865] Grammar corrections for the entire document
  [ticket/10865] Typo and phrasing change
  [ticket/10865] Updates and additions to /docs/INSTALL.html
2012-11-09 20:14:52 -05:00
Oleg Pudeyev
7c4318c033 [ticket/10865] Use code tags for install/database_update.php.
PHPBB3-10865
2012-11-09 20:13:06 -05:00
Oleg Pudeyev
6e6cc28b76 [ticket/10865] Should have been a slash.
PHPBB3-10865
2012-11-09 20:10:43 -05:00
Nils Adermann
0209431e4f Merge remote-tracking branch 'github-igorw/ticket/11181-olympus' into develop-olympus
* github-igorw/ticket/11181-olympus:
  [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus]
2012-11-09 23:46:51 +01:00
Igor Wiedler
923137cf31 [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus]
PHPBB3-11181
2012-11-09 23:22:02 +01:00
Oleg Pudeyev
a16b9d17da Merge PR #1044 branch 'bantu/ticket/11178' into develop-olympus
* bantu/ticket/11178:
  [ticket/11178] Do not set error_reporting to E_ALL in database_updater.php
2012-11-09 09:57:33 -05:00
Oleg Pudeyev
100acddf55 Merge PR #1042 branch 'bantu/ticket/10897' into develop-olympus
* bantu/ticket/10897:
  [ticket/10897] Combine bot updates and bot delete.
  [ticket/10897] Use same code/query for deleting.
  [ticket/10897] Make sure the user we're fetching is a bot.
  [ticket/10897] Do not handle IP address. There is no need.
  [ticket/10897] Update by user_id instead of bot_name.
  [ticket/10897] Move bot delete data to the relevant foreach loop.
  [ticket/10897] Add comment about what's going on.
  [ticket/10897] Remove unnecessary string casting.
  [ticket/10897] Add space after foreach.
  [ticket/10897] Update bots during phpBB update
  [ticket/10897] Bot list updated
2012-11-09 09:20:43 -05:00
Andreas Fischer
ed74c9c487 [ticket/11178] Do not set error_reporting to E_ALL in database_updater.php
Take whatever startup.php sets instead.

This especially takes care of E_STRICT messages that are generated because of
PHP4 compatibility.

PHPBB3-11178
2012-11-09 14:30:44 +01:00
Andreas Fischer
60ea1c10ef [ticket/10897] Combine bot updates and bot delete.
PHPBB3-10897
2012-11-09 13:40:48 +01:00
Andreas Fischer
54700f5ba2 [ticket/10897] Use same code/query for deleting.
PHPBB3-10897
2012-11-09 12:53:33 +01:00
Andreas Fischer
520ffdf368 [ticket/10897] Make sure the user we're fetching is a bot.
PHPBB3-10897
2012-11-09 12:47:50 +01:00
Andreas Fischer
c054757f3c [ticket/10897] Do not handle IP address. There is no need.
PHPBB3-10897
2012-11-09 12:46:21 +01:00
Andreas Fischer
63c64694bc [ticket/10897] Update by user_id instead of bot_name.
PHPBB3-10897
2012-11-09 12:41:59 +01:00
Andreas Fischer
935bc33268 [ticket/10897] Move bot delete data to the relevant foreach loop.
PHPBB3-10897
2012-11-09 12:19:58 +01:00
Andreas Fischer
de6d741d96 [ticket/10897] Add comment about what's going on.
PHPBB3-10897
2012-11-09 12:19:18 +01:00
Andreas Fischer
b2183c9b70 [ticket/10897] Remove unnecessary string casting.
PHPBB3-10897
2012-11-09 12:16:38 +01:00
Andreas Fischer
07e7c475d5 [ticket/10897] Add space after foreach.
PHPBB3-10897
2012-11-09 12:16:38 +01:00
Carlo
53e9bab237 [ticket/10897] Update bots during phpBB update
PHPBB3-10897
2012-11-09 12:10:53 +01:00
Carlo
399662d2af [ticket/10897] Bot list updated
'Baidu [Spider]' updated.
'Bing [Bot]' fixed only identation.
'Exabot [Bot]' changed because there is used also 'Exabot-Thumbnails'
user agent.
'NG-Search [Bot]' no longer exists.
'Nutch/CVS [Bot]' is the same of 'Nutch [Bot]'.
'OmniExplorer [Bot]' no longer exists.
'Seekport [Bot]' no longer exists.
'Synoo [Bot]' no longer exists.
'Voyager [Bot]' updated.
'W3C [Validator]' corrected (there was a *).
'WiseNut [Bot]' no longer exists.

PHPBB3-10897
2012-11-09 12:05:34 +01:00
Andreas Fischer
02df59f1fe Merge remote-tracking branch 'p/ticket/11081' into develop-olympus
* p/ticket/11081:
  [ticket/11081] Drop duplicated </td> in subsilver captcha qa template.
2012-11-07 22:56:25 +01:00
Oleg Pudeyev
c08b7385c2 Merge PR #717 branch 'NeoAdonis/ticket/10661' into develop-olympus
* NeoAdonis/ticket/10661:
  [ticket/10661] Added &nbsp; to enumerated recipients (prosilver)
2012-11-06 20:33:48 -05:00
Oleg Pudeyev
87a80e70da [ticket/11081] Drop duplicated </td> in subsilver captcha qa template.
PHPBB3-11081
2012-11-06 17:46:54 -05:00
Nils Adermann
875adc4247 Merge pull request #1035 from p/ticket/11159-olympus
[ticket/11159] static public is the currently approved order.
2012-11-06 10:54:06 -08:00
Oleg Pudeyev
a7babc211c [ticket/11159] static public is the currently approved order.
PHPBB3-11159
2012-11-06 10:41:06 -05:00
Andreas Fischer
fea118cf0d Merge remote-tracking branch 'unknownbliss/ticket/111642' into develop-olympus
* unknownbliss/ticket/111642:
  [ticket/11164] Update composer.phar
2012-11-05 15:17:55 -05:00
Unknown Bliss
0dbd569385 [ticket/11164] Update composer.phar
PHPBB3-11164
2012-11-04 20:34:31 +00:00
Andreas Fischer
88b100d818 Merge remote-tracking branch 'p/ticket/11158' into develop-olympus
* p/ticket/11158:
  [ticket/11158] Require acl_u_sig for ucp signature module.
  [ticket/11158] Revert old fix in PHPBB3-10186.
2012-10-29 15:13:33 -04:00
Oleg Pudeyev
5f5d395c62 [ticket/11158] Require acl_u_sig for ucp signature module.
PHPBB3-11158
2012-10-29 14:58:25 -04:00
Oleg Pudeyev
88bd7292f1 [ticket/11158] Revert old fix in PHPBB3-10186.
Revert "[ticket/10186] UCP signature panel displays when not authed
for signatures"

This reverts commit f6fa52540c0fb20d79b4d59cb08c49484d9f3116.

PHPBB3-10186
PHPBB3-11158
2012-10-29 14:58:19 -04:00
Andreas Fischer
c84268d2f9 Merge remote-tracking branch 'p/ticket/10848' into develop-olympus
* p/ticket/10848:
  [ticket/10848] Move include up.
  [ticket/10848] Add phpbb_ prefix.
  [ticket/10848] Redirect from adm to installer correctly.
2012-10-18 16:26:54 +02:00
Oleg Pudeyev
b283df8241 [ticket/10848] Move include up.
PHPBB3-10848
2012-10-17 22:35:36 -04:00
Oleg Pudeyev
bd44088757 Merge PR #918 branch 'Senky/ticket/10568' into develop-olympus
* Senky/ticket/10568:
  [ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pm
2012-10-17 22:10:49 -04:00
Oleg Pudeyev
bb09cd9c8e [ticket/10848] Add phpbb_ prefix.
PHPBB3-10848
2012-10-17 15:13:35 -04:00
Oleg Pudeyev
c630480ca1 [ticket/10848] Redirect from adm to installer correctly.
PHPBB3-10848
2012-10-17 15:08:09 -04:00
Oleg Pudeyev
f0544c884f Merge PR #624 branch 'nickvergessen/ticket/8743' into develop-olympus
* nickvergessen/ticket/8743:
  [ticket/8743] Include poster´s name in mail notifications
2012-10-16 21:20:58 -04:00
Oleg Pudeyev
bef3f9c7e7 Merge PR #917 branch 'Senky/ticket/10967' into develop-olympus
* Senky/ticket/10967:
  [ticket/10967] adding $root_path to posting_get_topic_icons
2012-10-16 20:30:45 -04:00
Andreas Fischer
0348950ff1 Merge branch 'ticket/russellwwest/11093' into develop-olympus
* ticket/russellwwest/11093:
  [ticket/11093] acp_users_overview.html has a wrongly placed </dd>
2012-10-16 14:40:10 +02:00
westr
d376348acf [ticket/11093] acp_users_overview.html has a wrongly placed </dd>
Amended the closing dd tag to the appropriate line: line 145 instead of 141

PHPBB3-11093
2012-10-16 14:39:32 +02:00
Senky
d434672dde [ticket/10967] adding $root_path to posting_get_topic_icons
PHPBB3-10967
2012-10-11 20:38:24 +02:00
Oleg Pudeyev
68641aab93 Merge PR #973 branch 'bantu/ticket/11069' into develop-olympus
* bantu/ticket/11069:
  [ticket/11069] Add closing span back to credit line in subsilver2 simple footer
2012-10-10 00:22:17 -04:00
Oleg Pudeyev
a7893ab299 Merge PR #1004 branch 'bantu/ticket/11131' into develop-olympus
* bantu/ticket/11131:
  [ticket/11131] Correctly use indefinite article for "warning".
2012-10-09 17:42:23 -04:00
Andreas Fischer
281afb8bd6 Merge remote-tracking branch 'mvinny/ticket/11135' into develop-olympus
* mvinny/ticket/11135:
  [ticket/11135] Full replacement of credit link to https
2012-10-06 06:12:45 +02:00
Vinny
95d02d74ac [ticket/11135] Full replacement of credit link to https
PHPBB3-11135
2012-10-05 21:18:59 -03:00
Andreas Fischer
8428b53087 Merge remote-tracking branch 'Senky/ticket/11112' into develop-olympus
* Senky/ticket/11112:
  [ticket/11112] updating links to phpbb.com to use SSL
2012-10-02 17:01:21 +02:00