|
|
39a0cb99de
|
Update yarn.lock files
|
2020-12-29 14:03:05 +03:00 |
|
|
|
e70e845c5f
|
web: common: bump version
|
2020-12-29 13:52:50 +03:00 |
|
|
|
675599c57d
|
web: components: bump version
|
2020-12-29 13:52:38 +03:00 |
|
|
|
23a5935e5d
|
Merge branch 'develop' into feature/upgrade-dependencies
|
2020-12-29 13:40:46 +03:00 |
|
|
|
12881aa2c6
|
Use master as default branch for build (#160)
* Use master as default branch for build
* Update build
* Update push
|
2020-12-28 20:13:33 +03:00 |
|
|
|
f18d535cb1
|
Merge branch 'develop' into feature/upgrade-dependencies
|
2020-12-28 18:30:50 +03:00 |
|
|
|
a9dc75376d
|
Merge pull request #159 from ONLYOFFICE/feature/11.0.2
moved from 2e37dcd0
|
2020-12-28 18:25:26 +03:00 |
|
|
|
0ae7f84de6
|
SocketIO: fix
|
2020-12-28 16:47:59 +03:00 |
|
|
|
e6943a4544
|
Merge branch 'develop' into feature/11.0.2
|
2020-12-28 16:28:26 +03:00 |
|
|
|
bfa73ec5c2
|
moved from 2e37dcd0
|
2020-12-28 16:22:08 +03:00 |
|
|
|
a21fff2ab1
|
Fix warning " > react-tooltip@3.11.6" has incorrect peer dependency "react@>=^16.0.0".
|
2020-12-28 11:04:34 +03:00 |
|
Ilya Oleshko
|
6bfe934057
|
Merge pull request #158 from ONLYOFFICE/bugfix/sharing-panel-refactoring
Bugfix/sharing panel refactoring
|
2020-12-28 09:38:29 +03:00 |
|
|
|
16b312b7fb
|
Merge branch 'develop' into bugfix/sharing-panel-refactoring
|
2020-12-28 09:28:38 +03:00 |
|
|
|
2fdcbee8ef
|
Files: pass CallbackUrl. Fix trackedit.
|
2020-12-25 23:25:37 +03:00 |
|
|
|
472cb4bb0b
|
Fix warning Resolution field "js-yaml@3.13.1" is incompatible with requested version "js-yaml@~3.7.0"
|
2020-12-25 18:10:54 +03:00 |
|
|
|
2be04b3bc0
|
Update package.json and yarn.lock files
|
2020-12-25 17:48:11 +03:00 |
|
|
|
04e387f8d0
|
web: common: bump version
|
2020-12-25 17:03:03 +03:00 |
|
|
|
d31d0c7d03
|
Web: Common: fixed PeopleSelector employee status PropType
|
2020-12-25 17:01:42 +03:00 |
|
|
|
d09bc13b93
|
Web: Files: fixed share translations
|
2020-12-25 17:00:09 +03:00 |
|
|
|
9f8ff83084
|
Update yarn.lock files
|
2020-12-25 16:24:26 +03:00 |
|
|
|
2b08c711dc
|
Update Create-react-app to v4.0.1
|
2020-12-25 16:01:04 +03:00 |
|
|
|
5401cd775a
|
Merge branch 'develop' into bugfix/sharing-panel-refactoring
|
2020-12-25 15:29:30 +03:00 |
|
Sergey Kirichenko
|
bb06f4aa53
|
Add docker multiple Appserver services (#136)
|
2020-12-25 14:27:26 +03:00 |
|
|
|
25817f24ae
|
Merge branch 'develop' into bugfix/sharing-panel-refactoring
|
2020-12-25 12:38:03 +03:00 |
|
|
|
20900eeb72
|
Merge branch 'master' into develop
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
|
2020-12-25 12:09:52 +03:00 |
|
|
|
376aeab005
|
Merge pull request #157 from ONLYOFFICE/hotfix/v.0.0.5
Hotfix/v.0.0.5
|
2020-12-25 12:05:46 +03:00 |
|
|
|
d0ce5585a5
|
Files: fixed query
|
2020-12-24 22:05:39 +03:00 |
|
|
|
644142b952
|
Web: Files: fixed link for Twitter and Facebook
|
2020-12-24 14:06:32 +03:00 |
|
|
|
9350f1189e
|
Bump version to v0.0.5
|
2020-12-24 12:22:48 +03:00 |
|
|
|
a7d2d671fa
|
Merge pull request #129 from ONLYOFFICE/feature/version-hostory-redesign
Feature/version history redesign
|
2020-12-24 12:19:49 +03:00 |
|
|
|
1e234ed4aa
|
Web: Files: moved getAccessIcon to selectors
|
2020-12-24 11:28:34 +03:00 |
|
Artem Tarasov
|
e4ae387718
|
Web: Files: VersionHistory: refactoring
|
2020-12-24 10:52:34 +03:00 |
|
|
|
9fbf5a5be5
|
Merge branch 'develop' into bugfix/sharing-panel-refactoring
# Conflicts:
# products/ASC.Files/Client/src/components/panels/SharingPanel/SharingRow.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/store/files/selectors.js
# web/ASC.Web.Common/src/components/PeopleSelector/PeopleSelector.js
|
2020-12-24 10:52:01 +03:00 |
|
Artem Tarasov
|
ae682e2746
|
web: common: bump version
|
2020-12-24 10:16:16 +03:00 |
|
Artem Tarasov
|
5df8b7cc5b
|
Web: Files: VersionHistory: Ver. added to translation
|
2020-12-24 10:15:50 +03:00 |
|
Artem Tarasov
|
465765338c
|
Web: Files: versionHistory: fix after merge
|
2020-12-24 10:05:26 +03:00 |
|
Artem Tarasov
|
d756354ece
|
Merge branch 'develop' into feature/version-hostory-redesign
# Conflicts:
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Header/index.js
# web/ASC.Web.Common/package.json
|
2020-12-24 09:47:22 +03:00 |
|
|
|
76d7ed6c73
|
Merge branch 'master' into develop
# Conflicts:
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/src/components/drop-down/index.js
|
2020-12-23 21:42:44 +03:00 |
|
|
|
6cfe5ce45e
|
Merge pull request #156 from ONLYOFFICE/hotfix/v0.0.4
Hotfix/v0.0.4
|
2020-12-23 21:20:52 +03:00 |
|
Artem Tarasov
|
ae1a0cd8c1
|
Web: Files: versionHistory: applied new actions, removed unnecessary api requests
|
2020-12-23 19:29:05 +03:00 |
|
Artem Tarasov
|
4576f13c9e
|
Web: Files: versionHistory: fix actions
|
2020-12-23 18:53:09 +03:00 |
|
|
|
1891813132
|
fix save tenant
|
2020-12-23 18:36:05 +03:00 |
|
Vladislav Makhov
|
87ffdf40ad
|
Merge branch 'hotfix/v0.0.4' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.4
# Conflicts:
# web/ASC.Web.Components/package.json
|
2020-12-23 17:56:44 +03:00 |
|
Vladislav Makhov
|
248e032e10
|
web: files: fix paging combo box
|
2020-12-23 17:55:58 +03:00 |
|
Vladislav Makhov
|
9a567d3e53
|
web: components: added possibility to hide combo box with count items info
|
2020-12-23 17:55:03 +03:00 |
|
Vladislav Makhov
|
3d46b8e516
|
web: components: bump version
|
2020-12-23 17:53:00 +03:00 |
|
Artem Tarasov
|
8b4762b9a7
|
Web: Files: versionHistory: added action updateCommentVersion
|
2020-12-23 17:46:27 +03:00 |
|
Artem Tarasov
|
b15e6db9cc
|
Web: Files: versionHistory: added action restoreVersion
|
2020-12-23 16:54:12 +03:00 |
|
|
|
f3a45738a1
|
Web: Files: fix merge
|
2020-12-23 16:13:12 +03:00 |
|
Artem Tarasov
|
6498cd542e
|
Web: Files: versionHistory: added action markAsVersion
|
2020-12-23 15:40:07 +03:00 |
|
