TatianaLopaeva
3960ca1490
Web: Files: SharingPanel: Added loader when list of users does not load yet.
2021-03-30 15:24:44 +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
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
06e8a79b06
Web: Files: fixed drag to tree
2021-03-26 19:11:41 +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
Artem Tarasov
afd71e8ee5
Web: Files: Home: moved func getFilesContextOptions to index
2021-03-25 17:29:55 +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
Artem Tarasov
a6d31cb1de
Web: Files: FilesTile: moved Tiles in FilesTile dir
2021-03-24 14:53:08 +03:00
f732f5fba6
Web: Moved sw-template to @appserver/common and removed api cache (translation issue)
2021-03-24 11:45:58 +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
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
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
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
