Commit History

Author SHA1 Message Date
  Yuki Takei fdab244943 fix importing OptionsToSave 3 years ago
  Yuki Takei c3ef20dedc fix lint error 3 years ago
  Yuki Takei fd2a37bf94 Merge remote-tracking branch 'origin/dev/5.1.x' 3 years ago
  Yuki Takei 30199e849b fix lint error 3 years ago
  kaori 9059dcbc49 fix lint err 3 years ago
  kaori c3ebf20d9d fix optionsToSave type err 3 years ago
  kaori 8bc2606714 resolve conflict to pass optionsToSave props 3 years ago
  Yuki Takei 93dcb28a6a replace react-i18next with next-i18next 3 years ago
  Yuki Takei 6c736054f1 fix lint error 4 years ago
  Yuki Takei 40228e6bd2 refactor ConflictDiffModal 4 years ago
  yuto-oweseek 888c7bb76f modify conflict modal design 4 years ago
  yuto-oweseek f1e4123837 remove inappropriate classes in conflict diff modal 4 years ago
  yuto-oweseek cfbed3cd2a clean conflict diff modal state 4 years ago
  yuto-oweseek 87df04d6e1 add expand and close button to conflict diff modal 4 years ago
  yuto-oweseek 52a166a51f change operation order 4 years ago
  yuto-oweseek 2fc00588e4 remove editor container and use swr 4 years ago
  yuto-oweseek e94cab5a7c prevent reload when resolve conflict 4 years ago
  yuto-oweseek c1bc3e0be7 wip: resolve conflict method in page container 4 years ago
  stevenfukase 91f4db9c2e ts fix 4 years ago
  stevenfukase e19155ee0e wip ts fix 4 years ago
  Steven Fukase f586e72b75 Merge branch 'feat/79579-upgrade-conflict-modal' into feat/82741-fix-revision-selection 4 years ago
  stevenfukase f5a5b37542 cleanup 4 years ago
  stevenfukase 67dcc9f04b wip got value from cm 4 years ago
  stevenfukase 26a0bacc3e wip 4 years ago
  stevenfukase 78322d5b4a migrate to state from ref 4 years ago
  yuto-oweseek cb4ae1fba4 change displayed revision name 4 years ago
  yuto-oweseek e97034f737 change state to props on jsx confitional branch 4 years ago
  yuto-oweseek 2d41fec7f5 remove one line 4 years ago
  yuto-oweseek e3a22063b4 Merge branch 'feat/79579-upgrade-conflict-modal' into feat/79579-78640-color-diff-lines 4 years ago
  stevenfukase aa6408a446 typo fix 4 years ago