Commit graph

13570 commits

Author SHA1 Message Date
Matt Friedman
3f61075a15 [ticket/10362] HTML5 Fix - Replace name attribute with id in anchors
When validating for HTML5, the name attribute is obsolete/deprecated
when used in anchor tags. The ID tag should be used here instead.

PHPBB3-10362
2011-09-11 17:04:47 -07:00
Joas Schilling
5148358429 [ticket/10360] Fix invalid HTML5 markup introduced in PHPBB3-6632
I removed the fix of the original ticket and rebuild it with its own css class.
This also fixes the problem with the screwed up UCP Attachments page.

PHPBB3-6632
PHPBB3-10360
2011-09-11 02:03:32 +02:00
Patrick Webster
fbec7c9b2b [ticket/10322] Fix dynamic template includes
Dynamic template includes from variables was not implemented in the new
templating system.

PHPBB3-10322
2011-09-08 16:51:22 -05:00
Andreas Fischer
d24917bcba [ticket/10359] Also include utf_tools in style.php because of request class.
PHPBB3-10359
2011-09-08 23:34:18 +02:00
Igor Wiedler
34bc0427df [ticket/10359] Fix phpbb_request regression in download/file.php
The phpbb_request object, utf-8 tools and request_var injection are missing.

PHPBB3-10359
2011-09-08 22:37:19 +02:00
Andreas Fischer
b21cee731a Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10352] Add missing break for Oracle's sql_table_drop()
  [ticket/10351] Fix Oracle's sql_column_remove()
  [ticket/10294] Fix sql_affectedrows() in mssqlnative driver.
2011-09-06 00:44:19 +02:00
Andreas Fischer
92373e6d46 Merge remote-tracking branch 'bantu/ticket/10294' into develop-olympus
* bantu/ticket/10294:
  [ticket/10294] Fix sql_affectedrows() in mssqlnative driver.
2011-09-06 00:43:10 +02:00
Andreas Fischer
d28ec48675 Merge remote-tracking branch 'Noxwizard/ticket/10351' into develop-olympus
* Noxwizard/ticket/10351:
  [ticket/10351] Fix Oracle's sql_column_remove()
2011-09-06 00:42:48 +02:00
Andreas Fischer
3801101f3b Merge remote-tracking branch 'Noxwizard/ticket/10352' into develop-olympus
* Noxwizard/ticket/10352:
  [ticket/10352] Add missing break for Oracle's sql_table_drop()
2011-09-06 00:42:40 +02:00
Oleg Pudeyev
145bc23044 Merge remote-tracking branch 'igorw/ticket/10155' into develop
* igorw/ticket/10155:
  [ticket/10155] Briefly explain assets in coding-guidelines
  [ticket/10155] Move jQuery inclusion to footer
  [ticket/10155] Update to jQuery 1.6.2
  [ticket/10155] Add jQuery to AUTHORS
  [ticket/10155] Add jQuery, introduce global assets path
2011-09-05 06:03:19 -04:00
Oleg Pudeyev
367fe0b4cf Merge remote-tracking branch 'cyberalien/ticket/10350' into develop
* cyberalien/ticket/10350:
  [ticket/10350] Script for testing eval renderer
  [ticket/10350] Fix for class phpbb_template_renderer_eval
2011-09-05 05:21:19 -04:00
Oleg Pudeyev
93b892d24a Merge remote-tracking branch 'bantu/ticket/9474' into develop
* bantu/ticket/9474:
  [ticket/9474] Remove unused/unreferenced mcp_viewlogs.html files.
2011-09-05 02:53:13 -04:00
Oleg Pudeyev
dce62b5271 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10321] Add descriptions to the unit tests
  [ticket/10321] Do not append the ? if the param-list is empty anyway.
2011-09-05 02:48:54 -04:00
Oleg Pudeyev
cf5f0cce83 Merge remote-tracking branch 'nickvergessen/ticket/10321' into develop-olympus
* nickvergessen/ticket/10321:
  [ticket/10321] Add descriptions to the unit tests
  [ticket/10321] Do not append the ? if the param-list is empty anyway.
