Commit Graph

173 Commits

Author SHA1 Message Date
linonetwo
06be432b5a fix: assign name and avatar 2023-01-12 16:35:18 +08:00
linonetwo
235bfe646d fix: merge issue 2023-01-12 16:19:11 +08:00
linonetwo
4be968c421 fix: create yDoc for workspace created during createUser 2023-01-12 16:17:30 +08:00
linonetwo
ac1ddba094 fix: merge issue 2023-01-11 23:57:54 +08:00
linonetwo
107419cb8d Merge remote-tracking branch 'refs/remotes/origin/feat/cloud-sync-saika'
Conflicts:
	packages/data-center/package.json
	packages/data-center/src/datacenter.ts
	packages/data-center/src/index.ts
	pnpm-lock.yaml
2023-01-11 18:30:57 +08:00
linonetwo
0b2ab4f9a4 feat: create user if not exist 2023-01-11 17:54:26 +08:00
MingLiang Wang
7e77175679 feat: update invite function name 2023-01-11 17:30:16 +08:00
MingLiang Wang
62826f7ab7 feat: add channel 2023-01-11 17:21:41 +08:00
alt0
6459faeeb9 fix: local provider save workspaces info 2023-01-11 16:50:40 +08:00
alt0
250ac0e2ea fix: setBlob and getBlob use WorkspaceUnit 2023-01-11 15:36:13 +08:00
alt0
a11f411f6c fix: enable and update workspace use workspaceUnit as params 2023-01-11 15:27:31 +08:00
alt0
7e608e48ec fix: workspace unit setBlocksuiteWorkspace support null 2023-01-11 15:23:03 +08:00
alt0
8e091a37e2 fix: workspace unit type 2023-01-11 15:14:17 +08:00
alt0
db74706eca refactor: datacenter only export workspaceUnit 2023-01-11 15:07:04 +08:00
alt0
122cce042c Merge remote-tracking branch 'origin/master' into feat/cloud-sync-saika 2023-01-11 15:01:35 +08:00
alt0
57b204b6e2 test: fix test case 2023-01-11 13:52:56 +08:00
MingLiang Wang
48264edf91 feat: add query members 2023-01-11 12:34:57 +08:00
linonetwo
cdc196322c fix: tauri loading and method loading 2023-01-11 12:14:07 +08:00
MingLiang Wang
cdf07fd7c2 feat: remove workspaces pool 2023-01-10 23:01:50 +08:00
MingLiang Wang
eab86dffb8 feat: add logout 2023-01-10 22:44:49 +08:00
MingLiang Wang
ad5e7cb2f4 feat: fix data center 2023-01-10 21:44:40 +08:00
MingLiang Wang
412d5205c8 feat: add a time out 2023-01-10 21:35:22 +08:00
alt0
7e60b750d1 Merge remote-tracking branch 'origin/feat/cloud-sync-saika' into feat/cloud-sync-saika 2023-01-10 20:22:35 +08:00
alt0
b111c411bd fix: local provider create workspace should wait sync to idb 2023-01-10 20:22:14 +08:00
MingLiang Wang
104693916f feat: change the order of load workspaces 2023-01-10 20:11:46 +08:00
x1a0t
6c792d0e61 chore: update BlockSuite version 2023-01-10 19:31:57 +08:00
linonetwo
005d3bbaa9 fix: merge issue 2023-01-10 18:40:36 +08:00
alt0
b4571539ac Merge remote-tracking branch 'origin/feat/cloud-sync-saika' into feat/cloud-sync-saika 2023-01-10 18:37:43 +08:00
alt0
e13d27ad9c refactor: add workspace unit 2023-01-10 18:37:24 +08:00
MingLiang Wang
2260696675 feat: remove not used 2023-01-10 18:32:06 +08:00
linonetwo
6645e98a1b Merge remote-tracking branch 'refs/remotes/origin/feat/datacenter'
Conflicts:
	package.json
	packages/app/src/components/create-workspace/index.tsx
	packages/app/src/components/workspace-modal/index.tsx
	packages/app/src/components/workspace-modal/languageMenu.tsx
	packages/app/src/components/workspace-slider-bar/WorkspaceSelector/SelectorPopperContent.tsx
	packages/app/src/components/workspace-slider-bar/index.tsx
	packages/app/src/pages/_app.tsx
	pnpm-lock.yaml
2023-01-10 18:23:25 +08:00
MingLiang Wang
c28407f77d feat: synced socket upload 2023-01-10 18:19:40 +08:00
linonetwo
09e900b1f7 feat: implement load and warp workspace in ipc provider 2023-01-10 17:54:00 +08:00
DiamondThree
8f18048254 Merge branch 'feat/cloud-sync-saika' into feat/datacenter 2023-01-10 17:21:29 +08:00
MingLiang Wang
5723117cb8 feat: return name 2023-01-10 17:10:04 +08:00
linonetwo
876f3d235e Merge remote-tracking branch 'refs/remotes/origin/feat/cloud-sync-saika'
Conflicts:
	package.json
	packages/app/src/components/workspace-slider-bar/index.tsx
	packages/app/src/libs/i18n/resources/bn.json
	packages/app/src/libs/i18n/resources/fr.json
	packages/app/src/libs/i18n/resources/sr.json
	packages/app/src/libs/i18n/resources/zh-Hans.json
	packages/app/src/libs/i18n/resources/zh-Hant.json
	packages/app/src/pages/_app.tsx
	packages/data-center/src/datacenter.ts
	pnpm-lock.yaml
2023-01-10 17:08:57 +08:00
DiamondThree
60b379fcad Merge branch 'feat/cloud-sync-saika' into feat/datacenter 2023-01-10 17:07:44 +08:00
MingLiang Wang
209184327b feat: fix path 2023-01-10 17:06:54 +08:00
DiamondThree
255e09480a Merge branch 'feat/cloud-sync-saika' into feat/datacenter 2023-01-10 17:02:25 +08:00
MingLiang Wang
0f2af25249 feat: fix path 2023-01-10 17:00:18 +08:00
linonetwo
a76fadb1bc feat: load workspace in ipc provider 2023-01-10 16:55:23 +08:00
DiamondThree
bfcd53f39f Merge branch 'feat/cloud-sync-saika' into feat/datacenter 2023-01-10 16:51:02 +08:00
MingLiang Wang
31d3a012f9 feat: add message center 2023-01-10 15:39:24 +08:00
alt0
ecec2d6efe test: fix test case 2023-01-10 15:07:50 +08:00
alt0
42261a7f41 Merge remote-tracking branch 'origin/feat/cloud-sync-saika' into feat/cloud-sync-saika 2023-01-10 15:04:15 +08:00
alt0
ff63de2aa5 refactor: workspaces -> workspaceMetaCollection 2023-01-10 15:03:28 +08:00
MingLiang Wang
aeb1b1688d fix: fix avatar id 2023-01-10 14:56:53 +08:00
DiamondThree
f251ae7437 Merge branch 'feat/cloud-sync-saika' into feat/datacenter 2023-01-10 14:12:55 +08:00
MingLiang Wang
8c1636f1a2 feat: fix set name 2023-01-10 13:13:31 +08:00
MingLiang Wang
44e20cec3c feat: fix api name and params 2023-01-10 12:21:05 +08:00