Oleg Pudeyev 196ed8ef9f Merge PR #786 branch 'brunoais/ticket/10845' into develop ...

* brunoais/ticket/10845:
  [ticket/10845] Removed one empty line that wasn't supposed to be there
  [ticket/10845] Two of the three colouns were missing in the DB update file
  [ticket/10845] Remove censor from text
  [ticket/10845] Now it shows the preview post parsed
  [ticket/10845] Changed the report system. Now it saves posts with the bbcode

Conflicts:
	phpBB/includes/functions_content.php

2012-11-06 16:23:33 -05:00

..

acp

[ticket/11099] Mark acp_ban::display_ban_options() as static.

2012-10-30 18:43:00 -04:00

auth

[ticket/8713] Trim password in auth_db to keep compatibility.

2012-09-08 15:01:29 +02:00

cache

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

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

captcha

Merge remote-tracking branch 'p/ticket/11157' into develop

2012-10-30 18:19:44 -04:00

config

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

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

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

event

[feature/event-dispatcher] Fix copyright years

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

extension

[ticket/10933] Expanded prose documentation for phpbb_extension_provider.

2012-11-02 18:07:00 -04:00

hooks

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

lock

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

mcp

Merge PR #786 branch 'brunoais/ticket/10845' into develop

2012-11-06 16:23:33 -05: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

[ticket/8713] Update untrimmed_variable() doc block.

2012-09-09 21:53:17 +02:00

search

Merge PR #956 branch 'dhruvgoel92/ticket/11051' into develop

2012-10-10 00:39:29 -04:00

style

[ticket/10933] Use inheritDoc, eliminate copy pasted docblocks.

2012-11-02 19:28:32 -04:00

template

[ticket/10933] Dependency inject template context.

2012-11-02 18:51:35 -04:00

ucp

Merge branch 'develop-olympus' into develop

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

utf

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

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

.htaccess

[ticket/9698] Add .htaccess to the includes subdirectory.

2010-10-15 16:47:21 +02:00

bbcode.php

[ticket/10933] Dependency inject template context.

2012-11-02 18:51:35 -04:00

class_loader.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

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

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

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

Merge PR #786 branch 'brunoais/ticket/10845' into develop

2012-11-06 16:23:33 -05: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

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

2012-10-18 16:43:46 +02: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

[ticket/11100] Mark can_use_ssl() and can_use_tls() as static.

2012-09-08 01:12:34 +02:00

functions_messenger.php

[ticket/10933] Dependency inject template context.

2012-11-02 18:51:35 -04: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 PR #624 branch 'develop-olympus' into develop

2012-10-16 21:21:03 -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

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

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 PR #971 branch 'nickvergessen/ticket/11018' into develop

2012-10-22 17:44:34 -04:00

group_positions.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

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

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

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