Commit graph

899 commits

Author SHA1 Message Date
Nils Adermann
e11caec2a0 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10187] XHTML fix for empty groups in UCP.
2011-10-14 02:51:32 +02:00
Andreas Fischer
3ad5c45097 [ticket/10187] XHTML fix for empty groups in UCP.
PHPBB3-10187
2011-10-13 21:11:58 +02:00
Andreas Fischer
baf09125ab Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10408] Layout of topics/attachments list is broken in UCP and MCP
2011-10-13 17:10:38 +02:00
Joas Schilling
88aacd0f2c [ticket/10408] Layout of topics/attachments list is broken in UCP and MCP
PHPBB3-10408
2011-10-13 15:52:12 +02:00
Matt Friedman
2d0f96e8cc [ticket/10390] Revert back to escaped script tags inside document.write
Revert all script tags inside a document.write back to the escaped
version so they won't trip up any XML parsers.

PHPBB3-10390
2011-10-05 21:24:34 -07:00
Matt Friedman
2a28b6fc40 [ticket/10390] Use simpler HTML5 compliant js for the jQuery fallback
HTML5 styles (ACP / Prosilver) do not need to use escaped javascript
wrapped in an unescape function, so we can simplify it! Only subsilver2 will
use the escaped version of the fallback code, because it is still XHTML.

PHPBB3-10390
2011-09-27 11:11:42 -07:00
Matt Friedman
56c6476233 [ticket/10390] Allow option for jQuery to be hosted by a remote CDN
Add an option to the ACP so admins can choose to host jQuery
from the local version shipped with phpBB, or via a popular CDN.

PHPBB3-10390
2011-09-26 11:15:22 -07:00
Igor Wiedler
e41f9c9329 Merge branch 'develop' of github.com:phpbb/phpbb3 into develop
* 'develop' of github.com:phpbb/phpbb3: (44 commits)
  [ticket/10374] Remove 'custom template' cache prefix.
  [feature/remove-db-styles] Remove forgotten template variables.
  [feature/remove-db-styles] Removed style.php!
  [feature/remove-db-styles] Rework filesystem permission checks from 6d24a71.
  [feature/remove-db-styles] Update language to reflect removal of db storage.
  [feature/remove-db-styles] Mark log entrys as deprecated.
  [feature/remove-db-styles] Add error if template/theme file is unwritable.
  [feature/remove-db-styles] Add schema changes sinces 3.0.x.
  [feature/remove-db-styles] Readd table constant for upgrades etc.
  [feature/remove-db-styles] Update database schemas.
  [feature/remove-db-styles] Remove style.php DB storage.
  [feature/remove-db-styles] Remove parse_css_file option from themes.
  [feature/remove-db-styles] Remove DB theme handling code from session.
  [feature/remove-db-styles] ACP has forgotten how to store themes in the DB.
  [feature/remove-db-styles] Missed a few template DB bits in acp_styles.
  [feature/remove-db-styles] Removing unused methods from acp_style.
  [feature/remove-db-styles] Removed database storage of style components.
  [ticket/10371] Removing last mentions of imageset
  [ticket/10370] Add function documentation for get_stacktrace().
  [ticket/10370] Explain that we are not the ones hiding backtrace pieces.
  ...
2011-09-21 18:12:07 +02:00
Chris Smith
b1df91db80 [feature/remove-db-styles] Remove parse_css_file option from themes.
PHPBB3-9741
2011-09-20 21:06:52 +01:00
Nils Adermann
4e8e31c10b Merge remote-tracking branch 'github-cyberalien/feature/remove-imagesets' into develop
* github-cyberalien/feature/remove-imagesets:
  [feature/remove-imagesets] Script for converting imageset to css
  [feature/remove-imagesets] Changing subsilver
  [feature/remove-imagesets] Changing prosilver
  [feature/remove-imagesets] Adjustments to php files
  [feature/remove-imagesets] Changing admin control panel styles module
  [feature/remove-imagesets] Changing database structure
  [feature/remove-imagesets] Removing imageset files
  [feature/remove-imagesets] Moving images
