diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-09-05 06:03:19 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-09-05 06:03:19 -0400 |
| commit | 145bc230440f3a1a8d3252cfbfb767678d085320 (patch) | |
| tree | 451833c03814530e0a4b1aaad069fb5ba4ae4fcb /phpBB/docs | |
| parent | 367fe0b4cff31fc11185b84bc7e9e7936fe470e9 (diff) | |
| parent | b98fca54b0fd0e9aaca2f0f12ae9bcae14d014ec (diff) | |
| download | forums-145bc230440f3a1a8d3252cfbfb767678d085320.tar forums-145bc230440f3a1a8d3252cfbfb767678d085320.tar.gz forums-145bc230440f3a1a8d3252cfbfb767678d085320.tar.bz2 forums-145bc230440f3a1a8d3252cfbfb767678d085320.tar.xz forums-145bc230440f3a1a8d3252cfbfb767678d085320.zip | |
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
Diffstat (limited to 'phpBB/docs')
| -rw-r--r-- | phpBB/docs/AUTHORS | 1 | ||||
| -rw-r--r-- | phpBB/docs/coding-guidelines.html | 1 | ||||
| -rw-r--r-- | phpBB/docs/hook_system.html | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/docs/AUTHORS b/phpBB/docs/AUTHORS index 81bc9f52e6..723981b6b7 100644 --- a/phpBB/docs/AUTHORS +++ b/phpBB/docs/AUTHORS @@ -72,6 +72,7 @@ phpMyAdmin (c) 2001,2003 phpMyAdmin Devel team, http://www.phpmyadmin.net/ Jabber Class (c) 2006 Flyspray.org, http://www.flyspray.org/ Chora (c) 2000-2006, The Horde Project. http://horde.org/chora/ Horde Project (c) 2000-2006, The Horde Project. http://horde.org/ +jQuery (c) 2011, John Resig. http://jquery.com/ PHP License, version 3.0: Pear (c) 2001-2004 PHP Group, http://pear.php.net diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html index 6f952368ee..e8378e420c 100644 --- a/phpBB/docs/coding-guidelines.html +++ b/phpBB/docs/coding-guidelines.html @@ -262,6 +262,7 @@ PHPBB_QA (Set board to QA-Mode, which means the updater also c <p>Path locations for the following template variables are affected by this too:</p> <ul> + <li>{T_ASSETS_PATH} - assets (non-style specific, static resources)</li> <li>{T_THEME_PATH} - styles/xxx/theme</li> <li>{T_TEMPLATE_PATH} - styles/xxx/template</li> <li>{T_SUPER_TEMPLATE_PATH} - styles/xxx/template</li> diff --git a/phpBB/docs/hook_system.html b/phpBB/docs/hook_system.html index 0dc25630a8..20ebe995c5 100644 --- a/phpBB/docs/hook_system.html +++ b/phpBB/docs/hook_system.html @@ -395,6 +395,7 @@ PHPBB_USE_BOARD_URL_PATH (use generate_board_url() for image paths instead of $p <p>Path locations for the following template variables are affected by this too:</p> <ul> + <li>{T_ASSETS_PATH} - assets</li> <li>{T_THEME_PATH} - styles/xxx/theme</li> <li>{T_TEMPLATE_PATH} - styles/xxx/template</li> <li>{T_SUPER_TEMPLATE_PATH} - styles/xxx/template</li> |