Commit Graph

127 Commits

Author SHA1 Message Date
linonetwo 1b3bdda061 fix: merge issue 2023-01-12 17:22:13 +08:00
linonetwo 6a9b3b2fd3 Merge remote-tracking branch 'refs/remotes/origin/feat/datacenter-dev'
Conflicts:
	packages/app/src/components/create-workspace/index.tsx
	packages/data-center/package.json
	packages/data-center/src/index.ts
	pnpm-lock.yaml
2023-01-12 17:11:27 +08:00
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
DiamondThree 45f4c9e0e9 Merge branch 'feat/cloud-sync-saika' into feat/datacenter-dev 2023-01-12 14:10:13 +08:00
alt0 034e460701 fix: merge two empty doc, no udpate event trigger 2023-01-12 12:08:37 +08:00
linonetwo ac1ddba094 fix: merge issue 2023-01-11 23:57:54 +08:00
DiamondThree 753c59b534 feat: add publish workspace page list and workspace page 2023-01-11 23:54:25 +08:00
alt0 c7f974ed77 Merge remote-tracking branch 'origin/feat/cloud-sync-saika' into feat/cloud-sync-saika 2023-01-11 23:18:23 +08:00
alt0 8e4585495f refactor: create and load workspace will return workspaceUnit 2023-01-11 23:14:13 +08:00
DiamondThree d979acbba7 Merge branch 'feat/cloud-sync-saika' into feat/datacenter-dev 2023-01-11 22:56:18 +08:00
MingLiang Wang 2fe58960f3 feat: fix type 2023-01-11 22:49:52 +08:00
xiaodong zuo 0325f3f041 fix: add public-doc api 2023-01-11 22:23:03 +08:00
QiShaoXuan d438b77a1b Merge branch 'feat/cloud-sync-saika' of github.com:toeverything/AFFiNE into feat/datacenter-dev 2023-01-11 21:43:54 +08:00
MingLiang Wang 49eff042fe feat: add accept invite 2023-01-11 21:35:40 +08:00
QiShaoXuan af93c6e6c0 Merge branch 'feat/cloud-sync-saika' of github.com:toeverything/AFFiNE into feat/datacenter-dev 2023-01-11 21:24:40 +08:00
MingLiang Wang 932f5f02c4 feat: fix users list 2023-01-11 21:10:31 +08:00
MingLiang Wang fc2a5879bd feat: add channel for get new affine list 2023-01-11 20:57:56 +08:00
alt0 2d1fd3a083 fix: add param for download public workspace 2023-01-11 20:53:53 +08:00
DiamondThree a4284d56f8 Merge branch 'feat/cloud-sync-saika' into feat/datacenter-dev 2023-01-11 20:45:58 +08:00
alt0 8b757f538e feat: temporary support loading data for public workspace 2023-01-11 20:20:48 +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 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
DiamondThree 8e8e18fdf9 change workspacetype to worksopace until 2023-01-11 16:04:38 +08:00
DiamondThree b837126cea Merge branch 'feat/cloud-sync-saika' into feat/datacenter 2023-01-11 14:52:38 +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
DiamondThree ee6138134d feat: publish workspace 2023-01-11 12:12:12 +08:00
DiamondThree eef467558e fix: lint error and build error 2023-01-10 23:13:22 +08:00
MingLiang Wang eab86dffb8 feat: add logout 2023-01-10 22:44:49 +08:00
DiamondThree d7e6654965 Merge branch 'feat/cloud-sync-saika' into feat/datacenter 2023-01-10 22:01:43 +08:00
MingLiang Wang 412d5205c8 feat: add a time out 2023-01-10 21:35:22 +08:00
DiamondThree 8fcb24a6ba Merge branch 'feat/cloud-sync-saika' into feat/datacenter 2023-01-10 21:24:31 +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
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
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