Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/image bullet #2498

Merged
merged 37 commits into from
Jan 20, 2022
Merged

Feature/image bullet #2498

merged 37 commits into from
Jan 20, 2022

Conversation

SergeyLuzyanin
Copy link
Contributor

No description provided.

Vladimir Privezenov and others added 30 commits December 28, 2021 13:42
test push
d23bf65
Merge branch 'develop' of https://github.com/ONLYOFFICE/sdkjs into fe…
dcc7657 
…ature/imageBullet
refactor: replace part of code in readUniFill and writeUniFill method…
2384999 
…s readBlipFill and writeBlipFill
Merge branch 'develop' of https://github.com/ONLYOFFICE/sdkjs into fe…
ea328f5 
…ature/imageBullet
reset commit: thoughts about image bullet
4840375
feat: calculate images for presentation image bullet
62e16f8
feat: add require methods for BuBlip
47bc4cd
fix: add changes in write logic of Blip
15929c7
Merge branch 'develop' of https://github.com/ONLYOFFICE/sdkjs into fe…
98b98f1 
…ature/imageBullet
Merge branch 'develop' of https://github.com/ONLYOFFICE/sdkjs into fe…
631a9d6 
…ature/imageBullet
refactor: BuBlip class
3d679f3
fix(pe): add calculate FontSlot for blip bullet in Measure method
c5b2e32
refactor(pe): set braces with new line
bb22b96
fix: try to repair unit tests
cea56f7
fix: add new adding unit
b4d6ec1
feat: add test upload methods for image bullets in api
a4c07c3
fix: get font by first symbol and method copy
6bb3d1e
Merge branch 'develop' of https://github.com/ONLYOFFICE/sdkjs into fe…
702632c 
…ature/imageBullet

� Conflicts:
�	common/Drawings/Format/Format.js
fix: add export for type BULLET_TYPE_BULLET_BLIP
dc424cf
fix: compare method in CBuBlip class
06a8ee3
fix: add return for cases, when image not available
4637833
fix: add Write_ToBinary and Read_FromBinary for new fields
cc9300f
feat: add plug for change image bullet settings and method for get ra…
15beb97 
…sterImageId from bullet
refactor: delete unusual for image bullet in presentation
2793a6a
feat: add images for collaborative mode
0cd2b85
@SergeyLuzyanin
[imageBullet] fix image loading on coauthoring
8eb1926
fix: recalculate image bullet drawing
eddf87a
fix: add BuBlip isEqual method
3dc0b97
fix: load images to server from url blipFill
861e7d7
fix: indents in image bullets
3db4217
@SergeyLuzyanin SergeyLuzyanin merged commit d973d4c into develop Jan 20, 2022
@SergeyLuzyanin SergeyLuzyanin deleted the feature/imageBullet branch January 20, 2022 20:17
@papacarlo papacarlo mentioned this pull request Sep 22, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@SergeyLuzyanin