1
0
Fork 0
mirror of https://github.com/anyproto/anytype-heart.git synced 2025-06-09 09:35:00 +09:00

GO-4389 Merge branch 'main' of github.com:anyproto/anytype-heart into go-4389-do-not-create-entry-space-for-new-users

# Conflicts:
#	core/block/editor/accountobject/accountobject.go
This commit is contained in:
Sergey 2024-12-04 15:26:33 +01:00
commit 587a9e4847
No known key found for this signature in database
GPG key ID: 3B6BEF79160221C6
145 changed files with 8072 additions and 4267 deletions

File diff suppressed because it is too large Load diff

View file

@ -389,6 +389,7 @@ message Block {
bool dateIncludeTime = 5;
TimeFormat timeFormat = 6;
DateFormat dateFormat = 7;
FormulaType formula = 8;
enum DateFormat {
MonthAbbrBeforeDay = 0; // Jul 30, 2020
@ -402,6 +403,23 @@ message Block {
Format12 = 0;
Format24 = 1;
}
enum FormulaType {
None = 0;
Count = 1;
CountValue = 2;
CountDistinct = 3;
CountEmpty = 4;
CountNotEmpty = 5;
PercentEmpty = 6;
PercentNotEmpty = 7;
MathSum = 8;
MathAverage = 9;
MathMedian = 10;
MathMin = 11;
MathMax = 12;
Range = 13;
}
}
message Sort {
@ -412,6 +430,7 @@ message Block {
bool includeTime = 5;
string id = 6;
EmptyType emptyPlacement = 7;
bool noCollate = 8;
enum Type {
Asc = 0;