2011-09-20 21:26:37 +02:00
Andreas Fischer
054947adc0 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10324] Fixed XHTML validity error in User Notes Prosilver theme
2011-09-17 23:34:44 +02:00
galaxyAbstractor
94a0b7ef2e [ticket/10324] Fixed XHTML validity error in User Notes Prosilver theme
Replaced the deprecated align and width attributes with CSS.

PHPBB3-10324
2011-09-17 21:59:11 +02:00
Igor Wiedler
47bb42e2f0 Merge remote-tracking branch 'VSEphpbb/ticket/10362' into develop
* VSEphpbb/ticket/10362:
  [ticket/10362] Revert subsilver2 changes
  [ticket/10362] HTML5 Fix - Replace name attribute with id in anchors
2011-09-14 10:27:52 +02:00
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
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
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
Vjacheslav Trushkin
57fac62c0c [feature/remove-imagesets] Changing prosilver
Removing imagesets. Changing prosilver

PHPBB3-10336
2011-09-04 11:05:09 +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
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
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
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
Joas Schilling
53e0e3240c [ticket/10339] Remove invalid template loop variable from mcp_front.html
PHPBB3-10339
2011-08-24 10:33:12 +02:00
Andreas Fischer
ad20758916 [ticket/9474] Remove unused/unreferenced mcp_viewlogs.html files.
PHPBB3-9474
2011-08-23 00:11:15 +02:00
Oleg Pudeyev
19ee2d2d40 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9978] Added semicolons to JavaScript in overall_header.
2011-08-20 14:25:37 -04:00
Oleg Pudeyev
1680b3a2a7 Merge remote-tracking branch 'callumacrae/ticket/9978' into develop-olympus
* callumacrae/ticket/9978:
  [ticket/9978] Added semicolons to JavaScript in overall_header.
2011-08-20 14:17:31 -04:00
Callum Macrae
b18b3363e9 [ticket/9978] Added semicolons to JavaScript in overall_header.
Semicolons have been added to the anonymous functions in the javascript
in overall_header.html. This makes JSLint happier, and also makes the
code easier to minify.

PHPBB3-9978
2011-08-20 11:20:30 +01:00
Nils Adermann
d06dcd69e6 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/8571] Show age as 0 in birthday list when birthday is in the future.
  [ticket/8571] Show 'Age: 0' on viewprofile when birthday is in the future.
  [ticket/8571] Also display age on memberlist/viewprofile when age is 0.

Conflicts:
	phpBB/index.php
2011-08-18 17:46:31 -04:00
Nils Adermann
6330153937 Merge remote-tracking branch 'github-bantu/ticket/8571' into develop-olympus
* github-bantu/ticket/8571:
  [ticket/8571] Show age as 0 in birthday list when birthday is in the future.
  [ticket/8571] Show 'Age: 0' on viewprofile when birthday is in the future.
  [ticket/8571] Also display age on memberlist/viewprofile when age is 0.
2011-08-18 17:43:24 -04:00
Erik Frèrejean
e9c4370444 [ticket/10312] Un-check the shadow option while moving.
Don't create a shadow topic by default when moving a topic
the user should have the option to do this but it shouldn't
be done by default.

PHPBB3-10312
2011-08-10 14:42:05 +02:00
Oleg Pudeyev
124b8a92ec Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/8173] Removed some redundant code in the BBCode JavaScript.
2011-07-30 19:37:24 -04:00
Oleg Pudeyev
edb745e951 Merge remote-tracking branch 'callumacrae/ticket/8173' into develop-olympus
* callumacrae/ticket/8173:
  [ticket/8173] Removed some redundant code in the BBCode JavaScript.

Conflicts:
	phpBB/adm/style/acp_users_signature.html
