Artem Tarasov
|
0533163c78
|
Web: People: Home: deleted unnecessary code
|
2021-02-12 16:04:51 +03:00 |
|
Vladislav Makhov
|
0782f72943
|
web: people: remove unused code
|
2021-02-12 10:30:03 +03:00 |
|
Vladislav Makhov
|
fa4c0bafa3
|
web: people: migrate update user type action to mobx
|
2021-02-12 10:29:46 +03:00 |
|
Vladislav Makhov
|
4e3a2e024c
|
web: people: add group actions
|
2021-02-12 10:29:17 +03:00 |
|
Vladislav Makhov
|
ce65fd1059
|
web: people: fix setIsVisibleDataLossDialog
|
2021-02-12 10:28:46 +03:00 |
|
Vladislav Makhov
|
483a671dec
|
web: people: add stores, fix actions observes
|
2021-02-12 10:28:12 +03:00 |
|
Vladislav Makhov
|
27bec2e4b0
|
web: people: migrate group actions to mobx
|
2021-02-12 10:27:10 +03:00 |
|
Vladislav Makhov
|
d36ca5706d
|
web: people: hide unused code
|
2021-02-12 10:26:06 +03:00 |
|
Vladislav Makhov
|
654dee30c5
|
web: people: refactoring, fix actions
|
2021-02-12 10:25:24 +03:00 |
|
Vladislav Makhov
|
b9111b2689
|
web: people: add Avatar Editor Store
|
2021-02-12 10:23:27 +03:00 |
|
Artem Tarasov
|
480ddc15cd
|
Web: People: GroupAction: fixed signature if no manager assigned to the group
|
2021-02-11 17:28:39 +03:00 |
|
Vladislav Makhov
|
4c797137f8
|
web: people: comment out setSelected
|
2021-02-10 20:24:31 +03:00 |
|
Vladislav Makhov
|
ea61a9a056
|
web: people: migrate removeUser to mobx, comment out setSelected
|
2021-02-10 20:24:11 +03:00 |
|
Vladislav Makhov
|
56b00ffc9d
|
web: people: migrate updateUserStatus to mobx, comment out setSelected
|
2021-02-10 20:23:28 +03:00 |
|
Vladislav Makhov
|
a22d9f333d
|
web: people: migrate actions to mobx
|
2021-02-10 20:22:12 +03:00 |
|
Vladislav Makhov
|
60407b74d4
|
web: people: migrate setFilter to mobx
|
2021-02-10 20:20:23 +03:00 |
|
Vladislav Makhov
|
85568fed74
|
web: people: comment out unused code
|
2021-02-10 20:18:38 +03:00 |
|
Vladislav Makhov
|
ea49d6e9e0
|
web: people: add clear selection on selectGroup fn
|
2021-02-10 20:17:37 +03:00 |
|
Vladislav Makhov
|
de8737afcd
|
web: people: add deleteGroup fn
|
2021-02-10 20:15:40 +03:00 |
|
Vladislav Makhov
|
7885c26153
|
web: people: refactor onClose
|
2021-02-10 14:14:51 +03:00 |
|
Vladislav Makhov
|
5070dacaa9
|
web: people: migrate selection mechanism to mobx
|
2021-02-10 13:34:35 +03:00 |
|
Vladislav Makhov
|
c2dd454e45
|
web: people: migrate visibility of header group button menu mechanism to mobx
|
2021-02-10 13:34:18 +03:00 |
|
Vladislav Makhov
|
fa3ccbe1de
|
web: people: remove console log
|
2021-02-10 13:33:16 +03:00 |
|
Vladislav Makhov
|
b7635584cc
|
web: people: remove console log
|
2021-02-10 13:32:46 +03:00 |
|
Vladislav Makhov
|
ebe54cc705
|
web: people: add selectionStore and headerMenuStore init
|
2021-02-10 13:32:23 +03:00 |
|
Vladislav Makhov
|
c4346161c2
|
web: people: add isUserSelected fn
|
2021-02-10 13:31:40 +03:00 |
|
Vladislav Makhov
|
e222a96681
|
web: people: add Selection Store
|
2021-02-10 13:30:57 +03:00 |
|
Vladislav Makhov
|
673762894e
|
web: people: add Header Menu Store
|
2021-02-10 13:30:39 +03:00 |
|
Vladislav Makhov
|
09665b1a9d
|
web: people: remove debugger
|
2021-02-09 12:53:42 +03:00 |
|
Vladislav Makhov
|
923b00c8db
|
web: people: switch to getter
|
2021-02-09 12:52:32 +03:00 |
|
Vladislav Makhov
|
2755c6ace0
|
web: people: migrate filter, people fetching mechanism to mobx
|
2021-02-09 12:47:21 +03:00 |
|
Artem Tarasov
|
cfa9b48011
|
Web: People: GroupAction: fixed app crash when creating a group
|
2021-02-08 17:15:54 +03:00 |
|
Vladislav Makhov
|
cf6511cad2
|
web: people: migrate groups data
|
2021-02-08 10:43:20 +03:00 |
|
Vladislav Makhov
|
b6a0ba38ca
|
web: people: migrate groups data
|
2021-02-08 10:42:37 +03:00 |
|
Vladislav Makhov
|
9fcd48c110
|
web: people: migrate editing form store to mobx
|
2021-02-08 10:21:40 +03:00 |
|
Vladislav Makhov
|
30c6028350
|
web: people: migrate selected group prop
|
2021-02-08 10:03:05 +03:00 |
|
Vladislav Makhov
|
cd77bfa802
|
web: people: add stores to root
|
2021-02-08 10:02:41 +03:00 |
|
Vladislav Makhov
|
e58a489204
|
web: people: add Selected Group store
|
2021-02-08 10:02:07 +03:00 |
|
Vladislav Makhov
|
d285fa6ae4
|
web: people: add Editing Form store
|
2021-02-08 10:01:49 +03:00 |
|
Vladislav Makhov
|
997f7b6d65
|
web: people: migrate props to mobx
|
2021-02-08 10:01:01 +03:00 |
|
Artem Tarasov
|
cd18cf55cf
|
Web: People: dialogs/Home: fixed crash when deleting user and reopening modal dialog after deleting user
|
2021-02-05 17:26:25 +03:00 |
|
Vladislav Makhov
|
e747eeab92
|
web: people: remove dep from use effect
|
2021-02-05 16:19:46 +03:00 |
|
Vladislav Makhov
|
7deee30d24
|
web: people: migrate props to mobx
|
2021-02-05 16:19:18 +03:00 |
|
Vladislav Makhov
|
6ca4a97547
|
web: people: add target user store
|
2021-02-05 16:15:44 +03:00 |
|
Artem Tarasov
|
f67d0ca5e1
|
Web: People: GroupAction: fixed reset of the selected group in tree when updating (or following a link) of the group edit page
|
2021-02-05 14:08:48 +03:00 |
|
Vladislav Makhov
|
ce9b0e9ba8
|
web: people: add mobx props
|
2021-02-05 13:50:02 +03:00 |
|
Vladislav Makhov
|
d98b554695
|
web: people: replace redux connect with mobx
|
2021-02-05 13:49:44 +03:00 |
|
Artem Tarasov
|
89a21a6fca
|
Web: People/Common: fixed group reselect when exiting empty group editor, removed console.log() and unused code
|
2021-02-05 13:23:59 +03:00 |
|
Vladislav Makhov
|
6b98264bb2
|
web: add current user id
|
2021-02-04 20:11:58 +03:00 |
|
Vladislav Makhov
|
79a3ca68fd
|
web: fix data
|
2021-02-04 20:11:41 +03:00 |
|
Vladislav Makhov
|
a8eeb6e6e8
|
web: people: migrate isAdmin prop
|
2021-02-04 19:29:53 +03:00 |
|
Vladislav Makhov
|
881c56d693
|
web: people: add current module name
|
2021-02-04 18:58:24 +03:00 |
|
Vladislav Makhov
|
ffbc9cb57e
|
web: people: replace class component to functional
|
2021-02-04 18:26:44 +03:00 |
|
Vladislav Makhov
|
4f13f83a81
|
web: people: replace isLoading to MobX prop
|
2021-02-04 18:18:17 +03:00 |
|
Artem Tarasov
|
593d4235d5
|
Web: Piople: GroupAction: added groups transer to PeopleSelector, fixed group reset after unmounting component
|
2021-02-04 17:50:08 +03:00 |
|
Artem Tarasov
|
1121559cda
|
Web: People: fixed fetchGroup action to work with state
|
2021-02-04 17:30:33 +03:00 |
|
Vladislav Makhov
|
203e02e931
|
web: people: add People store models
|
2021-02-04 16:24:30 +03:00 |
|
Vladislav Makhov
|
c3eabf09e8
|
web: people: add inject and observer HOC's
|
2021-02-04 11:55:14 +03:00 |
|
Artem Tarasov
|
9618be3c73
|
Web: People: EmptyScreen: fixed selector for defining empty group
|
2021-02-04 11:01:22 +03:00 |
|
Artem Tarasov
|
5eef56b5d4
|
Web: People/Common: added and applied a method to request complete information for all groups
|
2021-02-03 17:25:13 +03:00 |
|
|
59ffbeaf1e
|
People: added method to get groups with members
|
2021-02-03 13:48:52 +03:00 |
|
Vladislav Makhov
|
ee4dc0b142
|
web: add provider to People, fix init data fetching
|
2021-02-03 09:22:56 +03:00 |
|
Artem Tarasov
|
ecce59a4ff
|
Web: Common/People: Filter: renamed method resetWithoutGroup to reset'
|
2021-02-02 20:12:38 +03:00 |
|
|
2a79d8bb8d
|
Web: Moved code to AuthStore usage
|
2021-02-02 17:26:58 +03:00 |
|
Artem Tarasov
|
b2aac3838c
|
Web: People/Files/Common: Filter: fixed default value for Search
|
2021-02-02 16:35:06 +03:00 |
|
Vladislav Makhov
|
26cdc94f1c
|
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
# Conflicts:
# products/ASC.Files/Client/src/App.js
# products/ASC.People/Client/src/App.js
|
2021-02-02 10:43:37 +03:00 |
|
Vladislav Makhov
|
25e58bcdf3
|
web: add provider
|
2021-02-02 10:23:00 +03:00 |
|
|
0577bb635d
|
Web: People: Changed work with user data from redux to mobx
|
2021-02-01 20:33:39 +03:00 |
|
TatianaLopaeva
|
af96aaf2b3
|
Web: Changed imports.
|
2021-02-01 16:10:02 +03:00 |
|
Vladislav Makhov
|
de88da2fa7
|
Web: Changed work with user data from redux to mobx
|
2021-02-01 11:45:26 +03:00 |
|
|
f91ce2390b
|
Web: Changed work with modules from redux to mobx
|
2021-01-29 18:06:02 +03:00 |
|
|
949ba5993e
|
Web: Update yarn.lock files
|
2021-01-29 17:18:49 +03:00 |
|
|
9841b2ef1f
|
Web: Added mobx and mobx-react packages
|
2021-01-29 17:17:58 +03:00 |
|
Artem Tarasov
|
ddc6aeac40
|
Web: People/Common: Filter: added a method to the filter to reset the state (except for the currnent group and sort)
|
2021-01-29 16:46:14 +03:00 |
|
|
652c7bd906
|
Merge branch 'develop' into feature/workspaces
# Conflicts:
# packages/asc-web-common/src/components/Layout/MobileLayout.js
# packages/asc-web-common/src/components/Layout/ScrollToTop.js
# packages/asc-web-common/src/components/Layout/context.js
# packages/asc-web-common/src/components/Layout/index.js
# packages/asc-web-common/src/components/NavMenu/index.js
# packages/asc-web-common/src/components/NavMenu/sub-components/header-nav.js
# packages/asc-web-common/src/components/PageLayout/index.js
# packages/asc-web-common/src/components/PageLayout/sub-components/article.js
# packages/asc-web-common/src/components/PageLayout/sub-components/section-header.js
# packages/asc-web-common/src/components/PageLayout/sub-components/section.js
# packages/asc-web-components/src/components/icons/svg/button.cancel.react.svg
# packages/asc-web-components/src/components/icons/svg/clear.active.react.svg
# packages/asc-web-components/src/components/icons/svg/load.error.react.svg
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/store/files/actions.js
# products/ASC.People/Client/package.json
# products/ASC.People/Client/src/App.js
# products/ASC.People/Client/src/components/pages/Profile/index.js
# products/ASC.People/Client/src/components/pages/ProfileAction/index.js
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/package.json
# web/ASC.Web.Client/src/App.js
# 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
# yarn.lock
|
2021-01-29 16:39:00 +03:00 |
|
Ilya Oleshko
|
8226d9185c
|
Merge branch 'develop' into feature/not-implemented-page
|
2021-01-29 12:38:22 +03:00 |
|
Artem Tarasov
|
0f68cbfc7b
|
Merge branch 'develop' into feature/empty-group
# Conflicts:
# products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
|
2021-01-29 11:52:06 +03:00 |
|
|
b0e8b9c6af
|
Bump version to v0.0.10
|
2021-01-29 11:13:27 +03:00 |
|
TatianaLopaeva
|
a22e262310
|
Update yarn lock files
|
2021-01-28 16:18:22 +03:00 |
|
Artem Tarasov
|
a55ae75a31
|
Web: People: EmptyScreen: fixed condition for empty group screen
|
2021-01-28 11:29:01 +03:00 |
|
TatianaLopaeva
|
24ee58f0f6
|
Web: Files/People: Fixed height of context menu for desktop.
|
2021-01-28 10:45:44 +03:00 |
|
Artem Tarasov
|
38cfd5d47b
|
Web: People: EmptyScreen: added selector for emptyGroup
|
2021-01-28 01:22:41 +03:00 |
|
Artem Tarasov
|
1cbc75b02c
|
Web: People: EmptyScreen: added screen for empty group, corrected title and description in EmptyScreen
|
2021-01-28 01:21:50 +03:00 |
|
Artem Tarasov
|
c78852bdff
|
Web: People: EmptyScreen: EmptyScreenContainer moved to a separate file
|
2021-01-28 00:42:24 +03:00 |
|
TatianaLopaeva
|
77ce035d15
|
Web: Files/People: Fixed context menu for desktop.
|
2021-01-27 20:01:52 +03:00 |
|
Artem Tarasov
|
93e6777b27
|
Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/index.js
# web/ASC.Web.Common/src/components/PageLayout/index.js
# web/ASC.Web.Components/package.json
|
2021-01-27 18:03:12 +03:00 |
|
Viktor Fomin
|
32bfef070e
|
Update yarn.lock files
|
2021-01-27 17:23:40 +03:00 |
|
|
b1dbaf7005
|
Web: Modified first templates
|
2021-01-27 15:38:35 +03:00 |
|
|
436bf7a06e
|
Web: People: Added routes
|
2021-01-27 10:31:29 +03:00 |
|
|
30ab7edfcf
|
Web: Fixed import errors
|
2021-01-27 10:29:15 +03:00 |
|
TatianaLopaeva
|
951961ad35
|
Web: Refactoring.
|
2021-01-26 18:21:50 +03:00 |
|
TatianaLopaeva
|
2b8dfc80e9
|
Web: Common/Files/People: Fixed "jumps" when go to the next page.
|
2021-01-26 13:50:29 +03:00 |
|
|
36c7a171df
|
Web: Fixed load/unload People store
|
2021-01-26 13:36:05 +03:00 |
|
|
f0e227731f
|
Fixed loading products, lazy loading webitemmanager
|
2021-01-26 12:29:50 +03:00 |
|
|
b9ed789746
|
Web: Applied WP:ModuleFederation best practices
|
2021-01-26 00:55:46 +03:00 |
|
|
64655a7da0
|
Api: modules. Added info method
|
2021-01-25 17:37:26 +03:00 |
|
Ilya Oleshko
|
e486a7919a
|
Web: Fixed modules icons
|
2021-01-25 14:28:51 +03:00 |
|
|
f8be896241
|
Merge branch 'develop' into feature/dotnet5
# Conflicts:
# common/ASC.Common/ASC.Common.csproj
# common/ASC.Core.Common/ASC.Core.Common.csproj
# common/ASC.Core.Common/EF/Context/BaseDbContext.cs
# common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
|
2021-01-22 16:34:40 +03:00 |
|
TatianaLopaeva
|
4a961ad82c
|
Web: Files/People: Added style condition for a mobile device.
|
2021-01-22 12:50:25 +03:00 |
|
|
3b43cfa334
|
Web: Files: fixed header styles
|
2021-01-21 18:43:48 +03:00 |
|
Artem Tarasov
|
cdecfc3ed3
|
Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/store/files/selectors.js
# web/ASC.Web.Client/src/App.js
|
2021-01-21 16:45:35 +03:00 |
|
TatianaLopaeva
|
1ed838e91e
|
Web: Files/People: Changed the condition for scroll to top on mobile/tablet devices.
|
2021-01-20 22:13:23 +03:00 |
|
TatianaLopaeva
|
4c262c2854
|
Web: Common: Changed mobile layout only for mobile/tablet devices.
|
2021-01-20 21:04:00 +03:00 |
|
|
8d62eb5fbf
|
Update yarn.lock files
|
2021-01-20 12:55:23 +03:00 |
|
|
3b959f81ed
|
Bump version to v0.0.9
|
2021-01-18 19:06:31 +03:00 |
|
TatianaLopaeva
|
a4f416789a
|
Merge branch 'develop' into feature/fix-hide/show-header
|
2021-01-18 12:02:40 +03:00 |
|
TatianaLopaeva
|
f14f83d1a1
|
Web: People/Files: Refactoring.
|
2021-01-15 17:55:18 +03:00 |
|
TatianaLopaeva
|
26c680010a
|
Web: Common/People: Deleted useless imports.
|
2021-01-15 17:50:30 +03:00 |
|
|
7650acfec3
|
Bump version to v0.0.8
|
2021-01-15 13:03:47 +03:00 |
|
|
4ea47886f6
|
Bump version to v0.0.7
|
2021-01-14 17:56:05 +03:00 |
|
TatianaLopaeva
|
f0679f3cdf
|
Web: Files/People: Fixed scrolling to the top when switching to a new page.
|
2021-01-13 16:19:20 +03:00 |
|
TatianaLopaeva
|
9bcb922c1a
|
Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/index.js
# web/ASC.Web.Common/src/components/Layout/index.js
# web/ASC.Web.Common/src/components/NavMenu/index.js
# web/ASC.Web.Common/src/components/PageLayout/index.js
# web/ASC.Web.Common/src/components/PageLayout/sub-components/section-header.js
# web/ASC.Web.Common/src/store/auth/actions.js
# web/ASC.Web.Common/src/store/auth/reducer.js
# web/ASC.Web.Common/src/store/auth/selectors.js
|
2021-01-13 13:27:55 +03:00 |
|
|
889949eb95
|
Merge branch 'develop' into feature/workspaces
# Conflicts:
# packages/asc-web-common/src/components/Layout/index.js
# packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/HistoryRowsLoader.js
# packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/HistoryRowsLoader.stories.js
# packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/README.md
# packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/StyledHistoryRowsLoader.js
# packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/index.js
# packages/asc-web-common/src/components/NavMenu/sub-components/nav-item.js
# packages/asc-web-common/src/components/PageLayout/sub-components/section.js
# packages/asc-web-common/src/desktop/index.js
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/public/index.html
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/dialogs/DownloadDialog/DownloadContent.js
# products/ASC.Files/Client/src/components/pages/DocEditor/index.js
# products/ASC.Files/Client/src/components/pages/Home/index.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Header/index.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/index.js
# products/ASC.Files/Client/src/components/panels/AddGroupsPanel/index.js
# products/ASC.Files/Client/src/components/panels/AddUsersPanel/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/SharingRow.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.People/Client/package.json
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/package.json
# web/ASC.Web.Client/src/helpers/confirmRoute.js
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/src/pages/login/i18n.js
# web/ASC.Web.Common/yarn.lock
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/yarn.lock
# web/ASC.Web.Login/src/LoginContent.jsx
# yarn.lock
|
2021-01-11 12:21:59 +03:00 |
|
|
60022bbc06
|
Update yarn.lock files
|
2020-12-30 21:33:07 +03:00 |
|
Vladislav Makhov
|
1f8769cd6b
|
Update yarn.lock
|
2020-12-30 19:51:17 +03:00 |
|
|
fc55550521
|
Merge pull request #166 from ONLYOFFICE/feature/asc-files-tests
Feature/asc files tests
|
2020-12-30 18:03:11 +03:00 |
|
Artem Tarasov
|
3a9f3b6e02
|
Merge branch 'release/v0.0.6' of github.com:ONLYOFFICE/AppServer into release/v0.0.6
|
2020-12-30 12:16:26 +03:00 |
|
Artem Tarasov
|
3d7eada1a6
|
Web: Cluient/Files/People: fix for safari - disabled security zone (white stripes around the edges of the screen in landscape orientation
|
2020-12-30 12:15:50 +03:00 |
|
Ilya Oleshko
|
065ae43f0a
|
Web: People : Profile : Fixed autofocus on mobile
|
2020-12-30 12:13:33 +03:00 |
|
|
74aa0abca8
|
Bump version to v0.0.6
|
2020-12-29 19:43:37 +03:00 |
|
|
fa7c2bf9f1
|
Merge branch 'develop' into feature/asc-files-tests
|
2020-12-29 18:37:28 +03:00 |
|
TatianaLopaeva
|
5340bded2f
|
Web: Common: Fixed displaying of article header at user profile.
|
2020-12-29 16:25:39 +03:00 |
|
TatianaLopaeva
|
d988d44b11
|
Web: Common: Fixed displaying of aside header.
|
2020-12-29 16:15:24 +03:00 |
|
|
39a0cb99de
|
Update yarn.lock files
|
2020-12-29 14:03:05 +03:00 |
|
|
a21fff2ab1
|
Fix warning " > react-tooltip@3.11.6" has incorrect peer dependency "react@>=^16.0.0".
|
2020-12-28 11:04:34 +03:00 |
|
|
2be04b3bc0
|
Update package.json and yarn.lock files
|
2020-12-25 17:48:11 +03:00 |
|
|
9f8ff83084
|
Update yarn.lock files
|
2020-12-25 16:24:26 +03:00 |
|
|
2b08c711dc
|
Update Create-react-app to v4.0.1
|
2020-12-25 16:01:04 +03:00 |
|
|
20900eeb72
|
Merge branch 'master' into develop
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
|
2020-12-25 12:09:52 +03:00 |
|
TatianaLopaeva
|
e79eb283a3
|
Web: Common/People: Deleted useless scroll up.
|
2020-12-24 18:06:20 +03:00 |
|
TatianaLopaeva
|
4e7b414c03
|
Web: Common/People: Fixed display downloading of profile & edit profile.
|
2020-12-24 18:02:49 +03:00 |
|
|
9350f1189e
|
Bump version to v0.0.5
|
2020-12-24 12:22:48 +03:00 |
|
TatianaLopaeva
|
6a1e80f1fb
|
Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/index.js
|
2020-12-24 11:03:52 +03:00 |
|
Diana
|
e20b87447e
|
Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into develop
|
2020-12-24 03:18:47 +03:00 |
|
|
76d7ed6c73
|
Merge branch 'master' into develop
# Conflicts:
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/src/components/drop-down/index.js
|
2020-12-23 21:42:44 +03:00 |
|
|
7803696e01
|
Update yarn.lock files
|
2020-12-23 12:43:27 +03:00 |
|
|
1d5fc44dac
|
Web: People: Added target for link
|
2020-12-23 11:57:09 +03:00 |
|
|
cffb61d1a5
|
Web: People: Added translation for success of sending the invitation
|
2020-12-23 11:43:53 +03:00 |
|
|
352ec309b8
|
Web: People: Fixed displaying errors on language change
|
2020-12-23 11:34:21 +03:00 |
|
TatianaLopaeva
|
0bd9a4001a
|
Web: Common/People: Fixed automatic scrolling when loading, viewing a profile and updating a profile and refactoring.
|
2020-12-23 11:30:48 +03:00 |
|
TatianaLopaeva
|
91f09ed700
|
Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
# web/ASC.Web.Common/src/store/auth/actions.js
|
2020-12-23 11:01:34 +03:00 |
|
|
57ba1d7cc5
|
People: model. Added FromInviteLink
|
2020-12-22 17:19:58 +03:00 |
|
|
64f8aadd56
|
People: fix activation email
|
2020-12-22 15:54:34 +03:00 |
|
Diana
|
9b338e0f78
|
Merge branch 'feature/asc-files-tests' of https://github.com/ONLYOFFICE/AppServer into develop
|
2020-12-22 15:37:10 +03:00 |
|
|
2d9906f6a1
|
Web: Common: added employeeStatus to PeopleSelector, fixed display of disabled users
|
2020-12-22 15:34:19 +03:00 |
|
|
50b45b785a
|
Web: People: fixed access to editing the profile for the user, fixed the registration date
|
2020-12-22 14:55:35 +03:00 |
|
|
06de1efbae
|
Update yarn.lock files
|
2020-12-22 11:59:57 +03:00 |
|
|
4f8c04a10f
|
Web: People: Fixed displaying SectionHeader loader
|
2020-12-22 11:50:44 +03:00 |
|
|
a54a735cfa
|
Web: People: Fixed displaying not found language in combobox
|
2020-12-22 11:36:07 +03:00 |
|
Alexey Kostenko
|
c3fbf9fc93
|
Web: Files/People: Removed hover on mobile devices in page navigation buttons
|
2020-12-21 17:56:25 +03:00 |
|
|
853f8fa8df
|
Web: People: fixed access to the profile
|
2020-12-18 15:44:04 +03:00 |
|
|
8f3de38301
|
Web: People: hid edit button if profile is disabled
|
2020-12-18 15:36:00 +03:00 |
|
TatianaLopaeva
|
02949cc644
|
Web: People: Article: Deleted useless console.log.
|
2020-12-18 09:47:15 +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 |
|
|
53f510ae18
|
Bump version to v0.0.4
|
2020-12-17 21:00:36 +03:00 |
|
TatianaLopaeva
|
def290f8eb
|
Web: People: Fixed displaying of header (Android).
|
2020-12-17 20:16:26 +03:00 |
|
|
326d234773
|
Update yarn.lock files
|
2020-12-17 18:35:04 +03:00 |
|
|
de4e0de1ed
|
Web: People: remove useless console.log from ProfileInfo
|
2020-12-17 17:40:10 +03:00 |
|
|
42a496f442
|
Web: People: removed componentDidMount from filter, fixed profile group select
|
2020-12-17 17:37:22 +03:00 |
|
|
9da7eb90b0
|
Web: People: fixed minDate, maxDate to profile dates
|
2020-12-17 15:17:32 +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 |
|
|
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 |
|
|
2b766b2862
|
Web: People: fixed Row checkedProps
|
2020-12-17 12:36:02 +03:00 |
|
Ilya Oleshko
|
2fe145d556
|
Web: People : Home : Fixed group menu out of screen
|
2020-12-17 12:19:18 +03:00 |
|
|
d849ac9c38
|
Web: People: Fixed empty phone and password inputs in ProfileAction
|
2020-12-17 12:08:57 +03:00 |
|
|
91a9255bbc
|
Web: People: fixed access to action menu
|
2020-12-17 11:11:12 +03:00 |
|
|
bc2bea064f
|
Web: People: added minDate to DatePicker
|
2020-12-17 11:09:44 +03:00 |
|
|
02698ae515
|
Web: People: fixed GroupAction translations
|
2020-12-17 11:06:46 +03:00 |
|
|
41bca489bb
|
Fixed versions (About version)
|
2020-12-16 19:09:56 +03:00 |
|
TatianaLopaeva
|
b1829fc49e
|
Web: People: Profile: Added check for ios & refactoring.
|
2020-12-16 16:28:30 +03:00 |
|
TatianaLopaeva
|
5cefde1bea
|
Web: People: Profile: Fixed automatic scrolling down on page refresh (ipad (safari/chrome))
|
2020-12-16 16:15:27 +03:00 |
|
TatianaLopaeva
|
5c2aba0d13
|
Web: People: Profile: Refactoring.
|
2020-12-16 12:42:00 +03:00 |
|
TatianaLopaeva
|
3fd5cda0cf
|
Web: People: Profile: Refactoring
|
2020-12-16 12:40:22 +03:00 |
|
|
4afadf2e0c
|
Web: Added support of public folders + moved back to original index.html
|
2020-12-15 19:27:30 +03:00 |
|
|
c9293ac86d
|
Merge branch 'develop' into feature/workspaces
# Conflicts:
# packages/asc-web-common/src/components/FilterInput/FilterInput.js
# packages/asc-web-common/src/components/FilterInput/sub-components/SortComboBox.js
# packages/asc-web-common/src/components/PageLayout/index.js
# packages/asc-web-common/src/components/PageLayout/sub-components/article-body.js
# packages/asc-web-common/src/components/PageLayout/sub-components/article-header.js
# packages/asc-web-common/src/components/PageLayout/sub-components/article-main-button.js
# packages/asc-web-common/src/components/PageLayout/sub-components/section-body.js
# packages/asc-web-common/src/components/PageLayout/sub-components/section-header.js
# packages/asc-web-common/src/components/PrivateRoute/PrivateRoute.js
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/pages/DocEditor/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/SharingRow.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/index.js
# products/ASC.Files/Client/src/store/files/actions.js
# products/ASC.Files/Client/yarn.lock
# products/ASC.People/Client/package.json
# products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/ContactField.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/DateField.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/EmailField.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/RadioField.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/TextChangeField.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/TextField.js
# products/ASC.People/Client/src/index.js
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/package.json
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Client/src/components/pages/Confirm/index.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/activateEmail.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeEmail.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeOwner.js
# web/ASC.Web.Client/src/helpers/confirmRoute.js
# web/ASC.Web.Client/src/index.js
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/yarn.lock
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/yarn.lock
# web/ASC.Web.Login/src/LoginContent.jsx
# web/ASC.Web.Login/src/sub-components/register-container.js
# yarn.lock
|
2020-12-15 18:40:27 +03:00 |
|
Artem Tarasov
|
91bce60705
|
Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
# web/ASC.Web.Components/src/components/drop-down/index.js
|
2020-12-15 16:33:01 +03:00 |
|
TatianaLopaeva
|
eb0743a3ad
|
Web: Common/People/Files: Added simplified functionality of scrolling up when switching to a new page.
|
2020-12-15 14:08:14 +03:00 |
|
TatianaLopaeva
|
0dd8f2858a
|
Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
# web/ASC.Web.Common/src/components/PageLayout/sub-components/article.js
|
2020-12-14 21:30:39 +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 |
|
TatianaLopaeva
|
0c615d470b
|
Web: Took the information about the width of the window from the store
|
2020-12-14 19:50:54 +03:00 |
|
TatianaLopaeva
|
b695e9d081
|
Web: People: Profile: Removed automatic scrolling down after multiple updates (ipad)
|
2020-12-14 16:37:18 +03:00 |
|
Ilya Oleshko
|
460b1ec0d9
|
Web: People : Home : Fixed fetch users after profile navigation
|
2020-12-11 16:03:48 +03:00 |
|
TatianaLopaeva
|
aa6eebb51b
|
Web: Files/People: Home: Fixed the displaying load of section header
|
2020-12-11 14:21:37 +03:00 |
|
TatianaLopaeva
|
c9a8027ddf
|
Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/pages/Home/index.js
# products/ASC.Files/Client/src/store/files/actions.js
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/src/components/PageLayout/index.js
# web/ASC.Web.Common/src/components/PageLayout/sub-components/section-body.js
# web/ASC.Web.Common/src/components/PageLayout/sub-components/section-header.js
# web/ASC.Web.Common/src/store/auth/actions.js
# web/ASC.Web.Common/src/store/auth/reducer.js
# web/ASC.Web.Components/package.json
|
2020-12-11 11:12:28 +03:00 |
|
Artem Tarasov
|
72a21a1def
|
Merge branch 'develop' into bugfix/dropdown-fix
|
2020-12-10 20:46:24 +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 |
|
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 |
|
Artem Tarasov
|
6511557445
|
Web: Components/People: applied prop showDisabledItems
|
2020-12-09 13:09:41 +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 |
|
|
ce4a3e3338
|
Update yarn.lock files
|
2020-12-08 18:17:46 +03:00 |
|
|
7d3dde38c4
|
Update yarn.lock files
|
2020-12-08 15:26:54 +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
|
071f6c27c3
|
Merge branch 'develop' into bugfix/dropdown-fix
# Conflicts:
# web/ASC.Web.Common/package.json
|
2020-12-08 13:15:02 +03:00 |
|
|
c48b5783f1
|
People: search ignore case
|
2020-12-07 19:56:59 +03:00 |
|
Ilya Oleshko
|
4147d2f31a
|
Web: Fixed temp loaders
|
2020-12-07 11:11:04 +03:00 |
|
|
71b6e9f27d
|
Web: Files: init Files build and loading (Moved out from CRA)
|
2020-12-07 10:49:07 +03:00 |
|
Ilya Oleshko
|
83466bd638
|
Merge branch 'develop' into bugfix/login-fix
|
2020-12-07 09:52:04 +03:00 |
|
|
70aa6c023d
|
Web: Added dynostore for people reducers loading
|
2020-12-06 20:15:01 +03:00 |
|
Artem Tarasov
|
93da24a63a
|
Web: Common/Files/People: fixed z-index
|
2020-12-04 14:58:37 +03:00 |
|
|
0784453daf
|
Fix errors on login and logout
|
2020-12-04 14:21:51 +03:00 |
|
|
1675896294
|
Merge branch 'develop' into feature/dotnet5
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Services/WCFService/IFileStorageService.cs
|
2020-12-04 11:59:10 +03:00 |
|
Ilya Oleshko
|
d03584fcdd
|
Web: Fixed isAuthenticated logic
|
2020-12-04 11:38:15 +03:00 |
|
|
a39192ff21
|
Web: Common: added new containers styles, added classNames to people and files containers
|
2020-12-03 18:03:05 +03:00 |
|
TatianaLopaeva
|
715b732706
|
Web: People: Refactoring
|
2020-12-03 17:22:27 +03:00 |
|
TatianaLopaeva
|
126f907d19
|
Web: People: Canceled scrolling up when blocking and deleting a user without calling the context menu
|
2020-12-03 16:21:48 +03:00 |
|
|
1ed59c1694
|
Web: People: init People build and loading (Moved out from CRA)
|
2020-12-03 13:09:33 +03:00 |
|
|
228c304211
|
Merge branch 'develop' into feature/asc-files-tests
|
2020-12-01 12:29:36 +03:00 |
|
TatianaLopaeva
|
2cebf625fc
|
Merge branch 'develop' into feature/fix-hide/show-header
|
2020-12-01 10:45:48 +03:00 |
|
|
f10f6b8d3b
|
Update yarn.lock files
|
2020-11-30 15:11:23 +03:00 |
|
|
4ad116937a
|
Merge branch 'develop' into bugfix/fix-empty-screen-description
|
2020-11-30 13:27:35 +03:00 |
|
|
c029a2df04
|
Web: People: fixed text alignment
|
2020-11-30 12:15:45 +03:00 |
|
|
8c965fa4e1
|
Web: People: changed empty screen description, fixed icons alignment
|
2020-11-28 13:44:31 +03:00 |
|
|
a0adc29899
|
Web: People: fixed alignment and color of icons
|
2020-11-28 13:15:30 +03:00 |
|
|
83e4db1e7f
|
Web: People: removed useless buttons styles
|
2020-11-28 13:05:10 +03:00 |
|
|
2b7480a200
|
Web: People: fixed headers fontWeight
|
2020-11-28 13:03:53 +03:00 |
|
TatianaLopaeva
|
e64b93da30
|
Merge branch 'develop' into feature/fix-hide/show-header
|
2020-11-27 11:22:50 +03:00 |
|
|
40546da35d
|
fix create file
|
2020-11-26 20:30:57 +03:00 |
|
|
afc280904b
|
Web: People: fixed passwordSettings minLength
|
2020-11-26 12:27:09 +03:00 |
|
|
4a1023808c
|
People: filter groups
|
2020-11-24 16:13:49 +03:00 |
|
|
b2832468c4
|
Frontend: client's code re-organization
|
2020-11-24 13:18:23 +03:00 |
|
TatianaLopaeva
|
bcadb285c2
|
Web: Common: Rename id for scroll
|
2020-11-24 11:26:10 +03:00 |
|
TatianaLopaeva
|
df1cc9bc80
|
Web: Common: Changed the conditions for scrolling the page up
|
2020-11-24 11:15:37 +03:00 |
|
|
beee70cd15
|
yarn workspaces init commit
|
2020-11-21 16:07:23 +03:00 |
|
Artem Tarasov
|
f2d15f07f8
|
Web: People: Filter: changed translation of elements in the sorting list
|
2020-11-20 12:43:35 +03:00 |
|
TatianaLopaeva
|
70f5118e13
|
Web: Common: Fixed issue with displaying context menu
|
2020-11-20 11:08:26 +03:00 |
|
TatianaLopaeva
|
975780ba25
|
Merge branch 'develop' into feature/fix-hide/show-header
|
2020-11-18 11:03:55 +03:00 |
|
TatianaLopaeva
|
b0df4eb3c9
|
Web/Common: Fixed show visible header when switching from desktop to tablet
|
2020-11-17 21:23:33 +03:00 |
|
|
6cb92946be
|
fix uploadmemberphoto
|
2020-11-17 18:01:34 +03:00 |
|
|
eb6b54482e
|
fix warnings
|
2020-11-17 13:47:17 +03:00 |
|
TatianaLopaeva
|
25fa29f500
|
Merge branch 'develop' into feature/fix-hide/show-header
|
2020-11-17 11:39:40 +03:00 |
|
|
75fce656f0
|
Merge branch 'develop' into feature/dotnet5
|
2020-11-17 11:31:14 +03:00 |
|
Alexey Kostenko
|
3702bd597d
|
Web: Common: Refactoring HOC withLayoutSize
|
2020-11-17 10:32:02 +03:00 |
|
Alexey Kostenko
|
c6d4b5bf60
|
Merge branch 'develop' into hotfix/filter-input-hotfix
|
2020-11-17 08:11:35 +03:00 |
|
Alexey Kostenko
|
99ae4dba20
|
Web: People: Changed Consumer to HOC
|
2020-11-17 06:39:08 +03:00 |
|
|
cd523404f1
|
Merge branch 'develop' into refactoring/scope
|
2020-11-16 17:09:19 +03:00 |
|
Alexey Kostenko
|
af8ce86d2d
|
Merge branch 'develop' into hotfix/filter-input-hotfix
|
2020-11-16 12:36:55 +03:00 |
|
TatianaLopaeva
|
e6fac866fe
|
Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
# web/ASC.Web.Common/src/components/NavMenu/index.js
# web/ASC.Web.Common/src/components/NavMenu/sub-components/header.js
|
2020-11-16 10:29:35 +03:00 |
|
|
a66f99f574
|
net5.0
|
2020-11-15 18:55:57 +03:00 |
|
|
68483bc979
|
Merge branch 'develop' into refactoring/scope
# Conflicts:
# common/ASC.FederatedLogin/LoginProviders/BoxLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/DocuSignLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/DropboxLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/GoogleLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/OneDriveLoginProvider.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Startup.cs
|
2020-11-13 16:03:17 +03:00 |
|
Alexey Kostenko
|
df060ba8a2
|
Merge branch 'develop' into hotfix/filter-input-hotfix
|
2020-11-13 10:58:34 +03:00 |
|
Viktor Fomin
|
fc33f10e37
|
Merge branch 'develop' into feature/filter-loader
|
2020-11-13 10:30:09 +03:00 |
|
|
2ec76cae70
|
Merge branch 'develop' into bugfix/x-www-form-urlencoded
|
2020-11-12 18:03:10 +03:00 |
|
Viktor Fomin
|
4c398104cb
|
Update yarn.lock files
|
2020-11-12 15:06:18 +03:00 |
|
Alexey Kostenko
|
913c45a00b
|
Merge branch 'develop' into hotfix/filter-input-hotfix
|
2020-11-12 14:40:46 +03:00 |
|
Viktor Fomin
|
9890f1cc43
|
Update yarn.lock files
|
2020-11-12 13:37:13 +03:00 |
|
Viktor Fomin
|
0bb00e39db
|
Web: People: added header loader
|
2020-11-12 13:31:19 +03:00 |
|
Alexey Kostenko
|
366989ea9c
|
Web: People: Added sectionWidth prop to filterInput
|
2020-11-12 11:23:08 +03:00 |
|
Viktor Fomin
|
3dc69fc9e8
|
Web: People: added group loader
|
2020-11-12 00:12:28 +03:00 |
|
Viktor Fomin
|
45e9ab5aea
|
Merge branch 'develop' into feature/filter-loader
|
2020-11-11 23:26:03 +03:00 |
|
|
d8bd2b7d21
|
Update yarn.lock files
|
2020-11-11 22:03:47 +03:00 |
|
|
c4411f7b00
|
Merge branch 'develop' into hotfix/section-loader
|
2020-11-11 21:54:02 +03:00 |
|
SuhorukovAnton
|
9039c810c5
|
x-www-form-urlencoded: fix
|
2020-11-11 18:36:58 +03:00 |
|
Viktor Fomin
|
d2a30544d6
|
Merge branch 'feature/filter-loader' of github.com:ONLYOFFICE/AppServer into feature/filter-loader
|
2020-11-11 17:38:10 +03:00 |
|
Viktor Fomin
|
91bc88ad28
|
Update yarn.lock files
|
2020-11-11 17:37:48 +03:00 |
|
Viktor Fomin
|
2cc252c2ae
|
Merge branch 'develop' into feature/filter-loader
|
2020-11-11 16:42:22 +03:00 |
|
Artem Tarasov
|
006ac1bb19
|
Update yarn.lock files
|
2020-11-11 16:16:30 +03:00 |
|
Alexey Kostenko
|
63dad62226
|
Web: People: Do not show the loader if the data has already been loaded (Switching from the profile page to the main page)
|
2020-11-11 15:46:46 +03:00 |
|
Alexey Kostenko
|
7a6a9b539b
|
Web: People: Fixed loading of the main page when switching from a profile
|
2020-11-11 14:09:40 +03:00 |
|
Viktor Fomin
|
40e2d85dbd
|
Update yarn.lock files
|
2020-11-11 13:27:17 +03:00 |
|
TatianaLopaeva
|
58ee96df1f
|
Web: Common: Fixed display of header
|
2020-11-11 12:09:19 +03:00 |
|
TatianaLopaeva
|
b8cb6f2508
|
Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
# web/ASC.Web.Common/src/components/PageLayout/sub-components/section-header.js
|
2020-11-11 10:13:03 +03:00 |
|
Viktor Fomin
|
0852dd0814
|
Merge branch 'feature/filter-loader' of github.com:ONLYOFFICE/AppServer into feature/filter-loader
|
2020-11-10 18:25:25 +03:00 |
|
Viktor Fomin
|
2ebd7e882c
|
Web: People: fix first loader
|
2020-11-10 18:20:56 +03:00 |
|
Viktor Fomin
|
df4c89cb91
|
Merge branch 'develop' into feature/filter-loader
|
2020-11-10 18:09:58 +03:00 |
|
Viktor Fomin
|
0490c8c3f0
|
Update yarn.lock files
|
2020-11-10 18:08:51 +03:00 |
|
Viktor Fomin
|
a82551568b
|
Web: People: fix props name
|
2020-11-10 17:30:43 +03:00 |
|
SuhorukovAnton
|
6e2860a7e5
|
Merge branch 'develop' into bugfix/x-www-form-urlencoded
|
2020-11-10 14:51:33 +03:00 |
|
SuhorukovAnton
|
44e565ca37
|
x-www-form-urlencoded: add models
|
2020-11-10 13:41:32 +03:00 |
|
Artem Tarasov
|
4031a609b8
|
Merge branch 'develop' into hotfix/documents-bugfix
# Conflicts:
# web/ASC.Web.Common/package.json
# web/ASC.Web.Components/src/components/icons/svg/index.js
|
2020-11-10 13:34:04 +03:00 |
|
|
1490332568
|
Merge branch 'develop' into refactoring/scope
# Conflicts:
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
# products/ASC.Files/Core/Helpers/WordpressHelper.cs
# products/ASC.Files/Server/Controllers/PrivacyRoomController.cs
# products/ASC.Files/Server/Startup.cs
|
2020-11-10 11:42:50 +03:00 |
|
Viktor Fomin
|
834e8e6516
|
Update yarn.lock files
|
2020-11-10 10:46:26 +03:00 |
|
Viktor Fomin
|
8648abedbd
|
Web: People: delete first header preloader
|
2020-11-10 10:40:33 +03:00 |
|
Viktor Fomin
|
afd252e2ce
|
Web: People: fix profile action loader
|
2020-11-10 03:08:59 +03:00 |
|
Viktor Fomin
|
a7dee56194
|
Update yarn.lock files
|
2020-11-09 23:01:57 +03:00 |
|
Viktor Fomin
|
9f19173195
|
Web: People: added circle in row
|
2020-11-09 22:57:02 +03:00 |
|
TatianaLopaeva
|
c458c2d4fd
|
Web: Common: Changed styles by layout
|
2020-11-09 20:50:02 +03:00 |
|
Viktor Fomin
|
6e8685d8d6
|
Update yarn.lock files
|
2020-11-09 16:54:13 +03:00 |
|
Viktor Fomin
|
b3f4bd3f64
|
Update yarn.lock files
|
2020-11-09 15:16:44 +03:00 |
|
Viktor Fomin
|
33ef924307
|
Web: People: fix first loader
|
2020-11-09 15:11:04 +03:00 |
|
Viktor Fomin
|
b0d202f7c9
|
Update yarn.lock files
|
2020-11-09 13:17:06 +03:00 |
|
Viktor Fomin
|
884cb67a35
|
Web: People: delete logo
|
2020-11-09 13:07:43 +03:00 |
|
Viktor Fomin
|
445b2e83b5
|
Web: People: delete loading label
|
2020-11-09 12:37:13 +03:00 |
|
Viktor Fomin
|
c2e74d3756
|
Update yarn.lock files
|
2020-11-06 18:43:16 +03:00 |
|
Viktor Fomin
|
b1f9db662d
|
Web: People: fix color
|
2020-11-06 16:17:56 +03:00 |
|
SuhorukovAnton
|
89c6e5548c
|
x-www-form-urlencoded: fix
|
2020-11-06 13:39:25 +03:00 |
|
SuhorukovAnton
|
7b8efca8b3
|
x-www-form-urlencoded: fix
|
2020-11-06 12:46:57 +03:00 |
|
SuhorukovAnton
|
855c5bc92b
|
x-www-form-urlencoded: first version
|
2020-11-06 12:03:49 +03:00 |
|
Viktor Fomin
|
151dc898f5
|
Update yarn.lock files
|
2020-11-05 12:28:39 +03:00 |
|
Artem Tarasov
|
38c7faec04
|
Merge branch 'develop' into hotfix/documents-bugfix
|
2020-11-05 11:57:55 +03:00 |
|
Artem Tarasov
|
ace2111197
|
Web: People: applied prop size for Avatar Component
|
2020-11-05 11:40:19 +03:00 |
|
Viktor Fomin
|
3bdff517f9
|
Web: People: rename headers components
|
2020-11-05 11:16:33 +03:00 |
|
TatianaLopaeva
|
7e034e60de
|
Web: Common: Added display condition for section-header when group button menu is visible
|
2020-11-05 10:39:53 +03:00 |
|
TatianaLopaeva
|
8f47fe938c
|
Merge branch 'develop' into feature/fix-hide/show-header
|
2020-11-05 10:35:16 +03:00 |
|
Artem Tarasov
|
df9a1658e9
|
Web: People: refactoring
|
2020-11-05 09:44:20 +03:00 |
|
Artem Tarasov
|
6a4cabcedf
|
Web: Components/Files/People: fix styles
|
2020-11-05 09:22:14 +03:00 |
|
|
79ea471098
|
Merge branch 'develop' into refactoring/scope
# Conflicts:
# common/ASC.Api.Core/Core/BaseStartup.cs
# common/ASC.Core.Common/BaseCommonLinkUtility.cs
# common/services/ASC.ApiSystem/Startup.cs
# common/services/ASC.Data.Backup/BackupServiceLauncher.cs
# common/services/ASC.Data.Backup/Startup.cs
# common/services/ASC.Data.Storage.Migration/Program.cs
# common/services/ASC.Notify/NotifyServiceLauncher.cs
# common/services/ASC.Notify/Program.cs
# common/services/ASC.Socket.IO.Svc/Program.cs
# common/services/ASC.Studio.Notify/Program.cs
# common/services/ASC.Thumbnails.Svc/Program.cs
# common/services/ASC.UrlShortener.Svc/Program.cs
# products/ASC.Files/Core/Configuration/ProductEntryPoint.cs
# products/ASC.Files/Server/Startup.cs
# products/ASC.Files/Service/Program.cs
# products/ASC.People/Server/Startup.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Startup.cs
# web/ASC.Web.Studio/Startup.cs
|
2020-11-04 15:22:43 +03:00 |
|
Viktor Fomin
|
72467a70c2
|
Web: People: fix header loader
|
2020-11-04 12:24:02 +03:00 |
|
Viktor Fomin
|
91c254c638
|
Web: Common: fix main button loader
|
2020-11-03 18:36:19 +03:00 |
|
Vladislav Makhov
|
22a494a5ad
|
yarn.lock update
|
2020-11-03 17:39:49 +03:00 |
|
Vladislav Makhov
|
1e483de4ba
|
Merge branch 'develop' into feature/third-party-settings
# Conflicts:
# web/ASC.Web.Client/src/components/pages/Settings/locales/en/translation.json
# web/ASC.Web.Client/src/components/pages/Settings/locales/ru/translation.json
# web/ASC.Web.Client/src/components/pages/Settings/utils/settingsTree.js
# web/ASC.Web.Client/src/store/settings/actions.js
# web/ASC.Web.Client/src/store/settings/reducer.js
# web/ASC.Web.Common/src/api/settings/index.js
# web/ASC.Web.Components/src/components/icons/svg/index.js
|
2020-11-03 15:29:09 +03:00 |
|
|
60e66c1abe
|
Web: Fixed PWA App icon url on iOS
|
2020-11-02 21:42:53 +03:00 |
|
|
7e828b5643
|
Autofac: fix
|
2020-11-02 19:27:08 +03:00 |
|
TatianaLopaeva
|
e876d2939a
|
Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
# web/ASC.Web.Common/src/components/Main/index.js
# web/ASC.Web.Common/src/components/PageLayout/index.js
# web/ASC.Web.Common/src/components/PageLayout/sub-components/article.js
|
2020-11-02 16:41:52 +03:00 |
|
Ilya Oleshko
|
318202ca57
|
Web: People : UserContent : Added sectionWidth property, fixed missing styles
|
2020-10-30 14:23:56 +03:00 |
|
Ilya Oleshko
|
b055c0224a
|
Web: People : Body : Added context to RowContainer
|
2020-10-30 14:23:23 +03:00 |
|
Ilya Oleshko
|
648427fbf4
|
Web: People : Header : Added context to Header
|
2020-10-30 14:22:48 +03:00 |
|
|
bc725f29df
|
Web: Common: added re-resizable package, added new acticle
|
2020-10-29 17:33:05 +03:00 |
|
|
265feee81e
|
Refactoring: scope
|
2020-10-29 12:31:55 +03:00 |
|
|
049e8f63e9
|
Refactoring: scope.
|
2020-10-29 11:13:51 +03:00 |
|
TatianaLopaeva
|
d7a8226671
|
Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
# web/ASC.Web.Common/src/components/Main/index.js
|
2020-10-28 19:02:51 +03:00 |
|
|
51f1f92307
|
Scope: refactoring.
|
2020-10-28 15:26:27 +03:00 |
|
|
e9a9b320e8
|
Scope: refactoring. Notify, People
|
2020-10-27 18:34:22 +03:00 |
|
Vladislav Makhov
|
eab8d8e8e2
|
update yarn.lock
|
2020-10-27 14:28:56 +03:00 |
|
TatianaLopaeva
|
1c09c48152
|
Merge branch 'develop' into feature/fix-hide/show-header
|
2020-10-27 10:52:12 +03:00 |
|
Vladislav Makhov
|
64a72b522f
|
Update yarn.lock
|
2020-10-27 10:49:55 +03:00 |
|
|
cb849577fb
|
Update yarn.lock files
|
2020-10-23 13:45:17 +03:00 |
|
|
b585313aa5
|
Update yarn.lock files
|
2020-10-23 12:21:57 +03:00 |
|
TatianaLopaeva
|
ce6f879f67
|
Web: People/Common added Layout
|
2020-10-22 20:09:44 +03:00 |
|
TatianaLopaeva
|
cf62d42532
|
Web:Added styled
|
2020-10-22 13:15:02 +03:00 |
|
TatianaLopaeva
|
8a62445203
|
Web: People/Common Added full page scroll
|
2020-10-22 10:52:42 +03:00 |
|
|
05a6034b05
|
Merge branch 'develop' into feature/people-filter-empty-screen
|
2020-10-19 20:53:59 +03:00 |
|
|
830c73a134
|
Scope: refactoring
|
2020-10-19 18:53:15 +03:00 |
|
Alexey Kostenko
|
5adc0f8697
|
Web: People: Added loader when switching groups
|
2020-10-19 14:15:04 +03:00 |
|
TatianaLopaeva
|
2dd956c700
|
Update yarn.lock files
|
2020-10-19 13:41:22 +03:00 |
|
TatianaLopaeva
|
41d0c3e9d9
|
Merge branch 'develop' into feature/people-filter-empty-screen
|
2020-10-19 12:11:34 +03:00 |
|
|
181ac04fd8
|
DI: register fix
|
2020-10-18 19:34:30 +03:00 |
|
|
ed50f3bc98
|
Update yarn.lock files
|
2020-10-16 16:38:11 +03:00 |
|
|
2ab62c351e
|
Web: People: Applied prettier style fix
|
2020-10-16 16:23:51 +03:00 |
|
TatianaLopaeva
|
14af00ffd7
|
Web: Added styles and changed images by layout
|
2020-10-16 16:21:33 +03:00 |
|
TatianaLopaeva
|
acfe89b4f4
|
Web: People: Fixed the error of returning to the list of users immediately after refreshing the page and switching to the profile view
|
2020-10-16 14:54:13 +03:00 |
|
Alexey Kostenko
|
94a31036eb
|
Fixed navigation (after create user did not work)
|
2020-10-16 08:55:44 +03:00 |
|
Alexey Kostenko
|
7230d2a48e
|
Web: People: Fixed navigation (after saving profile changes did not work)
|
2020-10-16 07:17:58 +03:00 |
|
|
ff1c1765b5
|
Web: Clients: Turned off Suspense fallback
|
2020-10-15 18:07:23 +03:00 |
|
Alexey Kostenko
|
df4c926436
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-15 13:50:05 +03:00 |
|
Alexey Kostenko
|
5bd7a3b29c
|
Web: People: Fix loading main People page, after switching from profile
|
2020-10-15 13:49:55 +03:00 |
|
TatianaLopaeva
|
14bb36900c
|
Update yarn.lock files
|
2020-10-15 11:22:58 +03:00 |
|
|
ea97ca05c2
|
Update yarn.lock files
|
2020-10-14 17:57:29 +03:00 |
|
TatianaLopaeva
|
f8353c5974
|
Web: People: Added translate for sex status
|
2020-10-14 14:02:24 +03:00 |
|
Alexey Kostenko
|
d7d2a94181
|
Web: People: Added missing translations
|
2020-10-14 12:48:19 +03:00 |
|
Alexey Kostenko
|
f16145ae62
|
Merge branch 'feature/files' into feature/avatar-editor-redesign
|
2020-10-13 17:00:18 +03:00 |
|
Alexey Kostenko
|
e95be64ea6
|
Web: Components/People: Small refactoring
|
2020-10-13 16:57:44 +03:00 |
|
|
49f5a52433
|
Update yarn.lock files
|
2020-10-13 16:52:17 +03:00 |
|
|
8205c230c7
|
Web: Clients: Added displaying Loader.Filter for MainButton
|
2020-10-13 16:43:41 +03:00 |
|
|
2fa205cb6f
|
Web: Clients: Fixed catching of initial API errors
|
2020-10-13 16:31:21 +03:00 |
|
Alexey Kostenko
|
8e5db50b9a
|
Web: People: Show data loss warning on exit
|
2020-10-13 16:24:46 +03:00 |
|
|
746ecc7f40
|
Web: Clients: Fixed applying single cursor on loading
|
2020-10-13 16:20:49 +03:00 |
|
Alexey Kostenko
|
e5254e0a54
|
Web: People: Fixed saving empty image when creating user
|
2020-10-13 15:53:53 +03:00 |
|
|
3dd9f71dda
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-13 15:51:24 +03:00 |
|
|
5d76e7e6b0
|
Web: Redesigned displaying of loading processes
|
2020-10-13 15:51:14 +03:00 |
|
|
668cb3e893
|
Merge branch 'master' into feature/files
|
2020-10-13 15:27:31 +03:00 |
|
Alexey Kostenko
|
30032bdce9
|
Web: People: Removed "is loading" from save button when upload image
|
2020-10-13 14:06:36 +03:00 |
|
|
0ae5ec1b1b
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-13 14:02:11 +03:00 |
|
|
b53e34a0f0
|
Web: Removed useless Link duplicates
|
2020-10-13 14:02:04 +03:00 |
|
Alexey Kostenko
|
31fee3c405
|
Web: People: Reset profile after editing or creating profile
|
2020-10-13 13:49:11 +03:00 |
|
Artem Tarasov
|
a4a959f972
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-13 13:43:16 +03:00 |
|
|
9968873305
|
Merge branch 'master' into feature/fix_API_return
# Conflicts:
# web/ASC.Web.Api/Controllers/SettingsController.cs
|
2020-10-13 13:33:24 +03:00 |
|
|
a504251359
|
Merge pull request #99 from ONLYOFFICE/feature/fix-changing-language
Feature/fix changing language
|
2020-10-13 12:55:37 +03:00 |
|
|
02f39a9c71
|
Merge branch 'master' into feature/files
# Conflicts:
# common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20201006101804_WebstudioDbContextMySql.cs
# common/ASC.Core.Common/Migrations/Npgsql/WebstudioDbContextNpgsql/20200929102646_WebstudioDbContextNpgsql.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# web/ASC.Web.Core/Files/FileUtility.cs
|
2020-10-13 12:52:28 +03:00 |
|
TatianaLopaeva
|
4ef2db2ed0
|
Web: Update yarn.lock
|
2020-10-13 12:37:34 +03:00 |
|
TatianaLopaeva
|
2f72748f2b
|
Web: Added getLanguage selector
|
2020-10-13 11:19:24 +03:00 |
|
TatianaLopaeva
|
f0299db016
|
Update yarn.lock
|
2020-10-13 11:14:09 +03:00 |
|
Alexey Kostenko
|
72ac2f5875
|
Web: People: Fixed avatar editor when creating user
|
2020-10-13 10:06:05 +03:00 |
|
Artem Tarasov
|
1173410695
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-13 10:05:53 +03:00 |
|
TatianaLopaeva
|
f6a5c8a30b
|
Web: People: added deleting cache and refactoring
|
2020-10-13 09:45:23 +03:00 |
|
|
c622be89a3
|
revert discard
|
2020-10-12 22:39:23 +03:00 |
|
|
43b9c33979
|
fix formating
|
2020-10-12 19:23:15 +03:00 |
|
TatianaLopaeva
|
1010886262
|
Web: Refactoring
|
2020-10-12 16:56:34 +03:00 |
|
|
36034bf97a
|
fix warnings
|
2020-10-12 16:52:31 +03:00 |
|
Alexey Kostenko
|
54f68cb02a
|
Web: People: Fixed adding avatar then create user
|
2020-10-12 16:13:14 +03:00 |
|
Artem Tarasov
|
8621f9f321
|
Web: People: profileView: fixed loader
|
2020-10-12 13:06:00 +03:00 |
|
Alexey Kostenko
|
fd2c71dce2
|
Web: People: Fixed avatar editor page (the path to the avatar was put into storage)
|
2020-10-12 10:04:40 +03:00 |
|
Alexey Kostenko
|
99262bdae6
|
Web: People: fix desktop avatarEditor
|
2020-10-12 08:59:17 +03:00 |
|
Alexey Kostenko
|
5838cd617c
|
Web: People: Return to profile editor after save avatar
|
2020-10-12 07:12:32 +03:00 |
|
Alexey Kostenko
|
237f737ba7
|
Merge branch 'feature/files' into feature/avatar-editor-redesign
|
2020-10-11 20:04:18 +03:00 |
|
|
ee6307e288
|
Web: People: Added hack for build machine only
|
2020-10-09 19:14:48 +03:00 |
|
Artem Tarasov
|
d7d9a55e50
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-09 16:23:41 +03:00 |
|
TatianaLopaeva
|
5f0c974629
|
Web: People: Added console.log
|
2020-10-09 16:16:28 +03:00 |
|
Artem Tarasov
|
24c799ed76
|
Web: People: applied ProfileView loader
|
2020-10-09 16:10:29 +03:00 |
|
|
e01ee037f2
|
Merge branch 'master' into feature/fix-messages
# Conflicts:
# common/ASC.Core.Common/Billing/TariffService.cs
# common/ASC.Core.Common/EF/Context/BaseDbContext.cs
# common/ASC.Core.Common/EF/Context/CoreDbContext.cs
# common/ASC.Core.Common/EF/Context/DbContext.cs
# common/ASC.Core.Common/EF/Context/DbContextManager.cs
# common/ASC.Core.Common/EF/Context/FeedDbContext.cs
# common/ASC.Core.Common/EF/Context/FilesDbContext.cs
# common/ASC.Core.Common/EF/Context/MessagesContext.cs
# common/ASC.Core.Common/EF/Context/ResourceDbContext.cs
# common/ASC.Core.Common/EF/Context/TelegramDbContext.cs
# common/ASC.Core.Common/EF/Context/WebstudioDbContext.cs
# common/ASC.Core.Common/EF/Model/AccountLinks.cs
# common/ASC.Core.Common/EF/Model/Core/Acl.cs
# common/ASC.Core.Common/EF/Model/Core/DbCoreSettings.cs
# common/ASC.Core.Common/EF/Model/Core/DbSubscriptionMethod.cs
# common/ASC.Core.Common/EF/Model/Core/Subscription.cs
# common/ASC.Core.Common/EF/Model/DbWebstudioSettings.cs
# common/ASC.Core.Common/EF/Model/DbWebstudioUservisit.cs
# common/ASC.Core.Common/EF/Model/Feed/FeedReaded.cs
# common/ASC.Core.Common/EF/Model/Feed/FeedUsers.cs
# common/ASC.Core.Common/EF/Model/FilesConverts.cs
# common/ASC.Core.Common/EF/Model/MobileAppInstall.cs
# common/ASC.Core.Common/EF/Model/Resource/ResAuthorsFile.cs
# common/ASC.Core.Common/EF/Model/Resource/ResAuthorsLang.cs
# common/ASC.Core.Common/EF/Model/TelegramUser.cs
# common/ASC.Core.Common/EF/Model/Tenant/DbButton.cs
# common/ASC.Core.Common/EF/Model/Tenant/DbQuotaRow.cs
# common/ASC.Core.Common/EF/Model/User/UserGroup.cs
# common/ASC.Core.Common/HostedSolution.cs
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# common/ASC.Data.Reassigns/QueueWorker.cs
# common/ASC.Data.Reassigns/ReassignProgressItem.cs
# common/ASC.Data.Reassigns/RemoveProgressItem.cs
# common/ASC.VoipService/Dao/CachedVoipDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/DaoFactory.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/EF/DbEncryptedData.cs
# products/ASC.Files/Core/Core/EF/DbFile.cs
# products/ASC.Files/Core/Core/EF/DbFilesBunchObjects.cs
# products/ASC.Files/Core/Core/EF/DbFilesSecurity.cs
# products/ASC.Files/Core/Core/EF/DbFilesTagLink.cs
# products/ASC.Files/Core/Core/EF/DbFilesThirdpartyApp.cs
# products/ASC.Files/Core/Core/EF/DbFilesThirdpartyIdMapping.cs
# products/ASC.Files/Core/Core/EF/DbFolderTree.cs
# products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
# products/ASC.Files/Core/Core/Search/FactoryIndexerFolder.cs
# products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderTagDao.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Server/Startup.cs
# web/ASC.Web.Studio/Startup.cs
|
2020-10-09 15:40:44 +03:00 |
|
|
1dfd7afe1c
|
Update yarn.lock files
|
2020-10-09 15:07:41 +03:00 |
|
|
a5c77baae0
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-09 14:57:52 +03:00 |
|
|
065c8daaa0
|
Web: People: Applied Filter loader
|
2020-10-09 14:57:43 +03:00 |
|
TatianaLopaeva
|
77426da7fe
|
Web: People: Added console.log
|
2020-10-09 14:45:15 +03:00 |
|
|
e01f577f39
|
Web: People: Fixed show loading process
|
2020-10-09 13:37:41 +03:00 |
|
SuhorukovAnton
|
370400e4c0
|
fix_API_return: first version
|
2020-10-09 13:05:48 +03:00 |
|
TatianaLopaeva
|
e60eac22f7
|
Web: People: Added color for Icon by layout
|
2020-10-08 17:33:16 +03:00 |
|
TatianaLopaeva
|
9d3381ba9c
|
Web: People: Added Box with displayProp and marginProp property, deleted style from Icon
|
2020-10-08 17:31:27 +03:00 |
|
Alexey Kostenko
|
1f91802257
|
Web: People: Fixed opening avatar editor (Create user)
|
2020-10-08 15:17:44 +03:00 |
|
TatianaLopaeva
|
54d2a99d29
|
Web: People: Added font-weight and color by layout
|
2020-10-08 14:49:57 +03:00 |
|
TatianaLopaeva
|
0e7f19332e
|
Web: People: Deleted unnecessary for EmptyScreenContainer widthProps
|
2020-10-08 14:25:28 +03:00 |
|
TatianaLopaeva
|
51b86b2620
|
Merge branch 'feature/files' into feature/people-filter-empty-screen
|
2020-10-08 14:15:51 +03:00 |
|
Alexey Kostenko
|
1129a00d21
|
Merge branch 'feature/files' into feature/avatar-editor-redesign
|
2020-10-08 14:00:50 +03:00 |
|
|
4059c94e34
|
Merge pull request #91 from ONLYOFFICE/feature/fix-redirect-after-update-profile
Feature/fix redirect after update profile
|
2020-10-08 13:20:31 +03:00 |
|
TatianaLopaeva
|
43dbd9e511
|
Web: People: Changed margin-right by layout
|
2020-10-08 12:04:35 +03:00 |
|
Artem Tarasov
|
3d60e9ac63
|
Web: People: fixed isEdit flag
|
2020-10-08 11:10:55 +03:00 |
|
Alexey Kostenko
|
95c3a379f7
|
Merge branch 'feature/files' into feature/avatar-editor-redesign
|
2020-10-08 11:03:59 +03:00 |
|
Alexey Kostenko
|
1f1dbdee36
|
Web: People: Desktop avatarEditor - Fix rotation bug, fixed Wheel empty image bug, fixed twitching of the picture when saving
|
2020-10-08 10:55:30 +03:00 |
|
Alexey Kostenko
|
f5592333c8
|
Web: People/Client: Fix rotation bug, fixed Wheel empty image bug, fixed twitching of the picture when saving, refactoring (remove callback using)
|
2020-10-08 09:55:20 +03:00 |
|
Artem Tarasov
|
c5dfb870b3
|
Web: People: deleted unusaed variables
|
2020-10-07 17:09:14 +03:00 |
|
Artem Tarasov
|
974ccdbf48
|
Merge branch 'feature/files' into feature/fix-redirect-after-update-profile
# Conflicts:
# products/ASC.People/Client/src/components/Article/Body/index.js
# products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Header/index.js
# products/ASC.People/Client/src/components/pages/Profile/index.js
# products/ASC.People/Client/src/store/profile/actions.js
|
2020-10-07 16:56:36 +03:00 |
|
Alexey Kostenko
|
98fef4e364
|
Web: People: Changed text in header ( avatar editor page )
|
2020-10-07 16:01:42 +03:00 |
|
TatianaLopaeva
|
34506827b5
|
Update yarn.lock
|
2020-10-07 15:53:29 +03:00 |
|
Alexey Kostenko
|
d5b62f7bb2
|
Merge branch 'feature/files' into feature/avatar-editor-redesign
|
2020-10-07 15:30:56 +03:00 |
|
|
e76e50dc79
|
Web: ServiceWorkers: Turned off debug mode
|
2020-10-07 13:43:51 +03:00 |
|
|
11348e5fba
|
Update yarn.lock files
|
2020-10-07 12:58:38 +03:00 |
|
|
2e74a1bde3
|
Web: Replaced some code tot selectors
|
2020-10-07 12:47:55 +03:00 |
|
Alexey Kostenko
|
90a045fa1c
|
Web: People: Refactoring (Moved mobile view of avatar editor from page to component)
|
2020-10-07 11:42:07 +03:00 |
|
Alexey Kostenko
|
5b7b9aacbb
|
Web: People: Added toggle AvatarEditor in redux (this state need for mobile view AvatarEditor)
|
2020-10-07 10:05:44 +03:00 |
|
|
42d7ffae45
|
Web: People: Fixed loading Profile info after change People filter fields
|
2020-10-06 19:26:01 +03:00 |
|
|
7fb3ce6c09
|
Web: People: Added groups for API people loading
|
2020-10-06 19:07:10 +03:00 |
|
|
c2cd41f8f2
|
Web: People: Fixed working of GroupMenu after applied reselect
|
2020-10-06 18:18:01 +03:00 |
|
Alexey Kostenko
|
4a318d4e13
|
Web: People: Removed the ability to go to the avatar editor from the context menu
|
2020-10-06 16:44:01 +03:00 |
|
Alexey Kostenko
|
9a80672059
|
Web: People: Fixed saving empty avatar, removed unused code
|
2020-10-06 15:57:55 +03:00 |
|
Artem Tarasov
|
0244d97007
|
Web: People: rename component LeaveFormDialog to DataLossWarningDialog, action setIsVisibleModalLeave to setIsVisibleDataLossDialog
|
2020-10-06 13:29:11 +03:00 |
|
|
3ad873f1c8
|
Web: People: Restored fields in filtering data
|
2020-10-06 12:46:10 +03:00 |
|
Artem Tarasov
|
045e618c3a
|
Merge branch 'feature/files' into feature/fix-redirect-after-update-profile
|
2020-10-06 12:20:21 +03:00 |
|
Artem Tarasov
|
e0547caad7
|
Web: People: fix routing
|
2020-10-06 11:49:36 +03:00 |
|
|
af756a1e76
|
Web: Fixed opening @self profile view
|
2020-10-06 11:33:53 +03:00 |
|
Alexey Kostenko
|
39ee2f972c
|
Merge branch 'feature/files' into feature/avatar-editor-redesign
|
2020-10-06 11:15:53 +03:00 |
|
Alexey Kostenko
|
2249cec75a
|
Web: People: Fixed upload new photo on avatar page
|
2020-10-06 10:53:26 +03:00 |
|
Alexey Kostenko
|
f429c75ab5
|
Web: People: Added Loader on avatar-editor page
|
2020-10-06 09:38:35 +03:00 |
|
Alexey Kostenko
|
f0f12bff69
|
Web: People: Code formatting
|
2020-10-06 08:46:47 +03:00 |
|
Alexey Kostenko
|
28b2f7630e
|
Web: People: Added translation keys
|
2020-10-06 08:23:20 +03:00 |
|
Alexey Kostenko
|
5df3850527
|
Web: People/Components: Added handling of the cancel button
|
2020-10-06 07:00:37 +03:00 |
|
|
c5f87f8200
|
Web: People: Fixed refresh page with Filter
|
2020-10-05 21:41:04 +03:00 |
|
|
8d7cf4f2dc
|
Web: Replaced getCurrentModule with getCurrentProduct selector
|
2020-10-05 20:56:36 +03:00 |
|
Artem Tarasov
|
16d70a4168
|
Web: People: added LeaveFormDialog to updateUserForm
|
2020-10-05 18:54:57 +03:00 |
|
Artem Tarasov
|
3493ec390a
|
Web: People: added LeaveFormDialog to article, createUser
|
2020-10-05 18:13:33 +03:00 |
|
Artem Tarasov
|
a0873f6db2
|
Web: People: refactoring LeaveFormDialog
|
2020-10-05 18:12:32 +03:00 |
|
Alexey Kostenko
|
b45965a15c
|
Web: Components/People: Added cancel button on avatar editor page
|
2020-10-05 17:15:25 +03:00 |
|
Artem Tarasov
|
5765475684
|
Web: People: added check for editing a form when clicking on a tree
|
2020-10-05 17:13:52 +03:00 |
|
Artem Tarasov
|
09a91ba47f
|
Web: People: refactoring LeaveFormDialog
|
2020-10-05 17:11:58 +03:00 |
|
Artem Tarasov
|
c44543e177
|
Web: People: deleted unusing variables
|
2020-10-05 17:10:28 +03:00 |
|
Alexey Kostenko
|
e6572e9574
|
Web: People/Components: Style fix, added translate keys
|
2020-10-05 15:39:55 +03:00 |
|
|
63ee865d98
|
Merge branch 'feature/files' into feature/loading-acceleration
# Conflicts:
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/index.js
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/src/pages/login/index.js
# web/ASC.Web.Common/src/utils/index.js
|
2020-10-05 15:37:09 +03:00 |
|
Artem Tarasov
|
5159b5c5b1
|
Web: People: added component LeaveFormDialog
|
2020-10-05 15:01:10 +03:00 |
|
Ilya Oleshko
|
df7a8c6515
|
Web: People: Home : Fixed status display
|
2020-10-05 14:59:42 +03:00 |
|
|
978b67f7a7
|
Update yarn.lock files
|
2020-10-05 14:46:07 +03:00 |
|
|
d00d16ee02
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Client/yarn.lock
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/src/components/pages/Wizard/index.js
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/src/api/settings/index.js
# web/ASC.Web.Common/src/pages/login/index.js
# web/ASC.Web.Common/src/store/auth/reducer.js
# web/ASC.Web.Common/src/utils/index.js
# web/ASC.Web.Common/yarn.lock
|
2020-10-05 13:32:26 +03:00 |
|
Artem Tarasov
|
0a248e6f3b
|
Web: People: fixed updating avatar in user list after creating new user
|
2020-10-05 13:29:14 +03:00 |
|
Artem Tarasov
|
0836a55d68
|
Web: People: fixed redirect after editing user via direct link
|
2020-10-05 12:45:16 +03:00 |
|
Artem Tarasov
|
a92365df79
|
fixed filter setting after returning from user/group view/edit
|
2020-10-05 11:29:01 +03:00 |
|
Artem Tarasov
|
0cac098bdf
|
Web: People: fixed updating list of users after creating user
|
2020-10-05 10:50:50 +03:00 |
|