Oleg Pudeyev 448df1cdf5 Merge branch 'ticket/9549' into develop ...

* ticket/9549:
  [ticket/9549] Display users in their primary group instead of their first group
  [ticket/9549] Change default value of "sort legend by group name" to false.
  [ticket/9549] Fix displaying empty groups
  [ticket/9549] Fix language strings.
  [ticket/9549] Only add group to legend/teampage when the checkbox is checked.
  [ticket/9549] New method move() to move a group more than 1 up/down.
  [ticket/9549] Fix some minor issues with descriptions and coding-guidelines.
  [ticket/9549] Throw an error when the given field-name is invalid.
  [ticket/9549] Make the class non static and extend delete_group function.
  [ticket/9549] Add template changes for subsilver2.
  [ticket/9549] Enhance teampage and legend functionality
  [ticket/9549] Add the module and files for the ACP.
  [ticket/9549] Update database with the new config values and columns
  [ticket/9549] Enhance teampage functionality with a new class, group_positions.

Conflicts:
	phpBB/install/database_update.php

2011-03-01 16:57:00 -05:00

..

acp

Merge branch 'ticket/9549' into develop

2011-03-01 16:57:00 -05:00

auth

Merge branch 'feature/igorw/request-class' into develop

2010-12-16 02:22:17 +01:00

cache

Merge branch 'develop-olympus' into develop

2011-02-01 07:42:51 +01:00

captcha

Merge branch 'develop-olympus' into develop

2011-01-30 01:17:06 +01:00

config

[task/config-class] Add an attribute for the table name in phpbb_config_db.

2011-01-12 01:47:41 +01:00

cron

[feature/system-cron] Added documentation for cron manager constructor.

2011-02-12 22:05:54 -05:00

db

Merge branch 'develop-olympus' into develop

2011-01-16 22:26:27 +01:00

diff

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

hooks

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

lock

[feature/system-cron] preg_match returns int so cast to bool, fix comment

2011-02-12 22:05:54 -05:00

mcp

Merge branch 'ticket/hanakin/10001' into develop

2011-02-28 00:07:59 +01:00

questionnaire

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

request

[feature/request-class] Fix the error message when accessing superglobal

2011-02-28 08:04:40 +01:00

search

[ticket/9574] Add pcre_utf8_support() function

2010-12-28 22:37:33 +01:00

ucp

Merge branch 'develop-olympus' into develop

2011-02-28 01:03:55 +01:00

utf

[ticket/9574] Remove conditional PHP<5.2 code

2010-12-28 22:36:25 +01:00

.htaccess

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

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

auth.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

bbcode.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

class_loader.php

[task/acm-refactor] Cleaning up left over mentions of ACM and fixing tests.

2011-01-09 23:49:44 +01:00

constants.php

Merge branch 'develop-olympus' into develop

2011-02-23 22:03:42 -05:00

functions_acp.php

Merge branch 'ticket/nickvergessen/9823' into develop

2011-02-04 00:32:10 +01:00

functions_admin.php

Merge branch 'develop-olympus' into develop

2011-02-24 20:59:19 -05:00

functions_compress.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

functions_content.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

functions_convert.php

Merge branch 'develop-olympus' into develop

2010-12-13 17:14:36 +01:00

functions_display.php

Merge branch 'ticket/hanakin/10001' into develop

2011-02-28 00:07:59 +01:00

functions_download.php

Merge branch 'develop-olympus' into develop

2011-02-24 10:54:51 +01:00

functions_install.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

functions_jabber.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

functions_messenger.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

functions_module.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

functions_posting.php

Merge branch 'develop-olympus' into develop

2011-02-24 20:59:19 -05:00

functions_privmsgs.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

functions_profile_fields.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

functions_template.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

functions_transfer.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

functions_upload.php

Merge branch 'develop-olympus' into develop

2011-01-10 23:43:04 +01:00

functions_user.php

Merge branch 'ticket/9549' into develop

2011-03-01 16:57:00 -05:00

functions.php

[feature/system-cron] Refactored cron task naming, loading and running.

2011-02-12 22:05:49 -05:00

group_positions.php

[ticket/9549] New method move() to move a group more than 1 up/down.

2011-02-16 18:22:32 +01:00

index.htm

…

message_parser.php

Merge branch 'ticket/igorw/9556' into develop

2010-12-13 16:35:55 +01:00

session.php

Merge branch 'develop-olympus' into develop

2011-02-26 08:05:55 -05:00

template.php

Merge branch 'develop-olympus' into develop

2010-12-13 17:22:05 +01:00