Nathan Guse 4b3264d9bb Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 ...

Conflicts:
	phpBB/includes/functions_posting.php
	phpBB/language/en/email/forum_notify.txt
	phpBB/language/en/email/newtopic_notify.txt
	phpBB/language/en/email/topic_notify.txt

2012-10-16 23:33:57 -05:00

..

adm

Merge PR #890 branch 'nickvergessen/ticket/10982' into develop

2012-10-16 21:47:13 -04:00

assets/javascript

Merge PR #890 branch 'nickvergessen/ticket/10982' into develop

2012-10-16 21:47:13 -04:00

cache

…

config

[ticket/11103] Make $phpbb_notifications a global and use it everywhere

2012-10-04 14:47:13 -05:00

develop

[ticket/11103] Add is_disabled column to notifications table

2012-10-13 23:24:30 -05:00

docs

Merge branch 'develop-olympus' into develop

2012-09-29 00:26:43 +02:00

download

[ticket/11101] Delay execution of container processors

2012-09-08 14:41:41 +02:00

files

…

images

…

includes

[ticket/11103] Add author name output to post/topic email templates

2012-10-16 23:27:49 -05:00

install

[ticket/11103] Add is_disabled column to notifications table

2012-10-13 23:24:30 -05:00

language

Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103

2012-10-16 23:33:57 -05:00

store

…

styles

[ticket/11103] Return false to prevent appending # to the URL

2012-10-16 18:14:06 -05:00

.htaccess

…

common.php

[ticket/11103] Make $phpbb_notifications a global and use it everywhere

2012-10-04 14:47:13 -05:00

composer.json

…

composer.lock

[feature/dic] Update composer.lock to symfony/* RC1

2012-08-25 17:08:38 +02:00

cron.php

…

faq.php

…

feed.php

…

index.php

[ticket/11103] Mark read link if notification has no URL to view it

2012-10-16 10:51:07 -05:00

mcp.php

[feature/php-events] Readd comment from d06adb06e9

2012-08-11 11:49:48 +02:00

memberlist.php

[feature/php-events] Fix doc of core.memberlist_prepare_profile_data

2012-08-20 10:07:05 +02:00

posting.php

Merge pull request #962 from imkingdavid/feature/add_events

2012-09-01 12:44:23 -07:00

report.php

[ticket/11103] Use report text for report notification, never notify reporter

2012-10-16 17:44:46 -05:00

search.php

[ticket/11051] add common_words variable

2012-10-04 23:32:50 +05:30

ucp.php

…

viewforum.php

Merge remote-tracking branch 'upstream/develop' into feature/dic

2012-08-25 17:00:40 +02:00

viewonline.php

[feature/php-events] Fix doc of core.viewonline_overwrite_location

2012-08-20 10:15:04 +02:00

viewtopic.php

Merge remote-tracking branch 'Fyorl/feature/attach-dl' into develop

2012-08-26 18:56:09 +02:00

web.config

…