Closed harksha closed 9 years ago
@osj2507 Ioana thinks the merge is correct but please take a few stikprøver to make sure that we haven't lost anything from previous commits from beta1.
Something is wrong with this as I see it, first off why is Roxanas commits in this still, do they belong to this fix as far as I see they do not fix anything for this issue.
Second we are including a lot of bootstrap js that we are not using at all, meaning that it will fill up and loaded even though nobody is actually using it, that should be cleaned up.
There is also several changes to the what version of ckeditor is being used, that does not belong to this issue either, since it is not changing anything in the plugins or menu of the ckeditor.
I ahve noted some things for the different commits also.
@osj2507 please review again :)