mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-13 11:06:03 +02:00
Code Issues Releases Wiki Activity
26,341 Commits 18 Branches 192 Tags
Commit Graph

802 Commits

Author SHA1 Message Date
Joas Schilling
03b1b63520 Merge branch '3.1.x' 2015-06-27 11:06:30 +02:00
Joas Schilling
2237030398 Merge pull request #3725 from RMcGirr83/ticket/13962 
[ticket/13962] MCP Queue dropdown for forum selection
 2015-06-27 11:01:47 +02:00
Marc Alexander
9e117a9eeb Merge branch '3.1.x' 
Conflicts:
	phpBB/includes/mcp/mcp_post.php
 2015-06-26 10:25:10 +02:00
Crizzo
ef6af2682b [ticket/13966] Adds the missing phpbb_dispatcher to includes/mcp/mcp_post 
PHPBB3-13966
 2015-06-25 22:22:56 +02:00
RMcGirr83
2ec5c5de17 [ticket/13962] MCP Queue dropdown for forum selection 
PHPBB3-13962
 2015-06-23 13:26:47 -04:00
Marc Alexander
b2ada8ba09 Merge branch '3.1.x' 
Conflicts:
	phpBB/includes/mcp/mcp_main.php
 2015-06-09 15:24:08 +02:00
Marc Alexander
072f4c9260 Merge pull request #3479 from brunoais/ticket/13685 
[ticket/13685] Allow modifying the query for mysql native fulltext search
 2015-06-09 14:27:13 +02:00
brunoais
1e45a05000 [ticket/13685] Add phpbb_dispatcher to fulltext search constructors 
PHPBB3-13685
 2015-06-07 18:40:44 +01:00
Joas Schilling
c28a213b1b Merge branch '3.1.x' 
Conflicts:
	phpBB/styles/subsilver2/template/mcp_post.html
 2015-06-04 17:46:36 +02:00
Joas Schilling
bb7f843344 Merge pull request #3558 from javiexin/ticket/13786 
[ticket/13786] Add events to add MCP post options
 2015-06-04 17:45:21 +02:00
Joas Schilling
f6d7ea425f Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13672] Removed bogus sting concatenation
  [ticket/13672] BUMP version to 3.1.5-dev
  [ticket/13672] Allow changing the data from the user-submitted report
 2015-05-28 12:59:04 +02:00
Joas Schilling
75dd91412b Merge pull request #3469 from brunoais/ticket/13672 
[ticket/13672] Allow changing the data from the user-submitted report

* brunoais/ticket/13672:
  [ticket/13672] Removed bogus sting concatenation
  [ticket/13672] BUMP version to 3.1.5-dev
  [ticket/13672] Allow changing the data from the user-submitted report
 2015-05-28 12:58:58 +02:00
Joas Schilling
7278356936 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13668] Removed bogus sting concatenation
  [ticket/13668] BUMP version to 3.1.5-dev
  [ticket/13668] Allow changing the query to obtain the user-submitted report.
  [ticket/13668] Convert the mcp report_details query to a built query

Conflicts:
	phpBB/includes/mcp/mcp_reports.php
 2015-05-28 12:56:26 +02:00
Joas Schilling
cf93c6503a Merge pull request #3468 from brunoais/ticket/13668 
[ticket/13668] Allow changing the query to obtain the user-submitted report

* brunoais/ticket/13668:
  [ticket/13668] Removed bogus sting concatenation
  [ticket/13668] BUMP version to 3.1.5-dev
  [ticket/13668] Allow changing the query to obtain the user-submitted report.
  [ticket/13668] Convert the mcp report_details query to a built query
 2015-05-28 12:55:31 +02:00
brunoais
4119be5a3d [ticket/13672] Removed bogus sting concatenation 
PHPBB3-13672
 2015-05-08 10:43:48 +01:00
brunoais
d4fb3996d3 [ticket/13668] Removed bogus sting concatenation 
PHPBB3-13668
 2015-05-08 10:41:42 +01:00
Marc Alexander
b1a52a5ef3 Merge branch '3.1.x' 2015-05-08 11:07:56 +02:00
Marc Alexander
7a478b27dd Merge pull request #3459 from brunoais/ticket/13664 
[ticket/13664] Add event to allow changing number of unapproved posts in mcp_front
 2015-05-08 11:07:50 +02:00
Marc Alexander
d275586689 Merge branch '3.1.x' 2015-05-08 00:17:24 +02:00
Marc Alexander
1e28748c0c Merge pull request #3455 from brunoais/ticket/13660 
[ticket/13660] Allow changing the query for total reports in mcp_front
 2015-05-08 00:17:10 +02:00
brunoais
603726371c [ticket/13660] BUMP version to 3.1.5-RC1 
PHPBB3-13660
 2015-05-06 23:08:07 +01:00
brunoais
9833eb4f13 [ticket/13672] BUMP version to 3.1.5-dev 
PHPBB3-13672
 2015-05-06 23:00:26 +01:00
brunoais
9e06beb48d [ticket/13668] BUMP version to 3.1.5-dev 
PHPBB3-13668
 2015-05-06 22:56:22 +01:00
brunoais
70cbe67105 [ticket/13664] BUMP version to 3.1.5-dev 
PHPBB3-13664
 2015-05-06 22:55:30 +01:00
