David King 54bd800dab Merge branch 'develop-olympus' into develop ...

Conflicts:
	phpBB/includes/session.php

2012-05-29 20:36:52 -04:00

..

adm

Merge remote-tracking branch 'github-dhruv/ticket/10308' into develop

2012-05-29 16:40:00 +02:00

assets/javascript

[ticket/10784] Do not show ajax overlay unless needed

2012-04-12 21:03:47 +02:00

cache

…

develop

Merge PR #799 branch 'develop-olympus' into develop

2012-05-10 14:43:14 -04:00

docs

Merge PR #725 branch 'develop-olympus' into develop

2012-05-10 15:58:55 -04:00

download

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

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

files

…

images

…

includes

Merge branch 'develop-olympus' into develop

2012-05-29 20:36:52 -04:00

install

[ticket/10906] Add setting for last post topic title in schema_data.sql

2012-05-22 10:14:20 -04:00

language

Merge remote-tracking branch 'github-dhruv/ticket/10308' into develop-olympus

2012-05-29 16:42:37 +02:00

store

…

styles

[ticket/10905] Last topic title for subsilver2

2012-05-22 15:34:39 -03:00

.htaccess

…

common.php

[ticket/10756] Renaming phpbb_style_template to phpbb_template

2012-04-19 04:25:25 +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

[ticket/10672] Fix total post count language string in statistics and feed

2012-02-27 19:13:31 +01:00

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-04-03 20:57:31 -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

Merge branch 'develop-olympus' into develop

2012-02-26 15:47:16 +01:00

ucp.php

…

viewforum.php

Merge branch 'develop-olympus' into develop

2012-02-11 05:48:03 -05:00

viewonline.php

…

viewtopic.php

[ticket/10847] fixing all misspelled "dependant" to "dependent"

2012-04-30 21:55:24 +02:00

web.config

…