Commit Graph

5130 Commits

Author SHA1 Message Date
b0f64ca924 Merge branch 'develop' into feature/personal 2021-06-29 14:50:51 +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
37a676cb5a Tenant: removed Public, PublicVisibleProducts 2021-06-24 15:55:12 +03:00
a4aa4843e8 crm: started migrate from FromForm to FromBody attribute 2021-06-23 22:32:56 +03:00
8998a72d8c Files: fixed build 2021-06-23 20:56:55 +03:00
d41f81e1cd Merge branch 'develop' into feature/remove_binary_formatter 2021-06-23 20:27:10 +03:00
c941468cdb Files: api. Added thumbnailStatus 2021-06-23 16:19:25 +03:00
20d1f9a738 merge from develop 2021-06-23 16:10:46 +03:00
89d9ea6297 Test: fix 2021-06-22 19:15:04 +03:00
282738cb13 Merge branch 'develop' into feature/personal 2021-06-22 18:44:12 +03:00
2cdcd36020 Web: Commented annoying logs 2021-06-22 13:43:18 +03:00
6d21bb2209 File: status fix 2021-06-22 11:42:29 +03:00
43fe4995f4 Web: Files: fixed SharingPanel translations 2021-06-22 10:29:29 +03:00
50a2b4b4d1 Merge branch 'develop' into feature/changing-selectbox-library 2021-06-22 08:56:51 +03:00
b5076ed81c File: fix status 2021-06-18 23:35:33 +03:00
4a4cab5352 Files: FileHelper decorator 2021-06-18 23:31:46 +03:00
d783bd8ab4 crm: fixed warnings 2021-06-18 20:38:32 +03:00
f70794a717 Merge branch 'develop' into feature/changing-selectbox-library 2021-06-18 11:58:06 +03:00
443da941be Web: Files: fixed select for thirdparty folders 2021-06-18 11:00:31 +03:00
3d3a8a2d6a Merge branch 'develop' into feature/remove_binary_formatter 2021-06-18 10:49:07 +03:00
a226cca872 Files: update document templates 2021-06-18 10:45:45 +03:00
249af955d1 Web: Files: added onSelect function for selectbox 2021-06-17 18:46:22 +03:00
df70473ce5 Merge branch 'develop' into feature/changing-selectbox-library 2021-06-17 17:19:17 +03:00
b088c925d6 Merge branch 'develop' into feature/personal
# Conflicts:
#	products/ASC.Files/Client/src/components/dialogs/ConnectDialog/index.js
#	products/ASC.Files/Client/src/pages/Home/index.js
#	products/ASC.Files/Client/src/store/FilesStore.js
2021-06-17 15:47:33 +03:00
0aa2eb3e85 Web: Files: removed react-selectable-fast library 2021-06-17 14:27:41 +03:00
6118e95028 Merge branch 'develop' into feature/personal 2021-06-17 14:25:09 +03:00
a3298a49ac Web: Files: fixed createTreeFolders 2021-06-17 12:04:01 +03:00
d7c8f22ea3 Merge branch 'develop' into feature/tree-menu-bugfix 2021-06-17 11:09:19 +03:00
b6d4408ce0 Files: fixed subfolders method 2021-06-16 21:53:56 +03:00
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
db7cfacd62 Files: remove warnings 2021-06-15 22:46:26 +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
456a82a3fc Web: Files: fixed tree menu update 2021-06-15 17:23:07 +03:00
ee029d557b fixed tests 2021-06-15 17:20: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