1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-01 03:54:56 +02:00

2010 Commits

Author SHA1 Message Date
Marc Alexander
c9338b38b3 Merge branch 'develop' of github.com:marc1706/phpbb3 into feature/avatars 2012-12-24 14:34:10 +01:00
Joas Schilling
e34b8ed094 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into 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
2012-12-20 22:51:38 +01:00
Oleg Pudeyev
31b5f91ea1 Merge PR #1148 branch 'imkingdavid/feature/events' into develop
* 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
  ...
2012-12-20 15:10:46 -05:00
Joas Schilling
1a07cd63a1 [feature/soft-delete] Fix "Mark all" and "Unmark all" links on topic list
PHPBB3-9657
2012-12-20 19:24:26 +01:00
Marc Alexander
daf9de689a [ticket/10954] Add missing semi-colon
PHPBB3-10954
2012-12-18 16:24:58 +01:00
Joas Schilling
63f3cd45bb [feature/soft-delete] Add delete information to approve deatils page
PHPBB3-9657
2012-12-18 15:08:05 +01:00
Joas Schilling
4300d06a17 [feature/soft-delete] Add "Restore" to the mcp forum quick moderation
PHPBB3-9657
2012-12-18 14:51:05 +01:00
Joas Schilling
b917e5a4bb [feature/soft-delete] Use new custom template system for AJAX confirm_box
PHPBB3-9657
2012-12-18 13:57:58 +01:00
Joas Schilling
0d7f61dc7a [ticket/11166] Use provided custom templates on AJAX confirm box
PHPBB3-11166
2012-12-18 13:50:56 +01:00
Marc Alexander
55b5336b02 [ticket/10954] Make sure to mark subforums unread and add small fixes
PHPBB3-10954
2012-12-18 09:55:22 +01:00
Marc Alexander
fb60f603ba [ticket/10954] Miscellaneous coding fixes
Remove obsolete or unneeded code. Also fix the behavior of removing
icon_topic_newest by actually removing the link to the first unread post
instead of just removing the icon.

PHPBB3-10954
2012-12-18 00:48:50 +01:00
David King
636227491d [feature/events] forumlist_body_last_post_title_after -> _prepend (subsilver2)
PHPBB3-9550
2012-12-17 17:59:41 -05:00
David King
8d6a4559ba [feature/events] Fix overall_footer_end -> overall_footer_after (subsilver2)
PHPBB3-9550
2012-12-17 17:48:15 -05:00
David King
3667ba7a09 [feature/events] Fix typo in event name
PHPBB3-9550
2012-12-17 17:39:25 -05:00
David King
4ad2747ccf [feature/events] Fix more subsilver2 events
PHPBB3-9550
2012-12-17 11:59:23 -05:00
David King
d25dffbb2d [feature/events] Fix some subsilver2 events
PHPBB3-9550
2012-12-17 11:57:18 -05:00
David King
8526dc14f0 [feature/events] Append "_append" to viewtopic_print_head
PHPBB3-9550
2012-12-17 11:52:37 -05:00
David King
cb3db020f0 [feature/events] ucp_pm_viewmessage_print_head_append
PHPBB3-9550
2012-12-17 11:51:07 -05:00
David King
d3db491e09 [feature/events] simple_footer_end -> simple_footer_after
PHPBB3-9550
2012-12-17 11:40:42 -05:00
David King
d22f171ad0 [feature/events] Append "_prepend" to posting_editor_options
PHPBB3-9550
2012-12-17 11:38:16 -05:00
David King
c6f9e4522b [feature/events] Fix events in prosilver overall_header.html
PHPBB3-9550
2012-12-17 11:38:00 -05:00
David King
9015a76cf6 [feature/events] Fix events in prosilver overall_footer.html
PHPBB3-9550
2012-12-17 11:37:46 -05:00
David King
37ac2c9aae [feature/events] Rename index_body_info_blocks: index_body_stat_blocks_before 2012-12-17 11:37:45 -05:00
Oleg Pudeyev
de54bccc58 [feature/events] There is nothing between head and body.
PHPBB3-9550
2012-12-17 11:37:36 -05:00
Michael Cullum
c527403ef7 [feature/events] Add location (prepend) to event name
PHPBB3-9550
2012-12-17 11:37:34 -05:00
Michael Cullum
a6122228eb [feature/events] Adjust to use prepend, not before
PHPBB3-9550
2012-12-17 11:37:33 -05:00
Michael Cullum
0b35136894 [feature/events] Add overall_footer_copyright_after template event
PHPBB3-9550
2012-12-17 11:37:31 -05:00
Michael Cullum
336f0c5641 [feature/events] Rename event to show location around copyright
PHPBB3-9550
2012-12-17 11:37:30 -05:00
Michael Cullum
c81d49c969 [feature/events] Add append to event name
PHPBB3-9550
2012-12-17 11:37:29 -05:00
Erik Frèrejean
b95549a7a7 [feature/events] Correct template calls
There where two `<!-- LEDGE ... -->` calls in the templates left.
Replace those two calls with the proper `<!-- EVENT ... -->`
call

