pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-07-11 06:22:44 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,410 Commits 58 Branches 10,452 Tags
63fd3bbc5adc84446d94de01bec308c9e8fdd5db
Commit Graph

53 Commits

Author SHA1 Message Date
Sergey.Konovalov
ae7b89cff2 to Revision: 65405 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@65407 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-21 00:39:24 +03:00
Sergey.Konovalov
8e97f8615b to Revision: 65405 delete unused ASCHTMLRenderer 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@65406 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-21 00:39:22 +03:00
Elen.Subbotina
dea13b8e9b исправлены проекты linux 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@65217 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-21 00:36:38 +03:00
Sergey.Konovalov
9ab620c76a убраны повторяющиеся файлы с ASCOfficeDocxFile2.lib 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@64127 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-21 00:23:49 +03:00
Sergey.Konovalov
3777a01821 в windows версии FileConverter2 заменен на x2t32.exe 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@63907 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-21 00:20:50 +03:00
Sergey.Konovalov
091f0e2217 сборка x2t для windows чтобы заменить конвертацию com dll и c# exe 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@63748 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-21 00:18:58 +03:00
Elen.Subbotina
0469589679 X2tConverter добавлен PptFile 
PptFile поправлен под iOs

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@62409 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-21 00:01:11 +03:00
Elen.Subbotina
14f5aa63d2 x2t linux build (wmf/emf) 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@62198 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:58:10 +03:00
Elen.Subbotina
507f72fb8d убрано раздвоение 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@62085 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:57:16 +03:00
Elen.Subbotina
2276da418e правки под Linux после исправлений под iOs . BOOL -> bool (TRUE->true, FALSE->false) 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@62078 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:57:10 +03:00
Elen.Subbotina
f49c8a052c git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@61920 954022d7-b5bf-4e40-9824-e11837661b57 2016-05-20 23:51:35 +03:00
Elen.Subbotina
90cf06377c для update c brunch/Docx2DoctConverter 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@61913 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:50:01 +03:00
Elen.Subbotina
1f1b74a7cf linux build - finish debug build 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59459 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:31:21 +03:00
Ivan.Shulga
d35e7b99ff linux build, undefined symbols error (cximage) are present 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59389 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:30:53 +03:00
Ivan.Shulga
c3cbdcbe63 linux build 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59324 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:30:00 +03:00
Elen.Subbotina
1e23168842 linux build 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59303 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:29:45 +03:00
Elen.Subbotina
14f9e4e475 linux build 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59298 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:29:37 +03:00
Ivan.Shulga
0e4f306014 merged 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59286 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:29:34 +03:00
Elen.Subbotina
7a38697040 git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59280 954022d7-b5bf-4e40-9824-e11837661b57 2016-05-20 23:29:27 +03:00
Elen.Subbotina
5eef800b4a git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59276 954022d7-b5bf-4e40-9824-e11837661b57 2016-05-20 23:29:24 +03:00
Elen.Subbotina
3c2483d6fe git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59264 954022d7-b5bf-4e40-9824-e11837661b57 2016-05-20 23:29:19 +03:00
Elen.Subbotina
20a3709488 git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59261 954022d7-b5bf-4e40-9824-e11837661b57 2016-05-20 23:29:12 +03:00
Elen.Subbotina
1174c745e5 linux build 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59259 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:29:10 +03:00
Elen.Subbotina
4324f8b644 delete 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59251 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:29:02 +03:00
Elen.Subbotina
a8832d0255 linux build 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59249 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:29:00 +03:00
Elen.Subbotina
ab3e457ea4 git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59235 954022d7-b5bf-4e40-9824-e11837661b57 2016-05-20 23:28:52 +03:00
Ivan.Shulga
3c4da71eb0 min->std::min 
max->std::max

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59232 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:28:47 +03:00
Ivan.Shulga
e5773581b2 fixed paths 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59185 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:27:58 +03:00
Ivan.Shulga
fb822d16ea min->std::min 
max->std::max

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59184 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:27:55 +03:00
Ivan.Shulga
0a93dc79fb successful linux build (PPTX format). linkage is not verified 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59151 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:27:37 +03:00
Ivan.Shulga
60f4381baa linux build 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59148 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:27:32 +03:00
Ivan.Shulga
c3f957bec0 linux build 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59125 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:27:27 +03:00
Elen.Subbotina
bf0ca88ede linux build 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59107 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:27:12 +03:00
Elen.Subbotina
e930e852eb linux build 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59071 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:26:18 +03:00
Elen.Subbotina
5f9581fcfb linux build 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59069 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:26:12 +03:00
Ivan.Shulga
7f7f857898 linux build (disabled font cutter) 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59068 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:26:09 +03:00
Elen.Subbotina
8fc3c1e390 git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59067 954022d7-b5bf-4e40-9824-e11837661b57 2016-05-20 23:26:06 +03:00
Elen.Subbotina
3da82d0591 git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59051 954022d7-b5bf-4e40-9824-e11837661b57 2016-05-20 23:25:32 +03:00
Elen.Subbotina
a608526038 git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59049 954022d7-b5bf-4e40-9824-e11837661b57 2016-05-20 23:25:27 +03:00
Elen.Subbotina
d9c2d9da12 убрана двойственность имен переменных и объектов 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59044 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:25:14 +03:00
Elen.Subbotina
39bd61477c linux build 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59039 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:25:04 +03:00
Elen.Subbotina
e0a234437a linux build 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59037 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:25:01 +03:00
Elen.Subbotina
78e188728c git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59032 954022d7-b5bf-4e40-9824-e11837661b57 2016-05-20 23:24:53 +03:00
Ivan.Shulga
257987e987 linux build 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59015 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:24:25 +03:00
Ivan.Shulga
af5307842e linux build 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@58948 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:23:13 +03:00
Ivan.Shulga
d067fad8b5 linux build 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@58926 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:22:48 +03:00
Ivan.Shulga
47d479b7b7 linux build 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@58885 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:21:37 +03:00
Ivan.Shulga
cb856823d3 right paths in include statements 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@58837 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:20:42 +03:00
Ivan.Shulga
0a0a3ece2a right paths in include statements 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@58832 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:20:35 +03:00
Ivan.Shulga
056092d978 qt pro file for lib 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@58830 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:20:32 +03:00