Commit Graph

288 Commits

Author SHA1 Message Date
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
DiamondThree fe3c7b446f feat: enable workspace cloud 2023-01-10 16:50:25 +08:00
DiamondThree 223f08c439 Merge branch 'feat/datacenter' of https://github.com/toeverything/AFFiNE into feat/datacenter 2023-01-10 16:29:48 +08:00
DiamondThree 49dd21de57 feat: update avatar 2023-01-10 16:29:37 +08:00
QiShaoXuan 16cb413ace feat: refactor setting page 2023-01-10 16:10:27 +08:00
QiShaoXuan c474775982 Merge branch 'feat/datacenter' of github.com:toeverything/AFFiNE into feat/datacenter 2023-01-10 15:43:41 +08:00
QiShaoXuan 469931a61f feat: reset quick search 2023-01-10 15:43:21 +08:00
DiamondThree 890e353dc7 feat: setting style 2023-01-10 15:35:07 +08:00
DiamondThree 64e90640b9 feat:update workspace avatar 2023-01-10 15:20:54 +08:00
DiamondThree 51e6f4344a fix: setting style and replace refer 2023-01-10 15:06:55 +08:00
DiamondThree b281b86c84 Merge branch 'feat/datacenter' of https://github.com/toeverything/AFFiNE into feat/datacenter 2023-01-10 14:28:15 +08:00
DiamondThree 9395b8989d fix: replace react-i18n with affine/i18n 2023-01-10 14:27:57 +08:00
QiShaoXuan 67c5a622ec Merge branch 'feat/datacenter' of github.com:toeverything/AFFiNE into feat/datacenter 2023-01-10 14:22:28 +08:00
QiShaoXuan e208ab6033 fix: type error 2023-01-10 14:22:08 +08:00
DiamondThree 84b62e474a feat: add updateWorkspace function 2023-01-10 14:12:24 +08:00
MingLiang Wang 7a0e205ff8 Merge remote-tracking branch 'origin' into feat/cloud-sync-saika 2023-01-10 12:20:27 +08:00
DiamondThree 710d740f30 feat: replease type Workspace with WorkspaceInfo 2023-01-10 12:06:17 +08:00
DiamondThree a80e15042a feat: add workspace-setting active 2023-01-10 11:45:34 +08:00
DiamondThree 779463dada feat: add workspace route 2023-01-10 11:43:21 +08:00
DiamondThree 030ec9fa88 Merge branch 'feat/datacenter' of https://github.com/toeverything/AFFiNE into feat/datacenter 2023-01-10 11:04:45 +08:00
DiamondThree c819d1f87c Merge branch 'master' into feat/datacenter 2023-01-10 10:57:52 +08:00
QiShaoXuan 76a039c885 fix: error reference 2023-01-10 10:12:25 +08:00
DiamondThree eea6662d7f fix: clear any 2023-01-10 00:13:05 +08:00
DiamondThree e91ea0d34b fix: clear any 2023-01-10 00:05:26 +08:00
DiamondThree e410b3e961 fix: datacenter type error 2023-01-09 23:58:59 +08:00
DiamondThree b1f14c0f71 fix: datacenter type error 2023-01-09 23:57:53 +08:00
DiamondThree 833df7be3c fix: datacenter type error 2023-01-09 23:55:34 +08:00
DiamondThree c1261e7977 fix: lint error 2023-01-09 23:42:38 +08:00
DiamondThree 319a5e4dc1 fix: lint error 2023-01-09 23:41:46 +08:00
DiamondThree 550e7f765f fix: lint error 2023-01-09 22:30:23 +08:00
DiamondThree f6826d73fa feat: user login 2023-01-09 21:41:55 +08:00
DiamondThree 054e1f78e1 feat: workspace setting 2023-01-09 21:19:02 +08:00
DiamondThree 10072148d1 feat: workspace setting 2023-01-09 21:13:23 +08:00
QiShaoXuan a6f81e2359 feat: refactor provider 2023-01-09 21:06:02 +08:00
DiamondThree 93866e56d2 feat: active workspace when created workspace 2023-01-09 20:35:12 +08:00
DiamondThree 9ef0fe9d06 feat: switch workspace 2023-01-09 20:15:05 +08:00
DiamondThree bcb8b9f211 feat: confilict 2023-01-09 18:50:37 +08:00
DiamondThree bf61fbc057 feat:add loadWorkspace 2023-01-09 18:46:36 +08:00
JimmFly d83693af93 Merge branch 'feat/cloud-sync-saika' into feat/poc 2023-01-09 18:10:41 +08:00
DiamondThree 5687fa211e feat: add workspace-help 2023-01-09 17:51:12 +08:00
DiamondThree 740500716e Merge branch 'feat/datacenter' of https://github.com/toeverything/AFFiNE into feat/datacenter 2023-01-09 17:25:17 +08:00
DiamondThree d6640e0793 feat: add createWoresapce function 2023-01-09 17:25:00 +08:00
QiShaoXuan 15f06fe85e feat: add workspace change event handler 2023-01-09 16:51:52 +08:00
QiShaoXuan 28b2943dc6 feat: refactor app state provider 2023-01-09 16:40:23 +08:00
alt0 b4ea9ae02c Merge remote-tracking branch 'origin/master' into feat/cloud-sync-saika 2023-01-09 15:38:25 +08:00
JimmFly 36a96b23e6 chore: update i18n keys 2023-01-09 15:19:20 +08:00
JimmFly 270c3f5a6a chore: update import package name 2023-01-09 14:57:49 +08:00