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

12042 Commits

Author SHA1 Message Date
Andreas Fischer
76f3d08383 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10315] Add top/bottom margin to the options in ACP to avoid overlapping
2011-09-27 20:58:17 +02:00
Andreas Fischer
dad7aa9593 Merge remote-tracking branch 'nickvergessen/ticket/10315' into develop-olympus
* nickvergessen/ticket/10315:
  [ticket/10315] Add top/bottom margin to the options in ACP to avoid overlapping
2011-09-27 20:57:55 +02:00
Andreas Fischer
887a9e583f Merge remote-tracking branch 'cs278/ticket/10387' into develop
* cs278/ticket/10387:
  [ticket/10387] Add CURRENT_PAGE var to the template when pagination is used.
2011-09-27 20:29:03 +02:00
Andreas Fischer
9e35eb2e1f Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10394] Remove call-time pass by reference from tests for PHP 5.4
2011-09-27 20:24:24 +02:00
Andreas Fischer
af66fbb93b Merge branch 'develop' of git://github.com/phpbb/phpbb3 into develop
* 'develop' of git://github.com/phpbb/phpbb3:
  [ticket/10392] Alter parent namespace stripping.
  [ticket/10392] Test for magic loop variables with nested namespaces.
  [ticket/10392] Missed fix for S_BLOCK_NAME.
  [ticket/10392] Fix access to nested special block variables.
2011-09-27 20:24:16 +02:00
Andreas Fischer
13b718e720 Merge remote-tracking branch 'naderman/ticket/10394' into develop-olympus
* naderman/ticket/10394:
  [ticket/10394] Remove call-time pass by reference from tests for PHP 5.4
2011-09-27 20:21:57 +02:00
Matt Friedman
2dca3c3c27 [ticket/10390] Serve jQuery from Google CDN Yes/No button in ACP
jQuery will now be available via remote CDN from Google. Microsoft and
jQuery CDNs have been removed, so we can simplify this option for the user.
Default mode is NO so the copy of jQuery included with phpBB is served by
default.

PHPBB3-10390
2011-09-27 11:12:11 -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
c6a2d81bd3 [ticket/10390] Drop http protocol for Microsoft's CDN option
Like Google, Microsoft supports both http and https protocols, so we
can drop the protocol alltogether from the url so the Microsoft CDN
will work on both HTTP or HTTPS sites without issue. Also I cleaned
up some of the comments here.

PHPBB3-10390
2011-09-27 11:11:30 -07:00
Matt Friedman
81e8faecbc [ticket/10390] Reword the language for jQuery host/server options
Reword some of the language used for the description and pull-down options
to try and make it more clear to users that they have the option to use
jQuery from their own server with the copy included with phpBB, or from one
of the remote CDN servers.

PHPBB3-10390
2011-09-27 11:10:43 -07:00
Nils Adermann
fd376dfbe6 Merge remote-tracking branch 'github-cs278/ticket/10392' into develop
* github-cs278/ticket/10392:
  [ticket/10392] Alter parent namespace stripping.
  [ticket/10392] Test for magic loop variables with nested namespaces.
  [ticket/10392] Missed fix for S_BLOCK_NAME.
  [ticket/10392] Fix access to nested special block variables.
2011-09-27 17:39:08 +02:00
Nils Adermann
b571b3e032 [ticket/10394] Remove call-time pass by reference from tests for PHP 5.4
PHPBB3-10394
2011-09-27 17:31:24 +02:00
Chris Smith
1f14013093 [ticket/10392] Alter parent namespace stripping.
PHPBB3-10392
2011-09-27 01:06:43 +01:00
Chris Smith
118bc6198e [ticket/10392] Test for magic loop variables with nested namespaces.
PHPBB3-10392
2011-09-27 01:02:58 +01:00
Chris Smith
02a24e2439 [ticket/10392] Missed fix for S_BLOCK_NAME.
PHPBB3-10392
2011-09-27 00:50:53 +01:00
Chris Smith
0f589d9ce4 [ticket/10392] Fix access to nested special block variables.
PHPBB3-10392
2011-09-26 20:52:07 +01:00
Matt Friedman
d4fe81f8f0 [ticket/10390] Fix a type-o - captialize AJAX
AJAX should be capitalized where it appears in the ACP as the
option: "Google AJAX API CDN"

PHPBB3-10390
2011-09-26 11:16:38 -07:00
Matt Friedman
abb0f3f96d [ticket/10390] Improve the jQuery CDN url generation function
Per p's comments, return the remote url from a variable instead of
using multiple returns. Also put the logic for creating Google's version
on its own line, and count the version number's dots instead of length
so it will be less likely to break if jQuery goes to version 1.10.

PHPBB3-10390
2011-09-26 11:16:10 -07:00
Matt Friedman
39840ef36d [ticket/10390] Move jQuery version definition
Move jQuery version definition to its own block

PHPBB3-10390
2011-09-26 11:15:47 -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
Cullen Walsh
6fce68b9b6 [ticket/9661] Remove eval() from functions_privmsgs.php
Tested by sending messages to myself on a test board.

PHPBB3-9661
2011-09-25 23:04:18 -07:00
Chris Smith
81f9385477 [ticket/9307] Add config variable to installation schema.
PHPBB3-9307
2011-09-25 22:13:43 +01:00
Chris Smith
ee5d585fe9 [ticket/10387] Add CURRENT_PAGE var to the template when pagination is used.
PHPBB3-10387
2011-09-25 13:11:24 +01:00
Chris Smith
138d1050fc [ticket/9307] Remove hardcoded chunk size of mass emails.
The new config option is 'email_max_chunk_size' I have not added
an interface option to change this.

