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 |
stevenfukase
|
539c422339
Merge branch 'feat/79579-upgrade-conflict-modal' into feat/79579-commonize-editor-component
|
4 years ago |
yuto-oweseek
|
f57ff43815
add condition of render
|
4 years ago |
yuto-oweseek
|
2725834c46
change useEffect dependency
|
4 years ago |
yuto-oweseek
|
6420ae4382
retrieve data from server side on conflict
|
4 years ago |
yuto-oweseek
|
1ca89d0e4e
merge parent branch
|
4 years ago |
yuto-oweseek
|
c5dd22a5a4
add todo comments
|
4 years ago |
stevenfukase
|
eb777a5d6c
fix
|
4 years ago |