Cesar G 4b46ac78a6 Merge branch '3.1.x' ...

* 3.1.x:
  [ticket/13905] Don't load loading.gif until needed.

2015-05-31 16:57:38 +02:00

..

adm

…

assets

Merge remote-tracking branch 'callumacrae/ticket/13905' into 3.1.x

2015-05-31 16:56:44 +02:00

bin

Merge pull request #3554 from Nicofuma/ticket/13770

2015-05-29 10:56:54 +02:00

cache

…

config

[ticket/13388] Integrate routing and di parameters resolution

2015-05-29 16:48:51 +02:00

develop

[ticket/13844] Fix language file so the tests pass

2015-05-16 23:13:50 +02:00

docs

Merge branch '3.1.x'

2015-05-28 12:42:56 +02:00

download

[ticket/13770] Wither interface for container_builder

2015-05-14 23:04:03 +02:00

ext

…

files

…

images

…

includes

Merge branch '3.1.x'

2015-05-30 10:58:40 +02:00

install

Merge pull request #3554 from Nicofuma/ticket/13770

2015-05-29 10:56:54 +02:00

language

Merge pull request #3383 from nickvergessen/ticket/9109

2015-05-29 16:04:56 +02:00

phpbb

Merge pull request #3592 from Nicofuma/ticket/13388

2015-05-30 13:21:22 +02:00

store

…

styles/prosilver

Merge branch '3.1.x'

2015-05-31 16:57:38 +02:00

.htaccess

…

app.php

…

common.php

[ticket/13770] Fix tests

2015-05-14 23:04:23 +02:00

composer.json

Merge branch '3.1.x'

2015-05-30 10:58:40 +02:00

composer.lock

Merge branch '3.1.x'

2015-05-30 10:58:40 +02:00

cron.php

…

faq.php

[ticket/13844] FAQ in new controller format

2015-05-16 22:09:05 +02:00

feed.php

…

index.php

…

mcp.php

…

memberlist.php

…

posting.php

Merge pull request #3613 from nickvergessen/ticket/13844

2015-05-29 15:44:39 +02:00

report.php

[ticket/13654] Moving reporting into controller

2015-04-16 11:29:11 +02:00

search.php

…

ucp.php

…

viewforum.php

…

viewonline.php

[ticket/13844] FAQ in new controller format

2015-05-16 22:09:05 +02:00

viewtopic.php

Merge branch '3.1.x'

2015-05-06 21:47:10 +02:00

web.config

…