====== Post-Doc 2012-2013 ======
===== Paper =====

  * Luc André, Stéphane Martin, Gérald Oster, Claudia-Lavinia Ignat, Supporting adaptable Granularity of changes for massive-scale collaborative editing. Collaborate Com'13.

===== Projects =====
  * [[rivage|Rivage Project]]
  * [[jbench|Projet JBenchMarker]] Initiator : Pascal Urso.

====== ATER 2011-2012 =====
===== Paper =====
   * Stéphane Martin, Mehdi Ahmed-Nacer , Pascal Urso, Controlled conflict resolution for replicated document Collaborate com 2012{{:recherche:collaborate.pdf|draft}}

===== ANR =====
  * Mehdi Ahmed-Nacer, Stéphane Martin, Pascal Urso: File system on CRDT.[[http://hal.inria.fr/hal-00720681
| Hal Inria]] 
  * Stéphane Martin, Mehdi Ahmed-Nacer , Pascal Urso, Abstract unordered and ordered trees CRDT. [[http://hal.inria.fr/hal-00648106/fr/|Hal Inria]]
====== ATER 2010-2011 =====
  * PHD Thesis, Collaborative editing on semi-structured documents {{:these_main.pdf|French text}}

====== Thesis 2007-2010 ======
===== Papers =====
  * Scalable XML Collaborative Editing with Undo (with the collaboration of  [[http://www.loria.fr/~urso/pmwiki.php|Pascal Urso]] and [[http://www.loria.fr/~weiss/pmwiki/pmwiki.php|Stephane Weiss]] - Loria Nancy) - COOPIS'10 [[http://hal.archives-ouvertes.fr/hal-00527234|(hal)]] LNCS 6426, p. 507 ff.
  * Collaborative edition on typed document - CDVE'10 [[http://www.springerlink.com/content/g52450g884luw442/|SpringerLink]]
  * Avoiding Conflicts is Better than Solving Conflicts (2009,{{:recherche:paperfirstsub.pdf|draft paper}},[[http://hal.archives-ouvertes.fr/hal-00429612/fr/|Research report]], short paper)
  * Peer to peer collaborative editing on XML-like tree (2008,{{:recherche:cdur.pdf|Paper}},{{:recherche:poster.pdf|Poster CDUR 2008}})


===== Project =====

  * [[projects:fcedit|Fast Cooperative Editor]] (FCedit, initiated in 2008)

====== Master Reports Informatique Fondamentale 2007 ======
[[http://www.cmi.univ-mrs.fr/~martin/memoire.pdf|Vers la vérification automatique de services web.]]