| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
PHPBB3-14972
|
|\ |
|
| |
| |
| |
| |
| |
| | |
by this correct $redirect will go to clean mcp page after merge
PHPBB3-14549
|
|\ \
| |/ |
|
| |\
| | |
| | |
| | | |
[ticket/14804] Add core event to MCP after merging topics
|
| | |\
| | | |
| | | |
| | | | |
PHPBB3-14804
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-14804
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-14804
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Renamed $topic_data and defined $to_topic_data in order to avoid ambiguity
and to stop overwriting a variable.
PHPBB3-14804
|
|\ \ \ \
| |/ / /
| | | |
| | | |
| | | | |
* 3.1.x:
[ticket/14795] Use maximum topic views instead of adding up views in merge
|
| | |/
| |/|
| | |
| | |
| | |
| | |
| | | |
Merging topics should not result in topic views being added up but rather in
the highest topic view showing up for the merged topic.
PHPBB3-14795
|
|\ \ \
| |/ / |
|
| |/
| |
| |
| | |
PHPBB3-14795
|
|\ \
| |/
| |
| |
| | |
* 3.1.x:
[ticket/14673] Changes wrong language variable in mcp_forum
|
| |
| |
| |
| | |
PHPBB3-14673
|
| |
| |
| |
| |
| |
| | |
Part 3 should fix tests up a little bit again.
PHPBB3-13454
|
| |
| |
| |
| |
| |
| | |
This is part 2 of the pr.
PHPBB3-13454
|
| |
| |
| |
| | |
PHPBB3-14325
|
| |
| |
| |
| | |
PHPBB3-14234
|
| |
| |
| |
| | |
PHPBB3-14234
|
|\ \
| |/
| |
| |
| | |
* 3.1.x:
[ticket/14106] Fix topics sorting in MCP for topics merging.
|
| |
| |
| |
| |
| |
| |
| | |
The "bug" in the deleted code comment is non-existent now.
The PR is for 3.1 only.
PHPBB3-14106
|
|\ \
| |/
| |
| |
| | |
Conflicts:
phpBB/includes/mcp/mcp_forum.php
|
| |
| |
| |
| |
| |
| | |
This event can be used to get some data in order to execute other actions.
PHPBB3-14014
|
| |
| |
| |
| | |
PHPBB3-8708
|
| |
| |
| |
| | |
PHPBB3-13455
|
| |
| |
| |
| | |
PHPBB3-13468
|
|/
|
|
| |
PHPBB3-13450
|
|
|
|
|
|
| |
https://tracker.phpbb.com/browse/PHPBB3-13328
PHPBB3-13328
|
|
|
|
|
|
| |
https://tracker.phpbb.com/browse/PHPBB3-13328
PHPBB3-13328
|
|
|
|
| |
PHPBB3-12612
|
|
|
|
| |
PHPBB3-12612
|
|
|
|
| |
PHPBB3-12612
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
[ticket/8610] Merging topics does not handle bookmarks correctly
* Nicofuma/ticket/8610:
[ticket/8610] Use css selector instead of xPath
[ticket/8610] Add functional test when two topics are merged
[ticket/8610] Throw an error when the dest topic isn't set
[ticket/8610] Fix bookmarks when merging all the posts of a topic
[ticket/8610] Merging topics does not handle bookmarks correctly
|
| |
| |
| |
| | |
PHPBB3-8610
|
| |
| |
| |
| |
| |
| | |
https://tracker.phpbb.com/browse/PHPBB3-8610
PHPBB3-8610
|
|/
|
|
| |
PHPBB3-12594
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
develop-ascraeus
* github-nickvergessen/ticket/12273: (55 commits)
[ticket/12273] Move $extension to constructor so the path is always set
[ticket/12273] Find events.md relative from the path not the phpbb root
[ticket/12273] Do not look in extensions docs/ and tests/ directory
[ticket/12273] Also check file for adm "Location:" events
[ticket/12273] Do not allow template events in non-html files
[ticket/12273] Fix return description
[ticket/12273] Update exporter to allow specifying an extension
[ticket/12273] Allow to filter events for extensions
[ticket/12273] Remove old parameter from function call
[ticket/12273] Fix table header for adm events
[ticket/12273] Add root path to recursive_event_filter_iterator
[ticket/12273] Fix missing classes in export_events_for_wiki.php
[ticket/12273] Use RecursiveDirectoryIterator with filter in php_exporter
[ticket/12273] Use RecursiveDirectoryIterator in md_exporter
[ticket/12273] Fix doc blocks
[ticket/12273] Do not allow 3.1-A1 for template events
[ticket/12273] Sort arguments alphabetically before exporting
[ticket/12273] Do not allow 3.1-A1 version
[ticket/12273] Update since version to 3.1.0-a* style
[ticket/12273] Update existing events
...
|
| |
| |
| |
| | |
PHPBB3-12273
|
|/
|
|
|
|
| |
... and needs to be reapproved.
PHPBB3-12052
|
|
|
|
| |
PHPBB3-12153
|
|
|
|
| |
PHPBB3-11849
|
|
|
|
| |
PHPBB3-11892
|
|
|
|
| |
PHPBB3-11700
|
|
|
|
| |
PHPBB3-11700
|
|
|
|
| |
PHPBB3-9657
|
|
|
|
| |
PHPBB3-9657
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* develop-olympus:
[ticket/8610] Update comment
[ticket/8610] Do not use requests to submit posts except in posting_test.php
[ticket/8610] Move posting helpers to separate file
[ticket/8610] Create helper functions to create topic/post in functional tests
[ticket/8610] Use phpbb_update_rows_avoiding_duplicates
[ticket/8610] Revert some funky merging I did from rebase
[ticket/8610] Add some comments
[ticket/8610] Update Bookmarks and Subscriptions when splitting topics
[ticket/8610] Update Bookmarks when merging posts into another topic
[ticket/8610] Update Bookmarks when forking topics
[ticket/8610] Update Bookmarks when merging topics
|
| | |
| | |
| | |
| | | |
PHPBB3-8610
|