Oleg Pudeyev 03d3f9adb5 Merge PR #785 branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/10835] changing "e-mail" to "email"
  [ticket/10835] changing CURRENT_CHANGE_PASSWORD_EXPLAIN language entry
  [ticket/10835] fixing misleading message in UCP

Conflicts:
	phpBB/language/en/ucp.php

2012-05-11 02:37:25 -04:00

..

attachment.html

[ticket/10298] Properly close embed tag for QuickTime in subsilver2.

2011-07-30 16:58:33 +02:00

bbcode.html

revert r8893 - there were massive problems with the display and select all code

2008-09-28 17:08:09 +00:00

breadcrumbs.html

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

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

captcha_default.html

[ticket/10456] Add tabindex to subsilver2 captcha

2012-02-21 11:25:22 +01:00

captcha_qa.html

[ticket/10456] Add tabindex to subsilver2 captcha

2012-02-21 11:25:22 +01:00

captcha_recaptcha.html

[ticket/9853] Change recaptcha theme from default to 'clean'.

2010-10-18 10:59:00 +02:00

confirm_body.html

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

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

custom_profile_fields.html

ahhh, there are you. I can see a new haircut... looks good.

2007-04-01 22:46:14 +00:00

editor.js

[ticket/10731] Fixed addquote() to work on opera browser.

2012-04-01 17:05:31 +03:00

faq_body.html

Merge branch 'develop-olympus' into develop

2011-12-25 00:58:11 +01:00

forumlist_body.html

[feature/remove-imagesets] Changing subsilver

2011-09-04 11:05:10 +03:00

index_body.html

[ticket/10173] Use a loop var for the birthdays list to allow proper templating

2011-05-08 15:36:27 +02:00

index.htm

ahhh, there are you. I can see a new haircut... looks good.

2007-04-01 22:46:14 +00:00

jumpbox.html

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

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

login_body.html

[ticket/10456] Add tabindex to subsilver2 captcha

2012-02-21 11:25:22 +01:00

login_forum.html

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

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

mcp_approve.html

Ok, here comes a big one. Poor updater. Also requires testing.

2007-10-03 15:05:54 +00:00

mcp_ban.html

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

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

mcp_footer.html

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

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

mcp_forum.html

[feature/remove-imagesets] Changing subsilver

2011-09-04 11:05:10 +03:00

mcp_front.html

[ticket/10641] Update MCP template with new plurality forms

2012-02-11 01:40:01 -06:00

mcp_header.html

#i62 - #i65

2007-09-22 18:31:50 +00:00

mcp_jumpbox.html

#i62 - #i65

2007-09-22 18:31:50 +00:00

mcp_logs.html

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

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

mcp_message.html

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

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

mcp_move.html

Merge remote-tracking branch 'erikfrerejean/ticket/10312' into develop

2011-08-16 18:36:22 +02:00

mcp_notes_front.html

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

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

mcp_notes_user.html

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

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

mcp_post.html

[feature/remove-imagesets] Changing subsilver

2011-09-04 11:05:10 +03:00

mcp_queue.html

[ticket/10690] Fix undefined UNAPPROVED_POSTS_ZERO_TOTAL in queue

2012-03-14 22:22:22 +01:00

mcp_reports.html

[ticket/10344] Add attachment icons to list of reported and queued posts/topics

2011-08-27 00:25:38 +02:00

mcp_topic.html

Merge branch 'develop-olympus' into develop

2012-03-16 06:18:35 -04:00

mcp_warn_front.html

[ticket/10705] Change WARNINGS_ZERO_TOTAL in subsilver2

2012-03-29 15:52:28 +01:00

mcp_warn_list.html

[ticket/10705] Change WARNINGS_ZERO_TOTAL in subsilver2

2012-03-29 15:52:28 +01:00

mcp_warn_post.html

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

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

mcp_warn_user.html

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

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

mcp_whois.html

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

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

memberlist_body.html

[feature/remove-imagesets] Changing subsilver

2011-09-04 11:05:10 +03:00

memberlist_email.html

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

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

memberlist_group.html

[feature/remove-imagesets] Changing subsilver

2011-09-04 11:05:10 +03:00

memberlist_im.html

Merge branch 'develop-olympus' into develop

2011-04-22 00:04:51 -04:00

memberlist_leaders.html

[feature/remove-imagesets] Changing subsilver

2011-09-04 11:05:10 +03:00

memberlist_search.html

only allow users having the a_user permission to search by email address (later on there will most likely a new permission for general email visibility)

2008-03-23 17:11:43 +00:00

memberlist_view.html

[feature/remove-imagesets] Changing subsilver

2011-09-04 11:05:10 +03:00

message_body.html

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

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

overall_footer.html

[ticket/10783] Added assets_version to subsilver2.

