![]() ![]() # a) learn a bit more about git and how to Merges ok and no further steps are needed. # before attempting the merge, check that # (the first time this will take a minute) # fetch latest code from the catalyst moodle repo Git remote add cat-moodle git:///moodle-r2.git # MOODLE_19_BRANCH as imported by catalyst If that happens you can merge in updates from the MOODLE_19_STABLE branch without waiting for me. But perhaps I fall behind, or get rolled over by a bus. Now, I will be regularly merging fixes from MOODLE_19_STABLE so all you need to do is that "git pull" regularly. # Pull updates from the mdl19-tinymce branch Git checkout -b mdl19-tinymce origin/mdl19-tinymce # branch to track the mdl19-tinymce branch, and # - not what you want - so create a local # moodle version we run in the OLPC School Server # the "default" branch of this repo is for the # clone the repo - will take a few minutes. If you want the git repository you do git clone.Ī quick workflow. want me to fix a bug that is hurting you? grab an XO test image or a Sugar LiveCD and show me the bug is there too ![]() bugfixes (post your patch right here on this thread or email me) This needs your help however, in the form of I'll try to defer merging from _STABLE into the -tinymce branch to keep things simple. If, like me, you are an avid git user, you can merge from catalyst's MOODLE_19_STABLE import to keep grabbing those good bugfixen from the _STABLE branch, and also merge / pull from that mdl19-tinymce branch for any bugfixes to tinymce. To use, set $CFG->defaulthtmleditor='tinymce' To download, follow the 'tree' link at the top, which will reveal a 'snapshot' link. The code is on a branch off MOODLE_19_STABLE (from the catalyst repo), right here: Many thanks to Mauno and Mathieu for all their work on TinyMCE for 2.0. consistent with HEAD (as much as possible) Today back and the office I completed the backport. With Mathieu, I explored the patchseries a bit, and figured out a few interdependencies and tricky bits. I know we also want to use it for our OLPC Moodle, which will make lots of kids happy (if it works well!). ![]() Over at the MoodleMoot AU, Mathieu told me that if I backported the TinyMCE to 1.9 it'd probably make a lot of people happy. ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |