a31dc583c1
Merge branch 'develop' into feature/personal
...
# Conflicts:
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/pages/Settings/index.js
2021-07-02 16:26:45 +03:00
2a44887b22
Web: hid temp loaders
2021-07-02 14:28:11 +03:00
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
1083fd8416
Merge branch 'develop' into feature/personal
...
# Conflicts:
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/store/FilesStore.js
2021-06-30 16:09:53 +03:00
b0f64ca924
Merge branch 'develop' into feature/personal
2021-06-29 14:50:51 +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
fbcdba3b17
Merge branch 'develop' into feature/personal
2021-06-25 11:10:49 +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
282738cb13
Merge branch 'develop' into feature/personal
2021-06-22 18:44:12 +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
6118e95028
Merge branch 'develop' into feature/personal
2021-06-17 14:25:09 +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
65378cc089
Merge branch 'develop' into feature/personal
...
# Conflicts:
# products/ASC.CRM/Client/public/index.html
# products/ASC.Calendar/Client/public/index.html
# products/ASC.Files/Client/public/index.html
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/pages/Home/index.js
# products/ASC.Mail/Client/public/index.html
# products/ASC.People/Client/public/index.html
# products/ASC.People/Client/src/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
# products/ASC.Projects/Client/public/index.html
2021-06-15 11:49:39 +03:00
bac090e180
Merge branch 'develop' into feature/personal
...
# Conflicts:
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
2021-06-11 13:11:08 +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
d01ef10cc5
Web: NavMenu/PageLayout: Was done:
...
- fixed loaders: two rectangle loader combined into one
- fixed loaders at index.html: two rectangle loader combined into one
- hide NavItem component
- hide click on Headline component
- fixed article padding style for desktop
- added new logo.
2021-06-04 14:42:21 +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