2011-09-05 02:42:41 -04:00
Patrick Webster
5c7f5f0516 [ticket/10352] Add missing break for Oracle's sql_table_drop()
PHPBB3-10352
2011-09-04 20:31:34 -05:00
Patrick Webster
d938d5d399 [ticket/10351] Fix Oracle's sql_column_remove()
The correct syntax is DROP COLUMN.

PHPBB3-10351
2011-09-04 20:22:36 -05:00
Vjacheslav Trushkin
0cb539ed72 [ticket/10350] Fix for class phpbb_template_renderer_eval
Fixing bug in class phpbb_template_renderer_eval

PHPBB3-10350
2011-09-04 23:25:54 +03:00
Vjacheslav Trushkin
3e76f74688 [feature/remove-imagesets] Script for converting imageset to css
Removing imagesets. Script for converting imageset to css

PHPBB3-10336
2011-09-04 11:05:30 +03:00
Vjacheslav Trushkin
4035f3f6c8 [feature/remove-imagesets] Changing subsilver
Removing imagesets. Changing subsilver

PHPBB3-10336
2011-09-04 11:05:10 +03:00
Vjacheslav Trushkin
57fac62c0c [feature/remove-imagesets] Changing prosilver
Removing imagesets. Changing prosilver

PHPBB3-10336
2011-09-04 11:05:09 +03:00
Vjacheslav Trushkin
830c3f4047 [feature/remove-imagesets] Adjustments to php files
Removing imagesets. Adjustments to php files

PHPBB3-10336
2011-09-04 01:08:00 +03:00
Vjacheslav Trushkin
98590201d8 [feature/remove-imagesets] Changing admin control panel styles module
Removing imagesets. Changing admin control panel styles module

PHPBB3-10336
2011-09-03 18:57:16 +03:00
Vjacheslav Trushkin
33adfd633b [feature/remove-imagesets] Changing database structure
Removing imagesets. Changing database structure

PHPBB3-10336
2011-09-03 18:55:30 +03:00
Vjacheslav Trushkin
929c13a52b [feature/remove-imagesets] Removing imageset files
Removing imagesets. Removing imageset files

PHPBB3-10336
2011-09-03 18:53:23 +03:00
Vjacheslav Trushkin
e5daccdf33 [feature/remove-imagesets] Moving images
Removing imagesets. Moving images

PHPBB3-10336
2011-09-03 18:51:33 +03:00
Andreas Fischer
6216e6748c Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10339] Remove invalid template loop variable from mcp_front.html
2011-08-30 01:52:26 +02:00
Andreas Fischer
8e5eacf692 Merge remote-tracking branch 'nickvergessen/ticket/10339' into develop-olympus
* nickvergessen/ticket/10339:
  [ticket/10339] Remove invalid template loop variable from mcp_front.html
2011-08-30 01:52:17 +02:00
Andreas Fischer
bf4eb6d06c Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10334] Require permissions to view the birthday-list on board index

Conflicts:
	phpBB/index.php
2011-08-30 01:41:41 +02:00
Andreas Fischer
1daefc6177 Merge remote-tracking branch 'nickvergessen/ticket/10334' into develop-olympus
* nickvergessen/ticket/10334:
  [ticket/10334] Require permissions to view the birthday-list on board index
2011-08-30 01:39:14 +02:00
Joas Schilling
57f7c24806 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10341] Also show forum/topic name of "0" as most active forum/topic.
2011-08-29 22:28:44 +02:00
Joas Schilling
a73bc353d6 Merge remote-tracking branch 'remotes/bantu/ticket/10341' into ticket/bantu/10341
* remotes/bantu/ticket/10341:
  [ticket/10341] Also show forum/topic name of "0" as most active forum/topic.
2011-08-29 22:27:20 +02:00
Joas Schilling
ee2c8702ea Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10346] Add drop_tables to perform_schema_changes and add tests
2011-08-29 21:00:13 +02:00
Nils Adermann
0f2e45800e [ticket/10346] Add drop_tables to perform_schema_changes and add tests
PHPBB3-10346
2011-08-29 14:24:50 -04:00
Oleg Pudeyev
37a659513e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10253] Fix IE9 handling in javascript, to correctly quote text.
2011-08-27 17:49:09 -04:00
Oleg Pudeyev
0d41385344 Merge remote-tracking branch 'nickvergessen/ticket/10253' into develop-olympus
* nickvergessen/ticket/10253:
  [ticket/10253] Fix IE9 handling in javascript, to correctly quote text.
