MikMik: Difference between revisions
No edit summary |
m (minor formatting fix) |
||
Line 12: | Line 12: | ||
}} |
}} |
||
'''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. |
'''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 wiki currently supports the Markdown markup format with rudimentary support for Mediawiki markup as well. |
Revision as of 04:30, 20 September 2007
Description & Goals
MikMik | |
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.