toeverything/AFFiNE
1
1
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2024-12-21 00:51:45 +03:00
Code Issues Packages Projects Releases Wiki Activity
1,668 Commits 66 Branches 453 Tags 350 MiB
005d3bbaa9
Commit Graph

414 Commits

Author SHA1 Message Date
linonetwo
005d3bbaa9 fix: merge issue 2023-01-10 18:40:36 +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
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
DiamondThree
c723c18086 feat: enable workspace cloud 2023-01-10 17:20:21 +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
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
MingLiang Wang
31d3a012f9 feat: add message center 2023-01-10 15:39:24 +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
alt0
ecec2d6efe test: fix test case 2023-01-10 15:07:50 +08:00
DiamondThree
51e6f4344a fix: setting style and replace refer 2023-01-10 15:06:55 +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
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
f251ae7437 Merge branch 'feat/cloud-sync-saika' into feat/datacenter 2023-01-10 14:12:55 +08:00
DiamondThree
84b62e474a feat: add updateWorkspace function 2023-01-10 14:12:24 +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
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
alt0
b0d68dadcb refactor: optimize createWorkspaceInfo 2023-01-10 11:55:50 +08:00
DiamondThree
a80e15042a feat: add workspace-setting active 2023-01-10 11:45:34 +08:00
alt0
2da463b501 test: fix test case 2023-01-10 11:44:33 +08:00
DiamondThree
779463dada feat: add workspace route 2023-01-10 11:43:21 +08:00
alt0
39f0b1b252 refactor: optimize setDefaultAvatar in provider 2023-01-10 11:34:05 +08:00
alt0
dcfe8237ef fix: create workspace optimize 2023-01-10 11:25:57 +08:00
alt0
d3012de9d6 fix: create workspace optimize 2023-01-10 11:23:00 +08:00
MingLiang Wang
9b875d19d2 feat: add ws link 2023-01-10 11:18:04 +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
d9e339c3c0 fix: change blocksuit version number 2023-01-10 11:04:31 +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