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

..

acp

[feature/sqlite3] Remove unneeded ORDER BY type from sqlite_master queries

2014-05-02 15:45:23 +02:00

captcha

[ticket/12458] Apply Squiz.WhiteSpace.SuperfluousWhitespace.* to legacy code.

2014-04-29 17:51:21 +02:00

diff

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

hooks

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

mcp

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

2014-05-02 12:22:05 +02:00

questionnaire

Merge remote-tracking branch 'upstream/develop' into ticket/11015

2012-12-06 21:49:24 -05:00

ucp

Merge remote-tracking branch 'github-prototech/ticket/12265' into develop-ascraeus

2014-05-02 18:29:50 +02:00

utf

[ticket/12458] Apply Squiz.WhiteSpace.SuperfluousWhitespace.* to legacy code.

2014-04-29 17:51:21 +02:00

.htaccess

…

bbcode.php

[ticket/11962] Resize posted images to fit and give them a class

2014-03-30 14:19:16 -07:00

constants.php

Merge remote-tracking branch 'github-exreaction/ticket/8323' into develop-ascraeus

2014-05-02 15:54:10 +02:00

functions_acp.php

[ticket/12273] Update since version to 3.1.0-a* style

2014-04-25 12:15:44 +02:00

functions_admin.php

[feature/sqlite3] Add support for SQLite 3

2014-05-02 15:45:20 +02:00

functions_compatibility.php

[ticket/12199] Move deprecated functions to functions_compatibility.php

2014-04-26 01:25:51 +02:00

functions_compress.php

[ticket/11981] Fix code sniffer complaints

2013-10-28 23:05:46 +01:00

functions_container.php

[ticket/12386] Rename DEBUG_EXTRA to DEBUG_CONTAINER for more descriptive name

2014-04-11 11:11:31 +02:00

functions_content.php

Merge remote-tracking branch 'github-prototech/ticket/11508' into develop-ascraeus

2014-05-02 16:40:01 +02:00

functions_convert.php

[feature/sqlite3] Add support for SQLite 3

2014-05-02 15:45:20 +02:00

functions_database_helper.php

[ticket/12282] Use interface for type hinting

2014-04-01 19:17:41 +02:00

functions_display.php

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

2014-05-02 12:22:05 +02:00

functions_download.php

[ticket/12282] Use interface for type hinting

2014-04-01 19:17:41 +02:00

functions_install.php

[feature/sqlite3] Add support for SQLite 3

2014-05-02 15:45:20 +02:00

functions_jabber.php

Merge branch 'develop-olympus' into develop

2013-07-12 10:37:52 -05:00

functions_messenger.php

[ticket/8558] htmlspecialchars_decode the contact name for emails

2014-05-02 13:03:14 +02:00

functions_module.php

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

2014-05-02 12:22:05 +02:00

functions_posting.php

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

2014-05-02 12:22:05 +02:00

functions_privmsgs.php

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

2014-05-02 12:22:05 +02:00

functions_transfer.php

[ticket/10763] Do not call non-static transfer() statically

2014-03-09 21:53:21 +01:00

functions_upload.php

[ticket/12458] Apply Squiz.WhiteSpace.SuperfluousWhitespace.* to legacy code.

2014-04-29 17:51:21 +02:00

functions_url_matcher.php

[ticket/12090] Split finding routes and returning routes into 2 methods

2014-03-09 18:38:21 +01:00

functions_user.php

Merge remote-tracking branch 'github-exreaction/ticket/8323' into develop-ascraeus

2014-05-02 15:54:10 +02:00

functions.php

Merge remote-tracking branch 'github-nickvergessen/feature/sqlite3' into develop-ascraeus

2014-05-02 17:57:22 +02:00

index.htm

…

message_parser.php

[ticket/12458] Apply Squiz.WhiteSpace.SuperfluousWhitespace.* to legacy code.

2014-04-29 17:51:21 +02:00

sphinxapi.php

[ticket/11248] Convert line endings to LF - develop edition.

2012-12-07 21:57:33 -05:00

startup.php

[ticket/10893] Update the usage of Composer

2012-05-13 13:05:20 -04:00