Igor Wiedler c2b31ca101 Merge remote-tracking branch 'upstream/develop' into ticket/11574 ...

* upstream/develop:
  [ticket/11704] Use the correct directory for dependency checking.
  [ticket/11704] Correctly escape "
  [ticket/11697] author_search() used incorrect parameter

2013-07-14 15:27:25 -04:00

..

adm

[ticket/11675] Fix template loop

2013-07-13 16:25:08 -05:00

assets/javascript

Merge remote-tracking branch 'remotes/cyberalien/feature/editor-code-tabs' into develop

2013-06-06 14:07:27 -05:00

cache

…

config

[ticket/11696] Rename db_tools.php so it can be autoloaded

2013-07-14 10:10:05 -04:00

develop

Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permission

2013-07-11 11:41:48 +02:00

docs

Merge branch 'develop-olympus' into develop

2013-07-13 19:30:57 +02:00

download

[ticket/10820] fix if condition to check for IE

2013-06-14 00:29:06 +05:30

files

…

images

…

includes

Merge remote-tracking branch 'upstream/develop' into ticket/11574

2013-07-14 11:34:58 -04:00

install

Merge remote-tracking branch 'upstream/develop' into ticket/11574

2013-07-14 11:34:58 -04:00

language

Merge branch 'develop-olympus' into develop

2013-07-13 13:16:58 -04:00

phpbb

Merge remote-tracking branch 'upstream/develop' into ticket/11574

2013-07-14 15:27:25 -04:00

store

…

styles

Merge pull request #1429 from cyberalien/ticket/11553

2013-07-13 14:20:23 -07:00

.htaccess

…

app.php

…

common.php

[ticket/11698] Moving all autoloadable files to phpbb/

2013-07-14 01:32:34 -04:00

composer.json

Merge branch 'develop-olympus' into develop

2013-07-13 10:28:02 -05:00

composer.lock

Merge branch 'develop-olympus' into develop

2013-07-13 10:28:02 -05:00

cron.php

…

faq.php

…

feed.php

[ticket/11481] Move prepended slash from calls into function

2013-06-06 20:35:38 +02:00

index.php

…

mcp.php

[ticket/9657] Use the service instead of the static class

2013-07-11 14:24:07 +02:00

memberlist.php

Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permission

2013-07-11 11:41:48 +02:00

posting.php

[ticket/9657] Use the service instead of the static class

2013-07-11 14:24:07 +02:00

report.php

Merge branch 'ticket/11566' into ticket/11566-develop

2013-07-01 23:25:29 +05:30

search.php

[ticket/9657] Use the service instead of the static class

2013-07-11 14:24:07 +02:00

ucp.php

[ticket/11685] Remove logout confirmation page

2013-07-13 12:27:00 -04:00

viewforum.php

[ticket/11702] Fix forum_posts left over for link-click counts in viewforum.php

2013-07-14 10:49:23 -04:00

viewonline.php

…

viewtopic.php

Merge remote-tracking branch 'phpbb/develop' into ticket/9657

2013-07-13 09:36:24 -04:00

web.config

…