2011-07-30 19:33:41 -04:00
Oleg Pudeyev
a8ee16b82d Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10293] Fixed the JavaScript in the jumpbox.
2011-07-30 18:36:15 -04:00
Oleg Pudeyev
7ebec68616 Merge remote-tracking branch 'callumacrae/ticket/10293' into develop-olympus
* callumacrae/ticket/10293:
  [ticket/10293] Fixed the JavaScript in the jumpbox.
2011-07-30 18:36:04 -04:00
Joas Schilling
e0bb46c852 [ticket/10253] Fix IE9 handling in javascript, to correctly quote text.
Since IE9 IE supports textarea.selectionStart and window.getSelection.
The only problem is, that the values are still incorrect.
Therefore we need to ensure that it is still treated the old way,
until IE fixes this completely.

PHPBB3-10253
2011-07-30 19:35:45 +02:00
Andreas Fischer
366b14b6c5 Merge remote-tracking branch 'igorw/ticket/10258' into develop
* igorw/ticket/10258:
  [ticket/10258] Add HTML5 meta charset tag
2011-07-30 16:49:39 +02:00
Callum Macrae
9c6339fb57 [ticket/8173] Removed some redundant code in the BBCode JavaScript.
The following code can be found in the ACP, when changing a user's
signature:

t: '{ BBCODE_T_HELP }',

The code that uses it and the code that produces it were changed or
removed a while ago, but this code remained. In 2c4c1f9, the accesskey
for the list item button was changed to y from t, explaining the origin of
the redundant code - although it wasn't being used then, either.

This commit also changes the helpline code of "[*]" to y, as the access
key is y, so this makes it more consistent.

PHPBB3-8173
2011-07-30 08:57:17 +01:00
Oleg Pudeyev
b960dd4e0d Merge remote-tracking branch 'callumacrae/ticket/10032' into develop-olympus
* callumacrae/ticket/10032:
  [ticket/10032] Fixed typos in bbcode button name.
2011-07-30 00:48:03 -04:00
Oleg Pudeyev
45b19e6419 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10032] Fixed typos in bbcode button name.
2011-07-30 00:45:31 -04:00
Oleg Pudeyev
43b5ca32be Merge remote-tracking branch 'callumacrae/ticket/10032' into develop-olympus
* callumacrae/ticket/10032:
  [ticket/10032] Fixed typos in bbcode button name.
2011-07-30 00:45:17 -04:00
Igor Wiedler
681c4a478d [ticket/10258] Add HTML5 meta charset tag
This allows knowing the charset when saving web pages to disk. Also, this is
supported by all browsers.

PHPBB3-10258
2011-07-29 16:32:22 +02:00
Callum Macrae
7e01850a42 [ticket/10293] Fixed the JavaScript in the jumpbox.
The current code is invalid, and results in an critical error which
aborts the script before it gets to return false, thus allowing the form
to submit with an invalid forum ID. This commit fixes that by
referencing "this" instead of "document.jumpbox", which didn't exist
because the form had no name.

PHPBB3-10293
2011-07-26 13:43:52 +01:00
Nils Adermann
ddbad5551d Merge remote-tracking branch 'github-igorw/ticket/10258' into develop
* github-igorw/ticket/10258:
  [ticket/10258] Remove the meta charset tag
  [ticket/10258] Adjust some deprecated tags for HTML5 in coding-guidelines
  [ticket/10258] Remove copyright meta tag from docs
  [ticket/10258] Remove resource-type and distribution meta tags
  [ticket/10258] Remove X-UA-Compatible and imagetoolbar meta tags
  [ticket/10258] Change the DOCTYPE to HTML5
2011-07-20 09:21:16 -04:00
Andreas Fischer
b4949675bf [ticket/8571] Also display age on memberlist/viewprofile when age is 0.
PHPBB3-8571
2011-07-20 00:31:45 +02:00