Andreas Fischer 9480a5e512 Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1
  [ticket/10965] Introduce a new profile field option to display no value

Conflicts:
	phpBB/includes/acp/acp_profile.php

2012-07-23 15:50:54 +02:00

..

acp_attachments.html

[feature/pagination-as-list] Various fixes and improvements

2012-07-18 14:31:21 +01:00

acp_ban.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_bbcodes.html

[ticket/10271] AJAXified various deletions in the ACP.

2012-03-31 02:09:15 +02:00

acp_board.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_bots.html

[ticket/10272] Renamed AJAX callback act_deact to activate_deactivate.

2012-03-31 02:09:22 +02:00

acp_captcha.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_database.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_disallow.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_email.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_forums_copy_perm.html

…

acp_forums.html

[ticket/10650] Revert merge of 'rahulr92/ticket/10650' into develop

2012-04-04 19:23:05 -04:00

acp_groups_position.html

[ticket/10410] Add option to display users in their first teampage group

2011-10-28 22:55:26 +02:00

acp_groups.html

[feature/pagination-as-list] Various fixes and improvements

2012-07-18 14:31:21 +01:00

acp_icons.html

[feature/pagination-as-list] Various fixes and improvements

2012-07-18 14:31:21 +01:00

acp_inactive.html

[feature/pagination-as-list] Various fixes and improvements

2012-07-18 14:31:21 +01:00

acp_jabber.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_language.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_logs.html

[feature/pagination-as-list] Various fixes and improvements

2012-07-18 14:31:21 +01:00

acp_main.html

[ticket/10271] AJAXified buttons on acp_main.

2012-03-31 02:09:15 +02:00

acp_modules.html

[feature/ajax] Remove not working module enable/disable ajax code

2012-03-31 02:10:17 +02:00

acp_permission_roles.html

[ticket/10271] AJAXified various deletions in the ACP.

2012-03-31 02:09:15 +02:00

acp_permissions.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_php_info.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_profile.html

Merge branch 'develop-olympus' into develop

2012-07-23 15:50:54 +02:00

acp_prune_forums.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_prune_users.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_ranks.html

[ticket/10271] AJAXified various deletions in the ACP.

2012-03-31 02:09:15 +02:00

acp_reasons.html

[ticket/10271] AJAXified various deletions in the ACP.

2012-03-31 02:09:15 +02:00

acp_search.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_send_statistics.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_styles.html

[feature/ajax] Fix acp_styles activate_deactivate ajax callback name

2012-03-31 02:10:17 +02:00

acp_update.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_users_avatar.html

…

acp_users_feedback.html

[feature/pagination-as-list] Various fixes and improvements

2012-07-18 14:31:21 +01:00

acp_users_overview.html

Merge remote-tracking branch 'github-dhruv/ticket/10308' into develop

2012-05-29 16:40:00 +02:00

acp_users_prefs.html

[feature/new-tz-handling] Fix timezone option when editing a user in the ACP

2012-06-18 15:09:45 +02:00

acp_users_profile.html

…

acp_users_signature.html

Merge branch 'develop-olympus' into develop

2011-07-30 19:37:24 -04:00

acp_users_warnings.html

…

acp_users.html

[feature/pagination-as-list] Various fixes and improvements

2012-07-18 14:31:21 +01:00

acp_words.html

[ticket/10271] AJAXified various deletions in the ACP.

2012-03-31 02:09:15 +02:00

admin.css

Merge branch 'develop-olympus' into develop

2012-07-01 00:20:04 +02:00

ajax.js

[ticket/10784] Do not show ajax overlay unless needed

2012-04-12 21:03:47 +02:00

captcha_default_acp_demo.html

…

captcha_gd_acp.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

captcha_qa_acp_demo.html

…

captcha_qa_acp.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

captcha_recaptcha_acp.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

captcha_recaptcha.html

…

colour_swatch.html

[ticket/10258] Add HTML5 meta charset tag

2011-07-29 16:32:22 +02:00

confirm_bbcode.html

…

confirm_body_prune.html

…

confirm_body.html

…

custom_profile_fields.html

…

editor.js

Merge branch 'develop-olympus' into develop

2011-12-16 15:50:11 +01:00

install_convert.html

…

install_error.html

…

install_footer.html

[ticket/10390] Revert back to escaped script tags inside document.write

2011-10-05 21:24:34 -07:00

install_header.html

[ticket/10258] Add HTML5 meta charset tag

2011-07-29 16:32:22 +02:00

install_install.html

…

install_main.html

…

install_update_diff.html

Merge branch 'develop-olympus' into develop

2012-05-06 18:39:32 +02:00

install_update.html

[ticket/9914] Add backup warning to updater.

2012-02-03 16:14:48 +00:00

message_body.html

…

overall_footer.html

[ticket/10783] Added assets_version to ACP and simple_*.html.

2012-04-11 14:37:15 +01:00

overall_header.html

[ticket/11008] Remove eval() calls to get document[id]

2012-07-21 00:12:37 +02:00

pagination.html

[feature/pagination-as-list] Various fixes and improvements

2012-07-18 14:31:21 +01:00

permission_forum_copy.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

permission_mask.html

…

permission_roles_mask.html

…

permission_trace.html

…

permissions.js

…

progress_bar.html

…

simple_body.html

…

simple_footer.html

[ticket/10783] Added assets_version to ACP and simple_*.html.

2012-04-11 14:37:15 +01:00

simple_header.html

[ticket/10783] Added assets_version to ACP and simple_*.html.

2012-04-11 14:37:15 +01:00

timezone_option.html

[feature/new-tz-handling] Use asset in acp and subsilver2 and remove duplicates

2012-06-19 19:08:53 +02:00

timezone.js

[feature/new-tz-handling] Use asset in acp and subsilver2 and remove duplicates

2012-06-19 19:08:53 +02:00

tooltip.js

…

viewsource.html

…