Artem Tarasov
|
10979b7fa2
|
web: common: bump version
|
2020-12-21 18:45:39 +03:00 |
|
Artem Tarasov
|
6fdbdb0d83
|
Web: Common: added isTabletView flag to store
|
2020-12-21 15:19:34 +03:00 |
|
Artem Tarasov
|
9dcde2d268
|
Web: Common: Layout: added new component Layout (from featature/fix-hide/show-header
|
2020-12-21 15:14:55 +03:00 |
|
Artem Tarasov
|
bfd11ede79
|
Merge branch 'develop' into feature/version-hostory-redesign
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/store/files/actions.js
# web/ASC.Web.Common/src/components/PageLayout/index.js
|
2020-12-21 13:15:43 +03:00 |
|
TatianaLopaeva
|
c88f63ba19
|
web: common: bump version
|
2020-12-21 11:14:07 +03:00 |
|
TatianaLopaeva
|
d07c28f184
|
Web: Common: Return a check condition for IOS. (iPad)
|
2020-12-21 11:13:56 +03:00 |
|
TatianaLopaeva
|
37046fc6a9
|
web: common: bump version
|
2020-12-21 10:46:45 +03:00 |
|
TatianaLopaeva
|
d7170bd448
|
Web: Common: PageLayout: Added a check condition if the device type is tablet. (iPad)
|
2020-12-21 10:46:35 +03:00 |
|
TatianaLopaeva
|
baf27c6cd2
|
web: common: bump version
|
2020-12-21 10:45:00 +03:00 |
|
TatianaLopaeva
|
0ac797a726
|
Web: Common: Added a check condition for Chrome. (iPad)
|
2020-12-21 10:44:40 +03:00 |
|
TatianaLopaeva
|
a6a8df6733
|
web: common: bump version
|
2020-12-18 21:24:47 +03:00 |
|
TatianaLopaeva
|
f967897db0
|
Web: Common: PageLayout: Refactoring.
|
2020-12-18 21:24:37 +03:00 |
|
TatianaLopaeva
|
3ab27c8280
|
web: common: bump version
|
2020-12-18 20:19:41 +03:00 |
|
TatianaLopaeva
|
256e1eb0e0
|
Web: Common: PageLayout: Refactoring.
|
2020-12-18 20:19:32 +03:00 |
|
TatianaLopaeva
|
3a017b57de
|
web: common: bump version
|
2020-12-18 20:16:25 +03:00 |
|
TatianaLopaeva
|
d5d71d0a7e
|
Web: Common: PageLayout: Fixed displaying at "Slide Over" on iPad.
|
2020-12-18 20:16:13 +03:00 |
|
Artem Tarasov
|
ec09f9ed2e
|
web: common: bump version
|
2020-12-18 18:32:36 +03:00 |
|
Artem Tarasov
|
ec190a5b98
|
Merge branch 'hotfix/v0.0.4' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.4
|
2020-12-18 18:23:15 +03:00 |
|
Artem Tarasov
|
3f7a2d3231
|
web: common: bump version
|
2020-12-18 18:23:04 +03:00 |
|
Artem Tarasov
|
6551e88c1e
|
Web: Common/Client: fix redirect after logout in Confirm
|
2020-12-18 18:22:53 +03:00 |
|
TatianaLopaeva
|
52627caab9
|
web: common: bump version
|
2020-12-18 18:14:21 +03:00 |
|
TatianaLopaeva
|
b967fe9925
|
Web: Common: PageLayout: Fixed displaying at "Slide Over" and "Split View" on iPad.
|
2020-12-18 18:13:25 +03:00 |
|
|
|
f42fc72cf9
|
Merge branch 'master' into develop
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
# web/ASC.Web.Common/package.json
# web/ASC.Web.Components/package.json
|
2020-12-17 21:03:48 +03:00 |
|
|
|
fb571c3ae6
|
web: common: bump version
|
2020-12-17 18:22:37 +03:00 |
|
|
|
76b04db830
|
Web: Common: Added VerstionBadge "Beta"
|
2020-12-17 18:21:48 +03:00 |
|
Artem Tarasov
|
9943d2c2ca
|
web: common: bump version
|
2020-12-17 16:26:35 +03:00 |
|
Artem Tarasov
|
fceb96c386
|
Merge branch 'hotfix/v0.0.3' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.3
|
2020-12-17 16:21:18 +03:00 |
|
Artem Tarasov
|
e0478dd2b3
|
web: common: bump version
|
2020-12-17 16:21:06 +03:00 |
|
Artem Tarasov
|
7851635005
|
Web: Client: Confirm: fix change password
|
2020-12-17 16:20:53 +03:00 |
|
Alexey Kostenko
|
e6d5c38059
|
web: common: bump version
|
2020-12-17 15:22:19 +03:00 |
|
Alexey Kostenko
|
fb2b591603
|
Merge branch 'hotfix/v0.0.3' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.3
|
2020-12-17 14:54:24 +03:00 |
|
Alexey Kostenko
|
86ef386d1b
|
web: common: bump version
|
2020-12-17 14:54:15 +03:00 |
|
Alexey Kostenko
|
b62695dc59
|
Web: Common: MediaViewer: Title style fix
|
2020-12-17 14:54:05 +03:00 |
|
Artem Tarasov
|
63c01a7ff6
|
Merge branch 'hotfix/v0.0.3' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.3
|
2020-12-17 14:50:32 +03:00 |
|
Artem Tarasov
|
cacfabdd04
|
web: common: bump version
|
2020-12-17 14:49:52 +03:00 |
|
Artem Tarasov
|
16d738e5ca
|
Web: Common/Client: changePassword: added logout if user is logged in
|
2020-12-17 14:49:30 +03:00 |
|
|
|
3815a57394
|
Update yarn.lock files
|
2020-12-17 12:37:28 +03:00 |
|
|
|
6e5fc07016
|
web: common: bump version
|
2020-12-17 11:13:38 +03:00 |
|
|
|
a6a6a1361c
|
Web: Common: fixed getCurrentUserId selector
|
2020-12-17 11:09:12 +03:00 |
|
|
|
cbb0c75492
|
Web: Common: added employeeStatus to PeopleSelector
|
2020-12-16 11:37:50 +03:00 |
|
|
|
e542f2b54e
|
Merge branch 'develop' into bugfix/sharing-panel-refactoring
|
2020-12-15 17:59:18 +03:00 |
|
Vladislav Makhov
|
b748693676
|
Merge branch 'develop' into feature/desktop-view
# Conflicts:
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# web/ASC.Web.Common/src/components/PageLayout/sub-components/section-body.js
# web/ASC.Web.Common/src/pages/login/index.js
# web/ASC.Web.Components/src/components/row/index.js
|
2020-12-15 11:00:54 +03:00 |
|
|
|
4027ca9599
|
Merge branch 'develop' into bugfix/sharing-panel-refactoring
|
2020-12-15 10:56:50 +03:00 |
|
|
|
cbc8888057
|
Merge branch 'develop' into feature/thirdparty-integrations
|
2020-12-15 10:55:15 +03:00 |
|
Artem Tarasov
|
59f80038e4
|
web: common: bump version
|
2020-12-15 10:11:30 +03:00 |
|
Artem Tarasov
|
287be4e83f
|
web: common: bump version
|
2020-12-15 10:11:21 +03:00 |
|
Artem Tarasov
|
a0f5261576
|
Merge branch 'develop' into bugfix/dropdown-fix
# Conflicts:
# web/ASC.Web.Common/package.json
|
2020-12-14 20:59:14 +03:00 |
|
Ilya Oleshko
|
f43a2562dd
|
web: common: bump version
|
2020-12-14 18:41:53 +03:00 |
|
Ilya Oleshko
|
bdb433ae35
|
Web: Common : Api: Fixed default filter sort order
|
2020-12-14 18:41:44 +03:00 |
|
|
|
45001f0dcf
|
Web: Common: added owner change api
|
2020-12-14 15:07:27 +03:00 |
|
|
|
15420cb96b
|
Web: Files: fixed ShareAccessRights constants
|
2020-12-14 15:06:24 +03:00 |
|
Vladislav Makhov
|
9381090ccd
|
Remove unused code
|
2020-12-14 09:19:13 +03:00 |
|
Vladislav Makhov
|
03e29cdec7
|
Remove unused code
|
2020-12-14 09:15:38 +03:00 |
|
TatianaLopaeva
|
89f5cb670c
|
web: common: bump version
|
2020-12-11 18:44:44 +03:00 |
|
TatianaLopaeva
|
0657447229
|
Web: Common: PageLayout: Added maximum width when loading an article (tablet/mobile)
|
2020-12-11 18:44:35 +03:00 |
|
Artem Tarasov
|
8ae9dd0df7
|
Web: Common: FilterInput: fixed z-index for backdrop when HideFilter is displayed
|
2020-12-11 17:16:11 +03:00 |
|
Alexey Kostenko
|
a20af486ad
|
web: common: bump version
|
2020-12-11 16:00:06 +03:00 |
|
Alexey Kostenko
|
3340786838
|
Web: Common: FilterInput: Fixed bug in the filter when navigating through groups in the People module
|
2020-12-11 16:00:00 +03:00 |
|
Artem Tarasov
|
1b825e4cfa
|
Web: Common: PageLayout: fixed condition for trigger stopping if current element is undefined
|
2020-12-11 11:54:07 +03:00 |
|
|
|
f70e6e907f
|
Merge branch 'develop' into bugfix/sharing-panel-refactoring
|
2020-12-11 11:34:23 +03:00 |
|
|
|
169c25d9bb
|
Merge branch 'develop' into feature/thirdparty-integrations
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/index.js
# products/ASC.Files/Client/src/store/files/actions.js
|
2020-12-11 10:04:19 +03:00 |
|
Artem Tarasov
|
7d5cb10068
|
web: common: bump version
|
2020-12-10 20:49:11 +03:00 |
|
Artem Tarasov
|
82e3e35cd4
|
Web: Common: PageLayoyt: deleted console.log
|
2020-12-10 20:48:58 +03:00 |
|
Artem Tarasov
|
72a21a1def
|
Merge branch 'develop' into bugfix/dropdown-fix
|
2020-12-10 20:46:24 +03:00 |
|
Artem Tarasov
|
7fbe85b318
|
Web: Common: PageLayout: fixed application crash after calling the context menu with right button and then clicking on the backdrop
|
2020-12-10 20:23:49 +03:00 |
|
Artem Tarasov
|
e6dfb13d7d
|
Web: Common/Components/Files: applied isAside prop for backdrop, fixed related bugs
|
2020-12-10 20:09:16 +03:00 |
|
Artem Tarasov
|
48f782b6bc
|
Web: Common/Components: removed unnecessary DOM requests
|
2020-12-10 20:06:04 +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 |
|
|
|
0b0d7187e0
|
Update yarn.lock files
|
2020-12-10 18:45:49 +03:00 |
|
|
|
be497b0f3a
|
web: common: bump version
|
2020-12-10 18:38:49 +03:00 |
|
|
|
b85faae56b
|
Web: Common: fixed filter update
|
2020-12-10 18:41:42 +03:00 |
|
Ilya Oleshko
|
5906b2f914
|
Merge branch 'develop' into feature/thirdparty-integrations
|
2020-12-10 16:25:44 +03:00 |
|
|
|
dff5391b68
|
Merge branch 'develop' into bugfix/sharing-panel-refactoring
|
2020-12-10 15:07:14 +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 |
|
Alexey Kostenko
|
1a53841499
|
Web: Files/People/Common: Fixed header style
|
2020-12-10 09:48:35 +03:00 |
|
|
|
09ce302b57
|
Web: Files: Init new conversation process
|
2020-12-09 18:37:24 +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 |
|
|
|
86325f87ba
|
Web: Common: fixed sharing api
|
2020-12-09 15:37:34 +03:00 |
|
|
|
254b03032f
|
Web: Common: Fixed status of undefined
|
2020-12-09 13:52:47 +03:00 |
|
Vladislav Makhov
|
509ce245ac
|
Comment out shouldComponentUpdate (temporary)
|
2020-12-09 11:30:21 +03:00 |
|
Artem Tarasov
|
fb10d00272
|
Web: Files/Components/Common/People: z-index fix
|
2020-12-09 10:59:04 +03:00 |
|
Artem Tarasov
|
854acc0b1a
|
Merge branch 'develop' into bugfix/dropdown-fix
# Conflicts:
# web/ASC.Web.Common/package.json
# web/ASC.Web.Components/package.json
|
2020-12-08 23:03:42 +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
|
06d6994b34
|
web: common: bump version
|
2020-12-08 18:26:38 +03:00 |
|
Alexey Kostenko
|
b0903aa99b
|
Web: Common: added CustomFilter constant
|
2020-12-08 18:25:17 +03:00 |
|
|
|
ce4a3e3338
|
Update yarn.lock files
|
2020-12-08 18:17:46 +03:00 |
|
|
|
c8f7555017
|
Merge branch 'develop' into bugfix/sharing-settings
# Conflicts:
# products/ASC.Files/Client/src/store/files/actions.js
# products/ASC.Files/Client/yarn.lock
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/yarn.lock
# web/ASC.Web.Components/yarn.lock
|
2020-12-08 18:06:31 +03:00 |
|
|
|
7d3dde38c4
|
Update yarn.lock files
|
2020-12-08 15:26:54 +03:00 |
|
|
|
9f778af8bd
|
web: common: bump version
|
2020-12-08 15:13:29 +03:00 |
|
|
|
42bfa9a3a6
|
Merge branch 'bugfix/sharing-settings' of github.com:ONLYOFFICE/AppServer into bugfix/sharing-settings
|
2020-12-08 15:12:42 +03:00 |
|
|
|
694daae135
|
Fixed redirection to default page if already logged-in
|
2020-12-08 15:12:33 +03:00 |
|
Ilya Oleshko
|
d2719e1cd9
|
Web: Fixed usage lodash/isEqual on fast-deep-equal
|
2020-12-08 14:09:46 +03:00 |
|
Ilya Oleshko
|
bd13067d0b
|
Web: Added fast-deep-equal
|
2020-12-08 14:08:26 +03:00 |
|
Artem Tarasov
|
5446a6a24d
|
Merge branch 'develop' into feature/version-hostory-redesign
|
2020-12-08 14:03:01 +03:00 |
|
Artem Tarasov
|
f632890cf2
|
web: common: bump version
|
2020-12-08 13:40:32 +03:00 |
|
