Activity log for bug #1521058

Date Who What changed Old value New value Message
2015-11-30 05:03:45 Aaron Wells bug added bug
2015-11-30 05:04:13 Aaron Wells description Robert noticed that there is a merge conflict ">>>>>" line left over in tinymce.jquery.js. It was apparently introduced in commit 3db4ecaf, one of the bootstrap commits. The merge conflict was later partially cleaned up in commit e0d6f1c67f8ac, but this part was overlooked. Looking closer, it's also apparent that quite a bit of duplicated code from that merge conflict was also left in place. Robert noticed that there is a merge conflict ">>>>>" line left over in tinymce.jquery.js. It was apparently introduced in commit 3db4ecaf, one of the bootstrap commits. The merge conflict was later partially cleaned up in commit e0d6f1c67f8ac, but this part was overlooked. Looking closer, it's also apparent that quite a bit of duplicated code from that merge conflict was also left in place. It's unclear whether this has caused any bugs, or which section of TinyMCE would cause this code to be executed.
2015-11-30 05:04:58 Aaron Wells mahara: milestone 16.04.0
2015-11-30 05:05:05 Aaron Wells nominated for series mahara/15.10
2015-11-30 05:05:05 Aaron Wells bug task added mahara/15.10
2015-11-30 05:05:05 Aaron Wells nominated for series mahara/16.04
2015-11-30 05:05:05 Aaron Wells bug task added mahara/16.04
2015-11-30 05:05:12 Aaron Wells mahara/15.10: milestone 15.10.2
2015-11-30 05:05:17 Aaron Wells mahara/15.10: status New Confirmed
2015-11-30 05:05:19 Aaron Wells mahara/16.04: status New Confirmed
2015-11-30 05:05:52 Aaron Wells description Robert noticed that there is a merge conflict ">>>>>" line left over in tinymce.jquery.js. It was apparently introduced in commit 3db4ecaf, one of the bootstrap commits. The merge conflict was later partially cleaned up in commit e0d6f1c67f8ac, but this part was overlooked. Looking closer, it's also apparent that quite a bit of duplicated code from that merge conflict was also left in place. It's unclear whether this has caused any bugs, or which section of TinyMCE would cause this code to be executed. Robert noticed that there is a merge conflict ">>>>>" line left over in tinymce.jquery.js. It was apparently introduced in commit 5ba3418499cc419e, one of the bootstrap commits. The merge conflict was later partially cleaned up in commit e0d6f1c67f8ac, but this part was overlooked. Looking closer, it's also apparent that quite a bit of duplicated code from that merge conflict was also left in place. It's unclear whether this has caused any bugs, or which section of TinyMCE would cause this code to be executed.
2015-11-30 23:35:27 Aaron Wells mahara/15.10: importance Undecided Low
2015-11-30 23:35:30 Aaron Wells mahara/16.04: importance Undecided Low
2015-12-02 20:07:40 Robert Lyon mahara/16.04: status Confirmed Fix Committed
2015-12-02 20:08:06 Robert Lyon mahara/15.10: status Confirmed Fix Committed
2016-03-23 23:07:33 Aaron Wells mahara/15.10: status Fix Committed Fix Released
2016-04-30 02:15:27 Kristina Hoeppner bug task deleted mahara/16.04
2016-04-30 02:15:31 Kristina Hoeppner mahara: status Fix Committed Fix Released