Marc Alexander 9bf58697dc Merge branch 'ticket/13073' into ticket/13073-develop ...

Conflicts:
	tests/controller/common_helper_route.php

2014-09-19 18:48:24 +02:00

..

adm

Merge pull request #2875 from PayBas/ticket/12961

2014-09-18 14:23:41 +02:00

assets

[ticket/13069] Fix timezone location filtering.

2014-09-16 14:47:42 -07:00

bin

[ticket/12663] Have cli.php language file at top level; unrelated to ACP.

2014-07-17 16:54:42 +02:00

cache

…

config

Merge branch 'develop-ascraeus' into develop

2014-09-17 20:11:23 +02:00

develop

[ticket/12958] Remove more references of subsilver2

2014-08-10 12:17:03 +02:00

docs

Merge branch 'develop-ascraeus' into develop

2014-09-05 21:07:02 +02:00

download

[ticket/13061] Replace the service event.subscriber_loader by a compiler pass

2014-09-13 14:34:18 +02:00

ext

[ticket/11163] Add ext/index.htm

2014-05-15 14:11:11 +02:00

files

Copy 3.0.x branch to trunk

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

images

…

includes

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

2014-09-19 18:48:24 +02:00

install

Merge branch 'develop-ascraeus' into develop

2014-09-18 14:04:22 +02:00

language

Merge pull request #2875 from PayBas/ticket/12961

2014-09-18 14:23:41 +02:00

phpbb

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

2014-09-19 18:48:24 +02:00

store

…

styles/prosilver

Merge branch 'develop-ascraeus' into develop

2014-09-18 15:07:51 -07:00

.htaccess

…

app.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

common.php

[ticket/12775] Update doc blocks

2014-07-07 01:02:37 +02:00

composer.json

[ticket/13032] Also update symfony/css-selector and pin it down.

2014-09-03 21:47:41 +02:00

composer.lock

[ticket/13032] Also update symfony/css-selector and pin it down.

2014-09-03 21:47:41 +02:00

cron.php

[ticket/12898] Call garbage_collection() at the end of cron.php

2014-07-28 14:45:39 +02:00

faq.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

feed.php

[ticket/13044] move GMT string out of gmdate()

2014-09-17 11:15:24 +02:00

index.php

…

mcp.php

[ticket/12612] Prefix get_*_data() with phpbb_ and delete unused global

2014-06-23 22:58:41 +02:00

memberlist.php

[ticket/12804] Disable jabber from memberlist sort options

2014-07-08 00:42:01 +02:00

posting.php

[ticket/13019] Always accept a reason for deleting a post/topic.

2014-09-14 10:38:56 -07:00

report.php

[ticket/12990] Use the full services name for the notification's types

2014-08-16 21:46:03 +02:00

search.php

[ticket/13066] Add search results core event to modify search title

2014-09-14 15:00:47 +08:00

ucp.php

[ticket/12612] Move function from ucp.php to functions_user.php

2014-06-18 16:57:13 +02:00

viewforum.php

[ticket/13062] Fix name of "ORDER_BY" key in SQL array

2014-09-19 00:56:16 +02:00

viewonline.php

[ticket/13051] Fix core event name

2014-09-09 13:12:29 -07:00

viewtopic.php

[ticket/13050] Allow topic/forum subscription when email/jabber is off

2014-09-07 18:54:34 +08:00

web.config

…