forums/phpBB/styles/subsilver2/template/ucp_prefs_personal.html, branch master

[ticket/12958] Remove subsilver2 for phpBB 3.2

2014-08-10T10:05:28+00:00

PHPBB3-12958

[ticket/12895] Rename user style setting to resolve conflict with style param

2014-07-29T11:24:44+00:00

The style URL parameter, i.e. style=1, will conflict with the user's style
setting due to it also being named style. This patch with solve this conflict.

PHPBB3-12895

[ticket/12372] Rename JS function dE() to phpbb.toggleDisplay()

2014-04-07T19:42:30+00:00

PHPBB3-12372

[ticket/12372] Move dE() function core.js

2014-04-07T19:27:48+00:00

PHPBB3-12372

[ticket/12372] Unify definition of function dE() across all files

2014-04-07T18:43:32+00:00

PHPBB3-12372

[ticket/11747] Use _prepend and _append for template events

2013-07-27T05:25:27+00:00

PHPBB3-11747

[ticket/11747] ucp_prefs_personal template events

2013-07-27T01:31:05+00:00

PHPBB3-11747

Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103

2012-12-08T03:14:39+00:00

Conflicts:
	phpBB/install/database_update.php
	phpBB/styles/prosilver/template/ucp_prefs_personal.html
	phpBB/styles/subsilver2/template/ucp_prefs_personal.html

Merge PR #1053 branch 'develop-olympus' into develop

2012-12-05T17:21:25+00:00

* develop-olympus:
  [ticket/10841] Revert more whitespace changes.
  [ticket/10841] Revert whitespace changes.
  [ticket/10841] adding space after if
  [ticket/10841] removing unnecessary spacing
  [ticket/10841] changing affectedrows check to COUNT in sql
  [ticket/10841] Modifying style and language selectors in UCP

Conflicts:
	phpBB/includes/ucp/ucp_prefs.php
	phpBB/styles/prosilver/template/ucp_prefs_personal.html

[ticket/10841] Revert whitespace changes.

2012-12-05T17:07:37+00:00

PHPBB3-10841