forums/phpBB/adm/style/acp_prune_users.html, branch master

[ticket/14201] Add events.md descriptions, fix accidentally swapped events

2015-10-12T14:31:09+00:00

PHPBB3-14201

[ticket/14201] Add more template events to ACP

2015-09-26T16:58:59+00:00

PHPBB3-14201

[develop] Fix incorrect merge conflict resolution from PR #2085

2014-03-05T10:51:38+00:00

PHPBB3-12235

Merge remote-tracking branch 'github-nickvergessen/ticket/12235' into develop

2014-03-05T10:49:11+00:00

* github-nickvergessen/ticket/12235:
  [ticket/12235] Convert WLM to custom profile field
  [ticket/12187] Do not make clickable when using as contact field
  [ticket/12187] Split generate_profile_fields_template() into 2 methods
  [ticket/12187] Remove user_website field
  [ticket/12187] Remove user_website functionality
  [ticket/12187] Convert website field data to custom profile field
  [ticket/12187] Add URL type for profile fields
  [ticket/12234] Replace ICQ with custom profile field
  [ticket/12233] Update schema file
  [ticket/12233] Add images back to subsilver2
  [ticket/12233] Allow profile fields to be contact fields

Conflicts:
	phpBB/adm/style/acp_prune_users.html

[ticket/12245] Fix id attributes in acp_prune_users.html

2014-03-03T22:11:45+00:00

The following labels had invalid id references:
1. joined (renamed to link to joined_after)
2. group_id (create teh id attribute on select box)

PHPBB3-12245

[ticket/12187] Remove user_website functionality

2014-03-03T19:01:19+00:00

PHPBB3-12187

[ticket/12045] Correctly close before closing parent tag

2013-11-28T12:17:38+00:00

PHPBB3-12045

[ticket/12045] Correctly close
with

2013-11-28T12:17:07+00:00

PHPBB3-12045

[ticket/11010] Fixes for number input in acp

2013-05-20T16:42:11+00:00

PHPBB3-11010

[ticket/10780] Replace colon usage in adm template output with {L_COLON}

2012-11-09T23:23:03+00:00

Same as 46a7940a976ec1f54078f803ec949aa2bfbf6316, but for ACP templates

PHPBB3-10780