2011-08-27 17:38:27 -04:00
Joas Schilling
6a2b13632d [ticket/10344] Add attachment icons to list of reported and queued posts/topics
PHPBB3-10344
2011-08-27 00:25:38 +02:00
Nils Adermann
2219193096 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10335] Add X-PHPBB-IS-BOT header so reverse proxies know about bots.
2011-08-26 05:59:34 -04:00
Nils Adermann
dc9a771473 Merge remote-tracking branch 'github-bantu/ticket/10335' into develop-olympus
* github-bantu/ticket/10335:
  [ticket/10335] Add X-PHPBB-IS-BOT header so reverse proxies know about bots.
2011-08-26 05:59:13 -04:00
Nils Adermann
73aca1a6fb Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10320] Exclude passworded forums when determining "Most active topic".
  [ticket/10320] Move phpbb_feed_base::get_passworded_forums() to user class.
2011-08-25 23:21:09 -04:00
Nils Adermann
0d4089da7f Merge remote-tracking branch 'github-bantu/ticket/10320' into develop-olympus
* github-bantu/ticket/10320:
  [ticket/10320] Exclude passworded forums when determining "Most active topic".
  [ticket/10320] Move phpbb_feed_base::get_passworded_forums() to user class.
2011-08-25 23:20:55 -04:00
Nils Adermann
459570bcca Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9995] Do not run forum SQL query when marking the whole board read.
  [ticket/9995] Always continue when harvesting $forum_ids for markread().
  [ticket/9995] Remove useless statement from display_forums()

Conflicts:
	phpBB/includes/functions_display.php
2011-08-25 23:16:31 -04:00
Andreas Fischer
7ae871dfae [ticket/9995] Do not run forum SQL query when marking the whole board read.
PHPBB3-9995
2011-08-26 03:59:39 +02:00
Andreas Fischer
afc35f610d [ticket/9995] Always continue when harvesting $forum_ids for markread().
PHPBB3-9995
2011-08-26 03:32:36 +02:00
Andreas Fischer
e4e854863f [ticket/9995] Remove useless statement from display_forums()
The $forum_ids array is only used if $mark_read == 'forums'.

When $mark_read == 'forums', we either continue when
$auth->acl_get('f_list', $forum_id) is false or true.

So this statement is never useful.

PHPBB3-9995
2011-08-26 03:29:05 +02:00
Andreas Fischer
c0507c6a9e [ticket/10278] Decrease default timeout of get_remote_file() to 6 seconds.
PHPBB3-10278
2011-08-25 20:39:35 +02:00
Andreas Fischer
29a23ae217 [ticket/10278] Return with a timeout error when fread() or fgets() time out.
PHPBB3-10278
2011-08-25 20:34:01 +02:00
Andreas Fischer
2ffdf56bfe [ticket/10278] Also set timeout on stream in get_remote_file().
From the PHP manual for fsockopen():
If you need to set a timeout for reading/writing data over the socket, use
stream_set_timeout(), as the timeout parameter to fsockopen() only applies
while connecting the socket.
http://www.php.net/manual/en/function.fsockopen.php

PHPBB3-10278
2011-08-25 20:14:49 +02:00
Andreas Fischer
4499be5795 [ticket/10341] Also show forum/topic name of "0" as most active forum/topic.
PHPBB3-10341
2011-08-25 17:44:45 +02:00
Andreas Fischer
4f8bb02a57 [ticket/10320] Exclude passworded forums when determining "Most active topic".
PHPBB3-10320
2011-08-25 17:33:39 +02:00
Andreas Fischer
4491746c73 [ticket/10320] Move phpbb_feed_base::get_passworded_forums() to user class.
PHPBB3-10320
2011-08-25 17:12:42 +02:00