Commit History

Author SHA1 Message Date
  yuto-oweseek d39d002406 use resolveandreload 4 years ago
  yuto-oweseek 08d3085543 add reload method 4 years ago
  yuto-oweseek 743a27ee5a add resolveconflict 4 years ago
  yuto-oweseek cfb2db8bc7 add i18n and use pagecontainer saveandreload 4 years ago
  yuto-o dfb94ec074 change names and add i18n 4 years ago
  yuto-oweseek 7f7732c66a comment is when select revision must be required to use state 4 years ago
  yuto-oweseek dc32f6ed71 works as inteded by using useref 4 years ago
  yuto-oweseek 3114814e51 adjust appearance and increase i18n 4 years ago
  yuto-oweseek e643ec3871 adjust modal appearance 4 years ago
  yuto-o c2f2f16fd6 display modal 4 years ago
  yuto-oweseek ff4ee0c9b9 make a little changes 4 years ago
  yuto-oweseek cd7ec7a8da make it possible to send data when conflicted 4 years ago
  yuto-o 6593378826 wip and change i18n 4 years ago
  Steven Fukase 8b197d37f2 i18n, impl 4 years ago
  Steven Fukase 3c265dfaed i18n 4 years ago
  Steven Fukase 72216713f1 props handling 4 years ago
  Steven Fukase dd291fedad cleanup, fixes 4 years ago
  Steven Fukase eae6e9680d wip state for mergeview 4 years ago
  Steven Fukase 980f9af666 wip connect MV to state 4 years ago
  Steven Fukase 5fd6be0823 wip 4 years ago
  Steven Fukase f8b865cc3a impl, cleanup 4 years ago
  Steven Fukase e263e5a4ac wip 4 years ago
  Steven Fukase 9d8f937a66 wip 4 years ago
  Steven Fukase 8a5a806f64 codemirror wip 4 years ago
  Steven Fukase 181304c839 wip conflict diff 4 years ago
  Steven Fukase 2c8dfdcf25 removed toggle 4 years ago
  Steven Fukase 5903aba816 wip diff modal 4 years ago