aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2012-12-231-3/+3
|\
| * [develop-olympus] Set build version (and thus package name) to 3.0.12-dev.Andreas Fischer2012-12-231-3/+3
* | Merge PR #1152 branch 'develop-olympus' into developOleg Pudeyev2012-12-221-17/+30
|\ \ | |/
| * Merge PR #1152 branch 'nickvergessen/ticket/11278' into develop-olympusOleg Pudeyev2012-12-221-17/+30
| |\
| | * [ticket/11278] Comment out the code for dropping the Q&A tablesJoas Schilling2012-12-211-6/+20
| | * [ticket/11278] Fix not running queries from db tools in database updateJoas Schilling2012-12-191-13/+12
* | | Merge remote-tracking branch 'p/ticket/10758-upload' into developAndreas Fischer2012-12-222-1/+19
|\ \ \
| * | | [ticket/10758-upload] Mark tests that don't work incomplete.Oleg Pudeyev2012-12-211-0/+2
| * | | [ticket/10758-upload] Convert error to a failure.Oleg Pudeyev2012-12-202-1/+17
* | | | Merge remote-tracking branch 'p/ticket/11248' into developAndreas Fischer2012-12-223-1796/+1826
|\ \ \ \
| * | | | [ticket/11248] Convert line endings to LF - develop edition.Oleg Pudeyev2012-12-073-1796/+1826
* | | | | Merge remote-tracking branch 'p/ticket/11037' into developAndreas Fischer2012-12-2214-21/+22
|\ \ \ \ \
| * | | | | [ticket/11037] Eliminate global $db usage in cache drivers.Oleg Pudeyev2012-12-2014-21/+22
* | | | | | Merge remote-tracking branch 'nickvergessen/ticket/11277' into developAndreas Fischer2012-12-211-1/+5
|\ \ \ \ \ \
| * | | | | | [ticket/11277] Correctly remove user_dst column on database updateJoas Schilling2012-12-211-1/+5
* | | | | | | Merge PR #1160 branch 'imkingdavid/ticket/11287' into developOleg Pudeyev2012-12-211-0/+52
|\ \ \ \ \ \ \
| * | | | | | | [ticket/11287] Add template event naming to docs/coding-guidelines.htmlDavid King2012-12-201-0/+52
| | |_|_|/ / / | |/| | | | |
* | | | | | | 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