Yuki Takei
|
5989715086
Merge pull request #5012 from weseek/feat/79579-upgrade-conflict-modal
|
пре 4 година |
yuto-oweseek
|
2aa8be79c1
Merge branch 'master' into imprv/81-improvements-about-tag
|
пре 4 година |
kaori
|
0aad37fa7a
fix error
|
пре 4 година |
kaori
|
5041d0fd94
commented out 'updatedAt' on PageContainer
|
пре 4 година |
yuto-oweseek
|
add3844ac0
remove unnesessary input in page container
|
пре 4 година |
yuto-oweseek
|
6c80e0f112
remove unnesessary one line
|
пре 4 година |
yuto-oweseek
|
07ae9cf8d1
remove unnesessary code and change type info
|
пре 4 година |
yuto-oweseek
|
c169994563
add update meta method in page container
|
пре 4 година |
yuto-oweseek
|
f10fcd386d
fix typo
|
пре 4 година |
yuto-oweseek
|
d53e2318c7
add copy operation to resolve conflict method
|
пре 4 година |
yuto-oweseek
|
e94cab5a7c
prevent reload when resolve conflict
|
пре 4 година |
yuto-oweseek
|
5065dfcba8
wip after fb
|
пре 4 година |
yuto-oweseek
|
c1bc3e0be7
wip: resolve conflict method in page container
|
пре 4 година |
yuto-oweseek
|
d1bd89a26b
change revision author
|
пре 4 година |
yuto-oweseek
|
c9101e7ec4
remove unnesessary method of page container
|
пре 4 година |
stevenfukase
|
dd65a4d8a4
fix reload on save
|
пре 4 година |
Steven Fukase
|
a56f35f3f4
Merge branch 'master' into feat/79579-upgrade-conflict-modal
|
пре 4 година |
Yuki Takei
|
573216cc98
imprv: Omit atlaskit and implement sidebar only with original codes (#4598)
|
пре 4 година |
yuto-oweseek
|
6420ae4382
retrieve data from server side on conflict
|
пре 4 година |
yuto-oweseek
|
6eca4f5039
move conflict revisions from pagestatusalert to conflictdiffmodal and change user field from remote
|
пре 4 година |
yuto-oweseek
|
90c42224c8
remove isConflictingOnSave
|
пре 4 година |
yuto-oweseek
|
3f81bd90c2
disable alert on post
|
пре 4 година |
yuto-oweseek
|
8ad2c0a596
remaining tasks are to adjust datetime format create method and update conflict revision
|
пре 4 година |
yuto-oweseek
|
713213aa4c
must set request user name and user image path
|
пре 4 година |
yuto-oweseek
|
4d30cf6b6f
can retrieve remote revision body
|
пре 4 година |
yuto-oweseek
|
e8c56d47cb
replace window location href to window location reload
|
пре 4 година |
yuto-oweseek
|
df990f10c6
make a little change after fb
|
пре 4 година |
yuto-oweseek
|
f2fb2e6117
Merge branch 'feat/77877-resolve-page-conflict-and-update-it' into feat/77877-78639-select-revision-and-copy-it-to-text-area
|
пре 4 година |
yuto-oweseek
|
83bc04ae83
merge master and resolve conflict
|
пре 4 година |
yuto-o
|
413a77ca9c
merge master and resolve conflict
|
пре 4 година |