Oleg Pudeyev b07ae3fe59 Merge PR #1053 branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/10841] Revert more whitespace changes.
  [ticket/10841] Revert whitespace changes.
  [ticket/10841] adding space after if
  [ticket/10841] removing unnecessary spacing
  [ticket/10841] changing affectedrows check to COUNT in sql
  [ticket/10841] Modifying style and language selectors in UCP

Conflicts:
	phpBB/includes/ucp/ucp_prefs.php
	phpBB/styles/prosilver/template/ucp_prefs_personal.html

2012-12-05 12:21:25 -05:00

..

acp

Merge remote-tracking branch 'Fyorl/ticket/10939' into develop

2012-11-10 23:49:29 +01:00

auth

…

cache

[ticket/10103] $rv had too few characters.

2012-12-04 13:45:02 -05:00

captcha

…

config

[ticket/11227] @return void -> @return null, per coding guidelines.

2012-11-30 23:03:06 -05:00

controller

[feature/controller] Allow injecting Symfony Request into controllers

2012-11-17 18:05:32 -05:00

cron

[ticket/11227] @return void -> @return null, per coding guidelines.

2012-11-30 23:03:06 -05:00

db

…

di

[feature/controller] Don't use $user->lang() before container compilation

2012-11-18 15:51:05 -05:00

diff

…

event

[feature/controller] Fix comments, check against more general HttpException

2012-11-19 12:55:15 -05:00

extension

…

hooks

…

lock

[ticket/11247] Fix wrong property reference in flock class.

2012-12-05 01:54:29 -05:00

mcp

…

php

…

questionnaire

Merge branch 'develop-olympus' into develop

2012-11-29 23:17:58 +01:00

request

Merge remote-tracking branch 'Fyorl/ticket/10939' into develop

2012-11-10 23:49:29 +01:00

search

[ticket/11174] include utf_tools in postgres search backend

2012-11-27 08:49:06 -05:00

style

[ticket/11227] @return void -> @return null, per coding guidelines.

2012-11-30 23:03:06 -05:00

template

[ticket/10103] Convert the rest of the tree to flock class.

2012-12-04 02:26:55 -05:00

ucp

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

2012-12-05 12:21:25 -05:00

utf

…

.htaccess

…

bbcode.php

…

class_loader.php

…

constants.php

…

datetime.php

…

error_collector.php

…

functions_acp.php

…

functions_admin.php

Merge branch 'develop-olympus' into develop

2012-11-29 23:17:58 +01:00

functions_compress.php

…

functions_container.php

Merge PR #1088 branch 'igorw/ticket/11199' into develop

2012-11-15 09:07:41 -05:00

functions_content.php

…

functions_convert.php

…

functions_display.php

…

functions_download.php

[ticket/11227] @return void -> @return null, per coding guidelines.

2012-11-30 23:03:06 -05:00

functions_install.php

[ticket/10091] Bump minimum supported postgresql version to 8.3.

2012-12-04 02:52:18 -05:00

functions_jabber.php

…

functions_messenger.php

Merge branch 'develop-olympus' into develop

2012-12-05 10:03:29 +01:00

functions_module.php

[ticket/10601] Comment to help understanding the code

2012-11-28 19:37:16 +00:00

functions_posting.php

…

functions_privmsgs.php

…

functions_profile_fields.php

…

functions_transfer.php

…

functions_upload.php

…

functions_url_matcher.php

[feature/controller] Rename get_paths to import_paths_from_finder

2012-11-16 17:05:46 -05:00

functions_user.php

Merge remote-tracking branch 'Fyorl/ticket/10939' into develop

2012-11-10 23:49:29 +01:00

functions.php

Merge branch 'develop-olympus' into develop

2012-11-29 23:17:58 +01:00

group_positions.php

[ticket/11227] @return void -> @return null, per coding guidelines.

2012-11-30 23:03:06 -05:00

index.htm

…

json_response.php

…

message_parser.php

…

session.php

…

sphinxapi.php

…

startup.php

…

update_helpers.php

…

user.php

…