MikMik: Difference between revisions

From OLPC
Jump to navigation Jump to search
(saving space)
No edit summary
Line 7: Line 7:
|base=No
|base=No
|version=0.2
|version=0.2
|source= In a [http://ephemera.media.mit.edu/textnet/ bzr repository] at <small><tt>ephemera.media.mit.edu/textnet/</tt></small>
|source= In a [http://projects.mako.cc/source/textnet bzr repository] at <small><tt>http://projects.mako.cc/source/textnet</tt></small>
|l10n=none
|l10n=none
|contributors=[[User:Mako|Mako Hill]]
|contributors=[[User:Benjamin Mako Hill|Benjamin Mako Hill]]
}}
}}
A distributed wiki editor that supports good automatic merge resolution. Undergoing testing; needs a better UI. Right now there's a major known bug and some unresolved interface issues. UNICEF is doing some unmerged but related user interface work.


'''MikMik'' is a wiki built on top of the [Bazaar http://bazaar-vcs.org] distributed revision control system. In simple use, it acts like any number of simple wikis. However, it provides a text-specific "word-by-word" interface to difference reflection and resolution. More importantly, it provides a Javascript interface for conflict resolution.


The wiki currently supports the Markdown markup format with rudimentary support for Mediawiki markup as well.

The system targets the XO-1 and is currently undergoing testing and improvement and needs a better UI. There is currently a major known bug and some unresolved interface issues. UNICEF is doing related user interface work in coordination with the project.

TextNet was built by [[User:Benjamin Mako Hill|Benjamin Mako Hill]] as his Masters degree thesis at the MIT Media Lab.


{{stub}}
{{stub}}

Revision as of 04:29, 20 September 2007

Description & Goals

MikMik
Activity4.png
Status: pre-alpha
Version: 0.2
Base: No
Source: In a bzr repository at http://projects.mako.cc/source/textnet
l10n: none
Contributors
Benjamin Mako Hill

'MikMik is a wiki built on top of the [Bazaar http://bazaar-vcs.org] distributed revision control system. In simple use, it acts like any number of simple wikis. However, it provides a text-specific "word-by-word" interface to difference reflection and resolution. More importantly, it provides a Javascript interface for conflict resolution.

The wiki currently supports the Markdown markup format with rudimentary support for Mediawiki markup as well.

The system targets the XO-1 and is currently undergoing testing and improvement and needs a better UI. There is currently a major known bug and some unresolved interface issues. UNICEF is doing related user interface work in coordination with the project.

TextNet was built by Benjamin Mako Hill as his Masters degree thesis at the MIT Media Lab.

This article is a stub. You can help the OLPC project by expanding it.


See also