aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge PR #985 branch 'imkingdavid/ticket/11088' into developOleg Pudeyev2012-12-125-45/+142
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * imkingdavid/ticket/11088: [ticket/11088] Pass required objects in as arguments [ticket/11088] Globalize objects in new permission function [ticket/11088] Move permission creation to a function [ticket/11088] Copy a_styles permission for a_extensions [ticket/11088] Remove extraneous word from sentence in comment [ticket/11088] Changed "file extensions" to "attachment extensions" [ticket/11088] Fix the database updater to correctly manipulate the modules [ticket/11088] Put language pack module move below extension module creation [ticket/11088] Untested, progress on update script [ticket/11088] Fix typo (period instead of comma) [ticket/11088] Untested progress for update script [ticket/11088] Added missing comma [ticket/11088] Removed added space [ticket/11088] Move style, extension and language pack management to customise
| * [ticket/11088] Pass required objects in as argumentsDavid King2012-12-121-4/+4
| | | | | | | | PHPBB3-11088
| * [ticket/11088] Globalize objects in new permission functionDavid King2012-12-121-3/+4
| | | | | | | | PHPBB3-11088
| * [ticket/11088] Move permission creation to a functionDavid King2012-12-121-72/+66
| | | | | | | | PHPBB3-11088
| * [ticket/11088] Copy a_styles permission for a_extensionsDavid King2012-12-121-1/+1
| | | | | | | | PHPBB3-11088
| * [ticket/11088] Remove extraneous word from sentence in commentDavid King2012-12-121-1/+1
| | | | | | | | PHPBB3-11088
| * [ticket/11088] Changed "file extensions" to "attachment extensions"David King2012-12-121-2/+2
| | | | | | | | PHPBB3-11088
| * [ticket/11088] Fix the database updater to correctly manipulate the modulesDavid King2012-12-122-18/+86
| | | | | | | | PHPBB3-11088
| * [ticket/11088] Put language pack module move below extension module creationDavid King2012-12-121-11/+10
| | | | | | | | PHPBB3-11088
| * [ticket/11088] Untested, progress on update scriptDavid King2012-12-121-29/+20
| | | | | | | | | | | | This should rename Styles category to Customise, move language packs, and add extension management PHPBB3-11088
| * [ticket/11088] Fix typo (period instead of comma)David King2012-12-121-1/+1
| | | | | | | | PHPBB3-11088
| * [ticket/11088] Untested progress for update scriptDavid King2012-12-121-14/+41
| | | | | | | | PHPBB3-11088
| * [ticket/11088] Added missing commaDavid King2012-12-121-1/+1
| | | | | | | | PHPBB3-11088
| * [ticket/11088] Removed added spaceDavid King2012-12-121-1/+1
| | | | | | | | PHPBB3-11088
| * [ticket/11088] Move style, extension and language pack management to customiseDavid King2012-12-125-10/+27
|/ | | | | | | Instead of being separated, these related ACP modules are now grouped intuitively. PHPBB3-11088
* Merge remote-tracking branch 'remotes/imkingdavid/ticket/11243' into developNathan Guse2012-12-111-1/+1
|\
| * [ticket/11243] Show download all link on all pages of topic with attachmentsDavid King2012-12-111-1/+1
|/ | | | PHPBB3-11243
* Merge remote-tracking branch 'p/feature/template-events' into developDavid King2012-12-101-1/+1
|\ | | | | | | | | | | | | | | * p/feature/template-events: [feature/template-events] Pass arguments in correct order. Conflicts: phpBB/includes/style/style.php
| * [feature/template-events] Pass arguments in correct order.Oleg Pudeyev2012-12-101-1/+1
| | | | | | | | | | | | Thank you imkingdavid. PHPBB3-9550
* | Merge remote-tracking branch 'p/feature/template-events' into developDavid King2012-12-1034-27/+388
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Oleg Pudeyev (36) and others # Via Oleg Pudeyev * p/feature/template-events: (47 commits) [feature/template-events] Pass arguments in correct order. [feature/template-events] Order extensions in mock extension manager. [feature/template-events] Changes per imkingdavid's review. [feature/template-events] Make style names private on template. [feature/template-events] Test for event that is defined in parent style only. [feature/template-events] Specify style names, add inheritance tests. [feature/template-events] Normalize expected directory trees. [feature/template-events] Allow dataset to be correctly selectable. [feature/template-events] Dataset for template event testing with inheritance. [feature/template-events] Use style names array in template filter. [feature/template-events] Generate style names array in set_style. [feature/template-events] Convert a single style name to array of them. [feature/template-events] Chase dependency injection for template context. [feature/template-events] Adjust template events test to use the dataset. [feature/template-events] Create a dataset for template event tests. [feature/template-events] Indentation fix. [feature/template-events] Cosmetic changes. [feature/template-events] Wording: wrongly -> improperly. [feature/template-events] Indentation fix. [feature/template-events] Rename template_name to style_name. ...
| * | [feature/template-events] Pass arguments in correct order.Oleg Pudeyev2012-12-101-1/+1
| |/ | | | | | | | | | | Thank you imkingdavid. PHPBB3-9550
| * [feature/template-events] Order extensions in mock extension manager.Oleg Pudeyev2012-11-271-0/+1
| | | | | | | | PHPBB3-9550
| * [feature/template-events] Changes per imkingdavid's review.Oleg Pudeyev2012-11-175-5/+17
| | | | | | | | PHPBB3-9550
| * [feature/template-events] Make style names private on template.Oleg Pudeyev2012-11-172-2/+14
| | | | | | | | PHPBB3-9550
| * [feature/template-events] Test for event that is defined in parent style only.Oleg Pudeyev2012-11-173-0/+12
| | | | | | | | PHPBB3-9550
| * [feature/template-events] Specify style names, add inheritance tests.Oleg Pudeyev2012-11-171-7/+37
| | | | | | | | PHPBB3-9550
| * [feature/template-events] Normalize expected directory trees.Oleg Pudeyev2012-11-173-1/+1
| | | | | | | | PHPBB3-9550
| * [feature/template-events] Allow dataset to be correctly selectable.Oleg Pudeyev2012-11-172-13/+40
| | | | | | | | PHPBB3-9550
| * [feature/template-events] Dataset for template event testing with inheritance.Oleg Pudeyev2012-11-178-0/+8
| | | | | | | | PHPBB3-9550
| * [feature/template-events] Use style names array in template filter.Oleg Pudeyev2012-11-171-5/+13
| | | | | | | | | | | | | | This provides a straightforward way of iterating over all styles looking for templates in extensions. PHPBB3-9550
| * [feature/template-events] Generate style names array in set_style.Oleg Pudeyev2012-11-171-5/+11
| | | | | | | | PHPBB3-9550
| * [feature/template-events] Convert a single style name to array of them.Oleg Pudeyev2012-11-1713-26/+33
| | | | | | | | | | | | | | This allows template code to know the entire style hierarchy for templates being rendered. PHPBB3-9550
| * [feature/template-events] Chase dependency injection for template context.Oleg Pudeyev2012-11-171-1/+1
| | | | | | | | PHPBB3-9550
| * [feature/template-events] Adjust template events test to use the dataset.Oleg Pudeyev2012-11-171-2/+2
| | | | | | | | PHPBB3-9550
| * [feature/template-events] Create a dataset for template event tests.Oleg Pudeyev2012-11-174-0/+0
| | | | | | | | | | | | Having all files in one directory is too much of a mess. PHPBB3-9550
| * [feature/template-events] Indentation fix.Nathan Guse2012-11-171-3/+6
| | | | | | | | PHPBB3-9550
| * [feature/template-events] Cosmetic changes.Oleg Pudeyev2012-11-172-4/+4
| | | | | | | | PHPBB3-9550
| * [feature/template-events] Wording: wrongly -> improperly.Nathan Guse2012-11-172-3/+3
| | | | | | | | PHPBB3-9550
| * [feature/template-events] Indentation fix.Nathan Guse2012-11-171-1/+1
| | | | | | | | PHPBB3-9550
| * [feature/template-events] Rename template_name to style_name.Oleg Pudeyev2012-11-173-17/+18
| | | | | | | | | | | | | | "Style name" makes a lot more sense and should be in line with recent style/template changes. PHPBB3-9550
| * [feature/template-events] Switch template event test to data providers.Oleg Pudeyev2012-11-171-16/+34
| | | | | | | | PHPBB3-9550
| * [feature/template-events] Add a universal template event test.Oleg Pudeyev2012-11-175-21/+33
| | | | | | | | | | | | | | | | | | Also drop the irrelevant includejs code and add a simple template event test. The simple test is not working yet however due to the template engine not correctly tracking which template it is rendering. PHPBB3-9550
| * [feature/template-events] Report when templates cannot be compiled.Oleg Pudeyev2012-11-171-0/+4
| | | | | | | | PHPBB3-9550
| * [feature/template-events] Update EVENT tag documentation.Oleg Pudeyev2012-11-171-1/+21
| | | | | | | | | | | | It should now fairly closely reflect what actually happens. PHPBB3-9550
| * [feature/template-events] Delete old comments/test code.Oleg Pudeyev2012-11-171-7/+0
| | | | | | | | PHPBB3-9550
| * [feature/template-events] Move comment to the function docblock.Oleg Pudeyev2012-11-171-3/+3
| | | | | | | | PHPBB3-9550
| * [feature/template-events] Handle user access correctly.Oleg Pudeyev2012-11-172-3/+21
| | | | | | | | | | | | | | | | Pass through $user from template to filter. Allow $user to be null for standalone usage of the template engine. PHPBB3-9550
| * [feature/template-events] Always commit suicide for invalid event names.Oleg Pudeyev2012-11-171-9/+2
| | | | | | | | | | | | | | | | | | Note: suicide happens for syntactically invalid event names, e.g. event names containing punctuation. Event names for which there are no events are silently dropped. PHPBB3-9550
| * [feature/template-events] Chase template/style renames and changes.Oleg Pudeyev2012-11-173-3/+3
| | | | | | | | PHPBB3-9550
| * [feature/template-events] Fix typo (waring -> warning)Erik Frèrejean2012-11-171-1/+1
| | | | | | | | PHPBB3-9550