|
|
408f432be6
|
Web: Common: added urls on authenticator app
|
2021-05-20 06:37:56 +03:00 |
|
|
|
b2611343b6
|
Web: Common: get old backup codes
|
2021-05-20 01:44:03 +03:00 |
|
Artem Tarasov
|
5996b3f74f
|
Merge branch 'develop' into bugfix/fixed-styles
|
2021-05-20 01:00:36 +03:00 |
|
Artem Tarasov
|
80a09fdb31
|
Web: Client: NavMenu: fixed position version-box when change orientation or window size
|
2021-05-20 00:57:11 +03:00 |
|
|
|
4e57f2a47f
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
|
2021-05-20 00:47:45 +03:00 |
|
|
|
37267b624f
|
Web: Common: added method for login with code and cookie
|
2021-05-19 18:21:40 +03:00 |
|
Alexey Kostenko
|
f25eb00494
|
Merge branch 'develop' into feature/access-rights-admins
|
2021-05-19 18:05:19 +03:00 |
|
|
|
8785f6151a
|
Web: Common: fixed reloading login page
|
2021-05-19 17:17:07 +03:00 |
|
|
|
03a71ae131
|
Merge branch 'bugfix/context-actions' of https://github.com/ONLYOFFICE/AppServer into bugfix/context-actions
# Conflicts:
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
|
2021-05-19 17:11:46 +03:00 |
|
|
|
3c6f831618
|
Web: Common: Api: Added removeShareFiles api method
|
2021-05-19 16:51:43 +03:00 |
|
|
|
2520544ad0
|
Web: Settings: Backup: Added possibility to disable options and added logic for third-party storage for manual backup.
|
2021-05-19 15:34:26 +03:00 |
|
|
|
2cd59d9014
|
Merge branch 'bugfix/context-actions' of https://github.com/ONLYOFFICE/AppServer into bugfix/context-actions
|
2021-05-19 13:55:13 +03:00 |
|
|
|
d5ff576188
|
Web: Files: Store: Added mark read action, added remove from list and mark read icons
|
2021-05-19 13:54:45 +03:00 |
|
|
|
d55c953805
|
Web: Files: fixed MediaViewer propTypes
|
2021-05-19 13:45:37 +03:00 |
|
|
|
536c6c2f5e
|
Web: Moved custom.scss to @appserver/common
+ Added missing ErrorBoundary
+ Removed useless commented code
|
2021-05-19 11:14:44 +03:00 |
|
|
|
b1b6bdc516
|
Web: Common: refactoring tfa store
|
2021-05-19 03:48:13 +03:00 |
|
|
|
07934f6cd9
|
Web: Common: fixed firefox header
|
2021-05-18 17:59:34 +03:00 |
|
|
|
6c51f15d28
|
Web: Components: fixed toggle-button styles
|
2021-05-18 17:58:45 +03:00 |
|
|
|
20404ad431
|
Web: Settings: Backup: Refactoring and Delete file-input-with-folder-path from components.
|
2021-05-18 15:22:00 +03:00 |
|
|
|
20403e2c98
|
Web: Common: reset tfa app
|
2021-05-17 23:28:52 +03:00 |
|
|
|
e87e0272ae
|
Web: Common: get tfa backup codes
|
2021-05-17 17:32:12 +03:00 |
|
|
|
d34e1eeaa6
|
Web: Common: deleted console.log
|
2021-05-17 16:54:21 +03:00 |
|
|
|
cce7b94d5d
|
Web: Common: deleted console.log
|
2021-05-17 16:52:38 +03:00 |
|
|
|
fadd46112c
|
Web: Common: added login with tfa code method, fixed url
|
2021-05-17 16:33:01 +03:00 |
|
|
|
f5998b650a
|
Web: Common: added login with tfa code method
|
2021-05-17 16:32:40 +03:00 |
|
|
|
bb8124d1fa
|
Web: Common: added login with tfa code method
|
2021-05-17 16:32:22 +03:00 |
|
Artem Tarasov
|
9eb3b2a375
|
Web: Components/Client: fix tree loader, fix version badge
|
2021-05-17 12:40:46 +03:00 |
|
Artem Tarasov
|
d43493e787
|
Merge branch 'develop' into bugfix/fixed-styles
|
2021-05-16 00:50:21 +03:00 |
|
Artem Tarasov
|
31105f4eb8
|
Web: Components: TreeMenu: fixed badge hitting the name of an item in menu wit a large number of new notifications
|
2021-05-16 00:50:09 +03:00 |
|
Artem Tarasov
|
f7c880c56e
|
Web: Common: PageLayout: fixed position scrollbar in article
|
2021-05-16 00:49:10 +03:00 |
|
|
|
77f17d55b6
|
Web: Common: redirect on confirm page
|
2021-05-14 15:59:15 +03:00 |
|
|
|
9b54835996
|
Web: Common: get secret key and qr
|
2021-05-14 15:58:50 +03:00 |
|
Alexey Kostenko
|
1d036e33d6
|
Merge branch 'develop' into feature/access-rights-admins
|
2021-05-14 13:13:34 +03:00 |
|
|
|
85bd971735
|
Merge branch 'develop' into feature/translations
|
2021-05-14 12:07:48 +03:00 |
|
|
|
eb628d3703
|
Merge branch 'develop' into bugfix/enable-favorites-recent-settings
|
2021-05-14 11:34:10 +03:00 |
|
|
|
1a58007fcd
|
Web: Common: removed custom selection frame
|
2021-05-14 11:21:59 +03:00 |
|
|
|
ef085ef7df
|
Web: Files: enable favorites and recent settings
|
2021-05-14 11:08:57 +03:00 |
|
|
|
39ebe87b43
|
Web: Settings: Backup: Removed storage parameters to the function.
|
2021-05-14 11:00:53 +03:00 |
|
|
|
0d98b05210
|
Web: Files: fixed icons clickability
|
2021-05-13 16:57:10 +03:00 |
|
Artem Tarasov
|
940dc60684
|
Web: Components: fix style of IconButton in PasswordInput Components
|
2021-05-13 00:00:55 +03:00 |
|
|
|
f05147eb29
|
Web: Common: fixed clickability for mobile devices
|
2021-05-12 16:53:40 +03:00 |
|
|
|
72ed5e031c
|
Web: Common: hide delete icon from MediaViewer for shared folder
|
2021-05-12 14:05:54 +03:00 |
|
|
|
e84fc5b5e3
|
Web: Common: redirect on confirm link
|
2021-05-12 12:10:08 +03:00 |
|
|
|
9ea5a131e8
|
Web: Files: fixed MediaViewer crash
|
2021-05-12 11:55:34 +03:00 |
|
Alexey Kostenko
|
f9c2eaefa6
|
Web: Components: Added prop - onClick anywhere in the row, except the checkbox and context menu
|
2021-05-11 14:54:30 +03:00 |
|
|
|
c857751572
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
# Conflicts:
# yarn.lock
|
2021-05-11 12:22:17 +03:00 |
|
Artem Tarasov
|
58a41faa4a
|
Merge branch 'develop' into feature/thumbnails
# Conflicts:
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# yarn.lock
|
2021-05-11 10:30:19 +03:00 |
|
Alexey Kostenko
|
62c789d68b
|
Merge branch 'develop' into feature/access-rights-admins
|
2021-05-11 10:19:31 +03:00 |
|
|
|
57a4b8a9b8
|
Upgrade lodash to version 4.17.21 (lodash vulnerability issue)
|
2021-05-07 21:12:25 +03:00 |
|
|
|
3ae370deed
|
Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into develop
|
2021-05-07 18:54:42 +03:00 |
|
|
|
6c3244a3e9
|
Web: Added opportunity to deploy all static clients to build/deploy directory (yarn build && yarn deploy)
|
2021-05-07 18:54:25 +03:00 |
|
|
|
7541e4bfe5
|
* Web:Settings: Backup: Added create schedule at document module, added information about created schedule for documents module and Refactoring.
|
2021-05-07 16:23:46 +03:00 |
|
|
|
7a27280dc3
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
|
2021-05-07 14:49:44 +03:00 |
|
|
|
7c2f36635b
|
Web: Common: refactoring
|
2021-05-07 14:32:00 +03:00 |
|
|
|
221edc5c33
|
Web: Common: get tfa settings
|
2021-05-07 14:22:21 +03:00 |
|
|
|
95c9c9d1a3
|
Merge branch 'develop' into feature/portal-modal-dialog
|
2021-05-06 16:30:31 +03:00 |
|
|
|
b7af18f636
|
v0.1.9
|
2021-05-06 14:57:01 +03:00 |
|
|
|
6aca6e9944
|
Web: Settings: Backup: Added third party storage component.
|
2021-05-06 14:42:31 +03:00 |
|
|
|
71e1468835
|
Web: Common: fixed MediaViewer styles
|
2021-05-06 12:52:19 +03:00 |
|
|
|
c50c65a1c5
|
Web: Components: moved ModalDialog to Portal
|
2021-05-06 12:49:53 +03:00 |
|
|
|
0f07cdb9e9
|
Web: Settings: Backup: Added learn more ink to the third party resource component.
|
2021-05-06 12:41:58 +03:00 |
|
|
|
a9a13d1346
|
Web: Refactoring & optimization.
|
2021-05-06 11:32:33 +03:00 |
|
|
|
3365d1a1dc
|
Web: Client: added showCopyLink prop to password-input component, fixed displaying "copy email and password" link
|
2021-05-05 15:48:19 +03:00 |
|
|
|
daef594561
|
Web: Packages: added tfa store
|
2021-05-05 14:59:08 +03:00 |
|
|
|
605f7d749e
|
Web: Components: FloatingButton: Added rotation on percent === 0
|
2021-05-04 22:14:42 +03:00 |
|
|
|
35ef6c27bf
|
Web: Files: removed file format for unselected items
|
2021-05-04 17:42:06 +03:00 |
|
|
|
d3eac61e1e
|
Web: Settings: Backup: Added delete schedule backup.
|
2021-05-04 16:01:44 +03:00 |
|
|
|
026306d7ca
|
Web: Login: Fix hard-coded list of trusted domains on registration
|
2021-05-04 15:35:09 +03:00 |
|
|
|
5b15461225
|
Web: Settings: Backup: Added logic for copying backup to documents module, added error processing, added toastr when copying is success.
|
2021-05-04 15:07:16 +03:00 |
|
|
|
3a564d76d0
|
Web: Settings: Backup: Added disable to save changes at Automatic backup when is copying to the temporary storage.
|
2021-05-04 12:00:05 +03:00 |
|
|
|
bdc681f94a
|
Web: Files: Fix favorite flag setup (thirdParty issue)
|
2021-05-04 11:18:24 +03:00 |
|
|
|
c8ab20f6a4
|
Web: Settings: Backup: Added logic for temporary storage.
|
2021-05-04 11:18:12 +03:00 |
|
|
|
e61375c348
|
Merge branch 'hotfix/v0.1.9' of https://github.com/ONLYOFFICE/AppServer into hotfix/v0.1.9
|
2021-04-30 17:25:32 +03:00 |
|
|
|
7ba67cf63a
|
Web: Fix click on webView link on ComingSoonPage (CRM, Projects, Mail, Calendar)
|
2021-04-30 17:25:26 +03:00 |
|
|
|
bec2690510
|
Web: fixed files productName
|
2021-04-30 16:47:47 +03:00 |
|
|
|
d55b39a653
|
Web: Files: Added and fix AutoFocus, tabulation and close on errors in ConnectDialog
|
2021-04-30 14:02:58 +03:00 |
|
|
|
b6881cd403
|
Web: Added check for connecting a third-party resource: input is disabled if user didn't connecting a third-party resource.
|
2021-04-30 11:27:27 +03:00 |
|
|
|
b8460209d3
|
Web: Components/Settings: Refactoring.
|
2021-04-30 10:35:02 +03:00 |
|
|
|
3ede66f9cd
|
Web: Settings: Backup: Added input with folder path. Added panel with only common documents.
|
2021-04-29 19:39:35 +03:00 |
|
Alexey Kostenko
|
17d4b0a4db
|
Merge branch 'develop' into feature/access-rights-admins
|
2021-04-29 15:11:50 +03:00 |
|
|
|
61695dfb5f
|
Web: Files: Hide Facebook share link (new FB SDK required)
|
2021-04-29 13:44:37 +03:00 |
|
|
|
9e40feb771
|
Added and applied Common.json for common translations (languages issue)
|
2021-04-29 10:14:47 +03:00 |
|
Alexey Kostenko
|
5f81e5a0ce
|
Web: Client: Added group button menu, fixed api getListAdmins, the ability to add new administrators
|
2021-04-29 09:40:55 +03:00 |
|
|
|
14719ed698
|
Web: Components: fixed checkbox icons style
|
2021-04-27 14:31:05 +03:00 |
|
|
|
2b6d536590
|
Merge branch 'release/v0.1.8' of https://github.com/ONLYOFFICE/AppServer into release/v0.1.8
|
2021-04-27 13:48:38 +03:00 |
|
Artem Tarasov
|
5d2264d483
|
Merge branch 'develop' into feature/thumbnails
# Conflicts:
# products/ASC.Files/Client/src/components/EditingWrapperComponent.js
# products/ASC.Files/Client/src/components/FileItem.js
# products/ASC.Files/Client/src/components/FilesContainer.js
# products/ASC.Files/Client/src/components/FilesContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/EditingWrapperComponent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/SimpleFilesRow.js
# products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
# products/ASC.Files/Client/src/components/sub-components/Badges.js
# products/ASC.Files/Client/src/components/sub-components/EditingWrapperComponent.js
# products/ASC.Files/Client/src/components/sub-components/Icons.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/FilesRowContainer.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleRowContent.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/BadgesFileTile.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FilesTileContainer.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/SimpleTileContent.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/TileContainer.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/TileContent.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
|
2021-04-27 13:40:38 +03:00 |
|
|
|
c324693034
|
Merge branch 'develop' into release/v0.1.8
|
2021-04-27 12:11:36 +03:00 |
|
Alexey Kostenko
|
a550197bc5
|
Web: Common: Fixed getAuthProviders api url
|
2021-04-27 12:02:51 +03:00 |
|
|
|
c6a08a50f9
|
Web: Fixed language for users then not changed language at profile yet.
|
2021-04-27 11:39:16 +03:00 |
|
|
|
a46f8ed04a
|
Web: Common: Fix openEdit query param
|
2021-04-26 19:02:40 +03:00 |
|
|
|
f3610ce7f6
|
Web: Common: Fix openEdit query param
|
2021-04-26 19:02:16 +03:00 |
|
|
|
cad6ee216c
|
Web: Components: Badge: Fixed event propagation for Badge component
|
2021-04-26 10:25:45 +03:00 |
|
|
|
7c9e35d004
|
Web: Components: ContextMenuButton: Fixed out of event call for new menu item
|
2021-04-26 09:45:57 +03:00 |
|
|
|
d2588270cf
|
Merge branch 'master' into develop
|
2021-04-23 20:16:42 +03:00 |
|
|
|
838435bab5
|
Merge branch 'hotfix/v0.1.7' of https://github.com/ONLYOFFICE/AppServer into hotfix/v0.1.7
|
2021-04-23 18:00:17 +03:00 |
|
|
|
cd699e37e2
|
Files: Fix opening of version
|
2021-04-23 18:00:05 +03:00 |
|
|
|
8159ae7b69
|
Web: Components: Row: Added new context-menu usage inside row
|
2021-04-23 17:58:06 +03:00 |
|
|
|
02bcb50e67
|
Web: Files: Fix ConnectedClouds context-options work
|
2021-04-23 15:02:57 +03:00 |
|
Alexey Kostenko
|
707f9bab50
|
Web: Common: Added proxy to OAuth login URL
|
2021-04-23 13:17:40 +03:00 |
|
TatianaLopaeva
|
1f8039f1b7
|
Web: Added storages to the Manual page.
|
2021-04-22 19:26:35 +03:00 |
|
Alexey Kostenko
|
b1ef3639c6
|
Fix
|
2021-04-22 16:13:02 +03:00 |
|
Alexey Kostenko
|
2d6083c972
|
Web: Components: Fixed warnings
|
2021-04-22 16:10:26 +03:00 |
|
Alexey Kostenko
|
8519fe4d60
|
Web: Components: SocialButton style fix
|
2021-04-22 14:54:06 +03:00 |
|
Alexey Kostenko
|
667a76b95f
|
Oauth: Refactoring
|
2021-04-22 13:34:42 +03:00 |
|
Alexey Kostenko
|
138fe92f9f
|
OAuth: Refactoring
|
2021-04-21 16:31:18 +03:00 |
|
Alexey Kostenko
|
691e7d5498
|
Merge branch 'develop' into feature/oauth2.0
|
2021-04-21 15:04:26 +03:00 |
|
|
|
1658e0d60a
|
Web: Common: removed custom SelectedFrame, fixed frame styles
|
2021-04-21 11:48:50 +03:00 |
|
Artem Tarasov
|
7f4888d2a2
|
Web: Files: fix drag
|
2021-04-21 02:23:31 +03:00 |
|
TatianaLopaeva
|
0f3eb1350b
|
Merge branch 'develop' into feature/team-template
# Conflicts:
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
|
2021-04-20 12:05:19 +03:00 |
|
|
|
0b0dbb971f
|
Web: Settings: Fix enabledJoin setup
|
2021-04-19 18:39:00 +03:00 |
|
|
|
3734027f4f
|
Web: Files: fixed newItem styles
|
2021-04-19 14:16:42 +03:00 |
|
|
|
9b6e4ace8b
|
Web: Files: fixed badge for tree menu
|
2021-04-19 14:08:40 +03:00 |
|
Alexey Kostenko
|
d9860256ec
|
Web: Common/Components: FacebookButton style fix
|
2021-04-19 09:49:47 +03:00 |
|
|
|
e586d42d3b
|
Web: Added clickBackdrop() for close unpinned Article on Tablet and Mobile
|
2021-04-16 20:23:08 +03:00 |
|
TatianaLopaeva
|
ab10641b45
|
Web: Rename teamTemplate.
|
2021-04-16 17:10:37 +03:00 |
|
Alexey Kostenko
|
8cb74d14b4
|
Web: Client/Common: Added thirdParty signup api
|
2021-04-16 16:34:24 +03:00 |
|
|
|
7062c713ad
|
Merge branch 'bugfix/v0.1.6' of https://github.com/ONLYOFFICE/AppServer into bugfix/v0.1.6
|
2021-04-16 16:05:01 +03:00 |
|
|
|
a289256846
|
Web: Files: added ConflictResolveDialog, refactoring files operations
|
2021-04-16 16:04:50 +03:00 |
|
TatianaLopaeva
|
052157d1fe
|
Web: Rename functions.
|
2021-04-16 15:35:02 +03:00 |
|
TatianaLopaeva
|
d4da2a8cbb
|
Web: Fixed width of input for horizontal orientation.
|
2021-04-16 14:38:17 +03:00 |
|
Alexey Kostenko
|
96ec652313
|
Merge branch 'develop' into feature/oauth2.0
|
2021-04-16 14:25:37 +03:00 |
|
Vladislav Makhov
|
c60d653bc1
|
web: fix hiding unpinned article when menu item clicked
|
2021-04-16 13:41:36 +03:00 |
|
TatianaLopaeva
|
297e4f42e9
|
Merge branch 'develop' into feature/team-template
|
2021-04-16 09:25:43 +03:00 |
|
TatianaLopaeva
|
e738cab4a2
|
Web: Added Error message & Added loader.
|
2021-04-15 19:51:59 +03:00 |
|
Artem Tarasov
|
54b96e8aa0
|
Merge branch 'develop' into feature/thumbnails
# Conflicts:
# packages/asc-web-common/components/PageLayout/sub-components/SelectedFrame.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/FilesRowContainer.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/SimpleFilesRow.js
|
2021-04-15 15:05:15 +03:00 |
|
Artem Tarasov
|
f8c69fd939
|
Web: Common: Loaders: added loaders for tiles
|
2021-04-15 11:47:02 +03:00 |
|
|
|
13d083f01c
|
Web: GroupMenu: Fix wrong items title displaying
|
2021-04-15 10:54:12 +03:00 |
|
|
|
33f5a07c70
|
Web: Files: fixed search by subfolders
|
2021-04-15 10:27:23 +03:00 |
|
TatianaLopaeva
|
fc40487de0
|
Web: Added setCurrentShema and setCustomShema methods, added form validation.
|
2021-04-14 14:26:26 +03:00 |
|
Artem Tarasov
|
74a5bf33dc
|
Web: Files: fix drag, deleted console.log
|
2021-04-14 12:41:08 +03:00 |
|
Artem Tarasov
|
4be1db4c9a
|
Web: Files: added calling the context menu when right-clicking on a tile
|
2021-04-14 00:09:51 +03:00 |
|
TatianaLopaeva
|
39064cf4e2
|
Web: Settings: Added cancel and save button.
|
2021-04-13 22:51:43 +03:00 |
|
|
|
4b5c73b3e7
|
Web: fixed input user-select
|
2021-04-13 17:05:23 +03:00 |
|
|
|
a321619c98
|
Web: fixed input select
|
2021-04-13 15:18:33 +03:00 |
|
TatianaLopaeva
|
ff370259e9
|
Web: Added "learn more and help url for common setting.
|
2021-04-13 14:47:46 +03:00 |
|
TatianaLopaeva
|
3487e40c51
|
Web: Settings: Added logic for team template, added getCustomSchema.
|
2021-04-13 14:34:04 +03:00 |
|
|
|
c324404767
|
Web: fixed firefox frame
|
2021-04-13 14:07:44 +03:00 |
|
Alexey Kostenko
|
e99f66267f
|
Style fix
|
2021-04-13 13:15:30 +03:00 |
|
|
|
c7017920e8
|
Web: fixed selection for mobile devices
|
2021-04-13 12:56:03 +03:00 |
|
|
|
5daf690ffb
|
Web: fixed selection
|
2021-04-13 12:49:37 +03:00 |
|
|
|
5936640ce2
|
Web: fixed selection
|
2021-04-13 12:43:17 +03:00 |
|
Alexey Kostenko
|
571b412d27
|
Web: Client/Components: Fixed facebook button styles/icon, fixed translations
|
2021-04-13 11:17:39 +03:00 |
|
Alexey Kostenko
|
544a24d0f1
|
Web: Client/Components: Style fix and added translations
|
2021-04-13 09:45:52 +03:00 |
|
|
|
8cfd5eb644
|
Web: Added SelectedFrame
|
2021-04-13 09:35:07 +03:00 |
|
Alexey Kostenko
|
cf7072a714
|
Refactoring
|
2021-04-12 10:57:21 +03:00 |
|
Alexey Kostenko
|
e187db767f
|
Web: Login: Updated field with buttons for login
|
2021-04-09 16:00:41 +03:00 |
|
Alexey Kostenko
|
b8354a98bf
|
Web: Components: Added FacebookButton component
|
2021-04-09 15:55:54 +03:00 |
|
Artem Tarasov
|
f8b36757ae
|
Merge branch 'develop' into feature/thumbnails
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/SimpleFilesRow.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
# products/ASC.Files/Client/src/store/index.js
|
2021-04-09 11:51:39 +03:00 |
|
Alexey Kostenko
|
ec6c1df3cf
|
Merge branch 'develop' into feature/oauth2.0
|
2021-04-08 11:59:08 +03:00 |
|
|
|
96d67be68c
|
Web: Fix hashSettings setup
|
2021-04-08 10:24:06 +03:00 |
|
