Commit Graph

7457 Commits

Author SHA1 Message Date
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
f8b3382a42 Files: tagDao. Fix 2020-09-08 16:22:45 +03:00
893f7be135 Merge branch 'master' into feature/files 2020-09-08 16:11:09 +03:00
187e5de648 TagDao: fix 2020-09-08 16:10:18 +03:00
TatianaLopaeva
46e9124f81 Added api methods for payments 2020-09-08 15:39:45 +03:00
d30026b82f Merge branch 'master' into feature/files 2020-09-08 15:20:05 +03:00
SuhorukovAnton
89daf213c5 encryption: fix 2020-09-08 15:07:59 +03:00
f464e031b8 Notify: fix 2020-09-08 11:42:13 +03:00
SuhorukovAnton
3d79f7c484 encryption: fix 2020-09-08 11:26:05 +03:00
00f913794d Web: Files: fixed arrow button 2020-09-08 11:16:03 +03:00
56ea45d492 web: components: bump version 2020-09-08 10:37:52 +03:00
72f5e6161d Web: Components: fix empty screen container 2020-09-08 10:37:40 +03:00
33b2f60c45 web: components: bump version 2020-09-08 09:58:07 +03:00
a2ea415cd6 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-09-08 09:57:25 +03:00
64dd0e2bd6 Web: Components: fixed empty-screen-container 2020-09-08 09:57:04 +03:00
72ebd235ec Merge branch 'feature/files' into feature/payments-enterprise 2020-09-07 18:42:57 +03:00
b357a52f7f Merge branch 'feature/payments-enterprise' of github.com:ONLYOFFICE/AppServer into feature/payments-enterprise 2020-09-07 18:42:46 +03:00
9778b258d7 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-07 18:41:51 +03:00
efbebc05b5 Update yarn.lock files 2020-09-07 18:41:42 +03:00
3729d92a5a web: common: bump version 2020-09-07 18:35:03 +03:00
1dff214c06 Web: Common: Remove error routing on 500 error 2020-09-07 18:34:47 +03:00
Artem Tarasov
797dd6c249 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-07 18:27:39 +03:00
Artem Tarasov
6d68dfd0c6 added redirect from / to homepage(settings in state.auth.settings.homepage) 2020-09-07 18:26:44 +03:00
886c7d6464 Merge branch 'master' into feature/files 2020-09-07 18:16:33 +03:00
98c20197fd web: components: bump version 2020-09-07 18:12:13 +03:00
58d2db1d97 Web: Components: fixed text-input disable color 2020-09-07 18:10:40 +03:00