Commit Graph

2305 Commits

Author SHA1 Message Date
Ilya Oleshko
61655a5790 Web: Files: App : Fixed initial requests, removed fetchMyFolder 2020-09-28 14:48:25 +03:00
Artem Tarasov
01eae38cec Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-28 13:48:44 +03:00
c593620865 Files: fix count 2020-09-28 13:41:48 +03:00
Artem Tarasov
6e832d47c2 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-28 13:10:23 +03:00
Artem Tarasov
1328eec01b Web: Files: refactoring translate SettingsTree 2020-09-28 12:55:59 +03:00
Ilya Oleshko
ecd18e2a13 Web: Files: Editor : Fixed frame height for tablet 2020-09-28 12:47:12 +03:00
2c1d473314 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
2020-09-28 12:29:33 +03:00
Alexey Kostenko
c8b88c507f Web: People: Updated toast notifications 2020-09-28 11:48:35 +03:00
Alexey Kostenko
99026e36be Web: Files: Updated toast notifications 2020-09-28 11:34:52 +03:00
a6180afa35 Web: Normalize routing + refactoring 2020-09-25 19:14:50 +03:00
89df700fb1 Files: fix 2020-09-25 13:47:21 +03:00
69b21cd7a5 Web: People: Fixed routing to GroupAction from Home page 2020-09-25 11:04:34 +03:00
c5ed32f384 Web: People: Fixed routing to view/edit Profile from Home page 2020-09-25 10:53:39 +03:00
TatianaLopaeva
eac4556983 Merge branch 'feature/files' into feature/payments-enterprise 2020-09-25 10:44:31 +03:00
63a973375a Web: People: Added RowsLoader to Section Body 2020-09-25 10:39:21 +03:00
72cf8e4f2b Web: Moved RowsLoader to ASC.Web.Common 2020-09-25 10:36:13 +03:00
Alexey Kostenko
69dcd77129 Web: People: Moved indication of success of link copy in InviteDialog 2020-09-24 16:18:37 +03:00
5cef360ade Web: Files: added hideAside prop to PageLayout 2020-09-24 15:07:08 +03:00
5f632302f9 Web: People: Added HeadlineLoader to Section Header 2020-09-24 14:35:23 +03:00
521ed5f24e Web: Files: Replaced HeadlineLoader to ASC.Web.Common variant 2020-09-24 14:27:48 +03:00
deabd31690 Web: People: Added TreeFolderLoader 2020-09-24 14:22:17 +03:00
b04f22b6e5 Web: Moved TreeFolderLoader to ASC.Web.Common 2020-09-24 13:58:18 +03:00
97539afc02 Web: People: Added HeadlineLoader 2020-09-24 13:42:32 +03:00
f2b0cdf1af Web: Moved HeadlineLoader to ASC.Web.Common 2020-09-24 13:37:54 +03:00
TatianaLopaeva
c82b0237d3 Merge branch 'feature/files' into feature/payments-enterprise 2020-09-24 13:06:46 +03:00
4c214e2ff2 Merge branch 'feature/files' into feature/loading-acceleration 2020-09-24 12:56:52 +03:00
2c18950df8 Web: Files: fixed display of icons for ipad 2020-09-24 12:09:01 +03:00
885eb4a691 Web: Clients: Added #temp-content markup on load and opportunity to hide it + router refactoring 2020-09-23 18:42:47 +03:00
01abc6d4f1 Web: Files: Added default loader before react is ready 2020-09-23 17:20:51 +03:00
0028707da6 Web: Files: Formatted file 2020-09-23 17:18:01 +03:00
TatianaLopaeva
1849e3712d Merge branch 'feature/files' into feature/payments-enterprise 2020-09-23 15:25:23 +03:00
Artem Tarasov
dc57312bf8 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-23 14:12:26 +03:00
Artem Tarasov
20dc47473c Web: People: fixed style of TreeMenu 2020-09-23 14:12:03 +03:00
Artem Tarasov
b4fe26e4fe Web: Files: fixed style of TreeFolders and TreeSettings 2020-09-23 14:11:35 +03:00
Alexey Kostenko
95179a967f Web: People: Removed unnecessary request to get invite link when visiting People page 2020-09-23 10:16:03 +03:00
a2be460357 Merge branch 'feature/files' into feature/loading-acceleration
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/Body/index.js
#	products/ASC.Files/Client/src/store/files/actions.js
2020-09-22 19:11:45 +03:00
Artem Tarasov
b2013f4dc2 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-22 17:58:17 +03:00
Artem Tarasov
9a6110ea9e Web: People: fixed size of sorting block on tablet 2020-09-22 17:57:54 +03:00
Artem Tarasov
a46bdc9b2b Web: Files: fixed size of sorting block on tablet 2020-09-22 17:57:36 +03:00
075798b90c moved from release/11 4414f77b 2020-09-22 17:17:17 +03:00
Alexey Kostenko
744f7cdfb6 Web: People: Removed forced copying of invitation link when opening ModalDialog 2020-09-22 16:14:35 +03:00
Artem Tarasov
964cd4a0ec Web: People: deleted unusing variable 2020-09-22 15:42:57 +03:00
Artem Tarasov
9a2f04008d Web: People: fixed styles 2020-09-22 15:18:36 +03:00
Artem Tarasov
16fbaa1ba6 Web: Files: fixed styles(color in row, margin in header) 2020-09-22 15:16:46 +03:00
5778b9bb62 Web: Files: Added RowsLoader for files list loading 2020-09-22 15:09:06 +03:00
Alexey Kostenko
6689b82d32 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-22 09:31:59 +03:00
29fcbcd8ac Web: Files: Added TreeFolderLoader for Article Body 2020-09-21 20:25:08 +03:00
86c98c319c Web: Files: Removed useless propType 2020-09-21 20:24:39 +03:00
9a4a940caf Web: Files: Removed useless rect 2020-09-21 20:24:14 +03:00
58b7048cbc Web: Files: Removed useless rect 2020-09-21 20:23:29 +03:00
826f802530 Web: Files: Applied pretty to selectors.js 2020-09-21 20:22:54 +03:00
a5805b7fe1 Web: Files: Added HeadlineLoader for Section Header 2020-09-21 20:04:25 +03:00
a4ef8c42a2 Web: Files: Re-written Files to load content dynamically (applied new Main and NavMenu and ContentLoader) 2020-09-21 19:33:38 +03:00
Artem Tarasov
f7afa7ee55 Web: Files: fixed rendering error while loading settingsTree 2020-09-21 15:36:17 +03:00
Artem Tarasov
caea60046f Web: People: refactoring: added utils.js, replaced changeDocumentTitle() with setDocumentTitle() 2020-09-21 14:54:35 +03:00
Artem Tarasov
9df49dc613 Web: Files: refactoring: added utils.js, replaced changeDocumentTitle() with setDocumentTitle() 2020-09-21 14:54:06 +03:00
TatianaLopaeva
ca420104fc Merge branch 'feature/files' into feature/payments-enterprise
# Conflicts:
#	web/ASC.Web.Client/src/App.js
#	web/ASC.Web.Common/src/components/StudioLayout/StudioLayout.js
2020-09-21 14:54:05 +03:00
Alexey Kostenko
cd7d714476 Web: People: Fix loader style 2020-09-21 12:17:56 +03:00
Alexey Kostenko
4e1415774d Web: Client: Opening the file immediately after creation 2020-09-21 11:06:53 +03:00
0000129b3b Merge branch 'master' into feature/release-11.0.0
# Conflicts:
#	common/ASC.Core.Common/Context/WorkContext.cs
#	common/ASC.Core.Common/Tenants/TenantControlPanelSettings.cs
#	common/ASC.Core.Common/Tenants/TenantQuota.cs
#	common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
#	common/ASC.Data.Storage/Encryption/Crypt.cs
#	common/ASC.Data.Storage/Encryption/CryptoStreamWrapper.cs
#	common/ASC.Data.Storage/Encryption/EncryptionFactory.cs
#	common/ASC.Data.Storage/Encryption/EncryptionServiceClient.cs
#	common/ASC.Data.Storage/Encryption/EncryptionSettings.cs
#	common/ASC.Data.Storage/Encryption/ICrypt.cs
#	common/ASC.Data.Storage/Encryption/IEncryptionService.cs
#	common/ASC.Data.Storage/Encryption/IMetadata.cs
#	common/ASC.Data.Storage/Encryption/IntegrityProtectionException.cs
#	common/ASC.Data.Storage/Encryption/Metadata.cs
#	common/ASC.Data.Storage/Encryption/StreamWrapper.cs
#	config/storage.json
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Core/PublicResources/webstudio_patterns.xml
2020-09-20 20:17:12 +03:00
Artem Tarasov
5f3a4c83e8 Web: People: fixed replacement of group members when adding 2020-09-19 23:26:11 +03:00
Artem Tarasov
16ff0e6386 Web: Files: fixed onExpand SettingsTree 2020-09-19 21:55:03 +03:00
7b4441676e Update yarn.lock files 2020-09-19 18:35:17 +03:00
0f00799480 Web: Client: Fixed redirect to defaultPage 2020-09-19 18:24:48 +03:00
9a092cb8ec moved from release/11 4414f77b 2020-09-18 17:45:59 +03:00
4a09b4b5f2 Web: fixed body scroll 2020-09-18 17:06:35 +03:00
Artem Tarasov
939a29442f Web: People: refactoring - changing document.title with changeTitleDocument() 2020-09-18 11:19:16 +03:00
Artem Tarasov
f3b8e4880c Web: Files: refactoring - changing document.title with changeTitleDocument() 2020-09-18 11:18:48 +03:00
Artem Tarasov
2e8a170166 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-17 16:10:09 +03:00
Artem Tarasov
ba03e55ffc added display of changes in group composition after adding/removing members 2020-09-17 16:05:56 +03:00
Artem Tarasov
fcaf136b2c added document title change after group update and deletion 2020-09-17 16:04:23 +03:00
d883ef441f Api: moved from release/11 4414f77b 2020-09-17 15:04:28 +03:00
9623029d82 Web: Files: Speeded up loading first page + refactoring 2020-09-17 12:07:36 +03:00
2f4a3141d5 Web: People: Speeded up loading first page + refactoring 2020-09-17 11:28:23 +03:00
TatianaLopaeva
a858a3a846 Merge branch 'feature/files' into feature/payments-enterprise
# Conflicts:
#	web/ASC.Web.Components/src/components/icons/svg/index.js
2020-09-17 11:25:51 +03:00
a4cb368513 Update yarn.lock files 2020-09-16 18:39:06 +03:00
ba7c4db354 WebL People: Remove temp prop 2020-09-16 18:35:49 +03:00
374e4ece1a WebL People: Remove temp prop 2020-09-16 18:32:14 +03:00
e66ca03cbb Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-16 18:08:41 +03:00
ecb2879a77 Web: Components: Styled AvatarEditor + applied changes 2020-09-16 18:08:32 +03:00
Artem Tarasov
0fb03ea54a Web: People: fixed double redirect after edit/create group 2020-09-16 16:13:03 +03:00
3b691247b2 Update yarn.lock files 2020-09-15 23:29:13 +03:00
986e53608d Update yarn.lock files 2020-09-15 22:55:11 +03:00
d750335924 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
#	web/ASC.Web.Components/package.json
2020-09-15 22:43:37 +03:00
2bad04c058 Update yarn.lock files 2020-09-15 22:42:42 +03:00
TatianaLopaeva
3eeb24a5b5 Merge branch 'feature/files' into feature/payments-enterprise
# Conflicts:
#	web/ASC.Web.Common/src/components/StudioLayout/StudioLayout.js
#	web/ASC.Web.Components/src/components/icons/svg/index.js
2020-09-15 17:52:45 +03:00
TatianaLopaeva
a3adea3c27 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
2020-09-15 17:39:34 +03:00
Artem Tarasov
58a43ed52d Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-15 16:24:57 +03:00
Vladislav Makhov
d4f4691fef Web: People: Change width values for rows 2020-09-15 16:22:58 +03:00
Vladislav Makhov
a0024722d0 Web: Files: Change width values for rows 2020-09-15 16:22:41 +03:00
Artem Tarasov
6a76e12027 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-15 16:22:38 +03:00
Artem Tarasov
6153e02c54 Web: People: added translation for Head field in GroupAction if there is no owner 2020-09-15 16:22:07 +03:00
4e34836e4e Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-09-15 15:47:47 +03:00
6231d0654f Web: Files: fixed isCanCreate selector to Header 2020-09-15 15:47:39 +03:00
Artem Tarasov
89baffc5d6 Web: People: fixed display of profile removed if the group was created without an owner 2020-09-15 15:36:43 +03:00
Artem Tarasov
9c0bac60f5 Web:People: fixed styles for TreeMenu 2020-09-15 15:05:40 +03:00
Artem Tarasov
861ab54818 Web:Files; refactoring styled SettingsTree 2020-09-15 14:51:28 +03:00
Artem Tarasov
b4d0776ca4 Web:People: changed check for rendering PageLayout.ArticleMainButton 2020-09-14 14:34:42 +03:00
Artem Tarasov
3e42b49c3e Web:People: added icons for tree nodes, changed icon for root folder 2020-09-14 14:31:44 +03:00
Artem Tarasov
fc8325f65f Web:Files: refactoring SettingsTree 2020-09-14 13:53:37 +03:00
Alexey
69b8d0ec7d Web: Files/People/Components: Content rendered without columns on mobile devices 2020-09-14 08:51:54 +03:00
65fbf2247e Update yarn.lock files 2020-09-11 22:51:28 +03:00
09c8febfd3 Web: Files: Removed setup wrong title 2020-09-11 22:40:52 +03:00
de290abd57 Web: Files: Replaced invalid characters 2020-09-11 22:40:09 +03:00
51709f3c6d Web: Files: Changed default cursor in TreeSettings on loading 2020-09-11 22:39:22 +03:00
a44b4bc60a Web: Files: Fixed setIsLoading is undefined on triangle icon click 2020-09-11 22:38:50 +03:00
8045eecf1b Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
#	products/ASC.Files/Client/src/components/Article/Body/index.js
2020-09-11 22:30:09 +03:00
c989eaf8a5 Web: Files: Changed default cursor in FolderTree on loading 2020-09-11 22:04:00 +03:00
2ccb4eebac Web: Files: Replaced title (People style) 2020-09-11 21:46:51 +03:00
4d97d6a7ac Web: Clients: Moved setup title to Article/Body 2020-09-11 21:45:46 +03:00
49ba2c96db Web: Files: Commented useless code 2020-09-11 20:43:40 +03:00
99a6fd523e Web: Client: Moved organizationName into authReducer 2020-09-11 18:03:40 +03:00
219ab9cac2 Web: Files: fixed Dnd display logic 2020-09-11 12:49:59 +03:00
a085b53cb8 Web: Files: refactoring isLoading 2020-09-11 12:22:18 +03:00
Artem Tarasov
76ad46fed1 refactoring, moved onLoading and isLoading to redux 2020-09-11 11:25:47 +03:00
c2d1df3fc3 Files: fix create first document 2020-09-10 21:34:23 +03:00
188b20ff86 Merge branch 'master' into feature/files 2020-09-10 17:10:19 +03:00
3a85553504 Files: GetFolderUrl fix 2020-09-10 17:09:27 +03:00
ea16508688 Merge branch 'master' into feature/files 2020-09-10 16:32:12 +03:00
2413e22323 Files: GetFolderUrl fix 2020-09-10 16:31:32 +03:00
Artem Tarasov
6a219488e9 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-10 16:01:30 +03:00
Artem Tarasov
3c4562a03a removed passing onLoading and isLoading in ArticleBodyContent through properties 2020-09-10 16:00:02 +03:00
Vladislav Makhov
395b8b392c Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-10 15:55:06 +03:00
Vladislav Makhov
175b244cd2 Fix state bug 2020-09-10 15:54:50 +03:00
3e059081fe Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-09-10 15:22:54 +03:00
36a0bf12f4 Web: Files: fixed error handler create file/folder 2020-09-10 15:22:44 +03:00
Vladislav Makhov
b81f2e0dba Fix state bug 2020-09-10 15:01:56 +03:00
Vladislav Makhov
c12ae9624b Avatar editor: add indication of loading process 2020-09-10 14:18:58 +03:00
f724848195 Merge branch 'master' into feature/files 2020-09-10 13:45:15 +03:00
0a6c2fda18 Files: fix FileConverterQueueScope 2020-09-10 13:44:38 +03:00
7433eea815 Web: Clients: SW: Added code for updating SW lifecycle to update the app after user triggered refresh 2020-09-10 13:19:06 +03:00
23b2a310a0 Merge branch 'master' into feature/files 2020-09-10 12:35:55 +03:00
fb0dec0a16 Files: fix 2020-09-10 12:30:33 +03:00
323823981a Update yarn.lock files 2020-09-09 22:25:31 +03:00
e4a222b57b Web: People: Fixed redirect on Save/Cancel GroupAction page 2020-09-09 22:18:27 +03:00
b3b6fd0938 Web: Components: Re-written ModalDialog component with SLOT pattern 2020-09-09 21:49:25 +03:00
cc9e0e1374 Merge branch 'master' into feature/scope
# Conflicts:
#	web/ASC.Web.Core/Notify/NotifyConfiguration.cs
2020-09-09 18:18:34 +03:00
SuhorukovAnton
5f62bfb00d scope: bugfix 2020-09-09 17:02:51 +03:00
Alexey
5843368d4f Web: Files: Increased the width of the "row update text" field 2020-09-09 15:41:28 +03:00
Artem Tarasov
1fd0f3c010 fixed redirect edit/view profile in people 2020-09-09 15:35:50 +03:00
e0febd8890 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Core/Core/FileStorageService.cs
2020-09-09 13:49:25 +03:00
a70b890581 Notify: rename 2020-09-09 13:43:39 +03:00
b674bc2f2f Merge branch 'master' into feature/files 2020-09-08 17:36:47 +03:00
c87fd2cfdb Files: share fix 2020-09-08 17:36:22 +03:00
c468c5e6cc Merge branch 'master' into feature/files 2020-09-08 17:03:19 +03:00
ad51a6bf29 Files: fix 2020-09-08 17:00:29 +03:00
98429ce4ab Merge branch 'master' into feature/files 2020-09-08 16:34:21 +03:00
92a72d7983 Files: Tag. Fix 2020-09-08 16:33:39 +03:00
765558b7b1 Merge branch 'master' into feature/files 2020-09-08 16:23:12 +03:00
f8b3382a42 Files: tagDao. Fix 2020-09-08 16:22:45 +03:00