Vjacheslav Trushkin ba431def5d Merge remote-tracking branch 'upstream/develop' into feature/merging-style-components ...

* upstream/develop: (65 commits)
  [ticket/10730] Added label tag around "select" text in post splitting UI
  [ticket/10732] Add config_dev.php and config_test.php to .gitignore
  [ticket/10586] Added space in if statement
  [ticket/10586] Tidy up comments
  [task/php5.3] Updated range of tested PHP versions
  [task/php5.3] Looks like I missed a few places that needed PHP 5.2 changed to PHP 5.3.2
  [task/php5.3] Changed minimum PHP requirement for Ascraeus to 5.3.2
  [ticket/10723] Stop Travis running all tests on sqlite
  [ticket/10703] Added a condition to check if ext directory exists
  [task/travis] Refactor php version check for dbunit install
  [task/travis] Exclude functional and slow tests
  [ticket/10719] Revert "Skip functional tests on PHP 5.2"
  [task/travis-develop2] Update version from 5.3 to 5.3.2
  [task/travis] Dropping support for 5.2 in develop branch
  [task/travis] Some more small travis fixes
  [task/travis] Rename travis phpunit config files
  [task/travis] Fixing some travis issues
  [ticket/10684] Adjust function and parameter name, minor changes.
  [task/travis] Add automated testing to readme
  [task/travis] Removing development information
  ...

Conflicts:
	phpBB/install/database_update.php

2012-03-29 22:38:07 +03:00

..

attachment.html

[ticket/9948] Inline quicktime files won't show

2010-12-15 09:39:28 +01:00

bbcode.html

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

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

captcha_default.html

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00:00

captcha_qa.html

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00:00

captcha_recaptcha.html

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

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

confirm_body.html

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00:00

custom_profile_fields.html

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00:00

drafts.html

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00:00

editor.js

Merge branch 'develop-olympus' into develop

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

faq_body.html

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00:00

forum_fn.js

[ticket/10253] Fix IE9 handling in javascript, to correctly quote text.

2011-07-30 19:35:45 +02:00

forumlist_body.html

Merge branch 'develop-olympus' into develop

2011-12-16 17:51:48 +01: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

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00:00

jumpbox.html

[ticket/10293] Fixed the JavaScript in the jumpbox.

2011-07-26 13:43:52 +01:00

login_body.html

Merge branch 'develop-olympus' into develop

2010-12-29 23:01:19 +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

Merge branch 'develop-olympus' into develop

2011-11-18 19:42:44 +01: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

Merge branch 'ticket/hanakin/10001' into develop

2011-02-28 00:07:59 +01:00

mcp_front.html

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

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

mcp_header.html

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +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

[ticket/10312] Un-check the shadow option while moving.

2011-08-10 14:42:05 +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

Merge branch 'develop-olympus' into develop

2011-09-17 23:34:44 +02:00

mcp_post.html

Merge branch 'develop-olympus' into develop

2011-11-18 19:42:44 +01: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/9556] Drop php closing tags, add trailing newline

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

mcp_topic.html

Merge branch 'develop-olympus' into develop

2012-03-28 23:24:06 -04:00

mcp_warn_front.html

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

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

mcp_warn_list.html

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

2010-11-11 19:10:55 +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

Merge branch 'develop-olympus' into develop

2012-02-28 22:25:09 +01:00

memberlist_email.html

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

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

memberlist_im.html

Merge branch 'develop-olympus' into develop

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

memberlist_leaders.html

Merge branch 'develop-olympus' into develop

2012-02-28 22:25:09 +01:00

memberlist_search.html

[ticket/9980] URLs to javascript should be T_SUPER_TEMPLATE_PATH instead of T_TEMPLATE_PATH

2011-01-08 01:33:35 +01:00

memberlist_view.html

Merge branch 'develop-olympus' into develop

2012-03-22 11:11:31 +01:00

message_body.html

[ticket/7138] Allow simple header and footer for trigger_error() messages

2011-11-13 16:30:11 +01:00

overall_footer.html

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

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

overall_header.html

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

2011-09-21 18:12:07 +02:00

posting_attach_body.html

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00:00

posting_body.html

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00:00

posting_buttons.html

Merge remote-tracking branch 'callumacrae/ticket/8173' into develop-olympus

2011-07-30 19:33:41 -04:00

posting_editor.html

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

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

posting_layout.html

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00:00

posting_pm_layout.html

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

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

posting_poll_body.html

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00:00

posting_preview.html

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00:00

posting_review.html

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

2010-11-11 19:10:55 +01: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] bbcode_nl2br missing.

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

quickreply_editor.html

[ticket/9146] Fix double occurring tabindex="6" in prosilver's QR

2010-05-16 16:59:48 +02: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/9220] Remove margin on table.table1 so it's centered in the blue box.

2012-02-27 16:32:29 +01:00

search_results.html

Merge branch 'develop-olympus' into develop

2011-12-16 17:51:48 +01:00

simple_footer.html

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

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

simple_header.html

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

2011-09-21 18:12:07 +02:00

ucp_agreement.html

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00:00

ucp_attachments.html

Merge branch 'develop-olympus' into develop

2011-12-16 17:51:48 +01:00

ucp_avatar_options.html

Bug #52495 - [Fix] Replace hard coded "px" with translated language-string.

2010-01-25 15:57:10 +00: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

Merge branch 'develop-olympus' into develop

2011-10-14 02:51:32 +02: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

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00:00

ucp_main_bookmarks.html

Merge branch 'ticket/hanakin/10001' into develop

2011-02-28 00:07:59 +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

Merge branch 'ticket/hanakin/10001' into develop

2011-02-28 00:07:59 +01:00

ucp_pm_history.html

[ticket/9757] Fix empty template variable {HISTORY_TITLE}

2010-07-29 13:19:19 -05:00

ucp_pm_message_footer.html

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00:00

ucp_pm_message_header.html

[ticket/10453] Fixing spacing

2012-02-26 16:54:31 +02:00

ucp_pm_options.html

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

2010-11-11 19:10:55 +01: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

Merge branch 'develop-olympus' into develop

2012-02-24 20:05:41 +02:00

ucp_pm_viewmessage_print.html

[ticket/10458] Fix xHTML errors when print-viewing PMs

2012-02-23 16:25:47 +01:00

ucp_pm_viewmessage.html

Merge branch 'develop-olympus' into develop

2012-02-26 16:01:42 +01: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

[ticket/10535] Removed email confirm from UCP, removed unused language entries

2011-12-15 23:15:24 +00: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

Merge branch 'develop-olympus' into develop

2011-12-16 17:51:48 +01:00

viewonline_body.html

[ticket/9220] Remove margin on table.table1 so it's centered in the blue box.

2012-02-27 16:32:29 +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

Merge branch 'develop-olympus' into develop

2011-10-29 12:35:44 +02:00

viewtopic_print.html

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

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