|
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 |
|
|
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 |
|
|
e314f6ff1c
|
Merge pull request #245 from ONLYOFFICE/feature/crm-migrate
Feature/crm migrate
|
2021-06-16 17:02:46 +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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
68f880254e
|
Web: Files: added dialog for converting to context actions
|
2021-06-11 17:20:38 +03:00 |
|
|
e074c0cf93
|
Web: Files: changed color of conversion
|
2021-06-11 16:56:43 +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 |
|
|
6b1656ff10
|
Files: settings
|
2021-06-11 14:33:07 +03:00 |
|
|
61e957d00a
|
Files: added /subfolders request
|
2021-06-11 14:24:01 +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 |
|
|
864ef2ff64
|
Web: Files: changed the logic of opening the folder tree
|
2021-06-11 12:50:33 +03:00 |
|
|
a9e55b49ec
|
Web: Files: hid the display of folders for the recycle bin
|
2021-06-11 12:04:23 +03:00 |
|
|
d619ed1851
|
package version increment
|
2021-06-11 11:58:42 +03:00 |
|
|
052ea3b07f
|
package version increment
|
2021-06-11 10:36:13 +03:00 |
|
|
64b6c973b1
|
Web: Files: fixed conversion
|
2021-06-10 20:18:30 +03:00 |
|
|
9bb8e9bd1d
|
Web: Files: fixed getConversationPercent
|
2021-06-10 17:33:50 +03:00 |
|
|
ed161258c3
|
Files: fix convert
|
2021-06-10 15:54:05 +03:00 |
|
|
7501e91ae3
|
Web: Client: Files: Fixed share option for not edited items
|
2021-06-10 14:19:26 +03:00 |
|
|
a47b94bd7f
|
Web: Files: removed useless uploadStatus, fixed upload bugs
|
2021-06-09 17:52:28 +03:00 |
|
|
fdc71ec359
|
Merge branch 'feature/restore-files-convertation' of github.com:ONLYOFFICE/AppServer into feature/restore-files-convertation
|
2021-06-09 15:02:44 +03:00 |
|
|
29733f0ace
|
Wen: Files: fixed upload panel style
|
2021-06-09 15:02:24 +03:00 |
|
|
59bab6a085
|
Web: Files: fixed conversion progress
|
2021-06-09 13:28:22 +03:00 |
|
|
d5989124f3
|
Web: Files: fixed conversion progress
|
2021-06-08 19:09:00 +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 |
|
|
83d4bfd7a3
|
Web: Files: added conversion for uploaded files
|
2021-06-08 14:24:47 +03:00 |
|
|
b8f7cb1b61
|
Web: Client: fixed sharing panel in editor
|
2021-06-07 18:21:02 +03:00 |
|