95352a2116
Bump version v0.1.3
2021-04-09 11:02:13 +03:00
Alexey Kostenko
b017562eaf
Web: Changed facebook icon
2021-04-09 10:30:54 +03:00
34cc54cb1e
Files: fixed quieries
2021-04-08 20:05:27 +03:00
b66008b33e
Bump version v0.1.2
2021-04-08 20:00:15 +03:00
Artem Tarasov
827d068040
Web: Files: refactoring, fixed transfer bages to tile
2021-04-08 16:44:26 +03:00
Alexey Kostenko
a01a41cce7
Web: Files: merge fix
2021-04-08 15:29:18 +03:00
TatianaLopaeva
3aca73b31f
Web: Files: Fixed margin between buttons.
2021-04-08 14:58:58 +03:00
TatianaLopaeva
12db80a964
Web: Files: Added loader for NewFilesPanel.
2021-04-08 13:37:16 +03:00
Alexey Kostenko
ec6c1df3cf
Merge branch 'develop' into feature/oauth2.0
2021-04-08 11:59:08 +03:00
bcf350c1d9
Bump version to v0.1.1
2021-04-08 10:23:33 +03:00
5c0f414587
Files: fix tests
2021-04-07 18:08:15 +03:00
43c6618998
Web: Projects: Revert webLink
2021-04-07 15:59:32 +03:00
775a670be1
Web: CRM: Revert webLink
2021-04-07 15:59:20 +03:00
559d7a9940
Web: Fixed export and import registerSW
2021-04-07 15:41:42 +03:00
4484d609a6
Web: Added registerSW for start Service-Worker + Added post SkipWaiting on update
2021-04-07 15:27:51 +03:00
Artem Tarasov
3ee7541e54
Web: Components/People: fixed translation in PasswordInput
2021-04-07 14:41:46 +03:00
13c9e5b0b6
Merge branch 'release/v0.1.0' of https://github.com/ONLYOFFICE/AppServer into release/v0.1.0
2021-04-07 13:07:17 +03:00
41310842ac
Web: Files: fixed @my
2021-04-07 13:07:08 +03:00
Vladislav Makhov
177a707fcb
Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0
2021-04-07 12:34:51 +03:00
Vladislav Makhov
33c3905c65
web: people: fix goBackAndReset, when creating user
2021-04-07 12:34:37 +03:00
36eb430652
Merge branch 'release/v0.1.0' of https://github.com/ONLYOFFICE/AppServer into release/v0.1.0
2021-04-07 12:21:43 +03:00
3c0e64005b
Web: Files: fixed selectedTreeNode
2021-04-07 12:21:32 +03:00
Ilya Oleshko
dfc769651a
Web: Files: FilesStore: Added download action for folders at context-menu
2021-04-07 11:58:33 +03:00
Ilya Oleshko
cb4e1677b8
Web: Files: FilesStore: Fixed empty separator, added missing options after merge
2021-04-07 11:45:01 +03:00
TatianaLopaeva
f7553b2343
Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0
2021-04-07 11:34:11 +03:00
TatianaLopaeva
375ce74464
Web:People: Fixed scroll to top when switching a group.
2021-04-07 11:34:05 +03:00
635d20580f
crm: refactoring
2021-04-06 20:33:28 +03:00
ee6ffd3ace
Updated packages
2021-04-06 20:16:24 +03:00
Ilya Oleshko
a1a4eadd07
Web: Files: Row: Added locales for new and version badges
2021-04-06 18:48:42 +03:00
740099ff52
Merge branch 'release/v0.1.0' of https://github.com/ONLYOFFICE/AppServer into release/v0.1.0
2021-04-06 17:25:25 +03:00
90fea0fb50
Web: Files: fixed onDragOver event
2021-04-06 17:25:15 +03:00
Ilya Oleshko
fb47962f12
Web: Files: Row: Disabled version action inside trash folder
2021-04-06 16:46:48 +03:00
19526b1d96
Web: Files: fixed canShareOwnerChange
2021-04-06 16:31:39 +03:00
54763ead47
Web: Files: fixed drag events
2021-04-06 16:06:16 +03:00
7bbf46fd90
Merge branch 'release/v0.1.0' of https://github.com/ONLYOFFICE/AppServer into release/v0.1.0
2021-04-06 15:47:14 +03:00
424efc1e72
Web: Files: fixed treeFolders drag
2021-04-06 15:47:04 +03:00
Artem Tarasov
fad3757a82
Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0
2021-04-06 15:30:17 +03:00
Artem Tarasov
b673e76d67
Web: Files: fixed update of the version in row after making changes in VersionHistoryPanel
2021-04-06 15:29:42 +03:00
Vladislav Makhov
fbf2c27910
Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0
2021-04-06 14:18:26 +03:00
Vladislav Makhov
065115fffd
web: people: fix avatar changes
2021-04-06 14:18:15 +03:00
TatianaLopaeva
3a35fb09fd
Web: People: Profile: Fixed the problem of displaying a different avatar when editing profile.
2021-04-06 14:11:02 +03:00
Vladislav Makhov
2c7c5532eb
web: people: fix tracking of avatar changes
2021-04-06 14:03:14 +03:00
Vladislav Makhov
5a6d3509fd
web: files: fix working with files without extension
2021-04-06 11:35:11 +03:00
8a9ad2d473
Merge branch 'release/v0.1.0' of https://github.com/ONLYOFFICE/AppServer into release/v0.1.0
2021-04-05 18:14:25 +03:00
12b5c6b769
Web: Projects: Fixed switch to desktop version
2021-04-05 18:14:20 +03:00
7861c432aa
Web: CRM: Fixed switch to desktop version
2021-04-05 18:14:04 +03:00
Ilya Oleshko
b228e20cdb
Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0
2021-04-05 18:10:35 +03:00
Ilya Oleshko
f6d8238602
Web: Files: Fixed empty elements inside context menu, added missing actions for deleted items
2021-04-05 18:10:26 +03:00
Artem Tarasov
817f810590
Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0
2021-04-05 18:07:30 +03:00
Artem Tarasov
056c288fae
Web: People: fixed reset filter after switching from profile
2021-04-05 18:06:48 +03:00
88ab4c53d9
Projects: Changed HelpURL
2021-04-05 17:47:00 +03:00
92ff8b3b2d
CRM: Changed HelpURL
2021-04-05 17:46:48 +03:00
Ilya Oleshko
7f0e24dc2b
Web: Files: Header: Fixed plus icon path
2021-04-05 17:10:04 +03:00
Viktor Fomin
27eb32d296
Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0
2021-04-05 16:54:48 +03:00
Viktor Fomin
4e7e795046
Web: Files: fixed scroll in upload panel
2021-04-05 16:54:28 +03:00
Ilya Oleshko
f94e093896
Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0
2021-04-05 16:45:49 +03:00
Ilya Oleshko
018f3fad33
Web: Files: Added data-api for new ContextMenu
2021-04-05 16:44:55 +03:00
cea14a9d4f
Merge branch 'release/v0.1.0' of https://github.com/ONLYOFFICE/AppServer into release/v0.1.0
2021-04-05 16:42:09 +03:00
ce7647ac5f
Web: Files: fixed Trans, hidden duplicate
2021-04-05 16:42:01 +03:00
Artem Tarasov
9d7f6265e7
Web: People: fixed manager name for a group without a manager
2021-04-05 16:35:38 +03:00
Artem Tarasov
e304af064b
Web: People: fixed group list query
2021-04-05 16:18:41 +03:00
Vladislav Makhov
bf6cb4b134
Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0
2021-04-05 16:09:34 +03:00
Vladislav Makhov
cf85e950ff
web: people: fix onGroupClick
2021-04-05 16:09:21 +03:00
2655f0c62d
Web: fixed Trans
2021-04-05 15:35:50 +03:00
Viktor Fomin
acd3e3db12
Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0
2021-04-05 15:22:00 +03:00
Viktor Fomin
6f4a6a972a
Web: Files: fixed import
2021-04-05 15:21:52 +03:00
Vladislav Makhov
dbd6c08772
Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0
2021-04-05 15:08:25 +03:00
Vladislav Makhov
b400a93407
web: files: remove api query, if cancelled or same title
2021-04-05 15:07:58 +03:00
Viktor Fomin
ded5ce44f2
Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0
2021-04-05 14:54:10 +03:00
Viktor Fomin
10f9d2ad2c
Web: Files: fixed getting userId
2021-04-05 14:53:37 +03:00
TatianaLopaeva
f095e9c71b
Web: Files: FloatingButton remains visible on error until the UploadPanel is opened.
2021-04-05 14:43:03 +03:00
Alexey Kostenko
866a1bfa68
Web: People: Removed unused method
2021-04-05 13:36:04 +03:00
Artem Tarasov
8e7324330a
Web: Files: fix after merge
2021-04-05 12:39:51 +03:00
Artem Tarasov
98f30631b2
Web: Files: store: refactoring contextOptionsStore
2021-04-05 12:39:31 +03:00
Artem Tarasov
43491f42a9
Merge branch 'develop' into feature/thumbnails
...
# Conflicts:
# products/ASC.Files/Client/src/Files.jsx
# 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
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/store/InitFilesStore.js
2021-04-05 10:54:27 +03:00
TatianaLopaeva
ed97700dcb
Web:Files: UploadPanel: Fixed styles of row content.
2021-04-05 10:26:46 +03:00
Alexey Kostenko
e333e7e82d
Web: People: Clear interval if getter token window is closed (connecting providers)
2021-04-04 16:53:27 +03:00
Artem Tarasov
2bb0f69e4b
Merge branch 'feature/thumbnails' of github.com:ONLYOFFICE/AppServer into feature/thumbnails
2021-04-02 23:56:49 +03:00
Artem Tarasov
1156f31d63
Web: Files: refactoring FIlesContent
2021-04-02 23:56:28 +03:00
a11804b60d
temp fix. BinaryFormatter deprecated in .net 5
2021-04-02 21:48:40 +03:00
b89e232e59
Web: Files: fixed drag
2021-04-02 19:29:06 +03:00
748ae7e343
crm: bugfix
2021-04-02 18:53:49 +03:00
Vladislav Makhov
b45e243fe6
web: files: fix stores init
2021-04-02 18:12:50 +03:00
Vladislav Makhov
3180831e19
web: files: fix stores init
2021-04-02 17:03:52 +03:00
Vladislav Makhov
0f6b08b2f3
web: files: transfer InitFilesStore to FilesStore
2021-04-02 16:33:18 +03:00
Vladislav Makhov
601c9441cb
web: files: remove unnecessary code
2021-04-02 15:45:49 +03:00
Vladislav Makhov
179fec232e
Merge branch 'develop' into bugfix/files-store
...
# Conflicts:
# products/ASC.Files/Client/src/store/FilesStore.js
2021-04-02 15:34:34 +03:00
Vladislav Makhov
3e3c442f7c
web: files: destructured variables
2021-04-02 15:02:03 +03:00
Vladislav Makhov
ff04684f53
web: remove unused code
2021-04-02 13:49:42 +03:00
Vladislav Makhov
d63132d9e7
web: files: remove console log
2021-04-02 13:06:12 +03:00
Vladislav Makhov
c99fc660c9
web: files: remove unused code and imports
2021-04-02 13:03:28 +03:00
Artem Tarasov
7fa13538f5
Web: File: moved okIcon and cancelIcon to EditingWrapperComponent
2021-04-02 12:45:40 +03:00
Vladislav Makhov
1bc8ad8600
web: files: fix FilesStore accesses
2021-04-02 12:41:13 +03:00
Vladislav Makhov
f532c06c55
web: files: fix UploadDataStore accesses
2021-04-02 12:40:59 +03:00
300c064556
Web: Files: fixed drag
2021-04-02 12:26:31 +03:00
Vladislav Makhov
2bafdbc0d2
web: files: fix TreeFoldersStore accesses
2021-04-02 11:20:19 +03:00
Vladislav Makhov
df3f8ca9e5
web: files: fix MediaViewerDataStore accesses
2021-04-02 11:16:01 +03:00
Vladislav Makhov
0eeee5842a
web: files: fix FormatsStore accesses
2021-04-02 11:13:33 +03:00
Alexey Kostenko
c4aaa3618f
Web: People: Show login settings only on your account
2021-04-02 11:10:26 +03:00
Artem Tarasov
ffb4405a1a
Web: Files: fix after merge
2021-04-02 00:11:15 +03:00
Artem Tarasov
43b9301e90
Merge branch 'develop' into feature/thumbnails
...
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/SimpleFilesRow.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTile/FilesTileContainer.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/store/FilesActionsStore.js
2021-04-01 18:19:09 +03:00
Vladislav Makhov
f70bcc52ca
web: files: fix FilesActionStore accesses
2021-04-01 17:34:22 +03:00
TatianaLopaeva
f79f75f6db
Merge branch 'develop' into feature/EditorIntegration
2021-04-01 16:42:33 +03:00
a71bbc9886
Files: fix finding template when saving file, hat doesn't have template
2021-04-01 16:32:10 +03:00
c0582c1130
merge from develop
2021-04-01 16:28:36 +03:00
TatianaLopaeva
0ea46425c6
Web:Files: Fix SharedPanel when uploadPanel is visible.
2021-04-01 15:32:21 +03:00
Artem Tarasov
83d3d82a65
Web: Files: created FilesItem component, refactoring SimpleFilesRow, deleted FileTile
2021-04-01 14:49:01 +03:00
TatianaLopaeva
26fe94ae5f
Web: Files: Added translation for EmbeddingPanel.
2021-04-01 13:50:57 +03:00
Artem Tarasov
ddcdb41734
Web: Files: added FilesContainer, removed FilesTileContainer and FilesRowContainer
2021-04-01 13:37:44 +03:00
Vladislav Makhov
61fcaf8315
web: files: fix SettingsStore accesses
2021-04-01 13:28:59 +03:00
TatianaLopaeva
968e0009ee
Web: Files: SharingPanel/EmbeddingPanel: Fixed icon path.
2021-04-01 13:03:28 +03:00
Vladislav Makhov
3915d28737
web: files: fix InitFilesStore accesses
2021-04-01 12:27:19 +03:00
Artem Tarasov
4bfcf39410
Web: Files: fix context menu action
2021-04-01 12:22:07 +03:00
Vladislav Makhov
07c457882a
web: files: fix FilesStore accesses
2021-04-01 11:58:22 +03:00
TatianaLopaeva
833bd357a0
Web: Files: Deleted useless condition for Editor.
2021-04-01 11:55:20 +03:00
TatianaLopaeva
fc1d8001b6
Web: Files: Deleted useless props.
2021-04-01 11:52:24 +03:00
TatianaLopaeva
386529c6fd
Merge branch 'develop' into feature/EditorIntegration
...
# Conflicts:
# products/ASC.Files/Client/src/store/FilesStore.js
2021-04-01 10:17:14 +03:00
Artem Tarasov
c6a462168c
Web: Files: Tile: refactoring
2021-04-01 10:08:07 +03:00
18b4fba15a
Merge branch 'develop' into feature/dotnet5
2021-03-31 20:38:05 +03:00
393ada80fc
crm: bugfix
2021-03-31 19:21:54 +03:00
166aaa8239
Merge branch 'develop' into bugfix/privacy-room
2021-03-31 18:01:58 +03:00
Vladislav Makhov
b0b8849ae5
web: files: fix isDesktop refer
2021-03-31 17:59:03 +03:00
TatianaLopaeva
33b165fd40
Web: Files/Editor: Added SharingDialog.
2021-03-31 16:49:14 +03:00
Alexey Kostenko
e4d11c8246
Web: People: Updating to the state of the connection to providers. Added notifications
2021-03-31 16:38:52 +03:00
Vladislav Makhov
2c253bd471
web: files: rename isItemsSelected to selectionCount
2021-03-31 13:56:56 +03:00
Vladislav Makhov
56f49526ad
web: files: fix link
2021-03-31 13:54:29 +03:00
c0e780a287
Web: Files: fixed showDragItems
2021-03-31 11:03:56 +03:00
Vladislav Makhov
1728da802d
web: fix isAccessedSelected
2021-03-31 10:49:46 +03:00
TatianaLopaeva
b52997a7f8
Merge branch 'develop' into feature/EditorIntegration
2021-03-30 18:39:09 +03:00
Vladislav Makhov
75386c10ea
web: files: add missing whitespaces in description
2021-03-30 16:05:04 +03:00
Vladislav Makhov
627e84aeaa
web: files: fix isAccessedSelected
2021-03-30 15:53:47 +03:00
TatianaLopaeva
dea731dfa7
Web: Files/Editor: Deleted useless code.
2021-03-30 15:44:45 +03:00
TatianaLopaeva
3960ca1490
Web: Files: SharingPanel: Added loader when list of users does not load yet.
2021-03-30 15:24:44 +03:00
Alexey Kostenko
e66d9e52d9
Web: People: Removed unnecessary method getSerializedProfile
2021-03-30 15:08:01 +03:00
Alexey Kostenko
14f95a61fa
Web: Files: removed method getOAuthToken from thirdPartyStore
2021-03-30 14:59:35 +03:00
Artem Tarasov
e7d9c9b9d5
Web: Files: added transfer func t and history to contextOptionsStore
2021-03-30 13:21:44 +03:00
6c46dd759f
Web: Files: fixed context options props
2021-03-30 12:14:25 +03:00
Alexey Kostenko
0f5e5cce3f
Web: Components/People/Login: Fixed warning ("React does not recognize prop")
2021-03-30 11:37:21 +03:00
Vladislav Makhov
b4ea70ddaa
web: files: regDesktop fix
2021-03-30 11:34:48 +03:00
06f34408ff
Merge branch 'develop' into feature/drag-and-drop
2021-03-30 11:10:15 +03:00
9427d98318
Web: Files: refactoring
2021-03-30 11:08:38 +03:00
TatianaLopaeva
f6e242f341
Web: Files: Added name space for translation.
2021-03-30 10:34:09 +03:00
TatianaLopaeva
dc0baec941
Web: Editor/Files: Fix displaying of shared user list at Shared Panel & Refactoring.
2021-03-30 10:21:30 +03:00
Artem Tarasov
ebca5f181e
Web: Files: applied contextOptionsStore in tile
2021-03-30 01:13:26 +03:00
Artem Tarasov
7fa2a132b5
Web: Files: added necessary methods to contextOptionsStore
2021-03-30 01:12:35 +03:00
Artem Tarasov
a50af59dd1
Web: Files: applied contextOptionsStore in row
2021-03-30 01:11:04 +03:00
Artem Tarasov
72e1e7a08f
Web: Files: added ContextOptionsStore
2021-03-29 22:23:49 +03:00
TatianaLopaeva
005d6759e9
Web: Editor/Files: Deleted conditions for Edit & Fixed url to folder where the file is located.
2021-03-29 19:31:11 +03:00
3a756986a0
Files: added enableExternalExt when creating file
2021-03-29 17:53:12 +03:00
91aa5996b5
Web: Files: refactoring
2021-03-29 17:45:26 +03:00
Vladislav Makhov
701e5fc2d1
web: files: fix isOnlyFoldersSelected
2021-03-29 16:25:16 +03:00
Vladislav Makhov
ddba3d91bf
web: files: fix isEncryptionSupport value
2021-03-29 16:13:21 +03:00
Vladislav Makhov
70b6e8fe51
web: files: fix share button for private room
2021-03-29 16:05:00 +03:00
Vladislav Makhov
760c3268df
web: files: add missing prop
2021-03-29 16:03:34 +03:00
a8d475cb91
Merge branch 'develop' into feature/drag-and-drop
2021-03-29 15:26:22 +03:00
b574424224
Files: added enableExternalExt when creating file
2021-03-29 15:06:51 +03:00
f381eb2780
Web: Files: fixed move operations for third party folders
2021-03-29 14:56:39 +03:00
d10f47d984
Web: Files: fixed scroll
2021-03-29 12:06:01 +03:00
fa372f118b
Web: Files: fixed scroll
2021-03-29 11:41:42 +03:00
TatianaLopaeva
704f241674
Web: Files: SharingPanel: Fixed icon pathname.
2021-03-28 23:00:21 +03:00
TatianaLopaeva
c4bcb8772c
Web: Files/Editor: Added additional conditions for access to the sharing panel and updated conditions for the custom filter.
2021-03-28 22:59:36 +03:00
TatianaLopaeva
5ccb86abeb
Web: Editor/Files: Refactoring & Moved icon to the common folder for icons.
2021-03-28 21:38:48 +03:00
TatianaLopaeva
88392ffd56
Web: Editor/Files: Refactoring.
2021-03-28 19:21:08 +03:00
TatianaLopaeva
9309818e77
Web: Files: Fixed internal link for document from the Editor.
2021-03-28 19:04:49 +03:00
TatianaLopaeva
89dbfd1f54
Web: Editor/Files: Fixed share email from the Editor.
2021-03-28 18:47:04 +03:00
4ee1cf80b5
crm: fixed reports query
2021-03-26 19:42:46 +03:00
06e8a79b06
Web: Files: fixed drag to tree
2021-03-26 19:11:41 +03:00
Alexey Kostenko
7ff66e894a
Web: Login: Render only available providers for login
2021-03-26 17:19:26 +03:00
TatianaLopaeva
7777d05515
Web: Editor/Files: Added full list of access rights for SharingPanel to Editor.
2021-03-26 17:18:43 +03:00
e72558182b
Web: Files: removed debugger
2021-03-26 17:12:40 +03:00
32338fdcbc
Merge branch 'develop' into feature/drag-and-drop
2021-03-26 16:11:16 +03:00
13f097e039
People: fix Activation
2021-03-26 15:59:56 +03:00
6b16402d82
Web: Files: fixed tree drag-and-drop, refactoring
2021-03-26 15:26:44 +03:00
TatianaLopaeva
2dba92ba28
Web: Editor/Files: Added refresh list of people and their access rights after changed at SharingPanel.
2021-03-26 15:19:55 +03:00
TatianaLopaeva
4892b39e0e
Web: Editor: Added SharingPanel.
2021-03-26 15:14:17 +03:00
TatianaLopaeva
1b9c327e10
Web: Files: SharingPanel: Fix icon path.
2021-03-26 14:51:25 +03:00
TatianaLopaeva
0e1225cc5a
Web: Files: helpers: Fix icon path.
2021-03-26 14:50:45 +03:00
TatianaLopaeva
c853accdf7
Web: Files: Fix icon path.
2021-03-26 14:50:12 +03:00
TatianaLopaeva
e2ebecac4d
Web: Files: Fix icon path.
2021-03-26 14:49:28 +03:00
TatianaLopaeva
e837ef77b5
Web: Files: Moved translation from common file to local folder.
2021-03-26 14:48:37 +03:00
TatianaLopaeva
f27c38e2d9
Web: Moved icons from files to common folder.
2021-03-26 14:45:29 +03:00
7c6bf909a6
Files: fixed query
2021-03-26 12:50:04 +03:00
65e1c72c01
Sln: fixed packages
2021-03-26 12:26:12 +03:00
18a2c0a53d
Merge branch 'develop' into feature/dotnet5
...
# Conflicts:
# common/ASC.Core.Common/EF/Model/Audit/LoginEvents.cs
# common/ASC.Core.Common/EF/Model/CRM/CrmContact.cs
# common/ASC.Core.Common/EF/Model/CRM/DbVoipCall.cs
# common/ASC.Core.Common/EF/Model/CRM/VoipNumber.cs
# common/ASC.Core.Common/EF/Model/DbWebstudioIndex.cs
# common/ASC.Core.Common/EF/Model/DbipLocation.cs
# common/ASC.Core.Common/EF/Model/Feed/FeedAggregate.cs
# common/ASC.Core.Common/EF/Model/Feed/FeedLast.cs
# common/ASC.Core.Common/EF/Model/Mail/Mailbox.cs
# common/ASC.Core.Common/EF/Model/Mail/ServerServer.cs
# common/ASC.Core.Common/EF/Model/Notify/NotifyInfo.cs
# common/ASC.Core.Common/EF/Model/Notify/NotifyQueue.cs
# common/ASC.Core.Common/EF/Model/Resource/ResAuthors.cs
# common/ASC.Core.Common/EF/Model/Resource/ResCultures.cs
# common/ASC.Core.Common/EF/Model/Resource/ResData.cs
# common/ASC.Core.Common/EF/Model/Resource/ResFiles.cs
# common/ASC.Core.Common/EF/Model/Resource/ResReserve.cs
# common/ASC.Core.Common/EF/Model/Tenant/DbTariff.cs
# common/ASC.Core.Common/EF/Model/Tenant/DbTenantVersion.cs
# common/ASC.Core.Common/EF/Model/Tenant/TenantIpRestrictions.cs
# common/ASC.Core.Common/EF/Model/User/UserPhoto.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20201006100008_CoreDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/MySqlCoreDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20201006101436_TenantDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20201006101436_TenantDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210309095116_TenantDbContextMySql.Designer.cs
# products/ASC.Files/Core/Core/EF/DbFilesTag.cs
# products/ASC.Files/Core/Core/EF/FilesDbContext.cs
2021-03-25 21:50:09 +03:00
22293af8d0
crm: bugfix
2021-03-25 19:36:41 +03:00
Alexey Kostenko
6fadc94b71
Web: Components/People: Fixed social-button styles
2021-03-25 18:06:48 +03:00
Artem Tarasov
afd71e8ee5
Web: Files: Home: moved func getFilesContextOptions to index
2021-03-25 17:29:55 +03:00
Alexey Kostenko
482530b2f8
Web: People: Added translations
2021-03-25 17:09:32 +03:00
Alexey Kostenko
3e4424b67b
Web: People/Common: Refactoring
2021-03-25 16:10:10 +03:00
2125a10011
Web: Files: fixed displaying selected node
2021-03-25 15:59:53 +03:00
1955e4f141
Web: Files: fixed drag styles, added drag tooltip
2021-03-25 15:29:34 +03:00
3e225e2ebb
Web: Files: fixed move thirdparty files
2021-03-25 11:47:59 +03:00
9b1fa3fd86
Web: Files: fixed drag
2021-03-25 11:29:51 +03:00
ec05e8dc9a
crm: refactoring & bugfix
2021-03-24 18:55:47 +03:00
Alexey Kostenko
894449d95c
Web: People: Unlink account from provider
2021-03-24 16:51:16 +03:00
Artem Tarasov
a6d31cb1de
Web: Files: FilesTile: moved Tiles in FilesTile dir
2021-03-24 14:53:08 +03:00
Alexey Kostenko
17956f05c0
Web: People: Linking with providers
2021-03-24 14:20:59 +03:00
f732f5fba6
Web: Moved sw-template to @appserver/common and removed api cache (translation issue)
2021-03-24 11:45:58 +03:00
11acb31f54
crm: refactoring
2021-03-23 18:41:56 +03:00
Alexey Kostenko
e1df253b22
Web: People/Components: Added login settings buttons to edit profile page, social button - style fix
2021-03-23 18:29:29 +03:00
f8c2f20fe8
Merge branch 'develop' into feature/workspaces
2021-03-23 14:21:30 +03:00
a94a87855a
People: fix ChangeUserPassword
2021-03-23 14:18:44 +03:00
4c9e366f43
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-23 10:43:31 +03:00
TatianaLopaeva
7ef1429cb7
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-23 10:40:23 +03:00
TatianaLopaeva
cc707204d9
Web: Removed jumps of article when the page is loading.
2021-03-23 10:39:37 +03:00
d9e3e96ab8
Web: Fix: init Files
2021-03-23 10:33:05 +03:00
0d6fcd6f52
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-22 22:37:34 +03:00
051a69e5b5
Web: People: GroupAction: Fix translation loading
2021-03-22 22:37:21 +03:00
0a9a1b1809
Files: fixed root method
2021-03-22 22:14:43 +03:00
TatianaLopaeva
6bb12c9524
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-22 21:10:23 +03:00
TatianaLopaeva
21b6567f7a
Web: People: Fix proxy route.
2021-03-22 21:10:15 +03:00
fd704ab12a
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-22 20:58:06 +03:00
5dd30c9502
Web: Client: fixed owner change
2021-03-22 20:56:53 +03:00
Ilya Oleshko
de8dc35fca
Web: Files: Apply route proxy
2021-03-22 20:51:52 +03:00
a1eb540d9d
Web: Files: Fixed routing from settings and folder
2021-03-22 20:34:02 +03:00
92530da98f
Web: Files: Fix proxy
2021-03-22 20:26:35 +03:00
0847693c55
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-22 20:02:03 +03:00
577464933b
Web: Files: Fixed proxy
2021-03-22 20:00:04 +03:00
b0c430b7ba
Merge branch 'develop' into feature/workspaces
2021-03-22 19:46:49 +03:00
12af2890dc
Web: Files: fixed markAsRead
2021-03-22 19:21:36 +03:00
11e3738090
files: added 'scope' attribute for several classes
2021-03-22 19:10:14 +03:00
1fac4bc1fe
crm: refactoring
2021-03-22 18:48:08 +03:00
44c4967f0f
Files: indexes renamed
2021-03-22 18:43:51 +03:00
TatianaLopaeva
26ef7bdd65
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-22 18:31:41 +03:00
e279ece3c4
Removed commented code
2021-03-22 18:24:19 +03:00
TatianaLopaeva
9baae539d2
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-22 18:11:45 +03:00
TatianaLopaeva
24cc620904
Web: Fixed displaying of shared files at aside & Deleted useless code.
2021-03-22 18:11:39 +03:00
d7981f3f53
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-22 17:35:41 +03:00
a8a6121e59
Web: Proxy fixes
2021-03-22 17:35:33 +03:00
78fd4f632c
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-22 16:46:34 +03:00
879259f160
Web: People: fixed getting peopleList
2021-03-22 16:45:24 +03:00
Viktor Fomin
0da17ef641
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-22 16:15:07 +03:00
Artem Tarasov
0fcdbd3fd7
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-22 16:16:03 +03:00
Artem Tarasov
a616d79ccf
Web: Files: fixed folder selection when clicking from settings
2021-03-22 16:15:18 +03:00
Ilya Oleshko
c689b59a03
Web: Files: Added missing ErrorBoundary import
2021-03-22 15:57:44 +03:00
Ilya Oleshko
70187ebd96
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-22 15:56:05 +03:00
Ilya Oleshko
49e28e53a4
Web: Files: Apply route proxy
2021-03-22 15:55:56 +03:00
2b1b3e508f
crm: refactoring
2021-03-22 15:42:03 +03:00
89f2431e1c
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-22 15:33:50 +03:00
05b417f63d
Web: People: hidden the phone field
2021-03-22 15:31:42 +03:00
c0d9a1572c
crm: refactoring
2021-03-22 14:56:42 +03:00
9182d0aac2
crm: bug fix
2021-03-22 14:38:28 +03:00
Viktor Fomin
5a9c782fc5
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-22 13:08:46 +03:00
Viktor Fomin
12f920047c
Web: People: fixed translate
2021-03-22 13:08:40 +03:00
TatianaLopaeva
7dc1b80ab6
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-22 13:00:35 +03:00
TatianaLopaeva
7c56caf2a6
Web: People: Fixed returned to the homepage after created group.
2021-03-22 12:59:06 +03:00
f8a2b438a9
Web: People: Add URL proxy
2021-03-22 12:06:30 +03:00
TatianaLopaeva
d0f2d9871f
Web: People: Deleted useless code at icon path.
2021-03-22 11:46:31 +03:00
d568693154
Big Fix commit:
...
+ Added new Clients for CRM/Products
+ Removed old fake coming-soon pages
+ Added combineUrl and AppSettingsConfig with proxyUrl
+ Added new fields to modules info on Server
+ Fixed work with icon and image urls
+ Added CRM/Projects to nginx/onlyoffice.conf
+ Applied combineUrl in studio links
+ Added and applied "id" field in package.json of all Clients
+ Added new bat files CrmClient.bat and ProjectsClient.bat
+ Fixed ProductClassName for Files
2021-03-22 00:34:21 +03:00
Viktor Fomin
30d7c7bd8f
Web: Files: fixed article width
2021-03-20 16:21:18 +03:00
75859212ab
Web: People: Fix conversation of Filter to URL and back
2021-03-20 13:16:45 +03:00
deafba32a7
Web: Files: Fix conversation of Filter to URL and back
2021-03-20 12:51:08 +03:00
1c4acb2842
Web: Fixed issue with Tree link first click
2021-03-20 11:54:21 +03:00
5f255d7aa4
Web: Files Fixed routing to third-party settings page
2021-03-20 11:45:41 +03:00
27afa22f85
Web: Files: Fixed Filter translations loading
2021-03-19 21:19:05 +03:00
1908c2d608
Web: Files: Refactoring
2021-03-19 21:11:22 +03:00
e797d01bee
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-19 21:07:16 +03:00
efe94a4589
Web: People: Fixed Filter translations loading
2021-03-19 21:07:10 +03:00
6da70a1449
crm: refactoring
2021-03-19 19:56:26 +03:00
TatianaLopaeva
c1e53e3c6e
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-19 19:21:20 +03:00
Artem Tarasov
aebb3c479f
Web: fix after merge
2021-03-19 19:24:16 +03:00
Artem Tarasov
6418c3af89
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
...
# Conflicts:
# products/ASC.People/Client/src/pages/Profile/Section/Header/index.js
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
2021-03-19 19:21:16 +03:00
TatianaLopaeva
7f193e003c
Web: People: Fix color of icon.
2021-03-19 19:11:16 +03:00
Artem Tarasov
4d9920a4d0
Web: People: fixed updating of user information after editing
2021-03-19 19:06:55 +03:00
741fca254f
Web: Fixed usage of auth.settingsStore
2021-03-19 19:02:43 +03:00
b42eb03270
Web: People: Hide reasign button
2021-03-19 18:41:22 +03:00
403487b7de
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-19 18:36:17 +03:00
60b57e5535
Web: People: Fixed move to edit profile (double slash in URL)
2021-03-19 18:36:11 +03:00
04d1642fac
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-19 18:24:33 +03:00
fc7d6e170a
Web: Files: added select items to shareButton click
2021-03-19 18:24:14 +03:00
bb898e24cd
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-19 18:23:19 +03:00
2df2b6809e
Web: People: Fixed primary link redirect to default filter
2021-03-19 18:23:14 +03:00
6b8d644aab
Web: Replaced all homepages to config variant
2021-03-19 18:22:35 +03:00
TatianaLopaeva
edb57b61d3
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-19 18:08:41 +03:00
1627e94ae9
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-19 18:07:25 +03:00
02c147bd92
Web: Files: added select files on right click event
2021-03-19 18:07:16 +03:00
Vladislav Makhov
62991e25f9
web: files: third party: fix blinking
2021-03-19 18:04:30 +03:00
TatianaLopaeva
e668407d63
Web: Files: Fixed settings styles of connected clouds.
2021-03-19 17:56:01 +03:00
06621ca2cb
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-19 16:31:48 +03:00
e63fc30a2e
Web: People: Fixed move to direct link
2021-03-19 16:31:41 +03:00
Artem Tarasov
51b978f6a3
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-19 14:13:56 +03:00
Artem Tarasov
7c7e7e8c05
Web: People: fixed transition from profile editing
2021-03-19 14:13:22 +03:00
26cb9bf60c
Web: Files: fixed onClickLinkForPortal
2021-03-19 12:18:17 +03:00
9fc950665b
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-19 11:22:36 +03:00
e87709dc70
Web: People: fixed InviteDialog styles
2021-03-19 11:22:25 +03:00
Artem Tarasov
a6c21657a1
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-19 11:18:21 +03:00
Artem Tarasov
3ab382cb5b
Web: Files: fix position of label ToggleButton in Settings
2021-03-19 11:18:06 +03:00
Artem Tarasov
9cfbc4f6a0
Web: People: fix position of email value in Profile
2021-03-19 11:17:36 +03:00
1e02f165ca
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
...
# Conflicts:
# products/ASC.People/Client/src/components/PeopleSelector/i18n.js
2021-03-19 10:55:22 +03:00
33281d9260
Web: Files: commented debug in i18n config
2021-03-19 10:53:13 +03:00
c862bbc7ef
Web: People: Fixed loading translations
2021-03-19 10:49:50 +03:00
78140c0739
Web: People: Fixed double init
2021-03-19 10:46:49 +03:00
3b340396a7
Web: Fixed jumping of NavMenu
2021-03-19 10:45:34 +03:00
TatianaLopaeva
7299252d8f
Web: People: PeopleSelector: Fixed load path of translations.
2021-03-19 10:01:42 +03:00
Artem Tarasov
d3d9234d40
Web: fix direct to VersionHistory and back (mobile)
2021-03-18 23:12:19 +03:00
8e6b2c78d8
Web: Moved ipl-progress-indicator to NavMenu
2021-03-18 22:26:52 +03:00
TatianaLopaeva
6e96c56916
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-18 18:09:34 +03:00
Alexey Kostenko
42d062f0d2
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-18 17:49:09 +03:00
Alexey Kostenko
6f2d927e57
Web: Files: Fixed navigating between folders through the tree
2021-03-18 17:48:57 +03:00
Vladislav Makhov
12dc227d03
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-18 17:47:44 +03:00
TatianaLopaeva
0281e18e20
Web: Files: Fixed color.
2021-03-18 16:39:58 +03:00
TatianaLopaeva
c8d40e698e
Web: People/Files: Fixed color of icons.
2021-03-18 16:30:45 +03:00
Vladislav Makhov
a16a0a833d
web: people: fix cancel btn
2021-03-18 14:19:42 +03:00
Artem Tarasov
66c346b40d
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-18 13:40:16 +03:00
Artem Tarasov
592d51f32e
Web: Files: fixed AppLoader renderer when first opening SharingPanel, VersionHistoryPanel
2021-03-18 13:39:51 +03:00
TatianaLopaeva
0e0624c02d
Web: People: Added loader when change language & refactoring.
2021-03-18 12:02:37 +03:00
Alexey Kostenko
b4c89be548
Web: Files: Fixed row in Sharing Panel (mobile width)
2021-03-17 17:32:38 +03:00
TatianaLopaeva
7950df5aaa
Web: People: Fix translation after reload page.
2021-03-17 16:37:24 +03:00
Viktor Fomin
26318d3563
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-17 15:29:38 +03:00
Viktor Fomin
27e79b748e
Web: Files: show rows loader on mobile
2021-03-17 15:29:29 +03:00
19b9067d65
crm: refactoring
2021-03-17 14:50:13 +03:00
Artem Tarasov
1841730e20
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-17 13:38:16 +03:00
Artem Tarasov
c9e4df5f1b
Web: moved PeopleSelector to People
2021-03-17 13:37:22 +03:00
323d9fd76e
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-17 13:32:35 +03:00
4c55b2264a
Web: Files: fixed files opening
2021-03-17 13:32:25 +03:00
062cc4cc78
Web: Disabled initialization of service-workers on development
2021-03-17 12:59:11 +03:00
8e7cad9b3f
Web: Removed useless files
2021-03-17 12:36:14 +03:00
c08aad3ab1
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-16 22:47:49 +03:00
a25261f242
Web: Files: Fixed move from Folder to Settings and back
2021-03-16 22:47:41 +03:00
Artem Tarasov
e85b8f8118
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-16 18:04:54 +03:00
Artem Tarasov
517bbf9885
Web: Files: VersionHistory: fixed constant loading of the history of the first selected file, double request to the srver
2021-03-16 18:04:38 +03:00
Alexey Kostenko
299d7b888f
Web: Files: Fixed first render icons in SharingPanel
2021-03-16 16:49:40 +03:00
Vladislav Makhov
b0c00fe749
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
...
# Conflicts:
# products/ASC.People/Client/src/Routes.jsx
2021-03-16 16:33:18 +03:00
Alexey Kostenko
3b6c2dc80b
Web: Files: Fixed sharing panel styles
2021-03-16 16:23:05 +03:00
Alexey Kostenko
72aca76c12
Web: Files/Components: Fixed row styles
2021-03-16 16:17:50 +03:00
Artem Tarasov
f7ca96d0e4
Web: Files: VersionHistory: fixed warrning with keys of elements
2021-03-16 15:14:25 +03:00
7b5a9ab80d
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-16 14:10:29 +03:00
24a6d61205
Web: Added creation and run of service-worker to all client apps
2021-03-16 14:10:20 +03:00
Vladislav Makhov
3caa960440
web: people: comment out
2021-03-16 13:40:18 +03:00
Diana
73731f23b7
fix
2021-03-16 12:53:06 +03:00
Alexey Kostenko
76f06ece3a
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-16 11:26:59 +03:00
Alexey Kostenko
25b136eada
Web: Components: Files: Fixed row styles
2021-03-16 11:26:49 +03:00
3ca1d1553e
Web: Files: fixed fetchTreeFolders
2021-03-16 10:31:02 +03:00
TatianaLopaeva
6cd763a7d0
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-15 18:08:41 +03:00
TatianaLopaeva
9c119ca9c7
Web: Files fixed scroll top when selected a folder. (for Mobile)
2021-03-15 18:08:19 +03:00
Ilya Oleshko
d99e7b731f
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-15 17:58:45 +03:00
Ilya Oleshko
0da65a6675
Web: Files: ConnectDialog: Fixed setting OAuth token after sending request
2021-03-15 17:58:37 +03:00
Ilya Oleshko
1964aaecdd
Web: Files: TreeFoldersStore: Fixed returning folders after set and fetch
2021-03-15 17:57:23 +03:00
Vladislav Makhov
a8d439da3a
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-15 17:22:32 +03:00
Vladislav Makhov
2224ae0b03
web: files: fix item creation render
2021-03-15 17:22:01 +03:00
Ilya Oleshko
dd8257daf5
Web: Files: ThirdPartyDialog: Fixed props usage
2021-03-15 17:16:03 +03:00
3c4f71c355
Web: Files: fixed remove third-party providers
2021-03-15 16:49:21 +03:00
8279174355
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
...
# Conflicts:
# products/ASC.Files/Client/src/Files.jsx
2021-03-15 14:57:44 +03:00
9ba58855d4
Web: Files: fixed EmptyContainer
2021-03-15 14:51:23 +03:00
f3f4cfd0b2
Web: Files: fixed ThirdParty
2021-03-15 14:50:43 +03:00
4902cb6a74
crm: refactoring. migrate ReportsController and VoIPController
2021-03-15 14:36:22 +03:00
Artem Tarasov
1ee2e02963
Web: People: TargetUserStore: fixed inability to change the language in the profile (an error appeared)
2021-03-15 10:03:30 +03:00
30222afaa4
crm: refactoring
2021-03-13 21:00:08 +03:00
e47417cda9
Web: People: Moved pages folder from components
2021-03-13 20:07:32 +03:00
491e9c5a39
Web: Refactoring
2021-03-13 19:01:22 +03:00
b7a7be3d1f
Web: Refactoring
2021-03-13 18:33:43 +03:00
145d720299
Web: Webpack: Added base url and commented proxy
2021-03-13 18:31:09 +03:00
8e1f5b30b5
Merge branch 'develop' into feature/workspaces
...
# Conflicts:
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/yarn.lock
# products/ASC.People/Client/package.json
# 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.Components/yarn.lock
# yarn.lock
2021-03-13 16:01:41 +03:00
561739f490
crm: migrate HttpHandler to Middleware
2021-03-13 15:22:14 +03:00
4d5ca86a74
Merge branch 'master' into develop
...
# Conflicts:
# products/ASC.Files/Client/yarn.lock
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/.env
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Client/src/helpers/i18n.js
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/src/api/modules/index.js
# web/ASC.Web.Common/src/store/auth/reducer.js
# web/ASC.Web.Common/yarn.lock
# web/ASC.Web.Components/yarn.lock
2021-03-12 19:52:01 +03:00
e8e1a176ea
Update yarn.lock files
2021-03-12 18:38:55 +03:00
b90876c97d
Bump version to v0.0.11
2021-03-12 17:20:24 +03:00
Alexey Kostenko
60fca302e0
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-12 16:59:05 +03:00
Alexey Kostenko
2489c25224
Web: Files: Fixed icons path in Sharing panel
2021-03-12 16:53:47 +03:00
ca94ae28cd
Web: Files: fixed empty filter container
2021-03-12 16:30:36 +03:00
Alexey Kostenko
9f458a8bb5
Web: People: Fixed icons path in profile
2021-03-12 15:43:53 +03:00
Ilya Oleshko
e673f48751
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-12 13:00:24 +03:00
Ilya Oleshko
4e5c42ff91
Web: Files: Row: Removed unused props
2021-03-12 13:00:15 +03:00
Vladislav Makhov
494bc7a828
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-12 11:40:44 +03:00
Vladislav Makhov
6a17922554
web: people: fix routing
2021-03-12 11:06:13 +03:00
4ec8f4958b
Web: Files: fixed file action
2021-03-12 11:05:23 +03:00
131672666d
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-12 10:51:06 +03:00
76ea36e661
Web: Files: added Router to files, fixed VersionHistoryPanel
2021-03-12 10:50:54 +03:00
Vladislav Makhov
fad5f13110
web: people: remove unused code
2021-03-12 10:23:57 +03:00
Vladislav Makhov
e018a15087
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-12 10:18:18 +03:00
Vladislav Makhov
aeecf33f95
web: people: fix invite dialog
2021-03-12 10:18:05 +03:00
TatianaLopaeva
eaa46e6c0f
Web: People: Added reload page when change language.
2021-03-12 09:37:55 +03:00
Alexey Kostenko
d5a6b5d81b
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-11 17:36:01 +03:00
Alexey Kostenko
85fc7535bf
Web: Components/Files: Fixed rendering svg when change folder
2021-03-11 17:35:52 +03:00
Vladislav Makhov
f349eb4a96
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-11 16:10:35 +03:00
TatianaLopaeva
b57a5d0627
Web: Files: Fixed displaying icons.
2021-03-11 14:18:23 +03:00
30e4390a39
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-11 13:57:24 +03:00
e17f7d7799
Web: Files: fixed sharing panel
2021-03-11 13:57:14 +03:00
Vladislav Makhov
1ae9b03a9f
web: people: fix empty screen after delete group
2021-03-11 11:18:14 +03:00
Viktor Fomin
24b212246c
Web: Files: fixed favorite icon click
2021-03-11 11:00:53 +03:00
Viktor Fomin
56a5c1bf20
Web: Files: fixed lock file
2021-03-11 10:46:55 +03:00
Viktor Fomin
2872b75768
Web: Files: deleted extra icon
2021-03-10 22:29:23 +03:00
392984ded3
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-10 19:33:18 +03:00
f0829f059d
Webpack: Fix loading react.svg
2021-03-10 19:33:10 +03:00
62488521e3
Web: Files: Modified production build
2021-03-10 19:07:54 +03:00
5e42dab1e9
crm: refactoring
2021-03-10 18:38:56 +03:00
e8992345ba
Web: People: Modified production build
2021-03-10 18:38:53 +03:00
4eeb6322bd
Web: Files: added file actions notification
2021-03-10 18:04:21 +03:00
4ed3a1a777
Web: Files: fixed files selection
2021-03-10 16:44:24 +03:00
557527a977
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-10 12:14:34 +03:00
fde03a699a
Web: Files: moved downloadFiles action from Header
2021-03-10 12:14:23 +03:00
Vladislav Makhov
531a6e87d7
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-10 12:05:49 +03:00
Vladislav Makhov
a7e7cf5f1a
Web: people: router fix
2021-03-10 12:05:07 +03:00
Vladislav Makhov
41388d6f2a
web: people: remove unused code
2021-03-10 11:17:49 +03:00
TatianaLopaeva
79465f6889
Web: People: Added loading when selected group.
2021-03-10 10:51:59 +03:00
Diana
3efc35a9fa
fix
2021-03-09 20:58:40 +03:00
Diana
4e62f6a204
update migrations ef tools v.5.0.3
2021-03-09 20:56:57 +03:00
7c04c68274
Web: Files: moved EmptyFilesContainer from Body
2021-03-09 19:23:17 +03:00
7fab0b47d7
crm: refactoring code
2021-03-09 18:37:16 +03:00
c504fe44a6
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-09 15:26:05 +03:00
26cf03878a
Web: Files: moved MediaViewer from Body
2021-03-09 15:25:46 +03:00
Vladislav Makhov
4c37804df4
web: people: fix routing
2021-03-09 15:19:58 +03:00
Vladislav Makhov
f0b82c8cea
web: people: fix routing in edit page
2021-03-09 15:05:52 +03:00
Vladislav Makhov
751eb1d4b6
web: people: refactoring
2021-03-09 14:53:33 +03:00
Vladislav Makhov
111c45f40a
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
...
# Conflicts:
# products/ASC.People/Client/src/components/pages/Profile/Section/Header/index.js
# yarn.lock
2021-03-09 09:46:45 +03:00
Vladislav Makhov
54ff155c85
web: people: add experimental separate context menu file
2021-03-09 09:44:08 +03:00
Vladislav Makhov
a7f5f57e55
web: people: fix routing
2021-03-09 09:37:51 +03:00
2a5a78bc74
Web: Packages: stable versions
2021-03-06 21:46:04 +03:00
a8a55167eb
Web: Editor: Optimization
2021-03-06 18:50:06 +03:00
a8ffda6c0f
crm: migrate from old project
2021-03-05 23:06:49 +03:00
d4abc1dcdc
Web: Files: fix
2021-03-05 17:51:39 +03:00
653440772d
Web: Files: added translations to SimpleFilesRow
2021-03-05 17:27:44 +03:00
cee06497f8
Web: Files: fixed context menu actions
2021-03-05 17:06:23 +03:00
ce9cba95bd
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-05 17:04:27 +03:00
2e96e29f58
Web: Files: fixed context menu actions
2021-03-05 17:03:44 +03:00
Vladislav Makhov
012a3d0129
web: people: fix routing in user row
2021-03-05 16:46:08 +03:00
Alexey Kostenko
9a791c61ad
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-05 14:47:33 +03:00
Alexey Kostenko
80de5fcab9
Web: People: Fixed navigating from profile page to list
2021-03-05 14:47:12 +03:00
46f1495de5
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-05 14:38:50 +03:00
c52052a152
Web: Files: fixed context menu delete action, removed useless code
2021-03-05 14:38:41 +03:00
877016d8e3
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-05 12:41:08 +03:00
TatianaLopaeva
6dcc819386
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-05 11:54:21 +03:00
TatianaLopaeva
58bebe1b83
Web: People: Fix icon path at profile menu.
2021-03-05 11:53:52 +03:00
7db261fea4
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-05 11:46:27 +03:00
25a2daeab5
Web: Files: moved editCompleteAction to store
2021-03-05 11:46:16 +03:00
TatianaLopaeva
5412f7b860
Web: NavMenu: Fixed icon path, deleted useless icons from modules.
2021-03-05 11:09:23 +03:00
TatianaLopaeva
993ddf9ac8
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-05 11:02:18 +03:00
TatianaLopaeva
e81d2c8bb7
Web: Common: Fixed logoUrl.
2021-03-05 11:01:49 +03:00
Ilya Oleshko
6442dfddca
Web: Files: Fixed share icon path
2021-03-05 10:46:02 +03:00
82a6dafb0f
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-04 19:09:58 +03:00
28a798c542
Web: Fixed work with translations + refactoring:
...
+ Login re-written to functional component
+ Replaced css to scss
2021-03-04 19:09:46 +03:00
4c1913c28a
Web: Files: fixed files creation
2021-03-04 18:44:30 +03:00
63fec5b296
Web: Files: fixed download action
2021-03-04 16:53:16 +03:00
c655622794
Web: Files: added files actions store
2021-03-04 15:43:53 +03:00
3b93ba28de
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-04 15:42:52 +03:00
b93928948d
Web: Files: fixed header delete action
2021-03-04 15:42:41 +03:00
TatianaLopaeva
249ea4ed7b
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-04 14:37:01 +03:00
TatianaLopaeva
5c826bcf29
Web: Added top loading indicator for desktop.
2021-03-04 14:36:31 +03:00
cc9a904dc2
Web: Files: fix
2021-03-04 13:23:48 +03:00
7cec3df259
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-04 12:33:06 +03:00
c35ed454af
Web: Files: fixed files context menu actions
2021-03-04 12:32:53 +03:00
Vladislav Makhov
22c7dcb414
web: people: refactoring
2021-03-03 19:11:12 +03:00
8c936e3ce0
Web: Styling
2021-03-03 18:21:06 +03:00
47a030f5a1
Web: Restored process indication in Files
2021-03-03 17:58:56 +03:00
8e1d5fb0b4
Web: webpack: changed devtool
2021-03-03 17:58:16 +03:00
68930abdcb
Web: Move toastr function to Web Client (mf: "studio/toastr")
2021-03-03 16:46:04 +03:00
TatianaLopaeva
17ac53d015
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-03 15:42:58 +03:00
TatianaLopaeva
ada47512f1
Web: Moved PeopleSelector to the Web Client.
2021-03-03 15:41:28 +03:00
Vladislav Makhov
34c1816aa5
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-03 14:54:37 +03:00
Vladislav Makhov
57609a6e7e
web: people: ProfileAction refactoring
2021-03-03 14:54:26 +03:00
238914e25e
Web: Files: refactoring
2021-03-03 13:22:50 +03:00
Vladislav Makhov
1dbfd7f105
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-03 12:33:25 +03:00
Vladislav Makhov
d2dd11ef91
web: people: isMe refactoring
2021-03-03 12:33:17 +03:00
TatianaLopaeva
90831adc31
Web: Moved GroupSelector to the People module.
2021-03-03 12:09:12 +03:00
Vladislav Makhov
b8702eb270
web: people: add isMe
2021-03-03 12:05:34 +03:00
Vladislav Makhov
c2a5eea4be
web: people: refactoring
2021-03-03 12:05:08 +03:00
TatianaLopaeva
5212633a8d
Web: Moved errors from Common to the Web Client.
2021-03-03 11:15:11 +03:00
Vladislav Makhov
756039eccd
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-03 09:33:53 +03:00
bd48d80239
Merge branch 'master' into feature/crm-migrate
2021-03-02 19:30:27 +03:00
e061a6db9e
crm: migrate from old project
2021-03-02 19:29:07 +03:00
bf7f680d08
Web: Moved NavMenu to Web Client
2021-03-02 18:25:20 +03:00
Vladislav Makhov
bb81b97df2
web: people: add missing prop
2021-03-02 16:36:45 +03:00
df8d922b9a
Web: People: refactoring
2021-03-02 15:44:14 +03:00
3ce638b69a
Web: People: Simplified People Home page (fixed render issues)
2021-03-02 15:11:17 +03:00
c304bbe8b7
Web: People: Fixed displaying user list
2021-03-02 11:06:34 +03:00
94708ed455
Web: Fixed opening /products/(files|people) with /filter (or profile) + proxy
2021-03-01 22:48:48 +03:00
8afbae082e
crm: migrate from old project
2021-03-01 20:36:18 +03:00
8a6afa8111
Web: Fixed load source maps
2021-03-01 18:21:40 +03:00
27ba8efeb3
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-01 17:01:02 +03:00
79cb70bc1f
Web: Added opportunity to load people page by primary link
2021-03-01 17:00:54 +03:00
0cf1150288
Web: Added opportunity to load files page by primary link
2021-03-01 16:29:37 +03:00
Ilya Oleshko
0c1689bec5
Bump version to v0.0.10
2021-03-01 16:27:21 +03:00
Vladislav Makhov
47004a1e1d
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
...
# Conflicts:
# packages/asc-web-components/input-block/index.js
2021-03-01 16:12:34 +03:00
Vladislav Makhov
f452b09ecd
web: fix icons
2021-03-01 16:11:45 +03:00
09d330104b
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-01 15:03:21 +03:00
1cfb03810e
Web: Added imports
2021-03-01 15:03:13 +03:00
d66f299f87
Web: Files: fixed mobx warnings
2021-03-01 14:43:19 +03:00
f734a91d82
Files: fix SaveEditing
2021-03-01 14:38:55 +03:00
7339fec101
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-01 14:16:47 +03:00
e6aeaac4a5
Web: Files: decomposed the settings store object
2021-03-01 14:16:37 +03:00
Vladislav Makhov
603db877b5
web: people: fix import
2021-03-01 12:30:33 +03:00
Vladislav Makhov
628916a1c1
web: people: fix svg import
2021-03-01 11:56:11 +03:00
TatianaLopaeva
b8fabd5de0
Update webpack.config for fix displaying of icons.
2021-02-28 21:59:50 +03:00
TatianaLopaeva
5ac0124640
Upgrade version of react-svg to remove additional wrapper and fix problem with displaying icons.
2021-02-28 21:39:50 +03:00
TatianaLopaeva
1e266d6fc8
Web: Files: Fix not displaying icon at actions.
2021-02-28 21:24:13 +03:00
Vladislav Makhov
7bf2a8e9b5
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-02-26 18:33:28 +03:00
7852dac3ca
Files: fix saveediting
2021-02-26 17:07:08 +03:00
f357c8b78c
Web: fixed icons for files module
2021-02-26 16:29:50 +03:00
Vladislav Makhov
ae45d875f6
web: people: fix group fetching
2021-02-26 15:53:06 +03:00
a2ace1a012
Web: People: Fix opening
2021-02-26 13:06:59 +03:00
96c4d63abe
Web: Fixed Files opening + added devtool: "inline-source-map"
2021-02-26 12:02:54 +03:00
Artem Tarasov
f10d8ae11d
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-02-26 00:20:24 +03:00
Artem Tarasov
904813031b
Web; People/Files/Login: fix imports
2021-02-26 00:19:04 +03:00
dccbe81002
DataAnnotations: fix
2021-02-25 21:18:27 +03:00
TatianaLopaeva
99ef717815
Web: Files: Fix url for common icons.
2021-02-25 19:12:39 +03:00
TatianaLopaeva
b7fc7dd523
Web: Files: Fix tree-folder icons.
2021-02-25 19:03:36 +03:00
Artem Tarasov
c35d0612f0
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
...
# Conflicts:
# products/ASC.Files/Client/src/store/InitFilesStore.js
2021-02-25 18:42:10 +03:00
Artem Tarasov
15602c3a8f
Web: Files: fix after merge
2021-02-25 18:41:06 +03:00
TatianaLopaeva
ab93fac698
Web: Files: Fix icons size.
2021-02-25 18:30:31 +03:00
933a1aec48
Web: Files: fixed tree menu
2021-02-25 18:03:54 +03:00
Artem Tarasov
9b27d51ac5
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
...
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/ThirdPartyList.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/AccessComboBox.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/linkRow.js
# products/ASC.Files/Client/src/helpers/desktop.js
# products/ASC.Files/Client/src/i18n.js
# products/ASC.Files/Client/src/store/FilesStore.js
# products/ASC.Files/Client/src/store/SettingsStore.js
# products/ASC.Files/Client/src/store/ThirdPartyStore.js
# products/ASC.Files/Client/src/store/TreeFoldersStore.js
# products/ASC.Files/Client/src/store/UploadDataStore.js
# products/ASC.Files/Client/src/store/VersionHistoryStore.js
# products/ASC.People/Client/src/helpers/converters.js
# products/ASC.People/Client/src/helpers/people-helpers.js
2021-02-25 17:57:32 +03:00
8b962cd88d
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-02-25 17:20:19 +03:00
Artem Tarasov
48b3c6b445
Web: Common: fix after merge, fix imports and hierarchy
2021-02-25 17:20:11 +03:00
b4fa1b2bb1
Web: Files: fixed icons imports, fixed components imports, fixed files module
2021-02-25 17:20:06 +03:00
Artem Tarasov
69ed46e8ae
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
...
# Conflicts:
# products/ASC.People/Client/src/components/Article/Body/index.js
# web/ASC.Web.Login/src/Login.jsx
2021-02-25 15:27:36 +03:00
Artem Tarasov
989fba5ecc
Web: applied new import from appserver/common
2021-02-25 15:22:53 +03:00
Vladislav Makhov
e91bb64d03
web: people: fix imports
2021-02-25 15:16:52 +03:00
b25dd2d6e2
.net 5
2021-02-25 12:02:28 +03:00
Diana
f1091f409a
fix dataannotations
2021-02-25 12:00:53 +03:00
4a40c8f894
Fix dependencies
2021-02-25 10:29:57 +03:00
Artem Tarasov
69dd27fac7
Web: applied new import from appserver/components
2021-02-24 20:11:23 +03:00
083d25bcd6
CRM: продолжаю переносить проект
2021-02-24 19:50:07 +03:00
38a00bdd7d
Merge branch 'develop' into feature/dataannotations
2021-02-24 15:38:34 +03:00
2007d9b3da
Web: People: Changed imports
2021-02-24 12:25:18 +03:00
507fadff55
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
...
# Conflicts:
# packages/asc-web-common/src/components/NavMenu/sub-components/nav-item.js
# packages/asc-web-common/src/store/auth/selectors.js
# packages/asc-web-components/src/components/icons/svg/index.js
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/Article/Body/TreeSettings.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/BadgesFileTile.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
# products/ASC.Files/Client/src/components/pages/Settings/Section/Body/ConnectedClouds.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/AccessComboBox.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/SharingRow.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/linkRow.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/ShareButton.js
# 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/Home/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Body/userContent.js
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Client/src/Shell.jsx
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
# yarn.lock
2021-02-24 10:57:03 +03:00
34d9eed580
Merge branch 'develop' into feature/workspaces
...
# Conflicts:
# packages/asc-web-common/src/components/GroupSelector/GroupSelector.stories.js
# packages/asc-web-common/src/components/NavMenu/sub-components/header-nav.js
# packages/asc-web-common/src/components/NavMenu/sub-components/header.js
# packages/asc-web-common/src/components/NavMenu/sub-components/nav-item.js
# packages/asc-web-common/src/components/NavMenu/sub-components/nav-logo-item.js
# packages/asc-web-common/src/components/PageLayout/index.js
# packages/asc-web-common/src/components/PeopleSelector/PeopleSelector.stories.js
# packages/asc-web-common/src/components/PrivateRoute/PrivateRoute.js
# packages/asc-web-common/src/store/AuthStore.js
# packages/asc-web-common/src/store/ModuleStore.js
# packages/asc-web-common/src/store/SettingsStore.js
# packages/asc-web-common/src/store/UserStore.js
# packages/asc-web-common/src/store/auth/actions.js
# packages/asc-web-common/src/store/auth/index.js
# packages/asc-web-common/src/store/auth/reducer.js
# packages/asc-web-common/src/store/auth/selectors.js
# products/ASC.Files/Client/config-overrides.js
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/Article/Body/ThirdPartyList.js
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/Article/Body/TreeSettings.js
# products/ASC.Files/Client/src/components/Article/Body/index.js
# products/ASC.Files/Client/src/components/Article/Header/index.js
# products/ASC.Files/Client/src/components/Article/MainButton/index.js
# products/ASC.Files/Client/src/components/dialogs/ConnectDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/ConvertDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/DeleteThirdPartyDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/DownloadDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/EmptyTrashDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/ThirdPartyMoveDialog/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/BadgesFileTile.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Paging/index.js
# products/ASC.Files/Client/src/components/pages/Home/index.js
# products/ASC.Files/Client/src/components/pages/Settings/Section/Body/ConnectedClouds.js
# products/ASC.Files/Client/src/components/pages/Settings/Section/Body/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/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/ChangeOwnerPanel/index.js
# products/ASC.Files/Client/src/components/panels/EmbeddingPanel/index.js
# products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
# products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/AccessComboBox.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/components/panels/UploadPanel/ShareButton.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/index.js
# products/ASC.Files/Client/src/components/panels/VersionHistoryPanel/index.js
# products/ASC.Files/Client/src/helpers/desktop.js
# products/ASC.Files/Client/src/helpers/i18n.js
# products/ASC.Files/Client/src/helpers/utils.js
# products/ASC.Files/Client/src/index.js
# products/ASC.Files/Client/src/store/files/actions.js
# products/ASC.Files/Client/src/store/files/reducers.js
# products/ASC.Files/Client/src/store/rootReducer.js
# products/ASC.People/Client/config-overrides.js
# products/ASC.People/Client/package.json
# products/ASC.People/Client/src/App.js
# products/ASC.People/Client/src/components/Article/Body/index.js
# products/ASC.People/Client/src/components/Article/Header/index.js
# products/ASC.People/Client/src/components/Article/MainButton/index.js
# products/ASC.People/Client/src/components/dialogs/ChangeEmailDialog/index.js
# products/ASC.People/Client/src/components/dialogs/ChangePasswordDialog/index.js
# products/ASC.People/Client/src/components/dialogs/ChangePhoneDialog/index.js
# products/ASC.People/Client/src/components/dialogs/ChangeUserStatusDialog/index.js
# products/ASC.People/Client/src/components/dialogs/ChangeUserTypeDialog/index.js
# products/ASC.People/Client/src/components/dialogs/DataLossWarningDialog/index.js
# products/ASC.People/Client/src/components/dialogs/DeleteProfileEverDialog/index.js
# products/ASC.People/Client/src/components/dialogs/DeleteSelfProfileDialog/index.js
# products/ASC.People/Client/src/components/dialogs/DeleteUsersDialog/index.js
# products/ASC.People/Client/src/components/dialogs/InviteDialog/index.js
# products/ASC.People/Client/src/components/dialogs/SendInviteDialog/index.js
# products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/GroupAction/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Body/userContent.js
# products/ASC.People/Client/src/components/pages/Home/Section/Filter/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Paging/index.js
# products/ASC.People/Client/src/components/pages/Home/index.js
# 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
# 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/components/pages/ProfileAction/Section/Body/avatarEditorPage.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/createAvatarEditorPage.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
# products/ASC.People/Client/src/components/pages/ProfileAction/index.js
# products/ASC.People/Client/src/components/pages/Reassign/Section/Header/index.js
# products/ASC.People/Client/src/components/pages/Reassign/index.js
# products/ASC.People/Client/src/helpers/i18n.js
# products/ASC.People/Client/src/helpers/utils.js
# products/ASC.People/Client/src/index.js
# products/ASC.People/Client/src/store/people/reducers.js
# products/ASC.People/Client/src/store/portal/actions.js
# products/ASC.People/Client/src/store/portal/reducers.js
# products/ASC.People/Client/src/store/profile/actions.js
# products/ASC.People/Client/src/store/profile/selectors.js
# products/ASC.People/Client/src/store/rootReducer.js
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/config-overrides.js
# web/ASC.Web.Client/package.json
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Client/src/components/pages/About/index.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/activateUser.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/components/pages/Confirm/sub-components/changePassword.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changePhone.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/profileRemove.js
# web/ASC.Web.Client/src/components/pages/Home/index.js
# web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/index.js
# web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/sub-components/advantagesContainer.js
# web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/sub-components/buttonContainer.js
# web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/sub-components/contactContainer.js
# web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/sub-components/headerContainer.js
# web/ASC.Web.Client/src/components/pages/Settings/Layout/index.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/custom-titles.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/language-and-time-zone.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/whitelabel.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerModalDialog.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/thirdPartyServicesSettings.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/accessRights.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/admins.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/modules.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/owner.js
# web/ASC.Web.Client/src/components/pages/ThirdParty/index.js
# web/ASC.Web.Client/src/components/pages/Wizard/index.js
# web/ASC.Web.Client/src/helpers/confirmRoute.js
# web/ASC.Web.Client/src/helpers/i18n.js
# web/ASC.Web.Client/src/helpers/utils.js
# web/ASC.Web.Client/src/index.js
# web/ASC.Web.Client/src/store/confirm/actions.js
# web/ASC.Web.Client/src/store/payments/actions.js
# web/ASC.Web.Client/src/store/settings/reducer.js
# web/ASC.Web.Client/src/store/settings/selectors.js
# web/ASC.Web.Client/src/store/store.js
# web/ASC.Web.Client/src/store/wizard/actions.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
# web/ASC.Web.Login/src/Login.jsx
# web/ASC.Web.Login/src/sub-components/register-container.js
# yarn.lock
2021-02-24 10:30:42 +03:00
TatianaLopaeva
2ee7f60d4c
Web/Files: Refactoring.
2021-02-23 22:19:51 +03:00
TatianaLopaeva
3e3b079b5a
Web: Components: Deleted useless Icons component.
2021-02-23 22:14:42 +03:00
846af80668
Update react-script and yarn.lock files
2021-02-23 15:56:29 +03:00
d270048827
Web: Removed commented code
2021-02-23 12:46:33 +03:00
Diana
4ddd2cebec
delete dataannotations
2021-02-20 22:02:12 +03:00
TatianaLopaeva
5fdb5c8508
Web: Fix not displaing of icons.
2021-02-20 18:25:46 +03:00
TatianaLopaeva
1d1cbe01af
Web: People: Downgrade rc-tree package.
2021-02-20 17:54:41 +03:00
TatianaLopaeva
1f8fd0a9db
Web: Added styles for icons. Added common icons styles.
2021-02-20 17:54:12 +03:00
6c80ebdff0
Merge branch 'develop' into feature/mobx
...
# Conflicts:
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/Article/Body/ThirdPartyList.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/components/pages/Home/index.js
# products/ASC.Files/Client/src/store/files/selectors.js
# products/ASC.People/Client/src/App.js
# products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.People/Client/src/components/pages/Home/index.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/index.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/src/store/group/actions.js
# products/ASC.People/Client/src/store/people/actions.js
# products/ASC.People/Client/src/store/people/selectors.js
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Client/src/components/pages/About/index.js
# web/ASC.Web.Client/src/components/pages/Home/index.js
# web/ASC.Web.Client/src/store/settings/actions.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/NavMenu/sub-components/header-nav.js
# web/ASC.Web.Common/src/components/NavMenu/sub-components/header-unauth.js
# web/ASC.Web.Common/src/components/NavMenu/sub-components/header.js
# web/ASC.Web.Common/src/components/NavMenu/sub-components/nav-item.js
# web/ASC.Web.Common/src/components/PageLayout/index.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
# web/ASC.Web.Components/src/components/loader/types/rombs.js
2021-02-20 17:31:58 +03:00
TatianaLopaeva
5d26bd5670
Web: Downgrade rc-tree package.
2021-02-20 13:19:01 +03:00
TatianaLopaeva
7023cf5f3a
Web: Transferring icons from a shared folder to modules. Icons are displayed by url.
2021-02-20 11:46:32 +03:00
Vladislav Makhov
697c6fc8b8
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
2021-02-20 10:46:33 +03:00
87b1108147
Web: Turned debug in i18n
2021-02-19 21:59:33 +03:00
d8bd3f6e7c
Web: Files: Simplified translation
2021-02-19 21:57:01 +03:00
19c7104d3d
Web: Removed useless dev packages + fixed warnings of building
2021-02-19 20:51:44 +03:00
85a500eac6
Web: Client: Simplified translation
2021-02-19 20:26:41 +03:00
d2e46c396f
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
2021-02-19 19:27:23 +03:00
e97ba3a8b3
Web: People: Simplified translation
2021-02-19 19:27:13 +03:00
Vladislav Makhov
a7208bf244
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
2021-02-19 16:08:39 +03:00
Vladislav Makhov
0b1f8cb22d
web: people: change prop to primitive value
2021-02-19 16:05:20 +03:00
7e32c26241
Files: fixed tests
2021-02-19 14:52:29 +03:00
3f35977864
Web: Files: fixed Header rerender
2021-02-19 13:22:38 +03:00
faae49a0e1
Merge branch 'feature/mobx' of https://github.com/ONLYOFFICE/AppServer into feature/mobx
2021-02-19 12:21:19 +03:00
e2cc45d1d1
Web: Files: fixed Home component rerender
2021-02-19 12:21:09 +03:00
Ilya Oleshko
cb72f2241b
Web: Added product version badge
2021-02-18 15:55:26 +03:00
Vladislav Makhov
753d1472b7
web: people: hide unused props
2021-02-18 15:15:14 +03:00
Vladislav Makhov
474fe57466
web: people: remove console.log
2021-02-18 13:24:34 +03:00
47d8405a01
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
2021-02-18 12:55:46 +03:00
a59ffc0a81
Web: Enabled wdy in People and Files
2021-02-18 12:55:37 +03:00
64c65a4a41
Merge branch 'feature/mobx' of https://github.com/ONLYOFFICE/AppServer into feature/mobx
2021-02-18 12:24:28 +03:00
561c82bccf
Web: Files: fixed files empty screen
2021-02-18 12:24:06 +03:00
Vladislav Makhov
f452ae2eae
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
2021-02-18 11:52:13 +03:00
Vladislav Makhov
855fd46560
web: people: return to set selected mechanism in group button menu
2021-02-18 11:52:03 +03:00
6e29fce81b
Merge branch 'feature/mobx' of https://github.com/ONLYOFFICE/AppServer into feature/mobx
2021-02-18 11:23:21 +03:00
d81b0fd770
Web: Files: fixed treeFolders
2021-02-18 11:23:03 +03:00
Vladislav Makhov
f5cf3683f4
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
2021-02-17 19:22:12 +03:00
Vladislav Makhov
da0d039be7
web: people: remove console.log
2021-02-17 19:22:04 +03:00
fbde2ee6f8
Web: Files: move from redux to mobx
2021-02-17 18:35:04 +03:00
3b659a31f5
Web: Files: fixed files creation
2021-02-17 18:07:09 +03:00
ca166e3c66
Web: People: Move from redux to mobx completely
2021-02-17 17:53:18 +03:00
Vladislav Makhov
4029233d32
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
2021-02-17 12:46:32 +03:00
Vladislav Makhov
98ab4973ae
web: people: hide unused code
2021-02-17 12:46:21 +03:00
Vladislav Makhov
1042506645
web: people: hide unused code
2021-02-17 12:30:55 +03:00
Vladislav Makhov
8d4994cb40
web: people: add getters
2021-02-17 12:30:36 +03:00
1ddcca5ed3
Merge branch 'feature/mobx' of https://github.com/ONLYOFFICE/AppServer into feature/mobx
2021-02-17 11:20:18 +03:00
de57a61c59
Web: Files: refactoring
2021-02-17 11:20:08 +03:00
Vladislav Makhov
4d0fbe8903
web: people: add missing observable dependencies in storages
2021-02-16 18:11:18 +03:00
Vladislav Makhov
15c80ae139
web: people: init refactoring
2021-02-16 17:42:33 +03:00
Vladislav Makhov
cb9dbff58f
web: people: fix callback param
2021-02-16 17:13:26 +03:00
Vladislav Makhov
a683c53735
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
2021-02-16 16:52:02 +03:00
7e86c680e3
Web: Files: added files uploader
2021-02-16 16:48:04 +03:00
Ilya Oleshko
d204c9b6de
Merge branch 'develop' into feature/not-implemented-page
2021-02-16 13:22:34 +03:00
52c9e4daac
Merge branch 'feature/mobx' of https://github.com/ONLYOFFICE/AppServer into feature/mobx
...
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Header/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
2021-02-16 12:16:13 +03:00
Vladislav Makhov
1d7f8c2e97
web: people: fix editing form data injection
2021-02-16 12:13:19 +03:00
a1fc390bc2
Web: Files: created formatsStore
2021-02-16 12:01:51 +03:00
Vladislav Makhov
c5ad94e358
resolve merge conflicts
2021-02-16 10:27:53 +03:00
Vladislav Makhov
09c580e268
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
...
# Conflicts:
# products/ASC.People/Client/src/components/pages/GroupAction/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Paging/index.js
# products/ASC.People/Client/src/components/pages/Home/index.js
# 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
# 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/components/pages/ProfileAction/index.js
# products/ASC.People/Client/src/components/pages/Reassign/Section/Header/index.js
2021-02-16 10:20:43 +03:00
Vladislav Makhov
e513ad35c9
web: people: hide unused code
2021-02-16 10:01:01 +03:00
Vladislav Makhov
86faaad05f
web: people: add is People admin getter
2021-02-16 10:00:35 +03:00
Vladislav Makhov
702351dbdd
web: people: add several func's
2021-02-16 09:59:56 +03:00
Vladislav Makhov
9db00e24ae
web: people: group button menu fix
2021-02-16 09:53:52 +03:00
722e04b458
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
...
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/ThirdPartyList.js
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/Article/Body/TreeSettings.js
# products/ASC.Files/Client/src/components/Article/MainButton/index.js
# products/ASC.Files/Client/src/components/dialogs/ConnectDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/ConvertDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/DeleteThirdPartyDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/DownloadDialog/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/components/pages/Settings/Section/Body/ConnectedClouds.js
# products/ASC.Files/Client/src/components/pages/Settings/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Settings/index.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.js
# products/ASC.Files/Client/src/components/panels/ChangeOwnerPanel/index.js
# products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
# products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/index.js
# products/ASC.People/Client/src/components/pages/Home/index.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
2021-02-15 23:03:15 +03:00
0b9a258f91
Web: Client: Moved to MobX
2021-02-15 22:43:07 +03:00
Vladislav Makhov
38dffc62ad
web: people: migrate data to mobx
2021-02-15 19:56:35 +03:00
Vladislav Makhov
5946e5b157
web: people: remove unused code
2021-02-15 18:47:17 +03:00
b37ee479e1
Merge branch 'feature/mobx' of https://github.com/ONLYOFFICE/AppServer into feature/mobx
2021-02-15 18:36:16 +03:00
d7647f6271
Web: Files: removed settings from FilesStore
2021-02-15 18:36:07 +03:00
Vladislav Makhov
ead67641a1
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
2021-02-15 18:26:31 +03:00
Vladislav Makhov
9f20de7496
web: people: migrate data to mobx
2021-02-15 18:26:17 +03:00
Artem Tarasov
3414ebc986
Web: People: dialogs/DeleteProfileEverDialog: removed anonymous function creation
2021-02-15 15:26:56 +03:00
42f5401a29
Merge branch 'feature/mobx' of https://github.com/ONLYOFFICE/AppServer into feature/mobx
2021-02-15 15:11:45 +03:00
68910bfa04
Web: Files: removed redux provider from files
2021-02-15 15:11:26 +03:00
Vladislav Makhov
aeeac1cc47
web: people: migrate data to mobx
2021-02-15 12:55:51 +03:00
Vladislav Makhov
be2813304e
web: people: hide unused code
2021-02-15 12:55:35 +03:00
Vladislav Makhov
0712360025
web: people: hide unused code
2021-02-15 12:55:17 +03:00
Vladislav Makhov
8827e6b8e2
web: people: migrate dialogues data to mobx
2021-02-15 12:53:50 +03:00
Vladislav Makhov
93b34f1150
web: people: migrate profile data to mobx
2021-02-15 12:52:29 +03:00
Vladislav Makhov
048da06f6e
web: people: add func's to AvatarEditorStore
2021-02-15 12:51:37 +03:00
Vladislav Makhov
94ff0f7dd8
web: people: InviteLinksStore init, add SetisLoading action
2021-02-15 12:51:10 +03:00
Vladislav Makhov
1c4df51ed3
web: people: update getTargetUser func
2021-02-15 12:50:29 +03:00
Vladislav Makhov
caa2388c34
web: people: add setUsers, update updateProfileInUsers func's
2021-02-15 12:49:49 +03:00
Vladislav Makhov
926ead6d6b
web: people: hide unused code
2021-02-15 12:48:46 +03:00
Vladislav Makhov
eb0f8bd208
web: people: add Invite Links Store
2021-02-15 12:48:08 +03:00
Ilya Oleshko
f2f2fbc07c
Merge branch 'develop' into feature/not-implemented-page
2021-02-15 10:58:34 +03:00
Artem Tarasov
134cb7f0ed
Web: People: GroupAction/helpers: added to helpers/constants.js user id if there is no manager in the group
2021-02-12 18:12:44 +03:00
Artem Tarasov
0533163c78
Web: People: Home: deleted unnecessary code
2021-02-12 16:04:51 +03:00
Artem Tarasov
1ddc2c951a
Merge branch 'develop' into feature/empty-group
...
# Conflicts:
# web/ASC.Web.Common/package.json
2021-02-12 13:10:41 +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
bf2da1322e
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
2021-02-10 20:24:43 +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
b8db0ea2a5
Web: Files: added new mobx storages
2021-02-10 17:46:48 +03:00
d804e3fbad
Merge branch 'feature/mobx' of https://github.com/ONLYOFFICE/AppServer into feature/mobx
2021-02-10 17:34:49 +03:00
c6b9ef48af
Files: fix GetRecalculateFilesCountUpdate
2021-02-10 15:44:07 +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
7f8a95058f
Web: Files: added context options to files row, added tree menu
2021-02-09 17:22:51 +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
Viktor Fomin
accdc264b8
Web: Files: fixed property
2021-02-08 14:49:53 +03:00
Vladislav Makhov
e1f7c37a6b
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
2021-02-08 10:43:36 +03:00
Vladislav Makhov
cf6511cad2
web: people: migrate groups data
2021-02-08 10:43:20 +03:00
04dd3f792c
Merge branch 'feature/mobx' of https://github.com/ONLYOFFICE/AppServer into feature/mobx
2021-02-08 10:43:20 +03:00
4d4e464275
Web: Files: moved isLoading to mobx store, added checkbox to files row
2021-02-08 10:43:10 +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
3b6ffef2a8
Merge branch 'develop' into feature/empty-group
2021-02-05 17:26:38 +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
c10c1f17cd
Merge branch 'feature/mobx' of https://github.com/ONLYOFFICE/AppServer into feature/mobx
2021-02-05 16:25:02 +03:00
2d9ee116de
Web: Files: added new mobx stores, replaced fetchFiles from redux to mobx action
2021-02-05 16:24:54 +03:00
Viktor Fomin
da33e26515
Web: Files: deleted console.log
2021-02-05 16:19:48 +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
Viktor Fomin
7188cda442
Web: Files: fixed favorite
2021-02-05 15:43:55 +03:00
Viktor Fomin
f921bdc9d0
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into bugfix/layout-fix
2021-02-05 15:35:42 +03:00
c66837ab0d
Files: fix status
2021-02-05 15:34:12 +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
Viktor Fomin
2de83fa0ae
Web: Files: fixed icons
2021-02-04 20:16:56 +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
7cf89aef1f
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
2021-02-04 16:24:46 +03:00
Vladislav Makhov
203e02e931
web: people: add People store models
2021-02-04 16:24:30 +03:00
Viktor Fomin
efd5b28cea
Web: Files: fixed spaces
2021-02-04 13:33:00 +03:00
Viktor Fomin
2a38633702
Web: Files: truncate filename in version history
2021-02-04 13:08:22 +03:00
9413ea871a
Web: Files: moved App from redux to mobx
2021-02-04 12:52:43 +03:00
Vladislav Makhov
c3eabf09e8
web: people: add inject and observer HOC's
2021-02-04 11:55:14 +03:00
Artem Tarasov
3ccf6fe42d
Merge branch 'develop' into feature/empty-group
2021-02-04 11:08:18 +03:00
Artem Tarasov
9618be3c73
Web: People: EmptyScreen: fixed selector for defining empty group
2021-02-04 11:01:22 +03:00
Ilya Oleshko
3a01516131
Merge branch 'develop' into feature/not-implemented-page
2021-02-03 21:14:58 +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
Alexey Kostenko
c250dc2034
Web: Component: Removed duplicate icon
2021-02-03 16:15:47 +03:00
Alexey Kostenko
3262f62c89
Merge branch 'develop' into feature/access-rights-fix
2021-02-03 16:06:52 +03:00
Alexey Kostenko
5a343565f4
Web: Files: SharingPanel: ComboBox button style fix
2021-02-03 16:03:23 +03:00
8bb69dd12f
Merge branch 'master' into feature/crm-migrate
2021-02-03 15:53:22 +03:00
Alexey Kostenko
da2216c005
Web: Files: Changed internal link icon
2021-02-03 14:39:32 +03:00
59ffbeaf1e
People: added method to get groups with members
2021-02-03 13:48:52 +03:00
Alexey Kostenko
bfcbf8fbdd
Merge branch 'develop' into feature/row-content-icon-fix
2021-02-03 10:45:00 +03:00
Vladislav Makhov
ee4dc0b142
web: add provider to People, fix init data fetching
2021-02-03 09:22:56 +03:00
Artem Tarasov
a23348732f
Merge branch 'develop' into feature/empty-group
2021-02-02 20:31:09 +03:00
Artem Tarasov
ecce59a4ff
Web: Common/People: Filter: renamed method resetWithoutGroup to reset'
2021-02-02 20:12:38 +03:00
Alexey Kostenko
2cadd58cf5
Web: Files: Do not show the pencil icon in Row, if user can't to edit the a document
2021-02-02 18:13:27 +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
Viktor Fomin
05d1359e39
Web: Files: added translate
2021-02-02 15:40:04 +03:00
Viktor Fomin
793a28715c
Web: Files: added translate
2021-02-02 15:38:26 +03:00
Viktor Fomin
4774a35c40
Web: Files: added translate
2021-02-02 15:34:29 +03:00
Vladislav Makhov
27523dc53a
web: files: fix merge
2021-02-02 10:44:56 +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
f8e6a72460
Web: Changed work with settings data from redux to mobx
2021-02-02 09:48:57 +03:00
Viktor Fomin
19a5526af4
Web: Files: added success message translate
2021-02-02 00:40:09 +03:00
Viktor Fomin
7dfa50a23e
Web: Files: delete files without notification
2021-02-02 00:36:18 +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
Alexey Kostenko
6bd41fa586
Web: Files: Fixed date, time and username in version history
2021-02-01 14:34:43 +03:00
Vladislav Makhov
de88da2fa7
Web: Changed work with user data from redux to mobx
2021-02-01 11:45:26 +03:00
Ilya Oleshko
8910ab5d65
Merge branch 'develop' into feature/not-implemented-page
2021-02-01 10:42:18 +03:00
Artem Tarasov
2f19984504
Merge branch 'develop' into feature/empty-group
2021-01-30 02:29:38 +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
Viktor Fomin
753fbb8a58
Merge branch 'develop' into bugfix/remove-google-sharing
2021-01-29 17:02:48 +03:00
Viktor Fomin
cb2d37f107
Web: Files: removed google plus share
2021-01-29 16:47:21 +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
Viktor Fomin
1dbf7098bb
Web: Files: fixed file status
2021-01-29 15:40:35 +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
a9b16585ea
Files: fix delete
2021-01-29 10:17:56 +03:00
TatianaLopaeva
8adfa96cbb
Web: Files: Deleted useless console.log.
2021-01-28 16:20:03 +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
993611097b
Merge branch 'develop' into feature/fix-hide/show-header
2021-01-28 10:50:29 +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
0246a30e84
Files: fix creation text file
2021-01-27 21:11:47 +03:00
TatianaLopaeva
77ce035d15
Web: Files/People: Fixed context menu for desktop.
2021-01-27 20:01:52 +03:00
666a390f13
Merge branch 'feature/fix-hide/show-header' of https://github.com/ONLYOFFICE/AppServer into feature/fix-hide/show-header
2021-01-27 19:28:45 +03:00
680622218e
Web: Components: fixed double opening of context menu for desktops
2021-01-27 19:28:34 +03:00
7cf1252b1e
Web: Files: fixed field isFolder to selection
2021-01-27 19:26:14 +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
Vladislav Makhov
72a5b5c2b9
Merge branch 'feature/upload-panel' of github.com:ONLYOFFICE/AppServer into feature/upload-panel
2021-01-27 17:29:09 +03:00
Vladislav Makhov
439abb6cd1
web: files: remove unused code
2021-01-27 17:28:54 +03:00
Viktor Fomin
32bfef070e
Update yarn.lock files
2021-01-27 17:23:40 +03:00
Vladislav Makhov
3af17d659f
web: files: remove unused code
2021-01-27 16:58:46 +03:00
Vladislav Makhov
a50f1a0d87
web: files: refactoring
2021-01-27 16:58:00 +03:00
Vladislav Makhov
b01200d5ed
web: files: remove unused code
2021-01-27 16:30:04 +03:00
Viktor Fomin
6e6d706b23
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/upload-panel
2021-01-27 16:09:59 +03:00
b1dbaf7005
Web: Modified first templates
2021-01-27 15:38:35 +03:00
Vladislav Makhov
700bca9c61
Merge branch 'feature/upload-panel' of github.com:ONLYOFFICE/AppServer into feature/upload-panel
2021-01-27 13:44:03 +03:00
Vladislav Makhov
7c267fd921
web: files: fix progress bar view
2021-01-27 13:43:51 +03:00
Viktor Fomin
4cc187fc78
Web: Files: fix
2021-01-27 13:10:22 +03:00
Viktor Fomin
88ceb29faa
Merge branch 'feature/upload-panel' of github.com:ONLYOFFICE/AppServer into feature/upload-panel
2021-01-27 12:50:50 +03:00
Viktor Fomin
6e48956d08
Web: Files: fixed empty panel
2021-01-27 12:50:36 +03:00
Viktor Fomin
a8d6ec462a
Web: Files: fixed tooltip
2021-01-27 12:37:54 +03:00
Viktor Fomin
3363a34113
Web: Files: filename truncation
2021-01-27 12:18:16 +03:00
Vladislav Makhov
f0052add3e
web: files: fix privacy room error
2021-01-27 12:17:37 +03:00
Viktor Fomin
9bb716a575
Web: Files: returned translation
2021-01-27 12:07:24 +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
61cfd029d9
Added CRM
2021-01-26 20:36:03 +03:00
9148527b90
Projects: fix
2021-01-26 20:09:50 +03:00
TatianaLopaeva
951961ad35
Web: Refactoring.
2021-01-26 18:21:50 +03:00
Vladislav Makhov
cb11417fb7
web: files: fix share button render
2021-01-26 17:46:36 +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
69922e7c48
Added ASC.Projects
2021-01-26 12:32:31 +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
Vladislav Makhov
f02c38080e
web: files: fix sharing panel render performance
2021-01-25 19:32:45 +03:00
Vladislav Makhov
4400873aa6
web: files: remove console log
2021-01-25 17:46:37 +03:00
64655a7da0
Api: modules. Added info method
2021-01-25 17:37:26 +03:00
TatianaLopaeva
55060e5a23
Web: Files: Fixed after merge.
2021-01-25 14:57:20 +03:00
TatianaLopaeva
bb8c1962fb
Merge branch 'develop' into feature/fix-hide/show-header
2021-01-25 14:54:59 +03:00
Ilya Oleshko
e486a7919a
Web: Fixed modules icons
2021-01-25 14:28:51 +03:00
1602fff50c
Files: fix insert
2021-01-25 12:04:25 +03:00
036ddc87c3
5.0.2
2021-01-22 16:49:38 +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
Viktor Fomin
fc4e018c7d
Web: Files: fixed uploadData
2021-01-22 14:41:45 +03:00
Viktor Fomin
4a00f39d8d
Web: Files: fix
2021-01-22 14:12:40 +03:00
TatianaLopaeva
4a961ad82c
Web: Files/People: Added style condition for a mobile device.
2021-01-22 12:50:25 +03:00
789b547ccf
Merge branch 'develop' into feature/workspaces
...
# Conflicts:
# packages/asc-web-components/src/components/icons/svg/icon_box.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_dropbox.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_google_drive.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_kdrive.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_nextcloud.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_onedrive.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_owncloud.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_sharepoint.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_webdav.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_yandex_disk.react.svg
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/dialogs/DownloadDialog/index.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/index.js
# products/ASC.Files/Client/src/store/files/actions.js
# products/ASC.People/Client/package.json
# 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-22 11:24:16 +03:00
Viktor Fomin
02974a973b
Web: Files: fixed icon name typo
2021-01-22 11:22:43 +03:00
Viktor Fomin
a5978c676b
Web: Files: fixed clear uploadFiles
2021-01-22 11:19:39 +03:00
TatianaLopaeva
c44fcf30ed
Web: Files: Fixed style of article after merge.
2021-01-22 11:17:59 +03:00
Vladislav Makhov
d5567ec4bf
Merge branch 'feature/upload-panel' of github.com:ONLYOFFICE/AppServer into feature/upload-panel
...
# Conflicts:
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/index.js
2021-01-21 21:30:14 +03:00
Vladislav Makhov
703a52a80b
web: files: fix render performance
2021-01-21 21:18:52 +03:00
Vladislav Makhov
93af940e51
web: commented console.log
2021-01-21 20:55:36 +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
Viktor Fomin
fa01f99667
Web: Files: fixed file icon color witch error
2021-01-21 16:34:02 +03:00
Ilya Oleshko
fc8226d592
Web: Files: Selectors: Fixed selector props order
2021-01-21 15:42:58 +03:00
Viktor Fomin
868526c70d
Web: Files: fixed hide header
2021-01-21 15:40:28 +03:00
2e85d8a220
Files: fix insert
2021-01-21 10:42:23 +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
d033841728
Web: Common: Removed scrolled of article on mobile/tablet devices.
2021-01-20 21:56:32 +03:00
TatianaLopaeva
4c262c2854
Web: Common: Changed mobile layout only for mobile/tablet devices.
2021-01-20 21:04:00 +03:00
Viktor Fomin
6107494d16
Web: Files: fixed finish upload
2021-01-20 15:04:41 +03:00
8d62eb5fbf
Update yarn.lock files
2021-01-20 12:55:23 +03:00
Viktor Fomin
fbcf056533
Web: Files: delete tooltip shadow
2021-01-20 12:51:59 +03:00
bf7a5d81df
Web: Files: fix "getsharingkeys" working
2021-01-20 12:36:35 +03:00
Viktor Fomin
f3d9b68211
Web: Files: fixed upload empty files
2021-01-20 12:35:19 +03:00