aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/9657] Break the schemas again to avoid merge conflictsJoas Schilling2013-02-277-10/+10
| | | | PHPBB3-9657
* [ticket/9657] Revert database_update.php changesJoas Schilling2013-02-271-248/+69
| | | | | | | | We revert all database update changes here, so we can easily move to migrations, without having a tones one conflicts. The changes will then be added in it's own migration file. PHPBB3-9657
* Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ↵Joas Schilling2012-12-20191-1376/+4710
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/softdelete-1-permission-rebase * 'develop' of https://github.com/phpbb/phpbb3: (544 commits) [feature/events] Fix improperly named event in documentation [feature/events] Fix alphabetization of events [feature/events] Put events in alphabetical order [feature/events] Make EVENTS.md lowercase [ticket/11285] Use more granularity in dependency checks in compress test [ticket/10880] The m_approve permisson no longer implies f_noapprove. [ticket/10803] Show failure message until user dismisses it [ticket/10954] Add missing semi-colon [ticket/10954] Make sure to mark subforums unread and add small fixes [feature/events] Use ` to escape HTML tags in markdown [feature/events] Remove HTML tags from markdown so they don't get parsed [ticket/10954] Miscellaneous coding fixes [feature/events] Remove extraneous space [feature/events] Add markdown template event documentation file [feature/events] forumlist_body_last_post_title_after -> _prepend (subsilver2) [feature/events] Fix overall_footer_end -> overall_footer_after (subsilver2) [feature/events] Fix typo in event name [ticket/10763] Use self when calling get_extension() in filespec class [feature/events] Fix more subsilver2 events [feature/events] Fix some subsilver2 events ... Conflicts: phpBB/install/database_update.php phpBB/posting.php
| * Merge PR #1148 branch 'imkingdavid/feature/events' into developOleg Pudeyev2012-12-2025-10/+183
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * imkingdavid/feature/events: (65 commits) [feature/events] Fix improperly named event in documentation [feature/events] Fix alphabetization of events [feature/events] Put events in alphabetical order [feature/events] Make EVENTS.md lowercase [feature/events] Use ` to escape HTML tags in markdown [feature/events] Remove HTML tags from markdown so they don't get parsed [feature/events] Remove extraneous space [feature/events] Add markdown template event documentation file [feature/events] forumlist_body_last_post_title_after -> _prepend (subsilver2) [feature/events] Fix overall_footer_end -> overall_footer_after (subsilver2) [feature/events] Fix typo in event name [feature/events] Fix more subsilver2 events [feature/events] Fix some subsilver2 events [feature/events] Append "_append" to viewtopic_print_head [feature/events] ucp_pm_viewmessage_print_head_append [feature/events] simple_footer_end -> simple_footer_after [feature/events] Append "_prepend" to posting_editor_options [feature/events] Fix events in prosilver overall_header.html [feature/events] Fix events in prosilver overall_footer.html [feature/events] Rename index_body_info_blocks: index_body_stat_blocks_before ...
| | * [feature/events] Fix improperly named event in documentationDavid King2012-12-201-2/+4
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/events] Fix alphabetization of eventsDavid King2012-12-201-4/+4
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/events] Put events in alphabetical orderDavid King2012-12-201-23/+23
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/events] Make EVENTS.md lowercaseDavid King2012-12-201-0/+0
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/events] Use ` to escape HTML tags in markdownDavid King2012-12-171-7/+7
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/events] Remove HTML tags from markdown so they don't get parsedDavid King2012-12-171-7/+7
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/events] Remove extraneous spaceDavid King2012-12-171-1/+1
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/events] Add markdown template event documentation fileDavid King2012-12-171-0/+130
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/events] forumlist_body_last_post_title_after -> _prepend (subsilver2)David King2012-12-171-1/+1
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/events] Fix overall_footer_end -> overall_footer_after (subsilver2)David King2012-12-171-1/+1
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/events] Fix typo in event nameDavid King2012-12-171-1/+1
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/events] Fix more subsilver2 eventsDavid King2012-12-172-2/+2
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/events] Fix some subsilver2 eventsDavid King2012-12-175-6/+9
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/events] Append "_append" to viewtopic_print_headDavid King2012-12-171-1/+1
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/events] ucp_pm_viewmessage_print_head_appendDavid King2012-12-171-1/+1
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/events] simple_footer_end -> simple_footer_afterDavid King2012-12-171-1/+1
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/events] Append "_prepend" to posting_editor_optionsDavid King2012-12-171-1/+1
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/events] Fix events in prosilver overall_header.htmlDavid King2012-12-171-5/+7
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/events] Fix events in prosilver overall_footer.htmlDavid King2012-12-171-4/+5
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/events] Rename index_body_info_blocks: index_body_stat_blocks_beforeDavid King2012-12-171-1/+1
| | |
| | * [feature/events] Append "_append" to acp_simple_header_headDavid King2012-12-171-1/+1
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/events] acp_simple_footer_end -> acp_simple_footer_afterDavid King2012-12-171-1/+1
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/events] Append "_append" to acp_overall_header_headDavid King2012-12-171-1/+1
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/events] Change _end suffix to _after in acp_overall_footer_endDavid King2012-12-171-1/+1
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/events] Append "_append" to acp_users_overview_optionsDavid King2012-12-171-1/+1
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/events] Fix names of events in adm/style/acp_main.htmlDavid King2012-12-171-2/+2
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/events] Append "_append" to acp_forums_normal_settingsDavid King2012-12-171-1/+1
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/events] There is nothing between head and body.Oleg Pudeyev2012-12-173-3/+0
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/events] Rename event_main_actions to acp_main_actionsJoas Schilling2012-12-171-1/+1
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/events] Add location (prepend) to event nameMichael Cullum2012-12-171-1/+1
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/events] Adjust to use prepend, not beforeMichael Cullum2012-12-171-1/+1
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/events] Add overall_footer_copyright_after template eventMichael Cullum2012-12-171-0/+1
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/events] Rename event to show location around copyrightMichael Cullum2012-12-171-1/+1
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/events] Add append to event nameMichael Cullum2012-12-171-1/+1
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/events] Adding acp prefix to acp event namesMichael Cullum2012-12-177-8/+8
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/events] Correct template callsErik Frèrejean2012-12-172-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | There where two `<!-- LEDGE ... -->` calls in the templates left. Replace those two calls with the proper `<!-- EVENT ... -->` call PHPBB3-9550
| | * [feature/events] Adding viewtopic_topic_title_prepend template eventMichael Cullum2012-12-172-2/+2
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/events] Fix index_link_prepend template eventMichael Cullum2012-12-171-1/+1
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/events] Add overall_header_index_link_left eventMichael Cullum2012-12-171-1/+2
| | | | | | | | | | | | | | | | | | | | | As a portal is of higher presdence than the board, unlike most extensions it has a link before the board index link. This event satifies that. PHPBB3-9550
| | * [feature/events] Adding forums_normal_settings acp template ledgeMichael Cullum2012-12-171-0/+1
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/events] Adding simple_footer_end acp template eventMichael Cullum2012-12-171-0/+1
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/events] Adding simple_header_head acp template eventMichael Cullum2012-12-171-0/+1
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/events] Add users_overview_options acp template eventMichael Cullum2012-12-171-0/+1
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/events] Add overall_footer_end acp template eventMichael Cullum2012-12-171-0/+2
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/events] Adding overall_header_head acp template eventMichael Cullum2012-12-171-0/+1
| | | | | | | | | | | | PHPBB3-9550
| | * [feature/events] Add main_actions acp template eventMichael Cullum2012-12-171-0/+2
| | | | | | | | | | | | PHPBB3-9550
generated by cgit v1.2.1 (git 2.21.0) at 2026-04-21 01:37:52 +0000