phpbb/phpBB/assets/javascript
Nils Adermann b187031082 Merge remote-tracking branch 'github-prototech/ticket/12265' into develop-ascraeus
* github-prototech/ticket/12265:
  [ticket/12265] Actually use $u_pm.
  [ticket/12265] Ensure that dropdown is always at the very left of the container
  [ticket/12265] Define a loop for contact icons.
  [ticket/12265] Break the icons that aren't in loop in case extensions add more
  [ticket/12265] Fix modulo logic.
  [ticket/12265] Adjust alignment of AIM and Jabber icons.
  [ticket/12265] Ensure that there's only 4 icons per row in IE & Opera.
  [ticket/12265] Add contact icon and remove border from last row & cells.
  [ticket/12265] Fix issue with dropdown being restricted by the width of parent
  [ticket/12265] Remove ugly logic.
  [ticket/12265] Simplify contact icon design and move to dropdown.

Conflicts:
	phpBB/viewtopic.php
2014-05-02 18:29:50 +02:00
..
core.js Merge remote-tracking branch 'github-prototech/ticket/12265' into develop-ascraeus 2014-05-02 18:29:50 +02:00
editor.js Merge branch 'develop-olympus' into develop 2014-02-19 09:23:02 -06:00
jquery.js [ticket/12337] Update jQuery to version 1.11.0 2014-03-31 21:09:47 -07:00
plupload.js [ticket/12375] Fix broken attachment deletion. 2014-04-08 21:51:56 -07:00