Commit Graph

334 Commits

Author SHA1 Message Date
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
DiamondThree
4fe2febda3 feat:add isOwner 2023-01-12 17:06:54 +08:00
DiamondThree
ede7a6bdaa feat:add leave workspace 2023-01-12 15:52:07 +08:00
DiamondThree
14c665757e fix: delete mock data 2023-01-12 14:59:13 +08:00
DiamondThree
1eb3553504 fix: delete mock data 2023-01-12 14:40:33 +08:00
DiamondThree
bb3ff8edc7 fix: remove unused variable references 2023-01-12 14:32:55 +08:00
DiamondThree
45f4c9e0e9 Merge branch 'feat/cloud-sync-saika' into feat/datacenter-dev 2023-01-12 14:10:13 +08:00
DiamondThree
1b544463c2 fix: login when no user. enabled on member 2023-01-12 11:50:49 +08:00
DiamondThree
753c59b534 feat: add publish workspace page list and workspace page 2023-01-11 23:54:25 +08:00
DiamondThree
9d431dbc18 feat:add logout 2023-01-11 21:44:32 +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
DiamondThree
a4284d56f8 Merge branch 'feat/cloud-sync-saika' into feat/datacenter-dev 2023-01-11 20:45:58 +08:00
DiamondThree
ca9f66ce99 fix: add publick worksapce 2023-01-11 20:25:52 +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
DiamondThree
e2a9c6c552 Merge branch 'feat/datacenter-dev' of https://github.com/toeverything/AFFiNE into feat/datacenter-dev 2023-01-11 17:14:05 +08:00
DiamondThree
60246f3a23 fix: back blocksuit version 2023-01-11 17:13:49 +08:00
QiShaoXuan
423f0e8e96 fix: type error 2023-01-11 16:37:41 +08:00
QiShaoXuan
b6b1ae0224 feat: add interaction to search button 2023-01-11 16:34:41 +08:00
QiShaoXuan
926bb7fd14 chore: remove currentWorkspaceId & currentMetaWorkspace 2023-01-11 16:33:25 +08:00
DiamondThree
8e8e18fdf9 change workspacetype to worksopace until 2023-01-11 16:04:38 +08:00
DiamondThree
4f56cc9ec9 Merge conflict 2023-01-11 15:11:34 +08:00
alt0
122cce042c Merge remote-tracking branch 'origin/master' into feat/cloud-sync-saika 2023-01-11 15:01:35 +08:00
DiamondThree
cb86e8b801 Merge branch 'feat/datacenter' of https://github.com/toeverything/AFFiNE into feat/datacenter 2023-01-11 14:57:50 +08:00
DiamondThree
e3dc089d51 feat:member list init 2023-01-11 14:57:36 +08:00
QiShaoXuan
27754833cf :Merge branch 'feat/datacenter' of github.com:toeverything/AFFiNE into feat/datacenter 2023-01-11 14:55:44 +08:00
QiShaoXuan
97b8456eac chore: remove usePageMetaList 2023-01-11 14:55:12 +08:00
DiamondThree
a0c333f823 Merge branch 'feat/datacenter' of https://github.com/toeverything/AFFiNE into feat/datacenter 2023-01-11 14:51:41 +08:00
DiamondThree
3159d6ff1b fixed memeber init 2023-01-11 14:48:50 +08:00
DiamondThree
3f6af0a964 feat:member list 2023-01-11 14:35:14 +08:00
xiaodong zuo
65f767e35a fix: modify dev location 2023-01-11 12:57:27 +08:00
DarkSky
b49a32c9c7 fix: dev server endpoint fix 2023-01-11 12:53:54 +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
DiamondThree
30679763ab feat: change workspaceInfo type 2023-01-10 21:59:09 +08:00
QiShaoXuan
1bf7a4a4fe Merge branch 'feat/datacenter' of github.com:toeverything/AFFiNE into feat/datacenter 2023-01-10 21:10:03 +08:00
QiShaoXuan
2780beddbb feat: refactor user & login function 2023-01-10 21:09:38 +08:00
DiamondThree
7909e03cef t :Merge branch 'feat/datacenter' of https://github.com/toeverything/AFFiNE into feat/datacenter 2023-01-10 21:08:46 +08:00
DiamondThree
ed46eb58fd fix: ensure return activeWorkspaceId 2023-01-10 21:08:28 +08:00
QiShaoXuan
b86a03642a fix: add judgement of currentWorkspace 2023-01-10 20:42:00 +08:00
DiamondThree
f1ea2ee691 Merge branch 'feat/datacenter' of https://github.com/toeverything/AFFiNE into feat/datacenter 2023-01-10 20:10:34 +08:00
DiamondThree
3be4e4015e feat: enable workspace cloud 2023-01-10 20:08:31 +08:00
QiShaoXuan
e8431122c9 feat: refactor provider logic 2023-01-10 19:41:19 +08:00
x1a0t
6c792d0e61 chore: update BlockSuite version 2023-01-10 19:31:57 +08:00
QiShaoXuan
33400f1c5a feat: modify loading style 2023-01-10 19:15:56 +08:00
QiShaoXuan
b2fe31dc02 feat: modify style 2023-01-10 18:34:26 +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
linonetwo
abc895c6b2 fix: merge issue 2023-01-10 18:15:02 +08:00
DiamondThree
c723c18086 feat: enable workspace cloud 2023-01-10 17:20:21 +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