TatianaLopaeva
|
ead4841112
|
Merge branch 'develop' into feature/fix-hide/show-header
|
2020-12-14 10:57:03 +03:00 |
|
|
|
156bf72046
|
Core: fix GetProperty
|
2020-12-11 12:48:21 +03:00 |
|
|
|
0a775abb82
|
Files: optimization
|
2020-12-11 11:46:41 +03:00 |
|
TatianaLopaeva
|
8f0dba2be2
|
Web: Common: PageLayout: Fixed after merged
|
2020-12-11 11:20:52 +03:00 |
|
TatianaLopaeva
|
c9a8027ddf
|
Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/pages/Home/index.js
# products/ASC.Files/Client/src/store/files/actions.js
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/src/components/PageLayout/index.js
# web/ASC.Web.Common/src/components/PageLayout/sub-components/section-body.js
# web/ASC.Web.Common/src/components/PageLayout/sub-components/section-header.js
# web/ASC.Web.Common/src/store/auth/actions.js
# web/ASC.Web.Common/src/store/auth/reducer.js
# web/ASC.Web.Components/package.json
|
2020-12-11 11:12:28 +03:00 |
|
TatianaLopaeva
|
09d2dfcbc5
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop
|
2020-12-11 10:50:59 +03:00 |
|
TatianaLopaeva
|
fd7c4f40cd
|
Merge branch 'bugfix/toast' into develop
|
2020-12-11 10:49:09 +03:00 |
|
|
|
cd72aa3d12
|
Merge pull request #150 from ONLYOFFICE/bugfix/upload-with-convertation
Bugfix/upload with convertation
|
2020-12-10 19:51:52 +03:00 |
|
|
|
b0617ac111
|
Merge branch 'develop' into bugfix/upload-with-convertation
|
2020-12-10 19:35:51 +03:00 |
|
|
|
2f9cacfd8f
|
Merge pull request #148 from ONLYOFFICE/bugfix/toast
Bugfix/toast
|
2020-12-10 19:34:32 +03:00 |
|
|
|
8c4be9ab6d
|
Merge branch 'bugfix/upload-with-convertation' of github.com:ONLYOFFICE/AppServer into bugfix/upload-with-convertation
|
2020-12-10 19:15:44 +03:00 |
|
|
|
2548dba9b7
|
Web: Files: Fixed opening file on external link
|
2020-12-10 19:15:36 +03:00 |
|
|
|
356ace1c57
|
Merge branch 'develop' into bugfix/upload-with-convertation
|
2020-12-10 19:14:58 +03:00 |
|
|
|
bd8d8c6a14
|
Merge branch 'bugfix/upload-with-convertation' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into bugfix/upload-with-convertation
|
2020-12-10 19:01:01 +03:00 |
|
|
|
72dd4c6bad
|
Web: Files: fixed article width
|
2020-12-10 19:00:44 +03:00 |
|
|
|
0b0d7187e0
|
Update yarn.lock files
|
2020-12-10 18:45:49 +03:00 |
|
|
|
b85faae56b
|
Web: Common: fixed filter update
|
2020-12-10 18:41:42 +03:00 |
|
|
|
be497b0f3a
|
web: common: bump version
|
2020-12-10 18:38:49 +03:00 |
|
|
|
419fe93913
|
Merge branch 'develop' into bugfix/toast
|
2020-12-10 18:37:17 +03:00 |
|
|
|
4c9db8c0cb
|
Web: Files: COMMENTED conversation functional
|
2020-12-10 18:24:19 +03:00 |
|
Viktor Fomin
|
d7d14b1bd2
|
Web: Common: show alert if convert error
|
2020-12-10 16:14:28 +03:00 |
|
|
|
78b7cb609a
|
Merge pull request #149 from ONLYOFFICE/bugfix/header-fix
Bugfix/header fix
|
2020-12-10 14:59:51 +03:00 |
|
Alexey Kostenko
|
3e448ce90e
|
web: common: bump version
|
2020-12-10 14:27:47 +03:00 |
|
Alexey Kostenko
|
ea3f287acb
|
Web: Common: Removed unused prop
|
2020-12-10 14:25:51 +03:00 |
|
Alexey Kostenko
|
abda53a082
|
Web: Files/People/Common: Fixed header styles
|
2020-12-10 13:31:53 +03:00 |
|
TatianaLopaeva
|
8e455a134f
|
web: components: bump version
|
2020-12-10 11:49:00 +03:00 |
|
Alexey Kostenko
|
1a53841499
|
Web: Files/People/Common: Fixed header style
|
2020-12-10 09:48:35 +03:00 |
|
|
|
74b3777fe7
|
Config: Added url to local DocumentServer
|
2020-12-09 21:43:57 +03:00 |
|
Viktor Fomin
|
60f11e4a18
|
Web: Files: fixed fileId
|
2020-12-09 19:38:00 +03:00 |
|
Viktor Fomin
|
ba06aaf913
|
Merge branch 'bugfix/upload-with-convertation' of github.com:ONLYOFFICE/AppServer into bugfix/upload-with-convertation
|
2020-12-09 18:39:54 +03:00 |
|
|
|
09ce302b57
|
Web: Files: Init new conversation process
|
2020-12-09 18:37:24 +03:00 |
|
Viktor Fomin
|
240d9acadd
|
Web: Files: fix
|
2020-12-09 16:53:05 +03:00 |
|
Viktor Fomin
|
f66e091b42
|
Merge branch 'bugfix/upload-with-convertation' of github.com:ONLYOFFICE/AppServer into bugfix/upload-with-convertation
|
2020-12-09 16:48:58 +03:00 |
|
|
|
2e0762b2c3
|
Merge branch 'develop' into bugfix/upload-with-convertation
# Conflicts:
# products/ASC.Files/Client/src/store/files/actions.js
|
2020-12-09 16:19:03 +03:00 |
|
|
|
4903bb4c91
|
Web: Files: Fixed uploading additional files when the upload has already started
|
2020-12-09 15:57:56 +03:00 |
|
Viktor Fomin
|
07d7fd70df
|
Web: Files: fixed loading
|
2020-12-09 15:40:44 +03:00 |
|
TatianaLopaeva
|
4cc62d8fe5
|
Merge branch 'develop' into bugfix/toast
|
2020-12-09 15:36:05 +03:00 |
|
TatianaLopaeva
|
eee2808ed4
|
Web: Components: Removed unnecessary comparison that prevented correct display of toasters when changing the screen width & refactoring
|
2020-12-09 15:34:10 +03:00 |
|
|
|
bd18aa1415
|
Web: Files: Re-written uploading process to async controlled chain calls
|
2020-12-09 13:54:04 +03:00 |
|
|
|
254b03032f
|
Web: Common: Fixed status of undefined
|
2020-12-09 13:52:47 +03:00 |
|
Viktor Fomin
|
c4cad309b3
|
Web: Files: fixed
|
2020-12-09 10:57:00 +03:00 |
|
|
|
76465323ff
|
Merge pull request #146 from ONLYOFFICE/bugfix/sharing-settings
Bugfix/sharing settings
|
2020-12-08 19:35:31 +03:00 |
|
|
|
4d88b2fc28
|
Update yarn.lock files
|
2020-12-08 18:37:19 +03:00 |
|
|
|
e4a43ff558
|
Merge branch 'bugfix/sharing-settings' of github.com:ONLYOFFICE/AppServer into bugfix/sharing-settings
|
2020-12-08 18:26:11 +03:00 |
|
Alexey Kostenko
|
3c6639c9c9
|
web: components: bump version
|
2020-12-08 18:26:47 +03:00 |
|
Alexey Kostenko
|
06d6994b34
|
web: common: bump version
|
2020-12-08 18:26:38 +03:00 |
|
Alexey Kostenko
|
0e2db11c9d
|
Web: Files: SharingPanel: Added new access option - "FilterEditing"
|
2020-12-08 18:26:27 +03:00 |
|
Alexey Kostenko
|
b0903aa99b
|
Web: Common: added CustomFilter constant
|
2020-12-08 18:25:17 +03:00 |
|
Alexey Kostenko
|
3a94023ba7
|
Web: Components: Added custom filter icon
|
2020-12-08 18:24:04 +03:00 |
|
|
|
ce4a3e3338
|
Update yarn.lock files
|
2020-12-08 18:17:46 +03:00 |
|
