Andreas Fischer 0e88f0db4a Merge branch 'develop-olympus' into develop-ascraeus ...

* develop-olympus:
  [ticket/12359] Remove inline width styling on UCP birthday fields

Conflicts:
	phpBB/styles/prosilver/template/ucp_profile_profile_info.html

2014-04-06 11:08:18 +02:00

..

profilefields

[ticket/12187] Add URL type for profile fields

2014-03-03 12:30:07 +01:00

ajax.js

[ticket/12327] Ajax fix

2014-04-04 18:53:00 +02:00

attachment.html

[ticket/11962] Resize posted images to fit and give them a class

2014-03-30 14:19:16 -07:00

avatars.js

[feature/avatars] Change avatar javascript to conform to new coding guidelines

2013-01-04 18:13:49 +01:00

bbcode.html

[ticket/11962] Resize posted images to fit and give them a class

2014-03-30 14:19:16 -07:00

captcha_default.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

captcha_qa.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

captcha_recaptcha.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

confirm_body.html

[ticket/12001] Ensure that form data is sent to server in AJAX requests.

2013-11-08 06:13:55 -08:00

confirm_delete_body.html

[ticket/12001] Ensure that form data is sent to server in AJAX requests.

2013-11-08 06:13:55 -08:00

drafts.html

[ticket/11956] Adjustments to responsive topiclist lists

2013-10-24 18:36:16 +03:00

faq_body.html

[ticket/10734] Removed unwanted span classes

2012-04-02 00:42:11 +05:30

forum_fn.js

[ticket/12090] Fix pagination for routes

2014-03-08 16:02:44 +01:00

forumlist_body.html

[ticket/12308] Template Event forumlist_body_last_row_after

2014-03-29 12:50:23 +01:00

index_body.html

Merge remote-tracking branch 'paybas/ticket/12329' into develop-ascraeus

2014-04-01 15:07:19 +02:00

index.htm

…

jumpbox.html

[ticket/8041] Merge item name into "Return to" string for better translations

2014-03-12 01:05:05 +01:00

login_body_oauth.html

[feature/oauth] More small fixes

2013-09-02 16:52:41 -04:00

login_body.html

[ticket/11795] Redo form elements auto-focus

2013-09-14 10:10:42 +03:00

login_forum.html

Merge branch 'develop-olympus' into develop

2013-05-06 22:11:33 +02:00

mcp_approve.html

[ticket/9657] Correctly split disapproving from perma deleting posts

2013-03-11 16:37:43 +01:00

mcp_ban.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

mcp_footer.html

…

mcp_forum.html

[ticket/12300] Make only red topic/forum row icons clickable to unread posts

2014-03-28 20:54:49 -07:00

mcp_front.html

[ticket/11935] Merge remote-tracking branch 'upstream/develop'

2013-10-29 19:12:32 -07:00

mcp_header.html

[ticket/12238] Remove defunct confirmation box template code.

2014-03-01 10:15:26 -08:00

mcp_logs.html

[ticket/11552] Responsive member list

2013-10-19 21:01:25 +03:00

mcp_message.html

…

mcp_move.html

[ticket/11166] Fix several custom confirm templates in prosilver

2013-03-03 17:23:06 +01:00

mcp_notes_front.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

mcp_notes_user.html

[ticket/11935] Remove obsolete table attributes from Prosilver

2013-10-19 08:55:13 -07:00

mcp_post.html

Merge branch 'develop' into ticket/11935

2013-10-20 15:57:57 -07:00

mcp_queue.html

[ticket/11956] Adjustments to responsive topiclist lists

2013-10-24 18:36:16 +03:00

mcp_reports.html

[ticket/11956] Adjustments to responsive topiclist lists

2013-10-24 18:36:16 +03:00

mcp_topic.html

[ticket/11782] Change p.rules to p.post-notice in templates

2013-08-11 19:57:34 +03:00

mcp_warn_front.html

Merge pull request #1788 from VSEphpbb/ticket/11935

2013-11-04 09:43:34 -08:00

mcp_warn_list.html

[ticket/11552] Responsive member list

2013-10-19 21:01:25 +03:00

mcp_warn_post.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

mcp_warn_user.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

mcp_whois.html

[ticket/11197] Prefix the css classes for the small arrow with "arrow"

2012-11-13 20:57:34 +01:00

memberlist_body.html

[ticket/12342] Remove spinner and fix useage of ajax on memberlist

2014-04-03 08:32:46 -07:00

memberlist_email.html

[ticket/11010] Changing email and url input types in prosilver templates

