Andreas Fischer 0d0338a55c Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/11548] Fix incorrect usage of array_map on acp groups page

Conflicts:
	tests/functional/common_groups_test.php
	tests/functional/ucp_groups_test.php

2013-07-12 20:09:22 +02:00

..

adm

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twig

2013-07-01 12:03:24 -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

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00:00

config

[feature/twig] Remove style dependency for controller helper

2013-07-05 12:11:59 -05:00

develop

[ticket/11413] Undo editing the user_notifications table

2013-04-29 21:22:07 -05:00

docs

Merge branch 'develop-olympus' into develop

2013-06-21 17:12:58 +02:00

download

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

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

files

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00:00

images

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00:00

includes

Merge branch 'develop-olympus' into develop

2013-07-12 20:09:22 +02:00

install

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twig

2013-07-04 11:19:10 -05:00

language

[ticket/11662] Typos: occured -> occurred

2013-07-12 17:51:29 +02:00

store

…

styles

[ticket/11388] INCLUDECSS

2013-07-11 15:31:55 -05:00

.htaccess

…

app.php

…

common.php

[ticket/11335] Replace "$phpEx" with $phpEx

2013-04-24 20:39:24 -05:00

composer.json

[feature/twig] Change composer to load Twig 1.13.*

2013-06-24 13:40:05 -05:00

composer.lock

[feature/twig] Change composer to load Twig 1.13.*

2013-06-24 13:40:05 -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

[ticket/11103] Instantiate $phpbb_notifications as needed

2012-12-13 19:19:40 -06:00

mcp.php

[ticket/9975] Moved a few E_USER_ERROR errors to /language

2013-04-23 09:55:36 -07:00

memberlist.php

[ticket/11454] Use set_addresses in other applicable areas

2013-04-24 15:34:12 -05:00

posting.php

Merge branch 'develop-olympus' into develop

2013-05-06 22:11:33 +02:00

report.php

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

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

search.php

…

ucp.php

Merge branch 'develop-olympus' into develop

2012-10-29 15:16:59 -04:00

viewforum.php

[ticket/10954] Change behavior of marking topics/forums

2012-12-14 15:46:45 +01:00

viewonline.php

[ticket/11259] adm_relative_path -> phpbb_adm_relative_path

2012-12-09 19:29:51 -06:00

viewtopic.php

Merge branch 'develop-olympus' into develop

2013-07-11 13:15:26 -05:00

web.config

…