515477 - Merge forumux branch back to trunk (and prod)

Status: VERIFIED FIXED

(support.mozilla.org :: General, defect)

Description

[Paul Craciunoiu [:paulc]]

Now that we're done with 1.3, we need to merge changes from 1.4 (forumux release) back to trunk and finally prod.

Comment 1

[Paul Craciunoiu [:paulc]]

Attachment: list of forumux commits

Here's a list of the changes that will be merged. Output of:
svn log --stop-on-copy

Comment 2

[Paul Craciunoiu [:paulc]]

Attachment: merge patch

ForumUX merge results:
3 conflicts
* webroot/styles/mozcommon.css
** manually solved by adding: http://viewvc.svn.mozilla.org/vc/projects/sumo/branches/forumux/webroot/styles/mozcommon.css?r1=29680&r2=49024&pathrev=49061
** list of changes: http://viewvc.svn.mozilla.org/vc/projects/sumo/branches/forumux/webroot/styles/mozcommon.css?view=log
* webroot/styles/mozcommon/ie7.css
** no change, see bug 510072 which is already fixed on trunk
** list of changes: http://viewvc.svn.mozilla.org/vc/projects/sumo/branches/forumux/webroot/styles/mozcommon/ie7.css?view=log
* webroot/templates/styles/mozkb/tiki-view_forum.tpl
** added fixes for bug 481890 and bug 511792
** list of changes: http://viewvc.svn.mozilla.org/vc/projects/sumo/branches/forumux/webroot/templates/styles/mozkb/tiki-view_forum.tpl?view=log

Started from trunk version r51178.

Modified files:
M      webroot/tiki-forum_rss.php
M      webroot/tiki-admin_include_rss.php
M      webroot/comments.php
M      webroot/tiki-newsearch.php
M      webroot/tiki-view_forum_thread.php
M      webroot/lib/rss/rsslib.php
M      webroot/lib/tikilib.php
M      webroot/lib/commentslib.php
M      webroot/lib/notifications/notificationemaillib.php
M      webroot/styles/mozfr.css
M      webroot/styles/mozcommon.css
M      webroot/styles/mozcommon/ie.css
M      webroot/styles/mozcommon/ie7.css
M      webroot/tiki-view_forum.php
M      webroot/templates/tiki-admin-include-rss.tpl
M      webroot/templates/tiki-newsearch.tpl
M      webroot/templates/styles/mozkb/comments.tpl
M      webroot/templates/styles/mozkb/tiki-edit_help_tool.tpl
M      webroot/templates/styles/mozkb/tiki-view_forum.tpl
M      webroot/templates/styles/mozkb/comment-header.tpl
M      webroot/templates/styles/mozkb/comment-body.tpl
M      webroot/templates/styles/mozfr/comment-icon.tpl
M      webroot/templates/styles/mozcommon/head.tpl
M      webroot/templates/mail/forum_post_notification.tpl
M      webroot/htaccess.dist

Attaching the patch that was used to merge. This is the patch I used for prod after resolving the conflicts above.

Merge done successfully in r51292 / r51294.

Comment 3

[Stephen Donner [:stephend] Not actively reading bugmail]

Verified FIXED -- already tested out a couple random fixes, and this looks like it took.

Also talked to James who SVN up'd without merge conflicts, post-merge.