2013-05-20 18:39:46 +02:00

memberlist_im.html

[ticket/12236] Move AOL Instant Messanger field to custom profile field

2014-03-05 22:13:22 +01:00

memberlist_search.html

[ticket/12236] Fix layout of memberlist search

2014-03-05 22:28:22 +01:00

memberlist_team.html

[ticket/11336] Changes "leaders"-mode to "team"-mode and so in test-file

2014-03-28 19:36:08 +01:00

memberlist_view.html

[ticket/12298] Template Event memberlist_view_contact_before/after

2014-03-29 12:13:17 -04:00

message_body.html

[ticket/11197] Prefix the css classes for the small arrow with "arrow"

2012-11-13 20:57:34 +01:00

overall_footer.html

[ticket/12338] Add Template Event overall_footer_page_body_after

2014-04-04 13:12:33 +02:00

overall_header.html

Merge remote-tracking branch 'paybas/ticket/12333' into develop-ascraeus

2014-04-04 23:55:36 +02:00

pagination.html

[ticket/12090] Fix pagination for routes

2014-03-08 16:02:44 +01:00

plupload.html

[ticket/12206] Fix mismatched Plupload language vars preventing localization.

2014-02-17 12:33:19 -08:00

posting_attach_body.html

[ticket/11915] Replace inline onclick event for inserting attachment bbcodes.

2014-01-17 19:25:11 -08:00

posting_body.html

…

posting_buttons.html

[ticket/12240] fontsize => size; fontcolor => color and added bbcode- in96

2014-03-03 18:34:53 +01:00

posting_editor.html

[ticket/8785] Fixed problem with add empty.png and travis will now pass

2014-03-09 22:14:40 +01:00

posting_layout.html

[ticket/12304] Add CSS class to rules-link container

2014-03-29 11:20:03 +01:00

posting_pm_header.html

[ticket/8785] Deletes additional add and add_bcc buttons

2014-03-11 22:02:43 +01:00

posting_pm_layout.html

[ticket/8785] and again a fresh line

2014-03-09 21:50:44 +01:00

posting_poll_body.html

[ticket/11803] Revert POLL_MAX_OPTIONS min value to 0

2013-08-26 19:56:27 +01:00

posting_preview.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

posting_review.html

[ticket/10734] Removed unwanted span classes

2012-04-02 00:42:11 +05:30

posting_smilies.html

[ticket/12137] Fix spacing in smiley block.

2014-01-26 18:11:16 -08:00

posting_topic_review.html

[ticket/11552] Move post subject before buttons

2013-10-19 13:22:47 +03:00

quickreply_editor.html

[ticket/12309] Template Event quickreply_editor_panel_before/after

2014-03-29 12:17:11 +01:00

report_body.html

Merge branch 'ticket/11566' into ticket/11566-develop

2013-07-01 23:25:29 +05:30

search_body.html

Merge branch 'develop' into ticket/11935

2013-10-20 15:57:57 -07:00

search_results.html

[ticket/12300] Make only red topic/forum row icons clickable to unread posts

2014-03-28 20:54:49 -07:00

simple_footer.html

[ticket/11703] Make jQuery CDN switch more generic.

2013-10-10 23:26:03 +02:00

simple_header.html

[ticket/12301] Template Event overall_header_body_before

2014-03-29 09:57:11 -04:00

timezone_option.html

[feature/twig] INCLUDEJS behavior now supports local relative paths

2013-07-02 11:07:12 -05:00

timezone.js

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11314

2013-03-26 13:18:54 +01:00

ucp_agreement.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

ucp_attachments.html

[ticket/11956] Adjustments to responsive topiclist lists

2013-10-24 18:36:16 +03:00

ucp_auth_link_oauth.html

[ticket/11872] Template syntax typos in oauth templates

2013-10-23 19:12:37 +03:00

ucp_auth_link.html

[ticket/11836] Fix fatal error on unsupported provider for auth link

2013-09-13 11:53:10 -04:00

ucp_avatar_options_gravatar.html

[ticket/11795] Use data-reset-on-edit attr to reset elements

2013-09-14 10:10:42 +03:00

ucp_avatar_options_local.html

[feature/avatars] Inform user of no available local avatars

2013-01-04 10:25:08 +01:00

ucp_avatar_options_remote.html

[ticket/11795] Use data-reset-on-edit attr to reset elements

2013-09-14 10:10:42 +03:00

ucp_avatar_options_upload.html

[ticket/11010] Fix input type for urls

2013-05-20 18:42:10 +02:00

ucp_avatar_options.html

