mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 20:44:01 +01:00
Code Issues Releases Wiki Activity
28,521 Commits 17 Branches 190 Tags
Commit Graph

858 Commits

Author SHA1 Message Date
Dhruv Goel
6d9c0a76df Merge pull request #2865 from marc1706/ticket/12966 
[ticket/12966] Sort posts by post_id in addition to sorting by post_time
 2014-08-29 20:44:01 +05:30
Marc Alexander
e5e45f860b [ticket/12966] Sort by post_time and post_id where applicable 
This change was not applied to the search as this would require a larger
rewrite of the search methods.

PHPBB3-12966
 2014-08-23 16:36:39 +02:00
rxu
30b6080529 [ticket/13006] Add variables to the 'core.modify_quickmod_actions' event 
Add $quickmod and $action variables
for the 'core.modify_quickmod_actions' event trigerring
to avoid of using global operator in corresponding extensions.

PHPBB3-13006
 2014-08-22 21:55:26 +08:00
Marc Alexander
b2701f00e9 Merge branch 'develop-ascraeus' into develop 2014-08-21 00:44:27 +02:00
Marc Alexander
31aac66f5a Merge pull request #2885 from Nicofuma/ticket/12990 
[ticket/12990] Use the full services name for the notification's types
 2014-08-21 00:44:05 +02:00
Marc Alexander
aa8403ff02 Merge branch 'develop-ascraeus' into develop 2014-08-20 22:04:14 +02:00
Tristan Darricau
9486c693b6 [ticket/12998] Fix use of $lang in mcp_warn.php 
PHPBB3-12998
 2014-08-19 23:02:54 +02:00
Tristan Darricau
fe1ab6d2ef [ticket/12993] Return an array instead of reference passing 
PHPBB3-12993
 2014-08-19 22:25:01 +02:00
Tristan Darricau
5e7d9d2fcf [ticket/12993] Fix includes of functions_display 
PHPBB3-12993
 2014-08-19 13:51:21 +02:00
Tristan Darricau
496cc64bc6 [ticket/12993] Rename to phpbb_get_user_rank 
PHPBB3-12993
 2014-08-18 16:32:05 +02:00
Forumhulp.com
8671e40217 [ticket/12993] Improve get_user_ranks 
Explanation in http://area51.phpbb.com/phpBB/viewtopic.php?f=108&t=46051

PHPBB3-12993
 2014-08-18 13:59:33 +02:00
Tristan Darricau
fe80967535 [ticket/12990] Use the full services name for the notification's types 
PHPBB3-12990
 2014-08-16 21:46:03 +02:00
Marc Alexander
6f804018d0 Merge branch 'develop-ascraeus' into develop 2014-08-11 07:32:27 +02:00
Cesar G
43a309ce2b [ticket/12967] Fix undefined variable phpbb_dispatcher error. 
PHPBB3-12967
 2014-08-11 00:34:12 +02:00
brunoais
602b932a23 [ticket/12928] Update to RC4 
PHPBB3-12928
 2014-08-09 18:18:19 +01:00
Marc Alexander
4840584cd6 Merge branch 'develop-ascraeus' into develop 2014-08-09 13:06:01 +02:00
Geolim4
3825aee130 [ticket/11520] Re-adjust userpost count on topic fork 
PHPBB3-11520
 2014-08-08 17:07:29 +02:00
Geolim4
af67bd3ea5 [ticket/11520] Coding guideline compliance 
PHPBB3-11520
 2014-08-08 17:07:16 +02:00
Geolim4
fc1e420a7c [ticket/11520] Re-adjust userpost count on topic fork 
PHPBB3-11520
 2014-08-08 17:05:40 +02:00
Joas Schilling
55c21834ad Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12927] core.mcp_queue_get_posts2_query_before
 2014-08-08 14:52:55 +02:00
Joas Schilling
96e9d728b9 Merge pull request #2824 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
Joas Schilling
4e66d7bdd9 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12880] core.mcp_queue_!is_topics_query_before
 2014-08-08 14:36:10 +02:00
Joas Schilling
53247573c2 Merge pull request #2764 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
Joas Schilling
b7f4d98cf2 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12876] core.mcp_mcp_front.mcp_front_view_queue_postid_list_after
 2014-08-08 14:33:11 +02:00
