phpbb/phpBB/language/en/acp
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
..
attachments.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
ban.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
board.php [feature/system-cron] Added acp ui for use_system_cron config setting. 2011-02-12 22:05:50 -05:00
bots.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
common.php [ticket/9549] Add the module and files for the ACP. 2011-02-16 18:21:48 +01:00
database.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
email.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
forums.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
groups.php [ticket/9549] Display users in their primary group instead of their first group 2011-02-25 15:47:34 +01:00
index.htm some bugfixes 2006-10-26 10:58:58 +00:00
language.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
modules.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
permissions.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
permissions_phpbb.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
posting.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
profile.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
prune.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
search.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
styles.php Merge branch 'develop-olympus' into develop 2011-02-21 20:47:44 -05:00
users.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00