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
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
18b4fba15a
Merge branch 'develop' into feature/dotnet5
2021-03-31 20:38:05 +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
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
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
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
Alexey Kostenko
6fadc94b71
Web: Components/People: Fixed social-button styles
2021-03-25 18:06:48 +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
Alexey Kostenko
894449d95c
Web: People: Unlink account from provider
2021-03-24 16:51:16 +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
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
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
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
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
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
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
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
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
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
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
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
