1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-12 01:11:15 +02:00
Commit Graph

673 Commits

Author SHA1 Message Date
43a309ce2b [ticket/12967] Fix undefined variable phpbb_dispatcher error.
PHPBB3-12967
2014-08-11 00:34:12 +02:00
3825aee130 [ticket/11520] Re-adjust userpost count on topic fork
PHPBB3-11520
2014-08-08 17:07:29 +02:00
af67bd3ea5 [ticket/11520] Coding guideline compliance
PHPBB3-11520
2014-08-08 17:07:16 +02:00
fc1e420a7c [ticket/11520] Re-adjust userpost count on topic fork
PHPBB3-11520
2014-08-08 17:05:40 +02:00
96e9d728b9 Merge pull request from brunoais/ticket/12927
[ticket/12927] core.mcp_queue_get_posts2_query_before

* brunoais/ticket/12927:
  [ticket/12927] core.mcp_queue_get_posts2_query_before
2014-08-08 14:52:35 +02:00
53247573c2 Merge pull request from brunoais/ticket/12880
[ticket/12880] core.mcp_queue_!is_topics_query_before

* brunoais/ticket/12880:
  [ticket/12880] core.mcp_queue_!is_topics_query_before
2014-08-08 14:35:53 +02:00
bef9d64179 Merge pull request from brunoais/ticket/12876
[ticket/12876] core.mcp_mcp_front.mcp_front_view_queue_postid_list_after

* brunoais/ticket/12876:
  [ticket/12876] core.mcp_mcp_front.mcp_front_view_queue_postid_list_after
2014-08-08 14:32:55 +02:00
0679f76287 [ticket/12927] core.mcp_queue_get_posts2_query_before
Adding the core.mcp_queue_get_posts2_query_before
event to mcp backend.

PHPBB3-12927
2014-08-08 10:52:08 +01:00
1f5f2327e8 [ticket/12876] core.mcp_mcp_front.mcp_front_view_queue_postid_list_after
Adding the core.mcp_mcp_front.mcp_front_view_queue_topicid_list_after
event to mcp backend.

PHPBB3-12876
2014-08-07 18:37:07 +01:00
50cc81afa3 [ticket/12880] core.mcp_queue_!is_topics_query_before
Adding core.mcp_queue_is_topics_query_before

PHPBB3-12880
2014-08-07 18:33:37 +01:00
1304ccc02b Merge pull request from brunoais/ticket/12877
[ticket/12877] core.mcp_mcp_front_reports_listing_query_before
2014-08-07 15:09:18 +02:00
a0feced63e [ticket/12877] core.mcp_mcp_front_reports_listing_query_before
Adding core.mcp_mcp_front_reports_listing_query_before

PHPBB3-12877
2014-07-23 07:20:20 +01:00
248b11c4db Merge pull request from Nicofuma/ticket/12818
[ticket/12818] Deleting a log entry in MCP produces a General error

* Nicofuma/ticket/12818:
  [ticket/12818] Use assertGreaterThanOrEqual in the tests
  [ticket/12818] Don't use the id for i=
  [ticket/12818] Add tests
  [ticket/12818] Fix the conditions in the call to $log->delete() in mcp_logs
