Commit Graph

13073 Commits

Author SHA1 Message Date
01639a56cc RazorCompileOnBuild:false<
GenerateMvcApplicationPartsAssemblyAttributes:false
2021-06-16 20:08:26 +03:00
53ee0ef484 fixed warnings 2021-06-16 18:00:27 +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
5fcbdbd7dd added health checks 2021-06-16 16:54:36 +03:00
1250201319 Web: Files: fixed upload progress 2021-06-16 14:31:13 +03:00
0ff78c5192 Merge branch 'develop' into feature/tree-menu-bugfix 2021-06-16 13:47:56 +03:00
7d0a1d340d Web: Files: fixed files render, removed log 2021-06-16 13:47:15 +03:00
b738bbc268 Web: Files: fixed files render 2021-06-16 13:38:18 +03:00
469678ac85 Api: fix settings 2021-06-16 13:03:41 +03:00
db7cfacd62 Files: remove warnings 2021-06-15 22:46:26 +03:00
429f5a1ea2 Smtp: fix warning 2021-06-15 21:40:36 +03:00
91e4d844fb Files: fix download 2021-06-15 21:40:12 +03:00
7d59d8f3a6 Web: Files: fixed deleteThirdParty 2021-06-15 18:59:07 +03:00
d2fa149247 Jenkins: fix 2021-06-15 17:32:25 +03:00
456a82a3fc Web: Files: fixed tree menu update 2021-06-15 17:23:07 +03:00
58deff8f26
Merge pull request #277 from ONLYOFFICE/hotfix/package_version_increment
package version increment
2021-06-15 17:21:33 +03:00
ee029d557b fixed tests 2021-06-15 17:20:53 +03:00
73547f421e Common: install newtonsoft 2021-06-15 16:44:53 +03:00
ad52d25d28 Web: Files: added tree menu update after folder deletion 2021-06-15 16:12:15 +03:00
dc1afaeafc Merge branch 'develop' into hotfix/package_version_increment 2021-06-15 16:01:19 +03:00
9c5dee7752 Index: separate configs 2021-06-15 15:57:16 +03:00
605d5ce043 removed unused references 2021-06-15 15:52:29 +03:00
c09a637758 Web: Files: changed the logic of opening the folder tree 2021-06-15 14:59:51 +03:00
d07273cee8 Web: Files: fixed display of tree menu, added new api for tree menu 2021-06-15 14:15:48 +03:00
Artem Tarasov
f8e28e5952 Merge branch 'develop' into feature/thumbnails
# Conflicts:
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
2021-06-15 14:06:29 +03:00
89264cc48d crm: created common project for common services 2021-06-15 13:41:17 +03:00
8305c30348
Merge pull request #278 from ONLYOFFICE/feature/restore-files-convertation
Feature/restore files convertation
2021-06-11 18:41:37 +03:00
Artem Tarasov
ee4760e899 Merge branch 'develop' into feature/thumbnails
# Conflicts:
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
2021-06-11 18:30:44 +03:00
a66e3afa92 Web: Tests: Commented "Save empty 'EN' keys to not found files" 2021-06-11 18:18:38 +03:00
4a154db396 Web: removed useless translations 2021-06-11 18:07:51 +03:00
5db2e8a868 Merge branch 'develop' into feature/restore-files-convertation 2021-06-11 17:50:28 +03:00
1927c9f9d6
Merge pull request #273 from ONLYOFFICE/bugfix/fixed-styles
Bugfix/fixed styles
2021-06-11 17:48:43 +03:00
52214ade4b Web: Common: Slowed down TopLoaderService show 2021-06-11 17:29:29 +03:00
68f880254e Web: Files: added dialog for converting to context actions 2021-06-11 17:20:38 +03:00
Artem Tarasov
d44f1bee0f Web: fixed loading people/my, fixed Loaders.ProfileView, deleted unnecessary code 2021-06-11 16:57:17 +03:00
e074c0cf93 Web: Files: changed color of conversion 2021-06-11 16:56:43 +03:00
92f317768e Merge branch 'develop' into feature/restore-files-convertation 2021-06-11 16:44:15 +03:00
ef59a2ac47 Web: Files: added hideConfirmConvert setting 2021-06-11 15:49:32 +03:00
cc79e88737 increment version 2021-06-11 15:27:52 +03:00
e0d076a7bc Merge branch 'develop' into feature/restore-files-convertation 2021-06-11 15:17:35 +03:00
Artem Tarasov
f181a491fb Merge branch 'develop' into bugfix/fixed-styles 2021-06-11 14:56:52 +03:00
Artem Tarasov
1073da9d58 Web: deleted unnecessary code 2021-06-11 14:55:53 +03:00
637be57e84 People: resize fix 2021-06-11 14:48:49 +03:00
6b1656ff10 Files: settings 2021-06-11 14:33:07 +03:00
61e957d00a Files: added /subfolders request 2021-06-11 14:24:01 +03:00
Artem Tarasov
81b778765f Web: People: navigation profile fix 2021-06-11 14:04:26 +03:00
Artem Tarasov
74fba5c2de Web: People: fixed loading Profile, ProfileAction, fixed navigation between them 2021-06-11 13:25:09 +03:00
c9012e3ba8 refactoring 2021-06-11 12:53:41 +03:00
c81be55004 delete System.Runtime.Serialization in applimit 2021-06-11 12:11:31 +03:00