[feature/twig] INCLUDEJS behavior now supports local relative paths

2013-07-02 11:07:12 -05:00

ucp_footer.html

…

ucp_groups_manage.html

[ticket/12153] Remove redundant calls to pagination.on_page().

2014-02-03 23:00:39 -08:00

ucp_groups_membership.html

[ticket/11489] Template changes for new topiclist layout

2013-05-14 09:17:43 +03:00

ucp_header.html

[ticket/11915] Move some of the #cp-main table rules to separate class.

2014-01-17 19:20:35 -08:00

ucp_login_link.html

[feature/oauth] More small fixes

2013-09-02 16:52:41 -04:00

ucp_main_bookmarks.html

[ticket/12300] Make only red topic/forum row icons clickable to unread posts

2014-03-28 20:54:49 -07:00

ucp_main_drafts.html

[ticket/11956] Adjustments to responsive topiclist lists

2013-10-24 18:36:16 +03:00

ucp_main_front.html

[ticket/12300] Make only red topic/forum row icons clickable to unread posts

2014-03-28 20:54:49 -07:00

ucp_main_subscribed.html

[ticket/12321] Remove execute bit from ucp_main_subscribed.html and buttons.png

2014-03-30 14:29:56 +03:00

ucp_notifications.html

[ticket/12342] Use prop() instead of attr() for boolean properties

2014-04-01 17:58:56 -07:00

ucp_pm_history.html

[ticket/11552] Move post subject before buttons

2013-10-19 13:22:47 +03:00

ucp_pm_message_footer.html

…

ucp_pm_message_header.html

[ticket/8041] Merge item name into "Return to" string for better translations

2014-03-12 01:05:05 +01:00

ucp_pm_options.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

ucp_pm_viewfolder.html

[ticket/12300] Make only red topic/forum row icons clickable to unread posts

2014-03-28 20:54:49 -07:00

ucp_pm_viewmessage_print.html

Merge branch 'develop-olympus' into develop

2014-01-27 20:48:28 +01:00

ucp_pm_viewmessage.html

[ticket/12322] Added profile-custom-field class

2014-04-01 10:58:44 +02:00

ucp_prefs_personal.html

[ticket/12342] Fix the Custom Dates function in UCP Prefs Global

2014-04-01 18:02:27 -07:00

ucp_prefs_post.html

[ticket/11747] Use _prepend and _append for template events

2013-07-26 22:25:27 -07:00

ucp_prefs_view.html

[ticket/11747] Use _prepend and _append for template events

2013-07-26 22:25:27 -07:00

ucp_profile_autologin_keys.html

[ticket/11935] Remove obsolete table attributes from Prosilver

2013-10-19 08:55:13 -07:00

ucp_profile_avatar.html

[feature/avatars] UCP Avatar Interface

2012-03-18 22:19:16 +00:00

ucp_profile_profile_info.html

Merge branch 'develop-olympus' into develop-ascraeus

2014-04-06 11:08:18 +02:00

ucp_profile_reg_details.html

Merge branch 'develop-olympus' into develop

2013-12-16 10:25:45 +01:00

ucp_profile_signature.html

[ticket/11552] Remove inline css for signature

2013-10-19 13:24:40 +03:00

ucp_register.html

[ticket/11010] Changing email and url input types in prosilver templates

2013-05-20 18:39:46 +02:00

ucp_remind.html

[ticket/11010] Changing email and url input types in prosilver templates

2013-05-20 18:39:46 +02:00

ucp_resend.html

[ticket/11010] Changing email and url input types in prosilver templates

2013-05-20 18:39:46 +02:00

ucp_zebra_foes.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

ucp_zebra_friends.html

[ticket/12177] Add ucp_friend_list_before/after

2014-02-13 14:51:53 +02:00

viewforum_body.html

Merge remote-tracking branch 'paybas/ticket/12329' into develop-ascraeus

2014-04-01 15:07:19 +02:00

viewonline_body.html

Merge branch 'develop' into ticket/11935

2013-10-20 15:57:57 -07:00

viewonline_whois.html

[ticket/10734] Removed unwanted span classes

2012-04-02 00:42:11 +05:30

viewtopic_body.html

[ticket/12327] Changing poll result-bars width from absolute to relative

2014-04-04 18:52:59 +02:00

viewtopic_print.html

Merge pull request #1959 from prototech/ticket/12131

2014-02-02 12:58:11 +01:00

viewtopic_topic_tools.html

[ticket/11241] Add border to dropdown menu options.

2013-12-06 00:56:31 -08:00