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

Merge PR #813 branch 'develop-olympus' into develop

2012-05-21 22:35:54 -04:00

cache

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

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

captcha

[ticket/10575] Adding public visibility to the methods.

2012-04-05 14:16:56 +01:00

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

[feature/event-dispatcher] Fix copyright years

2012-03-30 14:22:20 +02:00

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

[ticket/10931] Apply strtolower() correctly, i.e. not on false.

2012-06-11 15:46:03 +02:00

questionnaire

[feature/new-tz-handling] Remove appearances of board_dst and user_dst

2012-06-18 15:08:46 +02:00

request

…

search

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

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

style

[ticket/11012] Normalize $phpEx member vars to $php_ext

2012-07-21 16:19:01 +02:00

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

[ticket/10847] fixing all misspelled "dependant" to "dependent"

2012-04-30 21:55:24 +02:00

.htaccess

…

bbcode.php

[ticket/10743] Renaming user->theme

2012-06-11 19:56:50 -04:00

class_loader.php

…

constants.php

[feature/sphinx-fulltext-search] add sphinx_table constant to constants.php

2012-07-12 17:32:01 +05:30

datetime.php

[feature/new-tz-handling] Rename $user->tz back to $user->timezone

2012-07-18 16:52:52 +02:00

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

[feature/new-tz-handling] Remove appearances of board_dst and user_dst

2012-06-18 15:08:46 +02:00

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

[ticket/10756] Renaming phpbb_style_template to phpbb_template

2012-04-19 04:25:25 +02:00

functions_module.php

Merge remote-tracking branch 'dhruvgoel92/ticket/10704' into develop

2012-03-22 10:59:41 +01:00

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

Merge pull request #914 from EXreaction/ticket/10990

2012-07-22 16:25:17 -07:00

functions_profile_fields.php

Merge branch 'develop-olympus' into develop

2012-07-23 23:40:09 +02:00

functions_transfer.php

…

functions_upload.php

[ticket/10944] strpos now stricter and removed superfluous ternary

2012-07-17 17:39:19 +01:00

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

[ticket/10328] Fixed the header of json_response.php.

2012-03-31 02:09:21 +02:00

message_parser.php

…

session.php

Merge branch 'develop-olympus' into develop

2012-05-29 20:36:52 -04:00

sphinxapi.php

[feature/sphinx-fulltext-search] add sphinxapi.php file

2012-07-27 11:27:25 +05:30

startup.php

[ticket/10893] Update the usage of Composer

2012-05-13 13:05:20 -04:00

update_helpers.php

[ticket/11002] Use translating option to rename the Etc/GMT options

2012-07-21 15:18:16 +02:00

user.php

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

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