2012-04-11 14:33:09 +01:00

overall_header.html

[feature/remove-imagesets] Changing subsilver

2011-09-04 11:05:10 +03:00

pagination.html

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

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

posting_attach_body.html

#i62 - #i65

2007-09-22 18:31:50 +00:00

posting_body.html

Merge PR #592 branch 'develop-olympus' into develop

2012-04-19 21:03:15 -04:00

posting_buttons.html

[ticket/10849] Added missing helptext for listitem

2012-04-27 22:19:41 +02:00

posting_poll_body.html

ahhh, there are you. I can see a new haircut... looks good.

2007-04-01 22:46:14 +00:00

posting_preview.html

ahhh, there are you. I can see a new haircut... looks good.

2007-04-01 22:46:14 +00:00

posting_progress_bar.html

#i62 - #i65

2007-09-22 18:31:50 +00:00

posting_review.html

[feature/remove-imagesets] Changing subsilver

2011-09-04 11:05:10 +03:00

posting_smilies.html

Merge branch 'develop-olympus' into develop

2011-02-27 23:18:33 +01:00

posting_topic_review.html

[feature/save-post-on-report] Changed mark in subsilver2 to look like viewtopic

2012-03-19 08:27:32 -04:00

quickreply_editor.html

[feature/qrpreview] Preview from Quick Reply

2012-03-30 21:43:00 -04:00

report_body.html

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

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

search_body.html

[ticket/7417] Also focus search keywords and username in subsilver2.

2010-10-16 12:24:54 +02:00

search_results.html

[feature/remove-imagesets] Changing subsilver

2011-09-04 11:05:10 +03:00

searchbox.html

[ticket/10232] Renamed S_SEARCH_HIDDEN_FIELDS to S_SEARCH_LOCAL_HIDDEN_FIELDS

2011-06-18 23:22:25 +02:00

simple_footer.html

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

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

simple_header.html

[feature/remove-imagesets] Changing subsilver

2011-09-04 11:05:10 +03:00

ucp_agreement.html

Fixed Bug #15085 - [Feature] Add language selection on the registration terms page

2009-06-24 03:11:20 +00:00

ucp_attachments.html

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

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

ucp_footer.html

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

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

ucp_groups_manage.html

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

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

ucp_groups_membership.html

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

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

ucp_header.html

[ticket/9089] Add tabindex to PM recipient box, to allow tabbing to the subject

2012-02-21 11:10:10 +01:00

ucp_main_bookmarks.html

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

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

ucp_main_drafts.html

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

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

ucp_main_front.html

Merge branch 'develop-olympus' into develop

2012-02-10 21:00:51 -05:00

ucp_main_subscribed.html

[feature/remove-imagesets] Changing subsilver

2011-09-04 11:05:10 +03:00

ucp_pm_history.html

[feature/remove-imagesets] Changing subsilver

2011-09-04 11:05:10 +03:00

ucp_pm_message_footer.html

[ticket/8936] Subsilver2 missing reply-to-all feature.

2010-05-24 23:32:18 +02:00

ucp_pm_message_header.html

some fixes. :P

2007-09-18 14:49:19 +00:00

ucp_pm_options.html

Ok, here comes a big one. Poor updater. Also requires testing.

2007-10-03 15:05:54 +00:00

ucp_pm_popup.html

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

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

ucp_pm_viewfolder.html

[feature/remove-imagesets] Changing subsilver

2011-09-04 11:05:10 +03:00

ucp_pm_viewmessage_print.html

Merge branch 'develop-olympus' into develop

2011-11-14 22:01:36 +01:00

ucp_pm_viewmessage.html

[feature/remove-imagesets] Changing subsilver

2011-09-04 11:05:10 +03:00

ucp_prefs_personal.html

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

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

ucp_prefs_post.html

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

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

ucp_prefs_view.html

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

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

ucp_profile_avatar.html

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

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

ucp_profile_profile_info.html

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

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

ucp_profile_reg_details.html

Merge PR #785 branch 'develop-olympus' into develop

2012-05-11 02:37:25 -04:00

ucp_profile_signature.html

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

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

ucp_register.html

[ticket/10535] Remove email confirm check on registration form

2011-12-15 15:13:11 +00:00

ucp_remind.html

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

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

ucp_resend.html

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

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

ucp_zebra_foes.html

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

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

ucp_zebra_friends.html

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

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

viewforum_body.html

[feature/remove-imagesets] Changing subsilver

2011-09-04 11:05:10 +03:00

viewonline_body.html

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

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

viewonline_whois.html

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

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

viewtopic_body.html

[ticket/10510] Fixed a bug where quickmod tools weren't being displayed.

2012-03-17 18:06:45 +00:00

viewtopic_print.html

[ticket/10258] Add HTML5 meta charset tag

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