aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/9657] Break the schemas again to avoid merge conflictsJoas Schilling2013-02-277-10/+10
* [ticket/9657] Revert database_update.php changesJoas Schilling2013-02-271-248/+69
* Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softde...Joas Schilling2012-12-20297-1969/+7664
|\
| * Merge branch 'develop-olympus' into developAndreas Fischer2012-12-201-7/+18
| |\
| | * Merge remote-tracking branch 'p/ticket/11285' into develop-olympusAndreas Fischer2012-12-201-7/+18
| | |\
| | | * [ticket/11285] Use more granularity in dependency checks in compress testOleg Pudeyev2012-12-201-7/+18
| | |/
| * | Merge PR #1148 branch 'imkingdavid/feature/events' into developOleg Pudeyev2012-12-2025-10/+183
| |\ \
| | * | [feature/events] Fix improperly named event in documentationDavid King2012-12-201-2/+4
| | * | [feature/events] Fix alphabetization of eventsDavid King2012-12-201-4/+4
| | * | [feature/events] Put events in alphabetical orderDavid King2012-12-201-23/+23
| | * | [feature/events] Make EVENTS.md lowercaseDavid King2012-12-201-0/+0
| | * | [feature/events] Use ` to escape HTML tags in markdownDavid King2012-12-171-7/+7
| | * | [feature/events] Remove HTML tags from markdown so they don't get parsedDavid King2012-12-171-7/+7
| | * | [feature/events] Remove extraneous spaceDavid King2012-12-171-1/+1
| | * | [feature/events] Add markdown template event documentation fileDavid King2012-12-171-0/+130
| | * | [feature/events] forumlist_body_last_post_title_after -> _prepend (subsilver2)David King2012-12-171-1/+1
| | * | [feature/events] Fix overall_footer_end -> overall_footer_after (subsilver2)David King2012-12-171-1/+1
| | * | [feature/events] Fix typo in event nameDavid King2012-12-171-1/+1
| | * | [feature/events] Fix more subsilver2 eventsDavid King2012-12-172-2/+2
| | * | [feature/events] Fix some subsilver2 eventsDavid King2012-12-175-6/+9
| | * | [feature/events] Append "_append" to viewtopic_print_headDavid King2012-12-171-1/+1
| | * | [feature/events] ucp_pm_viewmessage_print_head_appendDavid King2012-12-171-1/+1
| | * | [feature/events] simple_footer_end -> simple_footer_afterDavid King2012-12-171-1/+1
| | * | [feature/events] Append "_prepend" to posting_editor_optionsDavid King2012-12-171-1/+1
| | * | [feature/events] Fix events in prosilver overall_header.htmlDavid King2012-12-171-5/+7
| | * | [feature/events] Fix events in prosilver overall_footer.htmlDavid King2012-12-171-4/+5
| | * | [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
| | * | [feature/events] acp_simple_footer_end -> acp_simple_footer_afterDavid King2012-12-171-1/+1
| | * | [feature/events] Append "_append" to acp_overall_header_headDavid King2012-12-171-1/+1
| | * | [feature/events] Change _end suffix to _after in acp_overall_footer_endDavid King2012-12-171-1/+1
| | * | [feature/events] Append "_append" to acp_users_overview_optionsDavid King2012-12-171-1/+1
| | * | [feature/events] Fix names of events in adm/style/acp_main.htmlDavid King2012-12-171-2/+2
| | * | [feature/events] Append "_append" to acp_forums_normal_settingsDavid King2012-12-171-1/+1
| | * | [feature/events] There is nothing between head and body.Oleg Pudeyev2012-12-173-3/+0
| | * | [feature/events] Rename event_main_actions to acp_main_actionsJoas Schilling2012-12-171-1/+1
| | * | [feature/events] Add location (prepend) to event nameMichael Cullum2012-12-171-1/+1
| | * | [feature/events] Adjust to use prepend, not beforeMichael Cullum2012-12-171-1/+1
| | * | [feature/events] Add overall_footer_copyright_after template eventMichael Cullum2012-12-171-0/+1
| | * | [feature/events] Rename event to show location around copyrightMichael Cullum2012-12-171-1/+1
| | * | [feature/events] Add append to event nameMichael Cullum2012-12-171-1/+1
| | * | [feature/events] Adding acp prefix to acp event namesMichael Cullum2012-12-177-8/+8
| | * | [feature/events] Correct template callsErik Frèrejean2012-12-172-2/+2
| | * | [feature/events] Adding viewtopic_topic_title_prepend template eventMichael Cullum2012-12-172-2/+2
| | * | [feature/events] Fix index_link_prepend template eventMichael Cullum2012-12-171-1/+1
| | * | [feature/events] Add overall_header_index_link_left eventMichael Cullum2012-12-171-1/+2
| | * | [feature/events] Adding forums_normal_settings acp template ledgeMichael Cullum2012-12-171-0/+1
| | * | [feature/events] Adding simple_footer_end acp template eventMichael Cullum2012-12-171-0/+1
| | * | [feature/events] Adding simple_header_head acp template eventMichael Cullum2012-12-171-0/+1
| | * | [feature/events] Add users_overview_options acp template eventMichael Cullum2012-12-171-0/+1