mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-29 10:39:19 +02:00
Code Issues Releases Wiki Activity
24,144 Commits 18 Branches 192 Tags
Commit Graph

730 Commits

Author SHA1 Message Date
Marc Alexander
7c4b7f63fc Merge branch 'develop-ascraeus' into develop 2014-10-21 18:58:06 -05:00
Marc Alexander
faec26b873 Merge pull request #3053 from Senky/ticket/13194 
[ticket/13194] BBCode isn't parsed when issuing a warning for a post
 2014-10-21 18:57:43 -05:00
Jakub Senko
defeb1a56f [ticket/13194] Use correct array to access bbcode_bitfield 
PHPBB3-13194
 2014-10-21 22:21:48 +02:00
Marc Alexander
6216771ac0 Merge branch 'develop-ascraeus' into develop 2014-10-18 18:00:38 -04:00
Joas Schilling
66342f5b89 [ticket/13171] Check the correct (soft)delete permission when deleting in MCP 
PHPBB3-13171
 2014-10-17 15:39:20 +02:00
Joas Schilling
b7610b444a Merge branch 'develop-ascraeus' into develop 2014-10-02 15:18:44 +02:00
Joas Schilling
2ee13bbc24 Merge pull request #3004 from Senky/ticket/13116 
[ticket/13116] Topic and post approval notifications got interchanged
 2014-10-02 15:18:23 +02:00
Marc Alexander
ec34fb85ca Merge branch 'develop-ascraeus' into develop 2014-10-01 15:59:15 +02:00
Joas Schilling
95c0d81ba1 [ticket/13119] Add another event which is triggered independent from actions 
PHPBB3-13119
 2014-10-01 14:54:26 +02:00
Joas Schilling
d73194a415 Merge branch 'develop-ascraeus' into develop 2014-10-01 10:19:39 +02:00
Joas Schilling
170b75d0c9 Merge pull request #2888 from Nicofuma/ticket/12993 
[ticket/12993] Improve get_user_ranks
 2014-10-01 10:19:24 +02:00
Cesar G
d644de5217 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13119] Remove unused globals and use the request class
  [ticket/13119] Add events to ACP's ban module
  [ticket/13119] Add events to MCP's ban module
 2014-10-01 00:44:16 -07:00
Joas Schilling
6f66423de9 [ticket/13119] Remove unused globals and use the request class 
PHPBB3-13119
 2014-09-30 18:22:06 +02:00
Joas Schilling
9c3126add0 [ticket/13119] Add events to MCP's ban module 
PHPBB3-13119
 2014-09-30 18:22:04 +02:00
Jakub Senko
e132cdd325 [ticket/13116] Interchange post and topic approval notification 
PHPBB3-13116
 2014-09-29 21:13:53 +02:00
Andreas Fischer
f73e60935d Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13057] Add $phpbb_dispatcher to the global in mcp/mcp_report.php
 2014-09-12 00:52:24 +02:00
Tristan Darricau
7b4c5bdd34 [ticket/13057] Add $phpbb_dispatcher to the global in mcp/mcp_report.php 
PHPBB3-13057
 2014-09-11 22:01:09 +02:00
Tristan Darricau
d1c4e0d63c Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13006] Add variables to the 'core.modify_quickmod_actions' event
 2014-09-11 16:44:57 +02:00
Tristan Darricau
5804e43589 Merge pull request #2903 from rxu/ticket/13006 
[ticket/13006] Add variables to the 'core.modify_quickmod_actions' event

* rxu/ticket/13006:
  [ticket/13006] Add variables to the 'core.modify_quickmod_actions' event
 2014-09-11 16:44:16 +02:00
Marc Alexander
05a7a57815 Merge branch 'develop-ascraeus' into develop 2014-08-30 22:56:26 +02:00
Marc Alexander
01f821bbc3 Merge pull request #2826 from brunoais/ticket/12928 
[ticket/12928] core.mcp_reports_gather_query_before
 2014-08-30 22:55:56 +02:00
Dhruv
df3bc78af8 Merge branch 'develop-ascraeus' into develop 
# By Marc Alexander
# Via Dhruv Goel (1) and Marc Alexander (1)
* develop-ascraeus:
  [ticket/12966] Sort by post_time and post_id where applicable
  [ticket/12966] Sort posts by post_id in addition to sorting by post_time
 2014-08-29 20:44:41 +05:30
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