Dhruv 24f26478c4 Merge branch '3.1.x' ...

Conflicts:
	phpBB/phpbb/search/fulltext_native.php

2015-03-14 23:44:58 +08:00

..

adm

Merge branch '3.1.x'

2015-03-06 14:36:22 +01:00

assets

[ticket/13666] Remove data-clicked attribute from all of form's submit buttons

2015-03-05 22:26:13 +01:00

bin

[ticket/13450] Type-hint return value of $phpbb_container->get()

2015-01-12 20:19:07 +01:00

cache

…

config

[ticket/13647] Move FAQ page to a controller

2015-02-22 20:20:28 +01:00

develop

Merge branch 'develop-ascraeus' into develop

2015-02-11 16:53:25 +01:00

docs

Merge branch '3.1.x'

2015-03-10 15:23:29 +01:00

download

[ticket/13455] Update calls to request_var()

2015-02-03 20:50:40 +01:00

ext

…

files

…

images

…

includes

Merge branch '3.1.x'

2015-03-10 15:20:28 +01:00

install

[ticket/13497] Update calls to get_tables()

2015-02-11 21:28:11 +01:00

language

Merge branch '3.1.x'

2015-02-20 20:53:03 +01:00

phpbb

Merge branch '3.1.x'

2015-03-14 23:44:58 +08:00

store

…

styles/prosilver

Merge branch '3.1.x'

2015-03-11 13:49:44 +01:00

.htaccess

…

app.php

[ticket/13450] Type-hint return value of $phpbb_container->get()

2015-01-12 20:19:07 +01:00

common.php

[ticket/13407] Bump minimal version to php 5.3.9

2015-02-04 17:40:18 +01:00

composer.json

[ticket/13407] Bump minimal version to php 5.3.9

2015-02-04 17:40:18 +01:00

composer.lock

[ticket/13407] Update composer.lock file

2015-02-04 17:48:10 +01:00

cron.php

[ticket/13455] Update calls to request_var()

2015-02-03 20:50:40 +01:00

faq.php

[ticket/13647] Use the Symfony way for redirecting

2015-02-27 22:58:51 +01:00

feed.php

[ticket/13455] Update calls to request_var()

2015-02-03 20:50:40 +01:00

index.php

[ticket/13450] Type-hint return value of $phpbb_container->get()

2015-01-12 20:19:07 +01:00

mcp.php

[ticket/13455] Remove unnecessary calls to utf8_normalize_nfc()

2015-02-03 20:50:40 +01:00

memberlist.php

[ticket/13455] Remove request_var() references from comments

2015-02-03 20:56:48 +01:00

posting.php

[ticket/13647] Generate route links for faq

2015-02-22 22:44:50 +01:00

report.php

[ticket/13455] Remove unnecessary calls to utf8_normalize_nfc()

2015-02-03 20:50:40 +01:00

search.php

Merge branch '3.1.x'

2015-02-18 18:04:46 +01:00

ucp.php

[ticket/13455] Update calls to request_var()

2015-02-03 20:50:40 +01:00

viewforum.php

Merge branch '3.1.x'

2015-03-06 13:45:12 +01:00

viewonline.php

[ticket/13647] Switch FAQ handling in view online to controller

2015-02-22 22:57:14 +01:00

viewtopic.php

Merge branch '3.1.x'

2015-02-18 18:04:46 +01:00

web.config

…