2014-07-11 11:53:38 +02:00
cc0f931473 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/12695] Add viewtopic language file for parse_attachments in mcp_post
2014-07-10 15:26:27 +02:00
83f4bd9ee7 [ticket/12695] Add viewtopic language file for parse_attachments in mcp_post
PHPBB3-12695
2014-07-10 14:39:53 +02:00
b7fb2e557e [ticket/12818] Fix the conditions in the call to $log->delete() in mcp_logs
PHPBB3-12818
2014-07-06 00:00:58 +02:00
952b4de231 [ticket/12612] Prefix check_ids() with phpbb_
PHPBB3-12612
2014-06-23 23:01:52 +02:00
4ac43856f7 [ticket/12612] Prefix mcp_sorting() with phpbb_
PHPBB3-12612
2014-06-23 23:00:13 +02:00
c315fc6c89 [ticket/12612] Prefix get_*_data() with phpbb_ and delete unused global
PHPBB3-12612
2014-06-23 22:58:41 +02:00
bba23f61b3 [ticket/12612] Prefix module url functions with phpbb_
PHPBB3-12612
2014-06-23 22:54:15 +02:00
09fc008e62 [ticket/12721] Add Squiz.ControlStructures.ElseIfDeclaration in legacy
PHPBB3-12721
2014-06-16 22:35:41 +02:00
ca3cdadd08 [ticket/12722] Add Generic.Formatting.SpaceAfterCast in the legacy ruleset
PHPBB3-12722
2014-06-16 19:05:09 +02:00
771cbb2b3a Merge pull request from Nicofuma/ticket/8610
[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
2014-06-09 22:57:27 +02:00
e8174f3d66 [ticket/12675] Fix code sniffer complaints introduced by recent commits
PHPBB3-12675
2014-06-09 00:51:01 +02:00
5b5f3a5d0c [ticket/12639] Send a correct IN entry when deleting marked logs
PHPBB3-12639
2014-06-02 23:15:25 +02:00
36071ded9d [ticket/12639] Delete entry in admin-log leads to mysql-error
PHPBB3-12639
2014-05-31 12:56:44 +02:00
40218ba5e6 Merge pull request from Nicofuma/ticket/10899
[ticket/10899] Using Delete All in log viewer with keyword search

* Nicofuma/ticket/10899:
  [ticket/10899] Update doc block
  [ticket/10899] Use isset($field_value['IN'])
  [ticket/10899] Add event core.delete_log
  [ticket/10899] Remove trailing ;
  [ticket/10899] Fix typo in the class name
  [ticket/10899] Add unit tests
  [ticket/10899] Get $phpbb_log from the container
  [ticket/10899] Remove extra ';'
  [ticket/10899] Typo
  [ticket/10899] Refactoring in \phpbb\log\log_interface
  [ticket/10899] Using Delete All in log viewer with keyword search
2014-05-30 23:13:00 +02:00
be52ea882a Merge pull request from Nicofuma/ticket/11942
[ticket/11942] Delete post/topic reason should be added to logs

* Nicofuma/ticket/11942:
  [ticket/11942] Don't change the reason to '' when hard deleting
  [ticket/11942] Don't show the checkbox if the post is already soft-deleted
  [ticket/11942] Remove useless IF in templates
  [ticket/11942] Apply the modifications to subsilver
  [ticket/11942] Always display delete reason
  [ticket/11942] Edits messages
  [ticket/11942] Change the formulation
  [ticket/11942] Adding the reason to hard deleted topic/post
  [ticket/11942] Delete post/topic reason should be added to logs
2014-05-30 23:04:02 +02:00
70f313eb4f [ticket/11942] Don't change the reason to '' when hard deleting
PHPBB3-11942
2014-05-29 00:49:12 +02:00
a759704b39 [ticket/12594] Remove @package tags and update file headers
PHPBB3-12594
2014-05-27 20:51:13 +02:00
c517cd6778 [ticket/8610] Throw an error when the dest topic isn't set
PHPBB3-8610
2014-05-27 01:38:43 +02:00
d20d86bf10 [ticket/8610] Fix bookmarks when merging all the posts of a topic
PHPBB3-8610
2014-05-27 01:35:52 +02:00
26674bff39 Merge pull request from n-aleha/ticket/12583
[ticket/12583] Add event core.mcp_warn_post_before/after

* n-aleha/ticket/12583:
  [ticket/12583] Redirect only on non-empty $message
  [ticket/12583] Add event core.mcp_warn_post_before/after
2014-05-26 18:39:44 +02:00
85fb2bf203 Merge pull request from n-aleha/ticket/12584
[ticket/12584] Add event core.mcp_warn_user_before/after

* n-aleha/ticket/12584:
  [ticket/12584] Redirect only on non-empty $message
  [ticket/12584] Add event core.mcp_warn_user_before/after
2014-05-26 18:36:53 +02:00
172b7cfe35 Merge pull request from marcosbc/ticket/12270
[ticket/12270] Current post and topic approval notification message

* marcosbc/ticket/12270:
  [ticket/12270] Fixed topic counting bug and tests
  [ticket/12270] Fixed tests not working
  [ticket/12270] No quote notif and double poster notification fix
  [ticket/12270] Fixed tests
  [ticket/12270] Fixed rebase conflicts
  [ticket/12270] Correct confirm approval message for topics
  [ticket/12270] Correcting to follow phpBB coding standards
  [ticket/12270] Better structured code and no debug error message
  [ticket/12270] Correct notifications for posts/topics now working
  [ticket/12270] Reverted templates
  [ticket/12270] Correct post&topic approval msg, no template changes
  [ticket/12270] Corrent post and topic approval notification message
2014-05-26 18:09:54 +02:00
62cb7e0c10 [ticket/12584] Redirect only on non-empty $message
PHPBB3-12584
2014-05-25 22:40:20 +03:00
fdb53b23fb [ticket/12584] Add event core.mcp_warn_user_before/after
Event for when warning a user from MCP.

PHPBB3-12584
2014-05-25 22:40:15 +03:00
589ad564cc [ticket/12583] Redirect only on non-empty $message
PHPBB3-12583
2014-05-25 22:00:37 +03:00
36dfb95816 [ticket/12270] Fixed topic counting bug and tests
Topics was not correctly counted (the counter didn't count topics
that were re-approved, for example, but only the ones that were
unapproved.
This should also fix the test that wasn't working correctly.

PHPBB3-12270
2014-05-24 14:06:23 +02:00
7a6867d54e [ticket/12583] Add event core.mcp_warn_post_before/after
Event for when warning a user for a post.

PHPBB3-12583
2014-05-23 16:30:41 +03:00
c47c50a29e [ticket/12270] Fixed tests not working
The success message wasn't output correctly if we were approving
topics.

PHPBB3-12270
2014-05-21 00:52:42 +02:00
237619792d [ticket/11942] Always display delete reason
PHPBB3-11942
2014-05-11 19:28:26 +02:00
49bc10de4d [ticket/8610] Merging topics does not handle bookmarks correctly
https://tracker.phpbb.com/browse/PHPBB3-8610

PHPBB3-8610
2014-05-10 22:17:01 +02:00
c6d7875b9b [ticket/10899] Refactoring in \phpbb\log\log_interface
PHPBB3-10899
2014-05-10 18:24:07 +02:00
c5a4ad3d31 [ticket/10899] Using Delete All in log viewer with keyword search
https://tracker.phpbb.com/browse/PHPBB3-10899

PHPBB3-10899
2014-05-10 17:03:09 +02:00
984ae598be [ticket/12270] No quote notif and double poster notification fix
Since a call was added to self::approve_topic(), the poster would
get double-notified about it (even if it was later marked as read).
Also, when creating a new topic with a quote, it would not be
notified, this has also been fixed.

PHPBB3-12270
2014-05-10 16:36:11 +02:00
7b0e535f03 [ticket/12501] Only select attachments uploaded before the post was reported.
The post text displayed to the user is the same as when it was reported, even if
the post was edited afterwards, thus it follows that the attachments would be
the same. This also addresses an issue where the index in the attachment bbcode
no longer matches that of its corresponding attachment when new attachments
are uploaded after the post is reported.

PHPBB3-12501
2014-05-05 11:05:15 -07:00
9705e1883d [ticket/12501] Parse the reported post message before its attachments.
This ensures that the empty lines from attachment.html aren't converted into
<br />.

PHPBB3-12501
2014-05-05 11:05:15 -07:00
1c336c3559 [ticket/11942] Adding the reason to hard deleted topic/post
PHPBB3-11942
2014-05-04 15:43:08 +02:00
dccc9ceeb5 [ticket/11942] Delete post/topic reason should be added to logs
https://tracker.phpbb.com/browse/PHPBB3-11942

PHPBB3-11942
2014-05-04 15:43:06 +02:00