Vjacheslav Trushkin 8363d32765 Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/10699] Long h2 title breaks div.minitabs in MCP
  [ticket/10699] Long h2 title breaks div.minitabs in MCP

Conflicts:
	phpBB/styles/prosilver/theme/tweaks.css

2012-04-02 16:20:21 +03:00

..

adm

[ticket/10665] Adding includejs to acp templates

2012-04-01 20:50:59 +03:00

assets/javascript

[ticket/10272] Removed code that was prevent event propogation in AJAX.

2012-03-31 02:10:16 +02:00

cache

…

develop

Merge remote-tracking branch 'upstream/develop' into feature/merging-style-components

2012-03-29 22:38:07 +03:00

docs

[feature/class-prefix] Rename auth => phpbb_auth

2012-03-31 18:14:11 +02:00

download

[feature/event-dispatcher] Add missing dispatcher to file.php

2012-03-28 21:45:21 +02:00

files

…

images

…

includes

Merge remote-tracking branch 'sadu/ticket/10438' into develop

2012-04-01 21:39:37 +02:00

install

Merge remote-tracking branch 'github-igorw/feature/class-prefix' into develop

2012-03-31 18:16:55 +02:00

language

Merge pull request #670 from imkingdavid/feature/qrpreview

2012-04-01 11:28:47 -07:00

store

…

styles

Merge branch 'develop-olympus' into develop

2012-04-02 16:20:21 +03:00

.htaccess

…

common.php

[feature/class-prefix] Rename auth => phpbb_auth

2012-03-31 18:14:11 +02:00

composer.json

[feature/event-dispatcher] Use real EventDispatcher through composer

2012-03-11 15:15:33 +01:00

composer.lock

[feature/event-dispatcher] Use real EventDispatcher through composer

2012-03-11 15:15:33 +01:00

cron.php

…

faq.php

…

feed.php

…

index.php

[ticket/10586] Moved some loading stuff below extension controller, updated tests

2012-03-28 16:48:16 -04:00

mcp.php

…

memberlist.php

Merge branch 'develop-olympus' into develop

2012-03-16 06:06:56 -04:00

posting.php

[feature/qrpreview] Do not error or show preview if no text is entered

2012-03-31 15:52:16 -04:00

report.php

[feature/save-post-on-report] Changed the name of the column

2012-03-19 08:27:32 -04:00

search.php

…

ucp.php

…

viewforum.php

…

viewonline.php

…

viewtopic.php

[ticket/10270] Removed all the inline language and HTML from the JS.

2012-03-31 02:09:17 +02:00

web.config

…