makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 21:38:54 +00:00
Code Issues Projects Releases Packages Wiki Activity
phpbb/phpBB/includes/mcp
History
Nathan Guse 2469225a72 Merge branch 'develop-olympus' of github.com:phpbb/phpbb3 into ticket/8610 
# By Oleg Pudeyev (29) and others
# Via Andreas Fischer (3) and others
* 'develop-olympus' of github.com:phpbb/phpbb3: (36 commits)
  [ticket/11262] Add .lock in cache directory to .gitignore
  [ticket/11265] Add assertions for board installation success.
  [ticket/11162] Reformat.
  [ticket/10491] Make recreate_database static.
  [ticket/11162] Rename tricky updates to database helper.
  [ticket/10491] Install board once per test run.
  [ticket/10972] Drop user deletion.
  [ticket/10972] Tweak user addition.
  [ticket/10972] Add destroy method to mock cache.
  [ticket/10972] Add mock null cache.
  [ticket/10972] Backport get_db from develop.
  [ticket/10972] Added explicit checks for creating duplicate users.
  [ticket/10972] Moved tests into appropriate places and added comments
  [ticket/10972] Added methods for creating and deleting basic users
  [ticket/11162] Use empty($queries).
  [ticket/11162] Review comments fixed.
  [ticket/11162] Reformat.
  [ticket/11162] Newlines to LF.
  [ticket/11162] Use correct functions.
  [ticket/11162] Account for notify_status.
  ...

Conflicts:
	phpBB/includes/mcp/mcp_topic.php
2012-12-13 20:46:25 -06:00
..
info Users can report PMs to moderators which are then visible in a new MCP module 2009-07-21 20:59:11 +00:00
mcp_ban.php initialize $pre_fill 2008-06-04 11:11:48 +00:00
mcp_forum.php Merge branch 'develop-olympus' of github.com:phpbb/phpbb3 into ticket/8610 2012-12-13 20:46:25 -06:00
mcp_front.php [ticket/9874] view_log() performs unneeded count query over all log entries. 2011-02-25 00:04:48 +01:00
mcp_logs.php [ticket/5506] Do not display an empty last page after deleting logs. 2011-07-14 04:05:20 +02:00
mcp_main.php [ticket/8610] Revert some funky merging I did from rebase 2012-12-13 20:32:43 -06:00
mcp_notes.php [ticket/5506] Do not display an empty last page after deleting logs. 2011-07-14 04:05:20 +02:00
mcp_pm_reports.php fix mcp sorting for pm_reports, and some minor language changes 2009-07-22 13:33:54 +00:00
mcp_post.php [ticket/10365] Require m_report permission to see reports in mcp_post 2011-10-30 19:10:58 +01:00
mcp_queue.php [ticket/9956] Display error message if no disapprove reason given 2011-10-14 04:18:44 +02:00
mcp_reports.php [ticket/10402] Fixed a formatting issue with report details. 2011-10-22 23:03:49 +01:00
mcp_topic.php Merge branch 'develop-olympus' of github.com:phpbb/phpbb3 into ticket/8610 2012-12-13 20:46:25 -06:00
mcp_warn.php [ticket/10797] user rank is displayed in mcp_warn.php 2012-04-16 01:24:10 +05:30