|
f724848195
|
Merge branch 'master' into feature/files
|
2020-09-10 13:45:15 +03:00 |
|
|
0a6c2fda18
|
Files: fix FileConverterQueueScope
|
2020-09-10 13:44:38 +03:00 |
|
|
9282ffbbf1
|
Merge branch 'master' into feature/files
|
2020-09-10 13:40:54 +03:00 |
|
|
f89af33b5b
|
fix unhandled exception
|
2020-09-10 13:39:26 +03:00 |
|
|
7433eea815
|
Web: Clients: SW: Added code for updating SW lifecycle to update the app after user triggered refresh
|
2020-09-10 13:19:06 +03:00 |
|
Artem Tarasov
|
11844629d9
|
added Icons.DepartmensGroupIcon
|
2020-09-10 12:49:24 +03:00 |
|
|
23b2a310a0
|
Merge branch 'master' into feature/files
|
2020-09-10 12:35:55 +03:00 |
|
|
fb0dec0a16
|
Files: fix
|
2020-09-10 12:30:33 +03:00 |
|
|
3f37da9891
|
fix notify
|
2020-09-10 12:02:26 +03:00 |
|
TatianaLopaeva
|
8a465e838d
|
Refactoring
|
2020-09-10 09:08:23 +03:00 |
|
TatianaLopaeva
|
305bb8ac7b
|
Refactoring
|
2020-09-10 09:05:55 +03:00 |
|
|
323823981a
|
Update yarn.lock files
|
2020-09-09 22:25:31 +03:00 |
|
|
e4a222b57b
|
Web: People: Fixed redirect on Save/Cancel GroupAction page
|
2020-09-09 22:18:27 +03:00 |
|
|
718a6e2ebb
|
web: common: bump version
|
2020-09-09 22:03:33 +03:00 |
|
|
e8f1d01aae
|
Web: Common: PeopleSelector: hidden user tooltip (issue: too slow work)
|
2020-09-09 22:03:12 +03:00 |
|
|
aa2632a3a0
|
web: common: bump version
|
2020-09-09 21:50:17 +03:00 |
|
|
f0871880e7
|
web: components: bump version
|
2020-09-09 21:50:07 +03:00 |
|
|
99db325520
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-09 21:49:34 +03:00 |
|
|
b3b6fd0938
|
Web: Components: Re-written ModalDialog component with SLOT pattern
|
2020-09-09 21:49:25 +03:00 |
|
|
6887206670
|
Merge pull request #74 from ONLYOFFICE/feature/scope
Feature/scope
|
2020-09-09 21:28:49 +03:00 |
|
|
cc9e0e1374
|
Merge branch 'master' into feature/scope
# Conflicts:
# web/ASC.Web.Core/Notify/NotifyConfiguration.cs
|
2020-09-09 18:18:34 +03:00 |
|
Artem Tarasov
|
d7237f43ba
|
web: common: bump version
|
2020-09-09 18:06:58 +03:00 |
|
Artem Tarasov
|
25834a705c
|
fixed warning selectedOption of type string
|
2020-09-09 18:06:09 +03:00 |
|
SuhorukovAnton
|
7b1de6b36a
|
Merge branch 'master' into feature/ASC.Data.Storage.Encryption
|
2020-09-09 17:14:48 +03:00 |
|
TatianaLopaeva
|
dc4199a6c8
|
Changed componentDidMount and componentDidUpdate at index, changed reducer and actions
|
2020-09-09 17:06:42 +03:00 |
|
SuhorukovAnton
|
5f62bfb00d
|
scope: bugfix
|
2020-09-09 17:02:51 +03:00 |
|
Alexey
|
5843368d4f
|
Web: Files: Increased the width of the "row update text" field
|
2020-09-09 15:41:28 +03:00 |
|
Artem Tarasov
|
1fd0f3c010
|
fixed redirect edit/view profile in people
|
2020-09-09 15:35:50 +03:00 |
|
|
a53cdc568d
|
Consumers: fix
|
2020-09-09 15:08:28 +03:00 |
|
Alexey
|
ddd3a70b67
|
web: common: bump version
|
2020-09-09 14:46:24 +03:00 |
|
Alexey
|
7ba59aae1e
|
Web: Common: Temporarily hiding the settings module from left menu
|
2020-09-09 14:45:53 +03:00 |
|
|
e0febd8890
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Core/Core/FileStorageService.cs
|
2020-09-09 13:49:25 +03:00 |
|
SuhorukovAnton
|
5aeaa0ee98
|
Merge branch 'master' into feature/ASC.Data.Storage.Encryption
|
2020-09-09 13:45:21 +03:00 |
|
|
a70b890581
|
Notify: rename
|
2020-09-09 13:43:39 +03:00 |
|
|
89860a2c2d
|
Merge pull request #75 from ONLYOFFICE/feature/default-value-module
Feature/default value module
|
2020-09-09 13:43:03 +03:00 |
|
SuhorukovAnton
|
88646b2d2f
|
default-value-module: fix
|
2020-09-09 13:38:43 +03:00 |
|
SuhorukovAnton
|
3875f9f4b0
|
default-value-module: fix
|
2020-09-09 13:36:53 +03:00 |
|
SuhorukovAnton
|
2378c3746e
|
default-value-module: fix
|
2020-09-09 13:25:50 +03:00 |
|
SuhorukovAnton
|
0f7901628b
|
default-value-module: fix
|
2020-09-09 13:25:13 +03:00 |
|
SuhorukovAnton
|
ae61f59d55
|
Merge branch 'master' into feature/ASC.Data.Storage.Encryption
|
2020-09-09 12:40:01 +03:00 |
|
SuhorukovAnton
|
ce27032fbb
|
default-value-module: first version
|
2020-09-09 12:31:57 +03:00 |
|
SuhorukovAnton
|
1752b9a4ba
|
encryption: fix
|
2020-09-09 12:03:21 +03:00 |
|
TatianaLopaeva
|
957c7cd741
|
Changed style for header-container
|
2020-09-09 11:22:44 +03:00 |
|
|
b674bc2f2f
|
Merge branch 'master' into feature/files
|
2020-09-08 17:36:47 +03:00 |
|
|
c87fd2cfdb
|
Files: share fix
|
2020-09-08 17:36:22 +03:00 |
|
|
c468c5e6cc
|
Merge branch 'master' into feature/files
|
2020-09-08 17:03:19 +03:00 |
|
|
ad51a6bf29
|
Files: fix
|
2020-09-08 17:00:29 +03:00 |
|
|
98429ce4ab
|
Merge branch 'master' into feature/files
|
2020-09-08 16:34:21 +03:00 |
|
|
92a72d7983
|
Files: Tag. Fix
|
2020-09-08 16:33:39 +03:00 |
|
|
765558b7b1
|
Merge branch 'master' into feature/files
|
2020-09-08 16:23:12 +03:00 |
|