aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [feature/extension-manager] Porting cron tasks over to the extension finderNils Adermann2011-09-2911-147/+102
| | | | PHPBB3-10323
* [feature/extension-manager] Extension Manager & FinderNils Adermann2011-09-2934-15/+1049
| | | | | | | Extensions RFC: http://area51.phpbb.com/phpBB/viewtopic.php?f=84&t=41499 Ticket: http://tracker.phpbb.com/browse/PHPBB3-10323 PHPBB3-10323
* Merge branch 'develop-olympus' into developAndreas Fischer2011-09-271-2/+2
|\ | | | | | | | | * develop-olympus: [ticket/10394] Use call_user_func_array to pass a ref into a dynamic function
| * Merge remote-tracking branch 'naderman/ticket/10394' into develop-olympusAndreas Fischer2011-09-271-2/+2
| |\ | | | | | | | | | | | | * naderman/ticket/10394: [ticket/10394] Use call_user_func_array to pass a ref into a dynamic function
| | * [ticket/10394] Use call_user_func_array to pass a ref into a dynamic functionNils Adermann2011-09-271-2/+2
| | | | | | | | | | | | PHPBB3-10394
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-09-271-5/+3
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/10315] Add top/bottom margin to the options in ACP to avoid overlapping
| * | Merge remote-tracking branch 'nickvergessen/ticket/10315' into develop-olympusAndreas Fischer2011-09-271-5/+3
| |\ \ | | | | | | | | | | | | | | | | * nickvergessen/ticket/10315: [ticket/10315] Add top/bottom margin to the options in ACP to avoid overlapping
| | * | [ticket/10315] Add top/bottom margin to the options in ACP to avoid overlappingJoas Schilling2011-09-211-5/+3
| | | | | | | | | | | | | | | | PHPBB3-10315
* | | | Merge remote-tracking branch 'cs278/ticket/10387' into developAndreas Fischer2011-09-271-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * cs278/ticket/10387: [ticket/10387] Add CURRENT_PAGE var to the template when pagination is used.
| * | | | [ticket/10387] Add CURRENT_PAGE var to the template when pagination is used.Chris Smith2011-09-251-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10387
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-09-272-3/+3
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * develop-olympus: [ticket/10394] Remove call-time pass by reference from tests for PHP 5.4
| * | | | Merge remote-tracking branch 'naderman/ticket/10394' into develop-olympusAndreas Fischer2011-09-272-3/+3
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | * naderman/ticket/10394: [ticket/10394] Remove call-time pass by reference from tests for PHP 5.4
| | * | | [ticket/10394] Remove call-time pass by reference from tests for PHP 5.4Nils Adermann2011-09-272-3/+3
| |/ / / | | | | | | | | | | | | PHPBB3-10394
* | | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into developAndreas Fischer2011-09-273-7/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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.
| * \ \ \ Merge remote-tracking branch 'github-cs278/ticket/10392' into developNils Adermann2011-09-273-7/+17
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
| | * | | [ticket/10392] Alter parent namespace stripping.Chris Smith2011-09-271-2/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-10392
| | * | | [ticket/10392] Test for magic loop variables with nested namespaces.Chris Smith2011-09-272-2/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-10392
| | * | | [ticket/10392] Missed fix for S_BLOCK_NAME.Chris Smith2011-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10392
| | * | | [ticket/10392] Fix access to nested special block variables.Chris Smith2011-09-261-4/+6
| |/ / / | | | | | | | | | | | | PHPBB3-10392
* | | | Merge remote-tracking branch 'cs278/ticket/10384' into developAndreas Fischer2011-09-243-7/+10
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | * cs278/ticket/10384: [ticket/10384] Language variable replacements should not check for var prefix. [ticket/10384] Update unit tests to test for failing variable.
| * | | [ticket/10384] Language variable replacements should not check for var prefix.Chris Smith2011-09-241-2/+3
| | | | | | | | | | | | | | | | PHPBB3-10384
| * | | [ticket/10384] Update unit tests to test for failing variable.Chris Smith2011-09-242-5/+7
| | | | | | | | | | | | | | | | PHPBB3-10384
* | | | Merge remote-tracking branch 'cs278/ticket/10375' into developAndreas Fischer2011-09-231-16/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
| * | | | [ticket/10375] Rework $source_file setting.Chris Smith2011-09-211-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only set the file if an mtime check or recompile are required. PHPBB3-10375
| * | | | [ticket/10375] Make _tpl_load() a little leaner.Chris Smith2011-09-211-19/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed duplicate variables - Set $source_file earlier for cache checks - Fixed useless mtime check PHPBB3-10375
| * | | | [ticket/10375] Use existing method to generate cache file name.Chris Smith2011-09-211-2/+1
| |/ / / | | | | | | | | | | | | PHPBB3-10375
* | | | Merge remote-tracking branch 'cs278/ticket/10152' into developIgor Wiedler2011-09-211-1/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * cs278/ticket/10152: [ticket/10152] Remove end '?>' from generated config.php.
| * | | | [ticket/10152] Remove end '?>' from generated config.php.Chris Smith2011-09-211-1/+0
| |/ / / | | | | | | | | | | | | PHPBB3-10152
* | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into developIgor Wiedler2011-09-21228-3532/+1876
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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. ...
| * | | Merge remote-tracking branch 'github-cs278/feature/remove-db-styles' into ↵Nils Adermann2011-09-2122-1168/+135
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | [feature/remove-db-styles] Remove forgotten template variables.Chris Smith2011-09-201-6/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-9741
| | * | | [feature/remove-db-styles] Removed style.php!Chris Smith2011-09-202-165/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Finally sanity has arrived! No more delivering CSS through PHP. Better 3 years late than never. PHPBB3-9741
| | * | | [feature/remove-db-styles] Rework filesystem permission checks from 6d24a71.Chris Smith2011-09-201-18/+52
| | | | | | | | | | | | | | | | | | | | PHPBB3-9741
| | * | | [feature/remove-db-styles] Update language to reflect removal of db storage.Chris Smith2011-09-201-18/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-9741
| | * | | [feature/remove-db-styles] Mark log entrys as deprecated.Chris Smith2011-09-201-0/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-9741
| | * | | [feature/remove-db-styles] Add error if template/theme file is unwritable.Chris Smith2011-09-202-29/+26
| | | | | | | | | | | | | | | | | | | | PHPBB3-9741
| | * | | [feature/remove-db-styles] Add schema changes sinces 3.0.x.Chris Smith2011-09-201-1/+10
| | | | | | | | | | | | | | | | | | | | PHPBB3-9741
| | * | | [feature/remove-db-styles] Readd table constant for upgrades etc.Chris Smith2011-09-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed in f23b224b946b37c171add5953e832641bbb3a5c3. PHPBB3-9741
| | * | | [feature/remove-db-styles] Update database schemas.Chris Smith2011-09-209-149/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes: * styles_template_data table * template_storedb on styles_template table * On styles_theme table: - theme_storedb - theme_mtime - theme_data PHPBB3-9741
| | * | | [feature/remove-db-styles] Remove style.php DB storage.Chris Smith2011-09-203-69/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | [feature/remove-db-styles] Remove parse_css_file option from themes.Chris Smith2011-09-202-7/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-9741
| | * | | [feature/remove-db-styles] Remove DB theme handling code from session.Chris Smith2011-09-201-49/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-9741
| | * | | [feature/remove-db-styles] ACP has forgotten how to store themes in the DB.Chris Smith2011-09-201-120/+22
| | | | | | | | | | | | | | | | | | | | PHPBB3-9741
| | * | | [feature/remove-db-styles] Missed a few template DB bits in acp_styles.Chris Smith2011-09-201-23/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-9741
| | * | | [feature/remove-db-styles] Removing unused methods from acp_style.Chris Smith2011-09-201-176/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These got left behind in 6854d47. PHPBB3-9741
| | * | | [feature/remove-db-styles] Removed database storage of style components.Chris Smith2011-09-209-373/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bulk of database storage of templates is removed, rendering template stored in the database as useless. Theme database storage is reduced to a skeleton for full removal soon. This commit was cherry picked from the old feature/ascraeus-experiment branch the old commit hash is 0dbe7e3b6cd450342d3c566eb2caf36ca1b5db8e. PHPBB3-9741
| * | | | Merge remote-tracking branch 'github-cs278/ticket/10374' into developNils Adermann2011-09-211-1/+1
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * github-cs278/ticket/10374: [ticket/10374] Remove 'custom template' cache prefix.
| | * | | [ticket/10374] Remove 'custom template' cache prefix.Chris Smith2011-09-201-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10374
| * | | | Merge remote-tracking branch 'github-cyberalien/ticket/10371' into developNils Adermann2011-09-202-15/+1
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * github-cyberalien/ticket/10371: [ticket/10371] Removing last mentions of imageset
| | * | | [ticket/10371] Removing last mentions of imagesetVjacheslav Trushkin2011-09-202-15/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | Removing last mentions of imageset PHPBB3-10371