Artem Tarasov
|
51d07b5652
|
Web: Client: Confirm: refactoring
|
2020-12-17 19:37:52 +03:00 |
|
Artem Tarasov
|
68d6c1872f
|
Merge branch 'hotfix/v0.0.3' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.3
|
2020-12-17 19:28:24 +03:00 |
|
Artem Tarasov
|
5542a09575
|
Web: Clietn: Confirm: fixed redirect (changePassword)
|
2020-12-17 19:27:56 +03:00 |
|
|
|
326d234773
|
Update yarn.lock files
|
2020-12-17 18:35:04 +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 |
|
Diana
|
fada5e278b
|
Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer into feature/asc-files-tests
|
2020-12-17 13:20:52 +03:00 |
|
Artem Tarasov
|
3daee8efbb
|
Web: Client: Confirm: fixed api method call
|
2020-12-17 12:38:23 +03:00 |
|
|
|
c573e23b0b
|
Merge branch 'hotfix/v0.0.3' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.3
|
2020-12-17 12:37:41 +03:00 |
|
|
|
3815a57394
|
Update yarn.lock files
|
2020-12-17 12:37:28 +03:00 |
|
Artem Tarasov
|
b565bfc77c
|
Web: Client: Confirm: fixed crash of the app when trying to change pass if the user is authorized on the portal
|
2020-12-17 12:32:58 +03:00 |
|
|
|
af930be4a7
|
web: components: bump version
|
2020-12-17 12:30:45 +03:00 |
|
|
|
5f63797266
|
Web: Components: Disabled fake context-menu inside AvatarEditor
|
2020-12-17 12:30:23 +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 |
|
|
|
41bca489bb
|
Fixed versions (About version)
|
2020-12-16 19:09:56 +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 |
|
Artem Tarasov
|
61ea05ca2d
|
web: components: bump version
|
2020-12-15 15:49:35 +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 |
|
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 |
|
Artem Tarasov
|
94240cc1c7
|
Web: Components: paging: fixed width dd
|
2020-12-11 16:33:02 +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
|
277e934cb1
|
Web: Components: backdrop: added the ability to pass an array to className
|
2020-12-11 15:25:53 +03:00 |
|
Artem Tarasov
|
80d8ec58cd
|
Web: Components: backdrop: simplified rendering conditions
|
2020-12-11 13:25:02 +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 |
|
Artem Tarasov
|
eaa436f28f
|
Web: Components: backdrop: fixed class name
|
2020-12-11 10:20:42 +03:00 |
|
Artem Tarasov
|
b49c41929b
|
web: components: bump version
|
2020-12-10 20:49:27 +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 |
|
Artem Tarasov
|
c8aad2f2d2
|
Web: Components: context-menu: added prop withBackdrop, tests
|
2020-12-10 19:42:59 +03:00 |
|
Artem Tarasov
|
5510487db8
|
Web: Components: dropdown: added backdrop, new props, tests
|
2020-12-10 19:41:42 +03:00 |
|
Artem Tarasov
|
83bfa3ed06
|
Web: Components: backdrop: backdrop rendering conditions changed
|
2020-12-10 19:40:23 +03:00 |
|
|
|
b0617ac111
|
Merge branch 'develop' into bugfix/upload-with-convertation
|
2020-12-10 19:35:51 +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 |
|
|
|
419fe93913
|
Merge branch 'develop' into bugfix/toast
|
2020-12-10 18:37:17 +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 |
|
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 |
|
|
|
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 |
|
Artem Tarasov
|
2c6616bafe
|
Web: Components: paging: fixed width of dropdown with list of pages'
|
2020-12-09 16:13:05 +03:00 |
|
|
|
86325f87ba
|
Web: Common: fixed sharing api
|
2020-12-09 15:37:34 +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 |
|
|
|
254b03032f
|
Web: Common: Fixed status of undefined
|
2020-12-09 13:52:47 +03:00 |
|
Artem Tarasov
|
6511557445
|
Web: Components/People: applied prop showDisabledItems
|
2020-12-09 13:09:41 +03:00 |
|
Artem Tarasov
|
4ebaa335ef
|
Web: Components: combobox: added prop showDisabledItems to show disabled items when displayType !== toggle
|
2020-12-09 13:06:32 +03:00 |
|
Artem Tarasov
|
0bdd17ce6f
|
Web: Components: drop-down: added prop to show disabled items
|
2020-12-09 12:38:58 +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
|
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
|
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 |
|
|
|
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 |
|
Alexey Kostenko
|
bc5b17367c
|
Merge branch 'bugfix/sharing-settings' of github.com:ONLYOFFICE/AppServer into bugfix/sharing-settings
|
2020-12-08 17:45:40 +03:00 |
|
Alexey Kostenko
|
74fb9dc052
|
web: components: bump version
|
2020-12-08 17:45:19 +03:00 |
|
Alexey Kostenko
|
96e946491a
|
web: common: bump version
|
2020-12-08 17:45:08 +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 |
|
Artem Tarasov
|
de11873bd4
|
Web: Components: group-buttons-menu: fixed display of disabled items
|
2020-12-08 14:54:39 +03:00 |
|
Artem Tarasov
|
34d246deaf
|
Web: Components/Files/People: z-index fix
|
2020-12-08 14:16:23 +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 |
|
Artem Tarasov
|
6af035a131
|
web: components: bump version
|
2020-12-08 13:40:18 +03:00 |
|
Artem Tarasov
|
31a8e30ee9
|
Web: Components: drop-down: refactoring
|
2020-12-08 13:40:12 +03:00 |
|
Artem Tarasov
|
52f0c1f96b
|
Web: Components/Files: fix bugs, refactoring
|
2020-12-08 13:33:58 +03:00 |
|
TatianaLopaeva
|
34583dde7f
|
Web: Common: Added logic for toasts that stack on top of each other and line up one after the other when clicked
|
2020-12-08 13:15:22 +03:00 |
|
Artem Tarasov
|
071f6c27c3
|
Merge branch 'develop' into bugfix/dropdown-fix
# Conflicts:
# web/ASC.Web.Common/package.json
|
2020-12-08 13:15:02 +03:00 |
|
Alexey Kostenko
|
6a9b8ca662
|
Merge branch 'develop' into bugfix/sharing-settings
|
2020-12-08 12:23:36 +03:00 |
|
Artem Tarasov
|
5a6469dffa
|
Web: Components: backdrop: fixed collapse conditions dropdowns
|
2020-12-08 09:49:07 +03:00 |
|
Viktor Fomin
|
d9e95dabab
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/floating-button
|
2020-12-07 21:03:07 +03:00 |
|
TatianaLopaeva
|
47653a2999
|
web: common: bump version
|
2020-12-07 19:02:21 +03:00 |
|
TatianaLopaeva
|
f2a3355ae8
|
Web: Common: Changed import for selector getLanguage
|
2020-12-07 19:01:10 +03:00 |
|
Vladislav Makhov
|
9c2238ad60
|
Comment out shouldComponentUpdate (temporary)
|
2020-12-07 17:33:01 +03:00 |
|
Vladislav Makhov
|
7ff435e5be
|
Fix circular dependencies
|
2020-12-07 17:32:00 +03:00 |
|
Vladislav Makhov
|
2c1c8dedb0
|
Merge branch 'develop' into feature/desktop-view
# Conflicts:
# products/ASC.Files/Client/src/App.js
# web/ASC.Web.Common/src/pages/login/index.js
# web/ASC.Web.Common/src/store/auth/actions.js
# web/ASC.Web.Common/src/store/auth/reducer.js
|
2020-12-07 16:03:47 +03:00 |
|
Viktor Fomin
|
982ce4e12c
|
Merge branch 'develop' into feature/floating-button
|
2020-12-07 14:50:49 +03:00 |
|
Viktor Fomin
|
2be2085655
|
Update yarn.lock files
|
2020-12-07 14:48:09 +03:00 |
|
Alexey Kostenko
|
d873db91ca
|
web: common: bump version
|
2020-12-07 14:13:31 +03:00 |
|
Alexey Kostenko
|
b1373ddef7
|
web: components: bump version
|
2020-12-07 14:13:21 +03:00 |
|
Alexey Kostenko
|
149adcc372
|
Merge branch 'develop' into bugfix/sharing-settings
|
2020-12-07 13:44:42 +03:00 |
|
Viktor Fomin
|
b693cbdd4f
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/floating-button
|
2020-12-07 13:19:32 +03:00 |
|
Ilya Oleshko
|
4147d2f31a
|
Web: Fixed temp loaders
|
2020-12-07 11:11:04 +03:00 |
|
Alexey Kostenko
|
3c2c0140c4
|
Web: Components: Added prop "color" to TextArea component
|
2020-12-07 10:40:18 +03:00 |
|
Ilya Oleshko
|
830fbfb6a3
|
web: common: bump version
|
2020-12-07 09:52:39 +03:00 |
|
Ilya Oleshko
|
049f7971f1
|
web: components: bump version
|
2020-12-07 09:52:29 +03:00 |
|
Ilya Oleshko
|
83466bd638
|
Merge branch 'develop' into bugfix/login-fix
|
2020-12-07 09:52:04 +03:00 |
|
Ilya Oleshko
|
cd100eba85
|
Web: Client: Fixed redirect after actions
|
2020-12-07 09:43:40 +03:00 |
|
|
|
2baf8cbc76
|
Fixed confirm link user creation
|
2020-12-04 17:15:00 +03:00 |
|
Artem Tarasov
|
93da24a63a
|
Web: Common/Files/People: fixed z-index
|
2020-12-04 14:58:37 +03:00 |
|
Artem Tarasov
|
089e398fed
|
Web: Components: drop-down: fixed passing props style
|
2020-12-04 14:58:05 +03:00 |
|
|
|
0784453daf
|
Fix errors on login and logout
|
2020-12-04 14:21:51 +03:00 |
|
Alexey Kostenko
|
ab71a6dd33
|
Web: Files/Common: Refactoring, changing access type to external share link
|
2020-12-04 14:09:31 +03:00 |
|
Vladislav Makhov
|
a3bd0823c6
|
Refactoring
|
2020-12-04 12:59:48 +03:00 |
|
Vladislav Makhov
|
18bec4ee4b
|
fix updateFileStream
|
2020-12-04 12:59:16 +03:00 |
|
Vladislav Makhov
|
72b9a10e82
|
Fix dispatch error
|
2020-12-04 12:13:51 +03:00 |
|
Ilya Oleshko
|
c32fc83399
|
Web: Client: Fixed property name, added missing property
|
2020-12-04 11:58:15 +03:00 |
|
Artem Tarasov
|
55928c4207
|
web: common: bump version
|
2020-12-04 11:52:40 +03:00 |
|
Artem Tarasov
|
4a8ba1493f
|
web: components: bump version
|
2020-12-04 11:52:31 +03:00 |
|
Artem Tarasov
|
1ea04f44bb
|
Merge branch 'develop' into bugfix/dropdown-fix
|
2020-12-04 11:51:31 +03:00 |
|
Artem Tarasov
|
ffcfc11587
|
Web: Components: Backdrop: fixed backdrop overlay
|
2020-12-04 11:50:21 +03:00 |
|
Artem Tarasov
|
06c132777a
|
Web: Common/Components: removed binding to id, added passing and binding className
|
2020-12-04 11:41:56 +03:00 |
|
Ilya Oleshko
|
d03584fcdd
|
Web: Fixed isAuthenticated logic
|
2020-12-04 11:38:15 +03:00 |
|