PHPBB3-9550
2012-12-17 11:37:27 -05:00
Michael Cullum
ce7d440a6e [feature/events] Adding viewtopic_topic_title_prepend template event
PHPBB3-9550
2012-12-17 11:37:26 -05:00
Michael Cullum
2a37f8b50f [feature/events] Fix index_link_prepend template event
PHPBB3-9550
2012-12-17 11:37:25 -05:00
Michael Cullum
243c984908 [feature/events] Add overall_header_index_link_left event
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
2012-12-17 11:37:23 -05:00
Michael Cullum
8012cd1d11 [feature/events] Move template ledges above </head> tag
PHPBB3-9550

Conflicts:

	phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
	phpBB/styles/prosilver/template/viewtopic_print.html
2012-12-17 11:37:13 -05:00
Michael Cullum
99cd766de0 [feature/events] Remove overall_head_head_body template ledge
PHPBB3-9550

Conflicts:

	phpBB/styles/prosilver/template/overall_header.html
2012-12-17 11:37:12 -05:00
Michael Cullum
8dcc2cded6 [feature/events] Rename RUNHOOKS to EVENT
Apply change to existing ledges

PHPBB3-9550
2012-12-17 11:37:11 -05:00
Joas Schilling
c0f900f695 [feature/events] Add forumlist_body_last_post in subsilver2
Used by NV Advanced Last Topic Titles

PHPBB3-9550
2012-12-17 11:37:09 -05:00
Joas Schilling
6ca65226e3 [feature/events] Fix forumlist_body_last_post in prosilver
Used by NV Advanced Last Topic Titles

PHPBB3-9550
2012-12-17 11:37:08 -05:00
Michael Cullum
47c1834382 [feature/events] Adding viewtopic_print_head_body template ledge
Needed by ReIMG Resizer

PHPBB3-9550
2012-12-17 11:37:07 -05:00
Michael Cullum
9b4ea94630 [feature/events] Adding ucp_pm_viewmessage_head_body template ledge
Needed by ReIMG Resizer

PHPBB3-9550
2012-12-17 11:37:06 -05:00
Michael Cullum
e865ee1bef [feature/events] Adding overall_head_head_body template ledge
Required by ReIMG Resizer

PHPBB3-9550
2012-12-17 11:37:05 -05:00
Michael Cullum
bc2f777b27 [feature/events] Adding simple_footer_end template ledge
PHPBB3-9550
2012-12-17 11:37:03 -05:00
Michael Cullum
244978cdb4 [feature/events] Adding overall_footer_end template ledge
Helpful for JS scripts that need to work with the DOM.

PHPBB3-9550
2012-12-17 11:37:02 -05:00
Michael Cullum
18af6dd664 [feature/events] Adding index_body_info_blocks template ledge
PHPBB3-9550
2012-12-17 11:37:01 -05:00
Michael Cullum
9e4043ff64 [feature/events] Adding forumlist_body_last_post template ledge
Used by NV Advanced Last Topic Titles

PHPBB3-9550
2012-12-17 11:36:59 -05:00
Michael Cullum
8534cbcc84 [feature/events] Adding overall_footer_index_link template ledge
Used by board3portal

PHPBB3-9550
2012-12-17 11:36:58 -05:00
Michael Cullum
bdd3e692fb [feature/events] Adding overall_header_index_link template ledge
Used by board3portal

PHPBB3-9550
2012-12-17 11:36:56 -05:00
Michael Cullum
f2ee104291 [feature/events] Add posting_editor_options template ledge
This is needed for options for posts and is used by topic as link MOD

PHPBB3-9550
2012-12-17 11:36:55 -05:00
Michael Cullum
fc2ebc34df [feature/events] Adds overall_footer_copyright template ledge
This allows people to add copyright information to the footer

PHPBB3-9550
2012-12-17 11:36:54 -05:00
Michael Cullum
c83c5c7f47 [feature/events] Add overall_header_nav template ledge
Adds a ledge next to the FAQ button for extensions to put links on the navigation bar

PHPBB3-9550
2012-12-17 11:36:53 -05:00