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_attachments.html

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

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

acp_ban.html

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

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

acp_bbcodes.html

#22875

2008-03-13 14:08:59 +00:00

acp_board.html

#15038

2007-11-05 19:07:10 +00:00

acp_bots.html

#15038

2007-11-05 19:07:10 +00:00

acp_captcha.html

Mirror login captcha option on captcha settings

2010-01-17 16:37:58 +00:00

acp_database.html

fix some XHTML issues in admin style - Bug #51405

2009-09-16 14:30:36 +00:00

acp_disallow.html

#15038

2007-11-05 19:07:10 +00:00

acp_email.html

Use L_EMAIL variants consistently... also added comments for translators to indicate where which variant is used (Bug #39495)

2009-04-17 13:05:11 +00:00

acp_forums_copy_perm.html

update acp forums copy style to look like the rest of the ACP

2009-09-30 14:50:49 +00:00

acp_forums.html

[ticket/9575] Also change 'administrate' to 'administer' in templates

2010-12-05 14:09:39 +01:00

acp_groups_position.html

[ticket/9549] Fix some minor issues with descriptions and coding-guidelines.

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

acp_groups.html

[ticket/9549] Only add group to legend/teampage when the checkbox is checked.

2011-02-17 23:59:41 +01:00

acp_icons.html

Hopefully nobody will notice me sneaking this one in:

2010-01-31 14:47:34 +00:00

acp_inactive.html

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

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

acp_jabber.html

Add warnings about plaintext passwords

2009-12-30 02:25:58 +00:00

acp_language.html

One commit for those fixes having a very tiny impact (mostly only whitespaces or forgotten spans, etc.)

2008-01-30 16:01:15 +00:00

acp_logs.html

fix some XHTML issues in admin style - Bug #51405

2009-09-16 14:30:36 +00:00

acp_main.html

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

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

acp_modules.html

#15038

2007-11-05 19:07:10 +00:00

acp_permission_roles.html

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

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

acp_permissions.html

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

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

acp_php_info.html

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

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

acp_profile.html

forgot to ci this

2009-08-27 20:48:09 +00:00

acp_prune_forums.html

#22875

2008-03-13 14:08:59 +00:00

acp_prune_users.html

#15038

2007-11-05 19:07:10 +00:00

acp_ranks.html

#15038

2007-11-05 19:07:10 +00:00

acp_reasons.html

#15038

2007-11-05 19:07:10 +00:00

acp_search.html

[feature/request-class] Remove direct access to _REQUEST in acp_search

2010-10-17 13:55:45 +02:00

acp_send_statistics.html

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

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

acp_styles.html

[ticket/9675] Put the code into methods to avoid code duplication.

2011-02-08 14:57:42 +01:00

acp_update.html

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

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

acp_users_avatar.html

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

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

acp_users_feedback.html

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

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

acp_users_overview.html

[ticket/9548] Delete user quicktool drop down should have an empty or invalid selection as the default

2010-04-18 15:13:53 +02:00

acp_users_prefs.html

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

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

acp_users_profile.html

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

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

acp_users_signature.html

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

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

acp_users_warnings.html

Fix #51305 - User need a_clearlog to delete warnings

2009-09-15 09:45:05 +00:00

acp_users.html

Fix Bug #45675 - Do not allow setting group as default group for pending user

2009-07-14 20:40:45 +00:00

acp_words.html

#22875

2008-03-13 14:08:59 +00:00

admin.css

[ticket/9104] Safari does not display box headers correctly in the ACP.

2010-08-19 12:22:18 -04:00

captcha_default_acp_demo.html

Set some svn properties. Cleanup.

2009-07-19 22:21:50 +00:00

captcha_gd_acp.html

submit buttons in same style as other submit buttons in ACP

2009-09-23 17:03:04 +00:00

captcha_qa_acp_demo.html

ACP usability

2010-01-26 10:57:00 +00:00

captcha_qa_acp.html

beautify q&a captcha a bit (only slightly)

2009-09-07 11:57:58 +00:00

captcha_recaptcha_acp.html

submit buttons in same style as other submit buttons in ACP

2009-09-23 17:03:04 +00:00

captcha_recaptcha.html

[ticket/9939] Fix JavaScript error in admin recaptcha template

2010-12-05 14:35:19 +01:00

colour_swatch.html

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

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

confirm_bbcode.html

merge r10513 into 3.0 branch: propdel

2010-02-23 16:18:57 +00:00

confirm_body_prune.html

some language-specific adjustements

2007-05-03 14:29:22 +00:00

confirm_body.html

some language-specific adjustements

2007-05-03 14:29:22 +00:00

custom_profile_fields.html

some bugs fixed

2007-08-15 17:32:48 +00:00

editor.js

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

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

install_convert.html

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

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

install_error.html

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

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

install_footer.html

Merge branch 'develop-olympus' into develop

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

install_header.html

removed executable props [Bug #6464]

2008-06-04 15:37:06 +00:00

install_install.html

removed executable props [Bug #6464]

2008-06-04 15:37:06 +00:00

install_main.html

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

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

install_update_diff.html

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

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

install_update.html

[ticket/9535] Also fix the margin in the install_update.html

2010-05-16 18:50:48 +02:00

message_body.html

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

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

overall_footer.html

Merge branch 'develop-olympus' into develop

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

overall_header.html

Fix bugs #25545, #26315 and #31325 - Mostly XHTML mistakes in prosilver and the ACP.

2009-06-12 12:29:08 +00:00

permission_forum_copy.html

Fix r9887. Remove duplicate content.

2009-07-28 22:18:39 +00:00

permission_mask.html

[ticket/9535] Fix some more rtl margin issues.

2010-05-16 18:50:25 +02:00

permission_roles_mask.html

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

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

permission_trace.html

do not get too excited

2007-07-26 15:51:11 +00:00

permissions.js

Trying to keep my sanity... begone evil underscored CSS class/id names

2007-03-05 23:13:50 +00:00

progress_bar.html

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

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

simple_body.html

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

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

simple_footer.html

[ticket/9859] Remove the credit line comment from all html files.

2011-01-16 17:53:30 +01:00

simple_header.html

Changed jumpto() JS function to be more fail-safe. (But #27635 - patch by peterkclee)

2009-04-17 16:05:25 +00:00

tooltip.js

ok, this one is rather large... the most important change:

2006-06-06 20:53:46 +00:00

viewsource.html

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

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