makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-16 00:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
30449 commits 18 branches 192 tags 206 MiB
Commit graph

3847 commits

Author SHA1 Message Date
Andreas Fischer
9d7b144c54 Merge remote-tracking branch 'bantu/ticket/10254' into develop-olympus 
* bantu/ticket/10254:
  [ticket/10254] Add "phpBB Group" to "Modified by" in prosilver stylesheet.css
  [ticket/10254] Removing the subsilver2 NOTE, incompatible with phpBB.com.
  [ticket/10254] Removing the NOTE as it is incompatible with phpBB.com.
  [ticket/10254] Remove subsilver2 as default style on theme.
  [ticket/10254] Remove style names from themes and fix some informations on it.
 2011-11-14 13:44:38 +01:00
Andreas Fischer
e543effc64 [ticket/10254] Add "phpBB Group" to "Modified by" in prosilver stylesheet.css 
PHPBB3-10254
 2011-11-14 13:32:54 +01:00
maelsoucaze
cf044c363b [ticket/10254] Removing the subsilver2 NOTE, incompatible with phpBB.com. 
PHPBB3-10254
 2011-11-14 13:29:38 +01:00
maelsoucaze
4d760630c3 [ticket/10254] Removing the NOTE as it is incompatible with phpBB.com. 
PHPBB3-10254
 2011-11-14 13:29:28 +01:00
maelsoucaze
c79992d1cc [ticket/10254] Remove subsilver2 as default style on theme. 
PHPBB3-10254
 2011-11-14 13:29:18 +01:00
maelsoucaze
dee836315c [ticket/10254] Remove style names from themes and fix some informations on it. 
PHPBB3-10254
 2011-11-14 13:28:42 +01:00
Andreas Fischer
d3a1b670bd Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/7138] Allow simple header and footer for trigger_error() messages

Conflicts:
	phpBB/styles/prosilver/template/message_body.html
 2011-11-13 20:28:29 +01:00
Raimon
65921ae67a [ticket/10453] PM viewmessage page is misplacing the online icon 
PHPBB3-10453

http://tracker.phpbb.com/browse/PHPBB3-10453
 2011-11-13 20:10:51 +01:00
David King
b371d62dd3 [ticket/7138] Allow simple header and footer for trigger_error() messages 
Adds a template condition using S_SIMPLE_MESSAGE that must be set to true
before calling trigger_error() which will automatically use the simple
header and footer files in the template directory instead of the overall
header and footer files.

PHPBB3-7138
 2011-11-13 16:30:11 +01:00
Andreas Fischer
5546e8cf57 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/7932] Fix font size in select boxes
 2011-11-01 20:24:00 +01:00
Andreas Fischer
945a63d204 Merge remote-tracking branch 'nickvergessen/ticket/7932' into develop-olympus 
* nickvergessen/ticket/7932:
  [ticket/7932] Fix font size in select boxes
 2011-11-01 20:23:20 +01:00
Joas Schilling
cf49b5f46f [ticket/7932] Fix font size in select boxes 
PHPBB3-7932
 2011-10-29 23:32:47 +02:00
Igor Wiedler
27a80d0379 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10422] Invalid "if" in viewtopic_body.html
 2011-10-29 12:35:44 +02:00
Joas Schilling
219bdbaf70 [ticket/8996] Correctly apply BBCodes in IE6-9 when applying with accesskey 
PHPBB3-8996
 2011-10-29 01:27:12 +02:00
Oleg Pudeyev
83d71ecb88 Merge remote-tracking branch 'VSEphpbb/ticket/10390' into develop 
* VSEphpbb/ticket/10390:
  [ticket/10390] Revert back to escaped script tags inside document.write
  [ticket/10390] Fix wording: fallback should be fall back
  [ticket/10390] Serve jQuery from Google CDN Yes/No button in ACP
  [ticket/10390] Use simpler HTML5 compliant js for the jQuery fallback
  [ticket/10390] Drop http protocol for Microsoft's CDN option
  [ticket/10390] Reword the language for jQuery host/server options
  [ticket/10390] Fix a type-o - captialize AJAX
  [ticket/10390] Improve the jQuery CDN url generation function
  [ticket/10390] Move jQuery version definition
  [ticket/10390] Allow option for jQuery to be hosted by a remote CDN

Conflicts:
	phpBB/install/database_update.php
 2011-10-20 20:46:48 -04:00
Vjacheslav Trushkin
c8399b8e30 [ticket/10422] Invalid "if" in viewtopic_body.html 
Fixing incorrect "IF" in viewtopic_body.html

PHPBB3-10422
 2011-10-18 21:37:51 +03:00
Joas Schilling
ab8ecf5b92 [ticket/9956] Display error message if no disapprove reason given 
PHPBB3-9956
 2011-10-14 04:18:44 +02:00
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
Vjacheslav Trushkin
e38fd2b9f2 [ticket/10371] Removing last mentions of imageset 
Removing last mentions of imageset

PHPBB3-10371
 2011-09-20 22:56:53 +03: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
b8da68385e [ticket/10362] Revert subsilver2 changes 
If subsilver2 will remain at XHTML then we do not need to make any
changes to its files.

PHPBB3-10362
 2011-09-13 21:12:34 -07: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
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
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