Commit Graph

290 Commits

Author SHA1 Message Date
linonetwo
1d4be5a290 Merge remote-tracking branch 'refs/remotes/origin/feat/datacenter'
Conflicts:
	packages/app/src/components/workspace-modal/languageMenu.tsx
	packages/data-center/package.json
	pnpm-lock.yaml
2023-01-30 11:00:31 +08:00
linonetwo
bef1c78879 fix: try avoid import code using window during test 2023-01-30 10:58:52 +08:00
linonetwo
1f63662960 feat: add test about tauri ipc provider 2023-01-30 10:57:27 +08:00
MingLiang Wang
84dd82aa96 feat: improve clear logic 2023-01-17 10:26:50 +08:00
MingLiang Wang
cc00f2cb2d fix: fix logout 2023-01-16 18:23:09 +08:00
tzhangchi
49a8be3ce6 chore: add enough message for assert 2023-01-14 09:58:25 +08:00
tzhangchi
9415f46ce5 feat: console.error when firebase configed error 2023-01-13 22:34:11 +08:00
zuomeng wang
b8efa9aa25
fix: change request baseUrl to dynamic (#737) 2023-01-13 10:42:37 +00:00
zuomeng wang
a739c1f773
fix: @blocksuite/store was already imported. This breaks constructor … (#736)
…checks and will lead to issues
2023-01-13 10:29:02 +00:00
MingLiang Wang
c95667eafb
fix: fix reconnect logic (#730) 2023-01-13 09:16:15 +00:00
zuomeng wang
2c1eee1194
fix: websocket should be link to blocksuiteWorkspace, not workspace id (#735) 2023-01-13 09:10:08 +00:00
x1a0t
fabd76edbe chore: update blocksuite including providing fetching header 2023-01-13 16:01:07 +08:00
zuomeng wang
21d24ad542
fix: deepscan error (#733) 2023-01-13 07:54:21 +00:00
zuomeng wang
ba9a57d4ae
fix: error TS2742: The inferred type of 'bareClient' cannot be name (#731) 2023-01-13 07:33:42 +00:00
DiamondThree
7fb5aae8b5
fix: deepscan error and warning (#728) 2023-01-13 07:25:33 +00:00
zuomeng wang
03ff4c3e3d
fix: upload origin doc when enable cloud (#729) 2023-01-13 07:09:56 +00:00
zuomeng wang
3efc4b554b
Merge remote-tracking branch 'origin/master' into feat/datacenter (#727) 2023-01-13 06:50:15 +00:00
linonetwo
3ab34de1e1 fix: seriailize update as list, not merge then on yrs side, which is broken 2023-01-12 23:29:23 +08:00
alt0
048beb60c2 Merge remote-tracking branch 'origin/feat/datacenter-dev' into feat/datacenter-dev 2023-01-12 19:51:00 +08:00
alt0
cea3d13805 fix: workspace avatar 2023-01-12 19:50:26 +08:00
DiamondThree
826a4bf381 Merge branch 'feat/cloud-sync-saika' into feat/datacenter-dev 2023-01-12 18:23:21 +08:00
MingLiang Wang
cf47098631 feat: fix access permission api 2023-01-12 18:13:44 +08:00
x1a0t
f78ee0670e fix: remove redundant package in data-center 2023-01-12 18:05:00 +08:00
MingLiang Wang
0b623a522b feat: add remove workspace by ids 2023-01-12 17:38:18 +08:00
linonetwo
1b3bdda061 fix: merge issue 2023-01-12 17:22:13 +08:00
MingLiang Wang
11edef1bbd feat: add new workspaces by arrays 2023-01-12 17:18:40 +08:00
DiamondThree
251cfc2340 fix: message in affine 2023-01-12 17:16:44 +08:00
DiamondThree
20e4686851 Merge branch 'feat/cloud-sync-saika' into feat/datacenter-dev 2023-01-12 17:15:52 +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
MingLiang Wang
819ab74178 feat: add cause of Request error 2023-01-12 15:24:40 +08:00
MingLiang Wang
9ae9bb8092 feat: add affine request error msg 2023-01-12 15:11:49 +08:00
x1a0t
13de557d24 chore: update BlockSuite version including introducing feature flag, adding upgrade npm script 2023-01-12 14:59:44 +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
alt0
48d355ee72 fix: after load workspace, we need to close other workspace, not detory. 2023-01-12 10:01:09 +08:00
himself65
1d3dd8aa77 feat: support flags in workspace 2023-01-12 00:53:53 +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
QiShaoXuan
2caa0fcb95 Merge branch 'feat/datacenter-dev' of github.com:toeverything/AFFiNE into feat/datacenter-dev 2023-01-11 21:23:56 +08:00
QiShaoXuan
0152172dd1 feat: connect with datacenter invite function 2023-01-11 21:23:41 +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
15bdd2f31e fix: getBlocksuiteWorkspace remove check 2023-01-11 20:55:08 +08:00
alt0
2d1fd3a083 fix: add param for download public workspace 2023-01-11 20:53:53 +08:00
alt0
bda94bb865 fix: public workspace don't need to check permission 2023-01-11 20:46:04 +08:00
DiamondThree
a4284d56f8 Merge branch 'feat/cloud-sync-saika' into feat/datacenter-dev 2023-01-11 20:45:58 +08:00
alt0
362b6f4238 fix: multiple add same workspace error 2023-01-11 20:43:19 +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
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
DiamondThree
60246f3a23 fix: back blocksuit version 2023-01-11 17:13:49 +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
alt0
250ac0e2ea fix: setBlob and getBlob use WorkspaceUnit 2023-01-11 15:36:13 +08:00
DiamondThree
e9b38a2380 Merge branch 'feat/cloud-sync-saika' into feat/datacenter-dev 2023-01-11 15:28:34 +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
DiamondThree
0023593128 Merge branch 'feat/cloud-sync-saika' into feat/datacenter-dev 2023-01-11 15:16:45 +08:00
alt0
8e091a37e2 fix: workspace unit type 2023-01-11 15:14:17 +08:00
DiamondThree
4f56cc9ec9 Merge conflict 2023-01-11 15:11:34 +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
DiamondThree
b837126cea Merge branch 'feat/cloud-sync-saika' into feat/datacenter 2023-01-11 14:52:38 +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
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
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
DiamondThree
d7e6654965 Merge branch 'feat/cloud-sync-saika' into feat/datacenter 2023-01-10 22:01:43 +08:00
DiamondThree
30679763ab feat: change workspaceInfo type 2023-01-10 21:59:09 +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
DiamondThree
8fcb24a6ba Merge branch 'feat/cloud-sync-saika' into feat/datacenter 2023-01-10 21:24:31 +08:00
DiamondThree
ed46eb58fd fix: ensure return activeWorkspaceId 2023-01-10 21:08:28 +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