Andreas Fischer fca0811943 Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/11112] updating links to phpbb.com to use SSL

Conflicts:
	phpBB/adm/index.php

2012-10-02 17:03:06 +02:00

..

acp

Merge remote-tracking branch 'EXreaction/ticket/11021' into develop

2012-09-15 17:48:51 +02:00

auth

…

cache

Merge remote-tracking branch 'github-igorw/feature/dic' into develop

2012-09-01 19:21:24 +02:00

captcha

…

config

…

cron

[feature/dic] Spaces to tabs, add useless docblocks

2012-09-01 19:17:01 +02:00

db

Merge branch 'develop-olympus' into develop

2012-08-26 15:22:12 +02:00

di/processor

[feature/dic] Spaces to tabs, add useless docblocks

2012-09-01 19:17:01 +02:00

diff

…

event

…

extension

[ticket/10631] Removing un-needed TODOs that are no longer needed.

2012-09-01 21:30:35 +01:00

hooks

…

lock

…

mcp

Merge remote-tracking branch 'nickvergessen/feature/php-events-4' into develop

2012-08-20 09:09:53 -04:00

php

…

questionnaire

…

request

…

search

Merge PR #954 branch 'dhruvgoel92/ticket/11032' into develop

2012-08-18 22:26:58 -04:00

style

…

template

Merge remote-tracking branch 'nickvergessen/ticket/10876' into develop

2012-09-08 15:58:25 -04:00

ucp

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

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

utf

…

.htaccess

…

bbcode.php

…

class_loader.php

…

constants.php

…

datetime.php

…

error_collector.php

…

functions_acp.php

Merge branch 'develop-olympus' into develop

2012-10-02 17:03:06 +02:00

functions_admin.php

[ticket/11052] update search backend constructor everywhere

2012-08-15 22:05:26 +05:30

functions_compress.php

[ticket/11092] phpbb_gen_download_links strict standards errors

2012-09-07 11:29:47 -05:00

functions_content.php

[feature/add_events] Put globals on one line

2012-08-22 10:41:59 -04:00

functions_convert.php

…

functions_display.php

[ticket/11092] phpbb_gen_download_links strict standards errors

2012-09-07 11:29:47 -05:00

functions_download.php

[feature/attach-dl] Optimised an sql query

2012-08-15 06:10:53 +08:00

functions_install.php

Merge remote-tracking branch 'github-igorw/feature/dic' into develop

2012-09-01 19:21:24 +02:00

functions_jabber.php

…

functions_messenger.php

…

functions_module.php

…

functions_posting.php

Merge remote-tracking branch 'nickvergessen/feature/php-events-4' into develop

2012-08-20 09:09:53 -04:00

functions_privmsgs.php

…

functions_profile_fields.php

…

functions_transfer.php

…

functions_upload.php

…

functions_user.php

[feature/add_events] Globalize event dispatcher object in some functions

2012-08-22 08:37:33 -04:00

functions.php

Merge branch 'develop-olympus' into develop

2012-10-02 17:03:06 +02:00

group_positions.php

…

index.htm

…

json_response.php

…

message_parser.php

…

session.php

…

sphinxapi.php

…

startup.php

…

update_helpers.php

…

user.php

[feature/php-events] Add core.user_setup event

2012-08-01 11:07:34 +02:00