makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-20 02:08:51 +00:00
Code Issues Projects Releases Packages Wiki Activity
phpbb/phpBB
History
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
..
adm Merge remote-tracking branch 'github-rxu/ticket/12403' into develop-ascraeus 2014-05-02 13:35:01 +02:00
assets Merge remote-tracking branch 'github-prototech/ticket/12265' into develop-ascraeus 2014-05-02 18:29:50 +02:00
bin [ticket/11998] Make phpbbcli executable and add shebang 2013-11-12 00:12:34 +01:00
cache [ticket/11700] Add back accidently deleted file in cache dir 2013-09-17 16:18:04 +02:00
config [ticket/12150] Use log service instead of add_log() function 2014-03-29 22:16:25 +01:00
develop [feature/sqlite3] Add support for SQLite 3 2014-05-02 15:45:20 +02:00
docs [feature/sqlite3] Add support for SQLite 3 2014-05-02 15:45:20 +02:00
download [ticket/12171] Send correct status 403 when forbidden and 404 when not found 2014-02-10 12:56:45 +01:00
files
images
includes Merge remote-tracking branch 'github-prototech/ticket/12265' into develop-ascraeus 2014-05-02 18:29:50 +02:00
install [feature/sqlite3] Add support for SQLite 3 2014-05-02 15:45:20 +02:00
language Merge remote-tracking branch 'github-prototech/ticket/12265' into develop-ascraeus 2014-05-02 18:29:50 +02:00
phpbb Merge remote-tracking branch 'github-nickvergessen/feature/sqlite3' into develop-ascraeus 2014-05-02 17:57:22 +02:00
store
styles Merge remote-tracking branch 'github-prototech/ticket/12265' into develop-ascraeus 2014-05-02 18:29:50 +02:00
.htaccess [ticket/11215] Remove unnecessary comment 2013-09-02 15:34:14 -07:00
app.php [ticket/11852] Split filesystem and path_helper into 2 classes 2013-09-26 15:34:44 +02:00
common.php [ticket/12273] Update since version to 3.1.0-a* style 2014-04-25 12:15:44 +02:00
composer.json [ticket/12423] Increase Composer minimum-stability to stable. 2014-04-20 16:45:34 +02:00
composer.lock [ticket/12424] Update Symfony component from v2.3.4 to v2.3.12. 2014-04-20 16:48:26 +02:00
cron.php [ticket/11189] Replace DEBUG_EXTRA with DEBUG 2012-11-10 10:45:02 -06:00
faq.php [ticket/12364] Add template identifier var to all missing pages 2014-04-06 17:41:09 +02:00
feed.php [ticket/12413] Fatal Error for feed.php?mode=forums 2014-05-02 13:25:33 +02:00
index.php Merge remote-tracking branch 'github-nickvergessen/ticket/12273' into develop-ascraeus 2014-05-02 12:22:05 +02:00
mcp.php Merge remote-tracking branch 'github-nickvergessen/ticket/12273' into develop-ascraeus 2014-05-02 12:22:05 +02:00
memberlist.php Merge remote-tracking branch 'github-exreaction/ticket/8323' into develop-ascraeus 2014-05-02 15:54:10 +02:00
posting.php [ticket/12273] Update since version to 3.1.0-a* style 2014-04-25 12:15:44 +02:00
report.php [ticket/12458] Apply Squiz.WhiteSpace.SuperfluousWhitespace.* to legacy code. 2014-04-29 17:51:21 +02:00
search.php Merge remote-tracking branch 'github-nickvergessen/ticket/12273' into develop-ascraeus 2014-05-02 12:22:05 +02:00
ucp.php [ticket/12273] Update since version to 3.1.0-a* style 2014-04-25 12:15:44 +02:00
viewforum.php Merge remote-tracking branch 'github-nickvergessen/ticket/12273' into develop-ascraeus 2014-05-02 12:22:05 +02:00
viewonline.php [feature/sqlite3] Add support for SQLite 3 2014-05-02 15:45:20 +02:00
viewtopic.php Merge remote-tracking branch 'github-prototech/ticket/12265' into develop-ascraeus 2014-05-02 18:29:50 +02:00
web.config [feature/controller] Remove URL rewriting by default 2012-11-16 17:06:02 -05:00