php-phpbb

mirror of https://github.com/phpbb/phpbb.git synced 2025-05-01 13:17:52 +02:00

Go to file

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

build

Merge branch 'develop-olympus' into develop

2011-02-27 23:06:01 +01:00

code_sniffer/phpbb

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

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

git-tools

[ticket/10044] Updated invocation documentation.

2011-02-16 21:13:35 -05:00

phpBB

Merge branch 'ticket/9549' into develop