Joas Schilling
bef9d64179 Merge pull request #2762 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
brunoais
621f940805 [ticket/12928] core.mcp_reports_gather_query_before 
Adding the core.mcp_reports_gather_query_before
event to mcp backend.

PHPBB3-12928
 2014-08-08 13:10:59 +01:00
brunoais
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
brunoais
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
brunoais
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
Marc Alexander
d1cd81785e Merge branch 'develop-ascraeus' into develop 2014-08-07 15:09:42 +02:00
Marc Alexander
1304ccc02b Merge pull request #2763 from brunoais/ticket/12877 
[ticket/12877] core.mcp_mcp_front_reports_listing_query_before
 2014-08-07 15:09:18 +02:00
brunoais
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
Andreas Fischer
d5958875c5 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [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
Andreas Fischer
248b11c4db Merge pull request #2701 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
Tristan Darricau
657fc069e8 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12695] Add viewtopic language file for parse_attachments in mcp_post
 2014-07-10 15:28:07 +02:00
Tristan Darricau
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
Marc Alexander
83f4bd9ee7 [ticket/12695] Add viewtopic language file for parse_attachments in mcp_post 
PHPBB3-12695
 2014-07-10 14:39:53 +02:00
Tristan Darricau
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
Nils Adermann
10d963a94e Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12612] Prefix check_ids() with phpbb_
  [ticket/12612] Prefix mcp_sorting() with phpbb_
  [ticket/12612] Prefix get_*_data() with phpbb_ and delete unused global
  [ticket/12612] Prefix module url functions with phpbb_
  [ticket/12612] Prefix upload_popup() with phpbb_
  [ticket/12612] Prefix handle_post_delete() with phpbb and remove unused global
  [ticket/12612] Prefix custom UCP module function with phpbb_
  [ticket/12612] Prefix _sort_last_active() with phpbb_
  [ticket/12612] Prefix show_profile() with phpbb and delete unused global
 2014-06-24 01:24:45 -04:00
Joas Schilling
952b4de231 [ticket/12612] Prefix check_ids() with phpbb_ 
PHPBB3-12612
 2014-06-23 23:01:52 +02:00
Joas Schilling
4ac43856f7 [ticket/12612] Prefix mcp_sorting() with phpbb_ 
PHPBB3-12612
 2014-06-23 23:00:13 +02:00
Joas Schilling
c315fc6c89 [ticket/12612] Prefix get_*_data() with phpbb_ and delete unused global 
PHPBB3-12612
 2014-06-23 22:58:41 +02:00
Joas Schilling
bba23f61b3 [ticket/12612] Prefix module url functions with phpbb_ 
PHPBB3-12612
 2014-06-23 22:54:15 +02:00
Andreas Fischer
c9da435d3c Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12721] Update rules descriptions
  [ticket/12721] Add Generic.NamingConventions.ConstructorName in strict
  [ticket/12721] Add Squiz.Functions.LowercaseFunctionKeywords in legacy
  [ticket/12721] Add Squiz.ControlStructures.ForLoopDeclaration in legacy
  [ticket/12721] Add Squiz.ControlStructures.ForEachLoopDeclaration
  [ticket/12721] Add Squiz.ControlStructures.ElseIfDeclaration in legacy
  [ticket/12721] Add Generic.Functions.OpeningFunctionBraceBsdAllman
  [ticket/12721] Add Squiz.Arrays.ArrayBracketSpacing in the legacy ruleset
  [ticket/12721] Add Generic.Files.LowercasedFilename in the legacy ruleset
 2014-06-17 00:42:40 +02:00
Tristan Darricau
09fc008e62 [ticket/12721] Add Squiz.ControlStructures.ElseIfDeclaration in legacy 
PHPBB3-12721
 2014-06-16 22:35:41 +02:00
Andreas Fischer
7f5aeeef01 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12722] Add Generic.Formatting.SpaceAfterCast in the legacy ruleset
 2014-06-16 22:24:59 +02:00
Tristan Darricau
ca3cdadd08 [ticket/12722] Add Generic.Formatting.SpaceAfterCast in the legacy ruleset 
PHPBB3-12722
 2014-06-16 19:05:09 +02:00
Joas Schilling
592624379f Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [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:33 +02:00
Joas Schilling
771cbb2b3a Merge pull request #2434 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
Andreas Fischer
31abf1ab02 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12675] Fix code sniffer complaints introduced by recent commits
 2014-06-09 02:38:35 +02:00