PHPBB3-9307
2011-09-24 22:05:40 +01:00
Andreas Fischer
d01c028c1c Merge remote-tracking branch 'cs278/ticket/10384' into develop
* cs278/ticket/10384:
  [ticket/10384] Language variable replacements should not check for var prefix.
  [ticket/10384] Update unit tests to test for failing variable.
2011-09-24 22:21:05 +02:00
Chris Smith
e9392bbdde [ticket/10384] Language variable replacements should not check for var prefix.
PHPBB3-10384
2011-09-24 20:50:35 +01:00
Chris Smith
fbb5c641b8 [ticket/10384] Update unit tests to test for failing variable.
PHPBB3-10384
2011-09-24 20:48:37 +01:00
Andreas Fischer
5e768036f7 Merge remote-tracking branch 'cs278/ticket/10375' into develop
* cs278/ticket/10375:
  [ticket/10375] Rework $source_file setting.
  [ticket/10375] Make _tpl_load() a little leaner.
  [ticket/10375] Use existing method to generate cache file name.
2011-09-23 03:40:02 +02:00
Igor Wiedler
6c038d0499 Merge remote-tracking branch 'cs278/ticket/10152' into develop
* cs278/ticket/10152:
  [ticket/10152] Remove end '?>' from generated config.php.
2011-09-21 18:13:09 +02: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
95d24e6fb7 [ticket/10375] Rework $source_file setting.
Only set the file if an mtime check or recompile are required.

PHPBB3-10375
2011-09-21 13:24:04 +01:00
Chris Smith
9d5e9af54b [ticket/10375] Make _tpl_load() a little leaner.
- Removed duplicate variables
- Set $source_file earlier for cache checks
- Fixed useless mtime check

PHPBB3-10375
2011-09-21 13:17:51 +01:00
Chris Smith
25aee49ca5 [ticket/10375] Use existing method to generate cache file name.
PHPBB3-10375
2011-09-21 13:17:10 +01:00
Chris Smith
e95aec1637 [ticket/10152] Remove end '?>' from generated config.php.
PHPBB3-10152
2011-09-21 08:36:53 +01:00
Nils Adermann
fab0ec64b3 Merge remote-tracking branch 'github-cs278/feature/remove-db-styles' into develop
* github-cs278/feature/remove-db-styles:
  [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.
2011-09-21 01:09:18 +02:00
Joas Schilling
5b66413f69 [ticket/10315] Add top/bottom margin to the options in ACP to avoid overlapping
PHPBB3-10315
2011-09-21 01:02:28 +02:00
Nils Adermann
207f249521 Merge remote-tracking branch 'github-cs278/ticket/10374' into develop
* github-cs278/ticket/10374:
  [ticket/10374] Remove 'custom template' cache prefix.
2011-09-21 00:41:17 +02:00
Chris Smith
903bc5b78a [ticket/10374] Remove 'custom template' cache prefix.
PHPBB3-10374
2011-09-20 23:33:08 +01:00
Chris Smith
7b7a56dc4a [feature/remove-db-styles] Remove forgotten template variables.
PHPBB3-9741
2011-09-20 23:15:30 +01:00
Chris Smith
c184fb86c9 [feature/remove-db-styles] Removed style.php!
Finally sanity has arrived! No more delivering CSS through PHP. Better
3 years late than never.

PHPBB3-9741
2011-09-20 23:12:07 +01:00
Chris Smith
ee994b2968 [feature/remove-db-styles] Rework filesystem permission checks from 6d24a71.
PHPBB3-9741
2011-09-20 23:01:55 +01:00
Chris Smith
8b21983222 [feature/remove-db-styles] Update language to reflect removal of db storage.
PHPBB3-9741
2011-09-20 22:42:52 +01:00
Chris Smith
58c3556e19 [feature/remove-db-styles] Mark log entrys as deprecated.
PHPBB3-9741
2011-09-20 22:42:17 +01:00
Chris Smith
6d24a7191f [feature/remove-db-styles] Add error if template/theme file is unwritable.
PHPBB3-9741
2011-09-20 22:18:06 +01:00
Chris Smith
cb245f5d04 [feature/remove-db-styles] Add schema changes sinces 3.0.x.
PHPBB3-9741
2011-09-20 21:06:53 +01:00
Chris Smith
364a69adc2 [feature/remove-db-styles] Readd table constant for upgrades etc.
Removed in f23b224b946b37c171add5953e832641bbb3a5c3.

PHPBB3-9741
2011-09-20 21:06:53 +01:00
Chris Smith
270cd839a6 [feature/remove-db-styles] Update database schemas.
Removes:
* styles_template_data table
* template_storedb on styles_template table
* On styles_theme table:
  - theme_storedb
  - theme_mtime
  - theme_data

PHPBB3-9741
2011-09-20 21:06:52 +01:00
Chris Smith
934a9da313 [feature/remove-db-styles] Remove style.php DB storage.
Removed all use of the DB for serving/caching the theme from style.php,
acp_style no longer stores the theme modified time either.

As a consequence currently all stylesheets will be served through style.php
(with no caching) until imagesets are removed [PHPBB3-10336], then
they can we served as static files by HTTPd.

PHPBB3-9741
2011-09-20 21:06:52 +01: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
Chris Smith
267daf0c39 [feature/remove-db-styles] Remove DB theme handling code from session.
PHPBB3-9741
2011-09-20 21:06:52 +01:00