phpbb/phpBB/develop
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
..
add_permissions.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
adjust_avatars.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
adjust_bbcodes.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
adjust_magic_urls.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
adjust_sizes.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
adjust_smilies.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
adjust_uids.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
adjust_usernames.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
benchmark.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
calc_email_hash.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
change_smiley_ref.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
check_flash_bbcodes.php [ticket/9903] Script for detecting potentially malicious flash bbcodes 2010-11-19 11:31:00 +01:00
collect_cache_stats.sh Copy 3.0.x branch to trunk 2009-10-04 18:14:59 +00:00
create_schema_files.php Merge branch 'ticket/9549' into develop 2011-03-01 16:57:00 -05:00
create_variable_overview.php Merge branch 'develop-olympus' into develop 2011-01-16 22:26:27 +01:00
fill.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
fix_files.sh exclude the image file with text in the name from having newlines fixed 2010-03-05 22:22:39 +01:00
generate_utf_casefold.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
generate_utf_confusables.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
generate_utf_tables.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
lang_duplicates.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
merge_attachment_tables.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
merge_post_tables.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
mysql_upgrader.php Merge branch 'develop-olympus' into develop 2011-02-24 23:45:55 +01:00
nuke-db.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
regex.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
remove-php-end-tags.py [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
repair_bots.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
search_fill.php Copy 3.0.x branch to trunk 2009-10-04 18:14:59 +00:00
set_permissions.sh [task/set-permissions] shell script to set file permissions 2010-06-28 18:12:56 +02:00
unicode_testing.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
update_email_hash.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
utf_normalizer_test.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00