SuhorukovAnton
|
df8b6fd8b0
|
private: firtst version
|
2020-08-12 12:58:08 +03:00 |
|
Ilya Oleshko
|
abc2bcc03c
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-08-11 15:57:35 +03:00 |
|
Ilya Oleshko
|
7ac9ad6c62
|
Web: People: Reassign: Fixed page wrapper
|
2020-08-11 15:51:27 +03:00 |
|
Ilya Oleshko
|
6df4e05bd9
|
Web: People: ProfileAction: Fixed page wrapper
|
2020-08-11 15:50:15 +03:00 |
|
Ilya Oleshko
|
bbc57115a3
|
Web: People: Profile: Fixed page wrapper
|
2020-08-11 15:49:54 +03:00 |
|
Ilya Oleshko
|
ade0c7d149
|
Web: People: Import: Fixed page wrapper
|
2020-08-11 15:49:40 +03:00 |
|
Ilya Oleshko
|
94f447a272
|
Web: People: Home: Fixed page wrapper
|
2020-08-11 15:49:22 +03:00 |
|
Ilya Oleshko
|
5d3f75b7ed
|
Web: People: GroupAction: Fixed page wrapper
|
2020-08-11 15:49:03 +03:00 |
|
|
|
07116cfea6
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-08-11 14:37:40 +03:00 |
|
|
|
f071702b77
|
Web: People: fixed profile routing
|
2020-08-11 14:37:03 +03:00 |
|
Ilya Oleshko
|
f41d10e07e
|
Web: People: Home: Fixed items of GroupButtonsMenu
|
2020-08-11 11:04:40 +03:00 |
|
|
|
be81ca291d
|
Update yarn.lock files + bump versions
|
2020-07-17 18:03:08 +03:00 |
|
|
|
d094546147
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Client/yarn.lock
# products/ASC.Files/Core/ASC.Files.Core/Core/FileStorageService.cs
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/yarn.lock
|
2020-07-17 17:48:50 +03:00 |
|
|
|
ec20c66c5d
|
Update yarn.lock files
|
2020-07-17 17:43:39 +03:00 |
|
|
|
562abfcdc9
|
DI: refactoring
|
2020-07-17 13:52:28 +03:00 |
|
|
|
679e77a3ea
|
Update yarn.lock files
|
2020-07-16 16:09:09 +03:00 |
|
|
|
098e872a38
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Client/yarn.lock
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/yarn.lock
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/yarn.lock
|
2020-07-16 15:58:43 +03:00 |
|
|
|
ec8c6a5ddb
|
Fixed security vulnerability in lodash
|
2020-07-16 15:54:04 +03:00 |
|
|
|
78b10ab893
|
Update yarn.lock files
|
2020-07-16 14:55:40 +03:00 |
|
|
|
a54be3b64c
|
Merge branch 'master' into feature/files
|
2020-07-15 16:57:14 +03:00 |
|
|
|
e10ac2ccfa
|
BaseStartup: refactoring
|
2020-07-15 15:33:44 +03:00 |
|
|
|
13b1d0140c
|
Web: People: fixed header styles
|
2020-07-08 14:25:01 +03:00 |
|
|
|
a05a058974
|
Web: People: fixed header styles
|
2020-07-08 13:21:06 +03:00 |
|
SuhorukovAnton
|
9d069de30a
|
general-startup: transform GeneralStartup to BaseStartup
|
2020-07-07 23:00:39 +03:00 |
|
SuhorukovAnton
|
00558dd95f
|
general-startup: fix
|
2020-07-06 10:56:17 +03:00 |
|
SuhorukovAnton
|
71d90ebfa2
|
general-startup: fix
|
2020-07-03 18:57:59 +03:00 |
|
SuhorukovAnton
|
2f5491f1ba
|
general-startup: first version
|
2020-07-03 14:47:27 +03:00 |
|
Ilya Oleshko
|
51d7984c91
|
Web: Fixed header icons width to 17px
|
2020-06-17 11:26:18 +03:00 |
|
Ilya Oleshko
|
b6dd65f1c7
|
Merge branch 'master' into feature/files
|
2020-06-15 09:22:52 +03:00 |
|
Ilya Oleshko
|
a1f3b4bde0
|
Web: Removed faker package, updated yarn lock and fixed stories
|
2020-06-11 15:54:53 +03:00 |
|
|
|
7ee4237af4
|
Update storybook packages (Fix ReDoS vulnerability in websocket-extensions)
|
2020-06-11 15:13:43 +03:00 |
|
|
|
144877ab38
|
Update yarn.lock files
|
2020-06-08 12:00:05 +03:00 |
|
Ilya Oleshko
|
be6b6eb3ad
|
Merge branch 'master' into feature/files
|
2020-06-05 14:25:54 +03:00 |
|
|
|
635ff124fb
|
Json: fixed enum
|
2020-06-05 14:05:42 +03:00 |
|
|
|
004dcc2d4d
|
Merge branch 'master' into feature/files
|
2020-06-04 16:48:03 +03:00 |
|
|
|
fed4d206f7
|
Revert logger
|
2020-06-04 16:46:58 +03:00 |
|
|
|
d7386049dc
|
Merge branch 'master' into feature/files
|
2020-06-04 16:27:06 +03:00 |
|
|
|
b55cc7c697
|
Startup: added command line
|
2020-06-04 16:26:31 +03:00 |
|
|
|
ae0fb62add
|
Merge branch 'master' into feature/files
|
2020-06-04 16:05:12 +03:00 |
|
|
|
794486f335
|
Notify: temp log
|
2020-06-04 16:04:17 +03:00 |
|
|
|
0a48d2b179
|
Merge branch 'master' into feature/files
|
2020-05-28 09:20:58 +03:00 |
|
|
|
e7ecaefa3c
|
Added JsonStringEnumConverter
|
2020-05-27 16:19:58 +03:00 |
|
NikolayRechkin
|
64811dbd39
|
update yarn.lock files
|
2020-05-21 15:35:28 +03:00 |
|
|
|
0705756719
|
Merge branch 'master' into feature/files
|
2020-05-19 23:13:51 +03:00 |
|
|
|
ecd66902a0
|
Merge branch 'master' into feature/system-json
|
2020-05-18 14:16:03 +03:00 |
|
|
|
1842076658
|
Merge branch 'master' into feature/files
|
2020-05-18 10:51:37 +03:00 |
|
|
|
47c79d57f0
|
Optimization
|
2020-05-17 16:08:20 +03:00 |
|
|
|
3a747ef8e4
|
Merge branch 'master' into feature/system-json
# Conflicts:
# common/ASC.Api.Core/Core/ApiContext.cs
# common/ASC.Api.Core/Core/ApiDateTime.cs
# common/ASC.Api.Core/Model/EmployeeWraper.cs
# common/ASC.Api.Core/Model/EmployeeWraperFull.cs
# common/ASC.Core.Common/Caching/CachedUserService.cs
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# products/ASC.People/Server/Models/GroupWrapperFull.cs
# products/ASC.People/Server/Startup.cs
# web/ASC.Web.Api/Models/BuildVersion.cs
|
2020-05-07 10:28:20 +03:00 |
|
Daniil Senkiv
|
09474e8be9
|
People.Client: replace FilterInput from asc-web-components to asc-web-common, delete asc-web-components FilterInput
|
2020-03-19 15:05:57 +03:00 |
|
|
|
15c5114a10
|
Update yarn.lock files
|
2020-03-18 13:08:58 +03:00 |
|
Daniil Senkiv
|
730ca469a1
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json
# products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json
# products/ASC.Files/Client/src/store/files/actions.js
# products/ASC.Files/Client/src/store/files/reducers.js
# products/ASC.Files/Client/src/store/files/selectors.js
|
2020-03-17 09:07:39 +03:00 |
|
Ilya Oleshko
|
01bda2d223
|
People.Client: Home: Fixed people row default width
|
2020-03-16 12:20:29 +03:00 |
|
|
|
0bcfec5a19
|
Update yarn.lock files
|
2020-03-16 11:20:25 +03:00 |
|
|
|
eb21f8a957
|
Update yarn.lock files
|
2020-03-16 10:37:55 +03:00 |
|
dependabot[bot]
|
3e25e5c6de
|
Bump acorn from 5.7.3 to 5.7.4 in /products/ASC.People/Client
Bumps [acorn](https://github.com/acornjs/acorn) from 5.7.3 to 5.7.4.
- [Release notes](https://github.com/acornjs/acorn/releases)
- [Commits](https://github.com/acornjs/acorn/compare/5.7.3...5.7.4)
Signed-off-by: dependabot[bot] <support@github.com>
|
2020-03-14 00:54:24 +00:00 |
|
|
|
9a1a118f79
|
Merge branch 'master' into feature/elastic
|
2020-02-27 11:24:14 +03:00 |
|
|
|
cae7c0f8c1
|
Web: People: fixed translation files
|
2020-02-27 11:12:11 +03:00 |
|
|
|
00e5f0c9cf
|
Web: People: added truncate prop to checkbox, added border to users list container
|
2020-02-26 16:18:55 +03:00 |
|
|
|
888d735790
|
Web: People: fixed user list styles
|
2020-02-26 15:35:12 +03:00 |
|
|
|
d33895d8d5
|
Web: People: added custom scroll to list users
|
2020-02-26 15:26:54 +03:00 |
|
|
|
a192178156
|
Merge branch 'feature/elastic' of github.com:ONLYOFFICE/AppServer into feature/elastic
|
2020-02-26 11:06:55 +03:00 |
|
|
|
1bc8f58df4
|
Merge branch 'master' into feature/user-actions-changes
|
2020-02-26 10:55:17 +03:00 |
|
|
|
ac5017da99
|
Merge branch 'master' into feature/elastic
# Conflicts:
# build/build.bat
# build/rebuild.bat
|
2020-02-26 10:46:37 +03:00 |
|
|
|
e4af4d168f
|
Update yarn.lock files
|
2020-02-26 10:23:38 +03:00 |
|
|
|
2ccd226940
|
web: clients: Fixed CRA proxy bug;
|
2020-02-26 10:02:37 +03:00 |
|
|
|
30dbb2a6ca
|
Web: People: added send email function
|
2020-02-25 16:58:34 +03:00 |
|
|
|
935772d783
|
Web: People: renamed DeleteGroupUsersDialog to DeleteUsersDialog
|
2020-02-25 16:20:48 +03:00 |
|
|
|
35e2e20049
|
Files: added model
|
2020-02-25 15:21:48 +03:00 |
|
|
|
48513d7356
|
Web: People: renamed an array of users
|
2020-02-25 14:20:35 +03:00 |
|
|
|
fa4a088692
|
Web: People: fixed onChange checkbox function
|
2020-02-25 14:18:28 +03:00 |
|
|
|
e476681495
|
Web: People: added display of all users in the list in DeleteGroupUsersDialog, fixed display of the list of users
|
2020-02-25 13:14:44 +03:00 |
|
|
|
d9522e48ef
|
Web: People: added display of all users in the list in ChangeUserStatusDialog, fixed display of the list of users
|
2020-02-25 11:58:04 +03:00 |
|
|
|
8737369a1c
|
Web: People: added display of all users in the list in ChangeUserTypeDialog, fixed display of the list of users
|
2020-02-25 11:35:34 +03:00 |
|
|
|
ee31bb29b5
|
Web: People: fixed dialog class names
|
2020-02-25 11:32:17 +03:00 |
|
|
|
44ec45ebb6
|
Merge branch 'master' into feature/elastic
# Conflicts:
# common/ASC.Common/Security/Cryptography/InstanceCrypto.cs
# common/ASC.Core.Common/Billing/TariffService.cs
# common/ASC.Core.Common/Caching/CachedQuotaService.cs
# common/ASC.Core.Common/Caching/CachedTenantService.cs
# common/ASC.Core.Common/Caching/CachedUserService.cs
# common/ASC.Core.Common/Context/Impl/AuthManager.cs
# common/ASC.Core.Common/Context/Impl/CoreConfiguration.cs
# common/ASC.Core.Common/Context/Impl/TenantManager.cs
# common/ASC.Core.Common/Context/SecurityContext.cs
# common/ASC.Core.Common/Data/DbSettingsManager.cs
# common/ASC.Core.Common/Tenants/TenantUtil.cs
# common/ASC.Data.Reassigns/QueueWorker.cs
# common/ASC.IPSecurity/IPSecurity.cs
# common/services/ASC.Studio.Notify/Program.cs
# products/ASC.People/Server/Startup.cs
# web/ASC.Web.Core/CookiesManager.cs
# web/ASC.Web.Core/Tfa/TfaManager.cs
|
2020-02-25 11:24:45 +03:00 |
|
|
|
a90b1fb424
|
People: added GetExpression
|
2020-02-25 11:02:13 +03:00 |
|
|
|
707e0bbf82
|
Web: People: added display of all users in the list in SendInviteDialog, fixed display of the list of users
|
2020-02-25 10:51:27 +03:00 |
|
|
|
af7ac989a6
|
Web: People: modified sending users to dialogs
|
2020-02-25 10:47:40 +03:00 |
|
|
|
a452774b8b
|
Web: People: added getUsersIds selector
|
2020-02-25 10:44:08 +03:00 |
|
|
|
9db8b26985
|
Replaced NewtonsoftJson with System.Text.Json
|
2020-02-21 16:19:32 +03:00 |
|
|
|
c0cc5cc188
|
Web: People: dialog message translations fixed
|
2020-02-21 11:57:47 +03:00 |
|
|
|
356e1d48ec
|
Web: People: fixed send email header
|
2020-02-21 11:33:55 +03:00 |
|
|
|
a9f64e474f
|
Merge branch 'master' into feature/user-actions-changes
|
2020-02-21 10:20:16 +03:00 |
|
|
|
28e94c16fc
|
Web: People: fixed closing group button menu
|
2020-02-21 10:18:20 +03:00 |
|
|
|
7429478e2c
|
Web: People: added new translations
|
2020-02-21 09:08:53 +03:00 |
|
|
|
41b943062a
|
Web: People: removed unused translations
|
2020-02-21 09:06:58 +03:00 |
|
|
|
c5dbf8c859
|
Removed unused dependencies
|
2020-02-20 17:57:48 +03:00 |
|
|
|
c05fd0bfe7
|
Web: People: fixed change user type error
|
2020-02-20 16:14:33 +03:00 |
|
|
|
dd6ac76105
|
Web: People: added new translations
|
2020-02-20 16:05:36 +03:00 |
|
|
|
a1efaa4c17
|
Web: People: added change user type dialog
|
2020-02-20 15:55:25 +03:00 |
|
|
|
43bdd40f46
|
Web: People: removed unused getSelectionIds function, fixed getUserType function
|
2020-02-20 15:50:33 +03:00 |
|
|
|
c9689bc7df
|
Web: People: rename DeleteGroupUsersShowUsers to ShowUsersList
|
2020-02-20 15:49:22 +03:00 |
|
|
|
65fa34dff4
|
Web: People: added change user status dialog
|
2020-02-20 14:13:54 +03:00 |
|
|
|
6c7145f32e
|
Web: People: removed set disabled dialog
|
2020-02-20 14:12:42 +03:00 |
|
|
|
f2dd97824d
|
Web: People: added new disable users dialog
|
2020-02-20 11:24:53 +03:00 |
|
|
|
e0e7803e56
|
Web: People: fixed users dialogs
|
2020-02-20 11:23:27 +03:00 |
|
|
|
f135a022d3
|
Web: People: fixed selectors functions
|
2020-02-20 11:22:23 +03:00 |
|
|
|
9ef838e8fc
|
Web: People: refactoring delete group users dialog
|
2020-02-20 09:28:58 +03:00 |
|
|
|
7ada48f0bc
|
Web: People: added send invite dialog to group users
|
2020-02-20 09:26:51 +03:00 |
|
|
|
05954f21e0
|
Web: People: added new translations to resourceConfig
|
2020-02-19 16:09:54 +03:00 |
|