Andreas Fischer
636524fa56 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13819] Add missing sql_freeresult() to files in includes/

Conflicts:
	phpBB/includes/acp/acp_database.php
 2015-05-06 01:06:21 +02:00
Marc Alexander
de90dd25b2 [ticket/13819] Add missing sql_freeresult() to files in includes/ 
PHPBB3-13819
 2015-05-05 23:55:13 +02:00
javiexin
f80dc9dc16 [ticket/13786] Add events to add MCP post options 
Three new events are included:
1) Core event to perform new moderator action in includes/mcp/mcp_post.php
2) Core event to add/modify template data in includes/mcp/mcp_post.php
3) Template event to present new options in template/mcp_post.html
Fix another typo.

PHPBB3-13786
 2015-04-27 17:36:43 +02:00
javiexin
18e8f281be [ticket/13786] Add events to add MCP post options 
Three new events are included:
1) Core event to perform new moderator action in includes/mcp/mcp_post.php
2) Core event to add/modify template data in includes/mcp/mcp_post.php
3) Template event to present new options in template/mcp_post.html
Fix typo.

PHPBB3-13786
 2015-04-27 15:35:09 +02:00
javiexin
e98a5afd07 [ticket/13786] Add events to add MCP post options 
Three new events are included:
1) Core event to perform new moderator action in includes/mcp/mcp_post.php
2) Core event to add/modify template data in includes/mcp/mcp_post.php
3) Template event to present new options in template/mcp_post.html

PHPBB3-13786
 2015-04-27 13:21:23 +02:00
MateBartus
a089ff5eb0 [ticket/13654] Moving reporting into controller 
Moving report.php's content into different services and controllers to
better comply with the MVC model.

Also implementing:
 * Replacement for reasons_display()
 * Adding assign_meta_refresh_var() to \controller\helper
 * Adding separate routes for easy configuration
 * Updating unit tests to expect to correct results
 * Add BC tests

PHPBB3-13654
 2015-04-16 11:29:11 +02:00
Joas Schilling
34b768cfaf Merge branch '3.1.x' 2015-04-06 11:31:58 +02:00
Joas Schilling
23db98276f Merge pull request #3409 from Senky/ticket/11424 
[ticket/11424] Quick-Mod Tools race condition results in NO_MODE
 2015-04-06 11:31:53 +02:00
brunoais
94da39cd88 [ticket/13660] Fix @since version. 
PHPBB3-13660
 2015-03-10 15:42:07 +00:00
brunoais
4cdcb6d5d3 [ticket/13672] Allow changing the data from the user-submitted report 
PHPBB3-13672
 2015-03-05 18:31:11 +00:00
brunoais
8a6d55520d [ticket/13668] Allow changing the query to obtain the user-submitted report. 
PHPBB3-13668
 2015-03-05 16:21:23 +00:00
brunoais
fa474c4378 [ticket/13668] Convert the mcp report_details query to a built query 
PHPBB3-13668
 2015-03-05 16:19:36 +00:00
Marc Alexander
f85d49aada Merge branch '3.1.x' 2015-03-05 15:47:04 +01:00
Marc Alexander
8f09ff210f Merge pull request #3413 from kasimi/ticket/13540 
[ticket/13540] Add topic info and total posts count to mcp_topic_review_modify_row event
 2015-03-05 15:46:33 +01:00
brunoais
21cc1fda85 [ticket/13664] Added alias to table to make modding easier. 
PHPBB3-13664
 2015-03-01 20:57:06 +00:00
brunoais
5fa6871ebf [ticket/13664] Add event to allow changing number of unapproved posts listed 
PHPBB3-13664
 2015-03-01 20:26:12 +00:00
brunoais
5ad69bbecf [ticket/13664] From string query in mcp_front unapproved posts to built query 
PHPBB3-13664
 2015-03-01 19:55:43 +00:00
brunoais
8b23272c33 [ticket/13660] Allow changing the query for total reports in mcp_front 
PHPBB3-13660
 2015-02-28 08:57:43 +00:00
Jakub Senko
8d6ab63fea [ticket/11424] Add space between control flow keywords and parenthesis 
PHPBB3-11424
 2015-02-19 22:07:26 +01:00
Marc Alexander
5ad4685f00 Merge branch '3.1.x' 2015-02-18 18:04:46 +01:00
kasimi
c7ce6cd26f [ticket/13540] Add total post count to mcp_topic_review_modify_row event 
PHPBB3-13540
 2015-02-17 00:48:04 +01:00
kasimi
f9d34a16dd [ticket/13540] Add topic_info to mcp_topic_review_modify_row event 
PHPBB3-13540
 2015-02-16 20:11:19 +01:00
Jakub Senko
6f56dc8568 [ticket/11424] Handle race condition properly for Quick-Mod Tools 
PHPBB3-11424
 2015-02-16 19:51:09 +01:00
JoshyPHP
4559aca723 [ticket/13595] Removed unused code 
PHPBB3-13595
 2015-02-13 22:55:04 +01:00
Gaëtan Muller
abcb2680ee [ticket/13455] Remove unnecessary calls to utf8_normalize_nfc() 
PHPBB3-13455
 2015-02-03 20:50:40 +01:00
Gaëtan Muller
f6e06da4c6 [ticket/13455] Update calls to request_var() 
PHPBB3-13455
 2015-02-03 20:50:40 +01:00