Commit Graph

28 Commits

Author SHA1 Message Date
f93a628c24 Refactoring build 2024-03-10 21:58:34 +03:00
f172cc86b3 Merge branch 'develop' into fix/drawing_file_client
# Conflicts:
#	DesktopEditor/fontengine/ApplicationFonts.cpp
2021-11-25 10:47:56 +03:00
d5cbd33a59 restore 2021-10-12 12:45:01 +03:00
45b6929dd4 gitignore stuff 2021-10-08 16:35:14 +03:00
761ceab8d2 Merge commit '8c726e475a562e64a39d36cac32226249a3f7697' into feature/odf 2021-09-07 12:10:14 +03:00
1f809a129d adding xps to DjVuFile/wasm 2021-07-06 12:57:21 +03:00
8a39c5470e build wasm 2021-07-01 18:22:00 +03:00
14e3951d7e back vcxproj and add some math files to OdfWriter 2021-04-12 13:49:42 +03:00
ee296ff09d math conversation 2021-04-02 07:01:27 +03:00
4269b2862f gitignore + start of feature 2021-03-31 14:22:53 +03:00
3b84a04b3a add raw and ska support 2021-03-25 14:42:13 +03:00
4e1804e159 Merge remote-tracking branch 'origin/release/v6.1.0' into develop 2020-10-22 15:56:11 +03:00
88cf60a3ed Fix 25 errors 2020-10-13 20:11:21 +03:00
df764e1940 . 2020-10-05 11:25:16 +03:00
7d5f2a4d41 Fix ios build 2020-04-20 09:56:51 +03:00
1b445aa3bb . 2020-01-09 10:41:41 +03:00
9a5cb77ca0 developing... 2020-01-07 19:08:08 +03:00
9bffb65dcb x2t 2.4.512 2018-01-29 15:46:08 +03:00
d0e0109560 . 2017-12-22 15:10:45 +03:00
5d524369b8 . 2017-12-14 19:31:33 +03:00
dfd54ff53f _MSC_VER >= 1900 build 2017-10-11 16:30:37 +03:00
386608166f test projects fix 2016-10-19 13:28:32 +03:00
beb64a6efa utf8 -> utf8 with BOM 2016-06-23 19:23:34 +03:00
e89cf2f58f .....
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@61945 954022d7-b5bf-4e40-9824-e11837661b57
2016-05-20 23:54:34 +03:00
93b3d23f13 .....
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@61944 954022d7-b5bf-4e40-9824-e11837661b57
2016-05-20 23:54:22 +03:00
27a51bca41 переход от IASCRenderer к IRenderer из DesktopEditor; отказ от импорта длл ASCImageStudio3 ASCHTMLRenderer; от AscGraphics только FontPicker и FontManager.
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@58742 954022d7-b5bf-4e40-9824-e11837661b57
2016-05-20 23:18:41 +03:00
57153b4860 git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@55195 954022d7-b5bf-4e40-9824-e11837661b57 2016-05-20 22:46:55 +03:00
fa26169418 git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@53635 954022d7-b5bf-4e40-9824-e11837661b57 2016-05-20 22:38:26 +03:00