Commit Graph

129 Commits

Author SHA1 Message Date
4be9f847fa crm: fixed sql 2021-06-30 19:55:20 +03:00
b6b1c72769 core: added new ThenBy linq extension. crm: fixed sql 2021-06-30 19:08:41 +03:00
c6ede6fff7 Merge branch 'develop' into feature/remove_itemList 2021-06-29 12:47:56 +03:00
a3cccc4044 crm: migrate from FromForm to FromBody attribute 2021-06-28 12:42:42 +03:00
3f2dfeb5a9 crm: started migrate from FromForm to FromBody attribute. bugfix 2021-06-25 16:58:42 +03:00
6e9d64da7a Merge branch 'develop' into feature/remove_itemList 2021-06-24 11:21:46 +03:00
a4aa4843e8 crm: started migrate from FromForm to FromBody attribute 2021-06-23 22:32:56 +03:00
d783bd8ab4 crm: fixed warnings 2021-06-18 20:38:32 +03:00
dd64101332 remove itemList 2021-06-18 15:56:15 +03:00
01639a56cc RazorCompileOnBuild:false<
GenerateMvcApplicationPartsAssemblyAttributes:false
2021-06-16 20:08:26 +03:00
3018e1822f crm: fix path 2021-06-16 17:30:31 +03:00
e314f6ff1c
Merge pull request #245 from ONLYOFFICE/feature/crm-migrate
Feature/crm migrate
2021-06-16 17:02:46 +03:00
89264cc48d crm: created common project for common services 2021-06-15 13:41:17 +03:00
Artem Tarasov
c25fa589a9 Web: People: deleted fonts with ext .woff, added hash to font name 2021-06-08 15:26:56 +03:00
b925943cb6 merge from develop 2021-06-07 17:23:25 +03:00
Artem Tarasov
9f21862f51 Merge branch 'develop' into bugfix/fixed-styles 2021-06-07 00:24:19 +03:00
Artem Tarasov
acd4a3893c Web: added rule to webpack.config for woff, woff2 2021-06-06 23:39:52 +03:00
fc20a742a1 crm: refactoring 2021-06-04 19:27:44 +03:00
58e7e41cdd crm: code cleanup 2021-06-04 17:38:42 +03:00
c04dc44e36 crm: refacroting 2021-06-03 15:51:29 +03:00
43de25b62a Merge branch 'develop' into feature/remove-unused-dep
# Conflicts:
#	common/ASC.Data.Storage/ASC.Data.Storage.csproj
#	common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj
2021-06-03 12:52:21 +03:00
e75e048e49 crm: fixed build 2021-06-02 18:24:49 +03:00
62ac315c8d Web: i18n: Replaced i18т config load: from "languageOnly" to "all" and added new utils function loadLanguagePath() + Refactoring 2021-06-02 13:55:11 +03:00
23e1083be7 Web: Removed empty translations keys 2021-06-01 13:49:37 +03:00
76d8ebb459 Tests moved to separate projects.
Removed unused dependepcies
2021-06-01 12:21:51 +03:00
de98856728 Web: Tests: Added new 'sk' translations; 2021-06-01 11:21:39 +03:00
8e532bc8b9 Web: Tests: Added new 'ro' translations; 2021-06-01 11:20:14 +03:00
3d62da4422 Web: Tests: Added new 'pt-BR' translations; 2021-06-01 11:19:13 +03:00
c5a5072aa7 Web: Tests: Added new 'lo' translations; 2021-06-01 11:17:19 +03:00
8eb62d8079 Web: Tests: Added new 'it' translations; 2021-06-01 11:15:24 +03:00
a0fc465678 Web: Tests: Added new 'fr' translations; 2021-06-01 11:13:50 +03:00
2018820472 Merge branch 'develop' into feature/crm-migrate 2021-05-31 19:37:51 +03:00
d7e3e71194 crm: removed DataContract attribute. 2021-05-31 19:37:00 +03:00
ccd30b7b90 crm: refactoring. used JsonPropertyName instead of DataMember 2021-05-31 19:14:59 +03:00
061b4e46e7 Web: Added not found 'de' language translation files (fix NotAllLanguageTranslatedTest issue) 2021-05-31 19:11:58 +03:00
e2b9561d7b Web: Rewritten all json translation files with sorting of properties alphabetically 2021-05-31 18:34:15 +03:00
74064fc76d Merge branch 'develop' into feature/translations 2021-05-29 21:59:02 +03:00
72527ccded Merge branch 'master' into develop
# Conflicts:
#	lerna.json
#	package.json
#	packages/asc-web-common/package.json
#	packages/asc-web-components/package.json
#	products/ASC.CRM/Client/package.json
#	products/ASC.Calendar/Client/package.json
#	products/ASC.Files/Client/package.json
#	products/ASC.Mail/Client/package.json
#	products/ASC.People/Client/package.json
#	products/ASC.Projects/Client/package.json
#	web/ASC.Web.Client/package.json
#	web/ASC.Web.Editor/package.json
#	web/ASC.Web.Login/package.json
2021-05-29 21:57:42 +03:00
d585c0a785 Web: Bumped version to 0.1.10 2021-05-29 21:26:13 +03:00
a9a7c0a4b7 crm: refactoring 2021-05-28 20:20:12 +03:00
401c8ca2e2 crm: migrate from newtonsoft to system.text.json 2021-05-28 18:18:55 +03:00
c8e5c5a93c crm: migrate from ProgressQueue to DistributedTaskQueue 2021-05-24 12:56:49 +03:00
af2f24e4ac Merge branch 'develop' into feature/translations 2021-05-20 13:11:13 +03:00
536c6c2f5e Web: Moved custom.scss to @appserver/common
+ Added missing ErrorBoundary
+ Removed useless commented code
2021-05-19 11:14:44 +03:00
4b4b03f2a4 Merge branch 'develop' into feature/crm-migrate 2021-05-18 19:06:54 +03:00
df1ebc8d77 Web: Moved translationKeys "OpenApp" and "ViewWeb" to "/static/locales/{lng}/Common.json" 2021-05-18 15:23:12 +03:00
f6ecc35ae7 Web: Moved translationKeys "LearnMore" and "ComingSoon" to "/static/locales/{lng}/Common.json" 2021-05-18 15:10:20 +03:00
86a7802ada crm: refactoring 2021-05-17 19:32:05 +03:00
bbe1f1f205 crm: code refactoring 2021-05-17 17:50:55 +03:00
2beacfcf23 Web: Enabled Common.json translations loading 2021-05-17 11:19:38 +03:00