932e18be1c
Web: Editor: Fix display additional buttons by doc param
2021-04-27 13:48:32 +03:00
5777f0abd4
Settings: confirm url
2021-04-27 13:41:32 +03:00
6114d960e3
Auth: AuthenticateMe added ConfirmUrl
2021-04-27 13:40:25 +03:00
c324693034
Merge branch 'develop' into release/v0.1.8
2021-04-27 12:11:36 +03:00
Alexey Kostenko
bf963f511b
Merge branch 'develop' into bugfix/thirdparty
2021-04-27 11:25:30 +03:00
20ee2a4772
Web: Client: fixed ConfirmRoute
2021-04-27 10:16:36 +03:00
Vladislav Makhov
9a06ab8b3b
web: client: fix closing on logo click
2021-04-27 09:27:24 +03:00
8bb173fa92
Thirdparty: fix providers
2021-04-26 21:42:39 +03:00
d97928fd37
Merge branch 'develop' into feature/support-hosting-as-service
2021-04-26 19:52:32 +03:00
db1f883005
Bump version v0.1.8
2021-04-26 18:59:33 +03:00
Alexey Kostenko
a96ae77570
OAuth: Fixed crash on login page
2021-04-26 16:41:57 +03:00
0128b01518
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
...
# Conflicts:
# products/ASC.People/Client/public/locales/en/Profile.json
# products/ASC.People/Client/public/locales/ru/Profile.json
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
# web/ASC.Web.Client/public/locales/en/Confirm.json
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Confirm.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
2021-04-26 15:57:19 +03:00
f11f18dffb
Auth: check tfa
2021-04-26 14:56:38 +03:00
Alexey Kostenko
2cc413ed16
Web: Client: Added button "AddUsers" on header on access-rights/admins page
2021-04-26 09:14:08 +03:00
98bef7c15d
Web: Settings: Added common documents storage.
2021-04-25 22:23:59 +03:00
a66a454462
Settings: added tfaapp method
2021-04-25 18:06:56 +03:00
6d2f417c5c
Method GetAuthProviders moved to PeopleController
2021-04-25 11:46:44 +03:00
c47f896f75
Client: added translations
2021-04-24 10:42:49 +03:00
d2588270cf
Merge branch 'master' into develop
2021-04-23 20:16:42 +03:00
4bdf5e4e55
Web: Fix fallback language apply on new language setup
2021-04-23 19:51:10 +03:00
cd699e37e2
Files: Fix opening of version
2021-04-23 18:00:05 +03:00
2d8b085d02
add support WindowsService/systemd for IHostBuilder
...
listen unix socket if it setup for Kestrel Web Server
2021-04-23 16:54:39 +03:00
Alexey Kostenko
d19a3469d1
Merge branch 'develop' into feature/access-rights-admins
2021-04-23 16:07:42 +03:00
Alexey Kostenko
67ae709db7
Web: Client: Moved page from old branch
2021-04-23 13:10:30 +03:00
fc39307489
Web: Fixed translation.
2021-04-23 10:32:43 +03:00
Alexey Kostenko
c430e983b4
Web: Client: Added admins page
2021-04-23 08:22:58 +03:00
TatianaLopaeva
1f8039f1b7
Web: Added storages to the Manual page.
2021-04-22 19:26:35 +03:00
553ac70278
Bump version v0.1.7
2021-04-22 14:13:12 +03:00
Alexey Kostenko
667a76b95f
Oauth: Refactoring
2021-04-22 13:34:42 +03:00
TatianaLopaeva
b2102d9e61
Web: Added common settings.
2021-04-22 09:58:02 +03:00
TatianaLopaeva
e4368caa63
Web: Added Restore Date.
2021-04-22 09:56:54 +03:00
Alexey Kostenko
138fe92f9f
OAuth: Refactoring
2021-04-21 16:31:18 +03:00
Alexey Kostenko
691e7d5498
Merge branch 'develop' into feature/oauth2.0
2021-04-21 15:04:26 +03:00
Alexey Kostenko
1aae2e60cf
Web: Client/Login: Removed 2nd window for actions through oAuth
2021-04-21 14:48:17 +03:00
TatianaLopaeva
79d005809b
Web: Settings: Added Automatic and Manual backup pages.
2021-04-21 14:11:10 +03:00
TatianaLopaeva
d4beb848a1
Web: Settings: Added data-management option to the settings tree and Added Backup page.
2021-04-21 11:14:43 +03:00
TatianaLopaeva
0f3eb1350b
Merge branch 'develop' into feature/team-template
...
# Conflicts:
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
2021-04-20 12:05:19 +03:00
TatianaLopaeva
ce20ae3de2
Web: Fixed tabIndex.
2021-04-20 11:55:14 +03:00
Ilya Oleshko
7adfe3112f
Merge branch 'feature/access-rights-new' of github.com:ONLYOFFICE/AppServer into feature/access-rights-new
2021-04-19 18:54:12 +03:00
Ilya Oleshko
b8910edc01
Merge branch 'develop' into feature/access-rights-new
2021-04-19 18:53:55 +03:00
bd495757cc
Merge branch 'master' into develop
2021-04-19 18:52:56 +03:00
36c65c1c43
Bump version v0.1.6
2021-04-19 18:41:27 +03:00
6c8654ba77
Merge branch 'develop' into feature/team-template
2021-04-19 16:47:52 +03:00
TatianaLopaeva
224bee68b4
Web: Settings: Added tabIndex.
2021-04-19 16:46:15 +03:00
Alexey Kostenko
1627490b05
Merge branch 'develop' into feature/access-rights-new
2021-04-19 16:21:38 +03:00
Alexey Kostenko
6bb13d77c8
Web: Client: Fixed HelpButton on mobile devices
2021-04-19 16:21:02 +03:00
Alexey Kostenko
49c2496391
Web: Client: Fixed translation in PeopleSelector, small refactoring
2021-04-19 16:12:34 +03:00
Viktor Fomin
56e61a028c
Web: Client: add fake qr-code
2021-04-19 14:01:29 +03:00
Viktor Fomin
e5906324c5
Web: Client: fixed key
2021-04-19 13:49:36 +03:00
461110e1a7
Web: Fix show loaders timeout for quickly responses
2021-04-19 13:36:40 +03:00
TatianaLopaeva
2a3d50cfd5
Web: Settings: Fixed position of buttons for desktop.
2021-04-19 12:30:54 +03:00
Alexey Kostenko
2749df79df
Web: Client: Redirect to default page after OAuth registration
2021-04-19 10:19:27 +03:00
Alexey Kostenko
03ec607cbf
Merge branch 'develop' into feature/oauth2.0
2021-04-19 08:25:42 +03:00
Viktor Fomin
15153b0fd4
Web: Client: add app activation route
2021-04-18 23:35:06 +03:00
Viktor Fomin
035708010f
Web: Client: add app activation page
2021-04-18 23:34:53 +03:00
Viktor Fomin
62edc883db
Web: Client: add translations
2021-04-18 23:34:26 +03:00
e586d42d3b
Web: Added clickBackdrop() for close unpinned Article on Tablet and Mobile
2021-04-16 20:23:08 +03:00
5f2998af87
refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile
2021-04-16 19:33:26 +03:00
Alexey Kostenko
49fd31c19b
Web: Client: Style fix
2021-04-16 18:22:04 +03:00
TatianaLopaeva
ab10641b45
Web: Rename teamTemplate.
2021-04-16 17:10:37 +03:00
Alexey Kostenko
8cb74d14b4
Web: Client/Common: Added thirdParty signup api
2021-04-16 16:34:24 +03:00
7cb9affc77
Web: Remove tap-highlight
2021-04-16 16:27:07 +03:00
3aae413e12
replace Path.Combine to CrossPlatform.PathCombine
2021-04-16 16:26:26 +03:00
TatianaLopaeva
42d29cbae5
Web: Settings: Added customName and customId.
2021-04-16 15:57:34 +03:00
ebc751530b
Web: Open menu by module title
2021-04-16 15:53:52 +03:00
TatianaLopaeva
06348316ec
Web: Settings: Deleted useless code.
2021-04-16 15:43:08 +03:00
TatianaLopaeva
b0f29486ff
Web: Deleted useless console log.
2021-04-16 15:36:06 +03:00
TatianaLopaeva
052157d1fe
Web: Rename functions.
2021-04-16 15:35:02 +03:00
Alexey Kostenko
96ec652313
Merge branch 'develop' into feature/oauth2.0
2021-04-16 14:25:37 +03:00
TatianaLopaeva
cd00030b24
Web: Layout: Fixed close the context menu. (Only for Mobile Devices).
2021-04-16 12:45:21 +03:00
Alexey Kostenko
067079363b
Web: Client: Fixed changing portal owner
2021-04-16 12:32:28 +03:00
Alexey Kostenko
d7930f9a8b
Web: Client: Redesign access rights page
2021-04-16 12:19:19 +03:00
TatianaLopaeva
2075aa6647
Web: Settings: Fix displaying of loading date.
2021-04-16 11:28:06 +03:00
TatianaLopaeva
ab1d41b2a8
Web: Fixed loading date.
2021-04-16 11:21:17 +03:00
TatianaLopaeva
297e4f42e9
Merge branch 'develop' into feature/team-template
2021-04-16 09:25:43 +03:00
TatianaLopaeva
53d449c508
Web: Deleted useless console.log.
2021-04-15 19:53:49 +03:00
TatianaLopaeva
e738cab4a2
Web: Added Error message & Added loader.
2021-04-15 19:51:59 +03:00
TatianaLopaeva
69ca5bbd90
Web: Settings: Fixed:
...
- the input is displayed without error if you changed the template
- if the template input is empty, then the option is changed to custom
- the problem with the correct display of the current option.
2021-04-15 17:49:16 +03:00
Alexey Kostenko
cd831d3f93
Web: Client: Refactoring
2021-04-15 16:20:41 +03:00
TatianaLopaeva
a9e9729cab
Web: Settings: Fixed save button if selected Custom schema.
2021-04-15 13:27:39 +03:00
TatianaLopaeva
5b07217b83
Web: Settings: Added saving session for selected option.
2021-04-15 11:28:13 +03:00
Alexey Kostenko
a8a9c8115f
Web: Client: Show the real number of administrators on the portal, small refactoring
2021-04-15 10:11:15 +03:00
2f38b2ec33
Settings: fixed custom schemaName
2021-04-14 21:08:27 +03:00
TatianaLopaeva
bb1c322672
Web: Settings: Added logic for click cancel button.
2021-04-14 19:31:30 +03:00
TatianaLopaeva
cfdc6f8568
Web: Added showReminder & Fixed selected option.
2021-04-14 18:44:35 +03:00
TatianaLopaeva
60218edb3b
Web: Added show button only if one of the input of form was changed & Added saving data during the session.
2021-04-14 18:18:11 +03:00
TatianaLopaeva
5a3f14d6fd
Merge branch 'feature/team-template' of github.com:ONLYOFFICE/AppServer into feature/team-template
2021-04-14 16:34:03 +03:00
038fd58d7c
Settings: fixed custom schemaName
2021-04-14 16:21:37 +03:00
Alexey Kostenko
7ee2de69d1
Web: Client: Redesign AccessRights page
2021-04-14 15:28:04 +03:00
Viktor Fomin
0150903ef3
Web: Client: add app auth route
2021-04-14 15:24:00 +03:00
Viktor Fomin
b7226cbfbc
Web: Client: add app auth page
2021-04-14 15:23:28 +03:00
Viktor Fomin
dd4ca59e66
Web: Client: add translations
2021-04-14 15:23:03 +03:00
fdc5ee0838
Settings: fixed custom name settings
2021-04-14 15:03:08 +03:00
TatianaLopaeva
88ed42bcfe
Merge branch 'feature/team-template' of github.com:ONLYOFFICE/AppServer into feature/team-template
2021-04-14 15:03:00 +03:00
TatianaLopaeva
fc40487de0
Web: Added setCurrentShema and setCustomShema methods, added form validation.
2021-04-14 14:26:26 +03:00
Viktor Fomin
f76ebe4095
Web: Client: added access portal page
2021-04-14 13:01:56 +03:00
TatianaLopaeva
39064cf4e2
Web: Settings: Added cancel and save button.
2021-04-13 22:51:43 +03:00
TatianaLopaeva
a599b70c96
Web: Added name of current template.
2021-04-13 21:43:23 +03:00
a30915f618
Settings: post and put customschemas
2021-04-13 21:11:38 +03:00
783a5f2b37
Merge branch 'feature/team-template' of github.com:ONLYOFFICE/AppServer into feature/team-template
2021-04-13 20:10:32 +03:00
0df4b998d1
Api: removed SchemaItemModel
2021-04-13 20:10:14 +03:00
TatianaLopaeva
ff370259e9
Web: Added "learn more and help url for common setting.
2021-04-13 14:47:46 +03:00
TatianaLopaeva
3487e40c51
Web: Settings: Added logic for team template, added getCustomSchema.
2021-04-13 14:34:04 +03:00
TatianaLopaeva
73d113e26f
Wen: Settings: Added translation.
2021-04-13 14:28:36 +03:00
Alexey Kostenko
571b412d27
Web: Client/Components: Fixed facebook button styles/icon, fixed translations
2021-04-13 11:17:39 +03:00
Alexey Kostenko
544a24d0f1
Web: Client/Components: Style fix and added translations
2021-04-13 09:45:52 +03:00
Alexey Kostenko
64ccdf81ae
Web: Client: Added oAuth to create user form
2021-04-12 18:14:39 +03:00
TatianaLopaeva
3b94348cf5
Web: Settings: Fixed translation.
2021-04-12 15:59:20 +03:00
TatianaLopaeva
8c7ec5d0d0
Web: Settings: Added team template to the settings tree.
2021-04-12 14:34:08 +03:00
TatianaLopaeva
91bd2c8c74
Web: Settings: Added team-template page.
2021-04-12 12:56:08 +03:00
2c0dd28ad4
Merge branch 'develop' into bugfix/files-panel
2021-04-12 12:09:33 +03:00
Alexey Kostenko
cf7072a714
Refactoring
2021-04-12 10:57:21 +03:00
Alexey Kostenko
0e4e7debac
Web: Login: Show facebook button first
2021-04-12 10:26:46 +03:00
Alexey Kostenko
6a6e4c4705
Web: Login: Added translations
2021-04-09 16:01:04 +03:00
Alexey Kostenko
e187db767f
Web: Login: Updated field with buttons for login
2021-04-09 16:00:41 +03:00
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
b66008b33e
Bump version v0.1.2
2021-04-08 20:00:15 +03:00
TatianaLopaeva
23ba37cc9d
Web: Layout: Fixed width of article for mobile.
2021-04-08 14:59:23 +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
80e796ed1e
Web: Hide displaying logo on Tables and Mobiles
2021-04-07 16:23:46 +03:00
559d7a9940
Web: Fixed export and import registerSW
2021-04-07 15:41:42 +03:00
9cbdfaab1b
Web: Removed commented code
2021-04-07 15:29:00 +03:00
4484d609a6
Web: Added registerSW for start Service-Worker + Added post SkipWaiting on update
2021-04-07 15:27:51 +03:00
TatianaLopaeva
cdef097fdd
Web: Fixed hiding header when switching group.
2021-04-07 13:35:32 +03:00
ee6ffd3ace
Updated packages
2021-04-06 20:16:24 +03:00
Artem Tarasov
f9107ae9f6
Web: Client: fixed bug with height calculation on ios
2021-04-06 20:01:32 +03:00
Alexey Kostenko
ab157b2caf
Web: Client: Fix
2021-04-05 17:34:58 +03:00
2c7434710c
Merge branch 'release/v0.1.0' of https://github.com/ONLYOFFICE/AppServer into release/v0.1.0
2021-04-05 15:49:08 +03:00
b9fe2c338f
Added New Proxy settings
2021-04-05 15:49:02 +03:00
2655f0c62d
Web: fixed Trans
2021-04-05 15:35:50 +03:00
TatianaLopaeva
24e80979f5
Web: createUser: Fixed margin-top for mobile devices.
2021-04-05 15:18:24 +03:00
Alexey Kostenko
df635f3bfd
Web: Login/Common: Clear interval if getter token window is closed
2021-04-04 16:39:35 +03:00
Alexey Kostenko
0647881975
Web: Login: Removed unnecessary method
2021-04-04 15:54:32 +03:00
Alexey Kostenko
aadb8e3827
Web: Login: Show notification if account not connected to provider
2021-04-02 13:06:27 +03:00
TatianaLopaeva
f79f75f6db
Merge branch 'develop' into feature/EditorIntegration
2021-04-01 16:42:33 +03:00
c0582c1130
merge from develop
2021-04-01 16:28:36 +03:00
TatianaLopaeva
8f8a0d2f44
Web: Editor: Deleted useless props.
2021-04-01 11:50:30 +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
TatianaLopaeva
33b165fd40
Web: Files/Editor: Added SharingDialog.
2021-03-31 16:49:14 +03:00
Vladislav Makhov
a6f1ed972c
web: fix progress-indicator style for desktop
2021-03-31 12:46:09 +03:00
Ilya Oleshko
ff79708e59
Web: Client: Layout: Fixed component render on old webkit devices, disable webkit-touch-callout at article
2021-03-31 10:42:59 +03:00
TatianaLopaeva
2a2b6cd1ac
Web: Editor: Refactoring.
2021-03-30 18:21:36 +03:00
TatianaLopaeva
af379ac72f
Web: Editor: Deleted useless console.log.
2021-03-30 15:48:08 +03:00
TatianaLopaeva
dea731dfa7
Web: Files/Editor: Deleted useless code.
2021-03-30 15:44:45 +03:00
TatianaLopaeva
1531a37951
Web: Editor: Fixed displaying of toast.
2021-03-30 14:03:43 +03:00
Alexey Kostenko
0f5e5cce3f
Web: Components/People/Login: Fixed warning ("React does not recognize prop")
2021-03-30 11:37:21 +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
Alexey Kostenko
b8c7be90ae
Web: Client: Removed ThirdPartyResponseRoute, handling third party response in static file
2021-03-30 07:50:45 +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
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
89dbfd1f54
Web: Editor/Files: Fixed share email from the Editor.
2021-03-28 18:47:04 +03:00
TatianaLopaeva
5d1e2f0e4c
Web: Editor: Added condition that don't change access when user can't edit.
2021-03-28 18:13:59 +03:00
TatianaLopaeva
40218e944e
Web: Editor: Added goBack button to the files.
2021-03-28 17:49:51 +03:00
TatianaLopaeva
7fba6003a2
Web: Editor: Added list of access rights when Editor initialized and access doesn't changed yet.
2021-03-26 18:27:30 +03:00
TatianaLopaeva
c417709197
Web: Editor: Refactoring.
2021-03-26 17:35:44 +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
Alexey Kostenko
ab3d5f1e77
Web: Login: Added icons and translations
2021-03-26 17:17:34 +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
129b066802
Web: Editor: Added mobx and mobx-react dependencies.
2021-03-26 15:05:07 +03:00
TatianaLopaeva
ff2d8a8a28
Web: Editor: Changed name space fro i18n.
2021-03-26 14:46:19 +03:00
TatianaLopaeva
2e44d28957
Added translate for access rights.
2021-03-26 14:43:50 +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
67ade06d34
Web: Login/Client: oauth login
2021-03-24 16:50:36 +03:00
f732f5fba6
Web: Moved sw-template to @appserver/common and removed api cache (translation issue)
2021-03-24 11:45:58 +03:00
97fa6c82ab
Web: Editor: webpack: disabled compression
2021-03-23 19:34:18 +03:00
30b976f25f
Web: Client: removed debugger, fixed onChangeOwner
2021-03-23 15:16:18 +03:00
40567ed10b
Web: Restore: remove remoteEntry script
2021-03-23 10:33:36 +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
4ce205fe9a
Web: Client: Commented not used code
2021-03-22 20:00:38 +03:00
b0c430b7ba
Merge branch 'develop' into feature/workspaces
2021-03-22 19:46:49 +03:00
950506a59c
calendar: migrate extension for DateTime
2021-03-22 19:13:15 +03:00
7c96b2f625
core: migrate several interfaces
2021-03-22 19:04:37 +03:00
e4897160a9
fixed SendEmailActivationInstructions
2021-03-22 18:56:04 +03:00
f19ee78c0f
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-22 18:52:33 +03:00
dea3f3bb20
Web: Fixed login redirect
2021-03-22 18:52:25 +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
ce86b6014b
Web: Settings: Add URL proxy
2021-03-22 18:24:03 +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
Viktor Fomin
0da17ef641
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-22 16:15:07 +03:00
Viktor Fomin
74e5686a0e
Web: Client: fixed language-timezone settings
2021-03-22 16:14:41 +03:00
89f2431e1c
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-22 15:33:50 +03:00
Alexey Kostenko
3524f3b6c6
Web: Client/Common: Fixed Route to homepage (Incorrect header on homepage)
2021-03-22 15:27:36 +03:00
83e9a8b4a4
Web: Add URL proxy on tryRedirectTo usage
2021-03-22 12:16:41 +03:00
b6a5249147
Web: Editor: Add URL proxy
2021-03-22 12:12:34 +03:00
Viktor Fomin
d3fdc2d8a3
Web: Client: fixed greeting settings
2021-03-22 11:57:08 +03:00
25bbd0cf2a
Merge branch 'develop' into feature/workspaces
2021-03-22 11:34:54 +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
fc7bd11088
Fix getshortenlink
2021-03-21 18:29:35 +03:00
335cc31939
Notify: fix
2021-03-21 17:51:49 +03:00
accd318dc0
Web: Fixed z-index of #ipl-progress-indicator
2021-03-20 11:24:33 +03:00
6b8d644aab
Web: Replaced all homepages to config variant
2021-03-19 18:22:35 +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
Artem Tarasov
dabf704485
Web: Client/Components: Wizard: layout fix
2021-03-18 22:55:15 +03:00
8e6b2c78d8
Web: Moved ipl-progress-indicator to NavMenu
2021-03-18 22:26:52 +03:00
f3f4037282
Web: Fixed Wizard
2021-03-18 21:54:03 +03:00
330c156cb8
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-18 18:20:31 +03:00
544abc2321
Web: Client: fixed changePassword form, removed debugger
2021-03-18 16:00:58 +03:00
TatianaLopaeva
2898cabc3f
Web: NavMenu: Fixed styles of title.
2021-03-18 13:53:21 +03:00
TatianaLopaeva
80247cbb1a
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-18 13:30:53 +03:00
TatianaLopaeva
242d6870aa
Web: PaymentsEnterprise: Fix styles & Added lost import.
2021-03-18 13:30:38 +03:00
23a23a0c68
Web: Client: fixed changeEmail confirm page
2021-03-18 12:29:16 +03:00
a861371826
Web: Client: fixed activateUser confirm page
2021-03-18 12:28:49 +03:00
6e2b2d5095
Web: Removed old svg
2021-03-17 21:26:28 +03:00
c3b49a713d
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-17 18:34:09 +03:00
409073eff7
Web: Client: fixed change password
2021-03-17 18:33:05 +03:00
Alexey Kostenko
15a212a567
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-17 17:02:30 +03:00
Alexey Kostenko
15c1d087f7
Web: Client: Hidden AdminsSettings
2021-03-17 17:01:59 +03:00
TatianaLopaeva
a6e3349d9e
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-17 16:46:25 +03:00
Alexey Kostenko
73727dc01f
Web: Client: Fixed infinity loading in language-and-time-zone page
2021-03-17 16:41:53 +03:00
TatianaLopaeva
7beba532dd
Web: Settings: Fixed displaying of icon.
2021-03-17 16:41:02 +03:00
86a63e6330
Web: Client: fixed createUser form
2021-03-17 16:35:45 +03:00
8036cb3401
Web: fixed confirm route
2021-03-17 15:56:09 +03:00
Alexey Kostenko
602ca59f2e
Web: Client: Close menu after switch module
2021-03-17 15:38:21 +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
062cc4cc78
Web: Disabled initialization of service-workers on development
2021-03-17 12:59:11 +03:00
f56970ed15
Web: Login: Fixed base urls
2021-03-17 12:48:22 +03:00
391b60c79d
Web: Login: Commented logs
2021-03-17 12:47:49 +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
Vladislav Makhov
1c59410c38
web: client: remove history props drilling
2021-03-16 16:31:49 +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
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
24d0af3851
Web: Client: Shell: Added route to ThirdPartyResponse page
2021-03-15 17:12:46 +03:00
Ilya Oleshko
c2902461cb
Web: Client: ThirdParty: Fixed import
2021-03-15 17:12:09 +03:00
TatianaLopaeva
eac9bb9b3b
Web: Settings: Fix icons displaying when moving from other modules.
2021-03-15 17:08:35 +03:00
a015b618a2
Web: Client: Added new service-worker on workbox v6
2021-03-14 23:36:20 +03:00
708a10a3f4
Web: Fixed logo displaying
2021-03-14 00:21: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
ad8d6d89d2
Web: Shell: Added virtualPath (proxy: /appserver)
2021-03-13 16:03:31 +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
94b6750a6b
web: common: bump version
2021-03-12 18:28:14 +03:00
22c3cfffcd
Web: Restored defaultPage
2021-03-12 18:27:52 +03:00
bc8943083f
Web: Clinet: Added default params to .env
2021-03-12 18:16:51 +03:00
c2338d6636
Merge branch 'hotfix/v0.0.11' of https://github.com/ONLYOFFICE/AppServer into hotfix/v0.0.11
2021-03-12 18:00:33 +03:00
e2061cd427
CustomNamingPeople: fix
2021-03-12 18:01:11 +03:00
b1dfa97386
Web: Client: Added support of homepage
2021-03-12 17:53:02 +03:00
ae7b7484b1
Web: Common: Fixed API proxy issue
2021-03-12 17:35:51 +03:00
b90876c97d
Bump version to v0.0.11
2021-03-12 17:20:24 +03:00
e514fe1a57
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
...
# Conflicts:
# web/ASC.Web.Client/src/Shell.jsx
2021-03-12 14:58:24 +03:00
e8e78604f1
Web: Added products/apps dynamic loading
2021-03-12 13:52:30 +03:00
7465b6cda4
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-12 13:12:03 +03:00
25cbaf3c0c
Web: Files: fixed NavMenu clickOutsideAction
2021-03-12 13:11:53 +03:00
TatianaLopaeva
6c4329f9c7
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-12 13:10:26 +03:00
TatianaLopaeva
b68487716b
Web: Added translation for setting at Nav.
2021-03-12 13:09:58 +03:00
Alexey Kostenko
91b5fc5795
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-12 12:50:25 +03:00
TatianaLopaeva
dd92aa049f
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-12 12:06:32 +03:00
TatianaLopaeva
43d7f6ba68
Web: Fix translation.
2021-03-12 12:05:12 +03:00
Alexey Kostenko
16eca008cd
Web: Client: Added bodyLoader to accessRights page
2021-03-12 11:54:53 +03:00
Artem Tarasov
7846f41a06
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-12 10:12:12 +03:00
Viktor Fomin
ca4727978c
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-12 00:14:08 +03:00
Viktor Fomin
59aa9ccd8f
Web: Client: hide header in editor
2021-03-12 00:14:00 +03:00
Artem Tarasov
63f1e788ad
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-11 21:14:21 +03:00
Artem Tarasov
96271b4dfb
Web: Components/Client: changed the way of passing elements to TabContainer component
2021-03-11 13:43:54 +03:00
TatianaLopaeva
749e028beb
Web: Layout: Fixed displaying of article.
2021-03-11 13:12:35 +03:00
TatianaLopaeva
9362f3cd2d
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-11 10:20:25 +03:00
TatianaLopaeva
1afbcc0009
Web: Settings: Added top loading indicator.
2021-03-11 10:19:56 +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
970ec1eecf
Web: Login: Modified production build
2021-03-10 19:24:15 +03:00
bac65c6744
Web: Client: Modified production build
2021-03-10 18:31:21 +03:00
6db29575b1
Web: Editor: Modified production build
2021-03-10 18:27:40 +03:00
Alexey Kostenko
26a4d5e4cf
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-10 13:41:02 +03:00
Alexey Kostenko
960342236d
Web: Client: Fixed transition from documents to settings
2021-03-10 13:40:39 +03:00
Viktor Fomin
585dbf3680
Web: fixed loader
2021-03-10 11:27:20 +03:00
40c7261fb1
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-10 10:36:14 +03:00
f962a2737b
Web: Remove slash
2021-03-10 10:35:43 +03:00
Viktor Fomin
9d06a6618a
Web: Client: change loader
2021-03-09 19:36:15 +03:00
b33b4990d1
Web: Login: fix register empty render
2021-03-09 13:58:03 +03:00
2a5a78bc74
Web: Packages: stable versions
2021-03-06 21:46:04 +03:00
20ef359023
Web: Restored package
2021-03-06 21:09:12 +03:00
fd05ceba27
Web: Editor: Upgrade dependencies
2021-03-06 18:54:32 +03:00
a8a55167eb
Web: Editor: Optimization
2021-03-06 18:50:06 +03:00
c96e783eab
Web: Added new @appserver/editor app
2021-03-05 21:15:48 +03:00
b65d83cc01
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-05 17:42:04 +03:00
32b8c7f6fe
Web: Fixed login work
2021-03-05 17:41:55 +03:00
TatianaLopaeva
289f749288
Web: About: Fix translation.
2021-03-05 14:24:34 +03:00
877016d8e3
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-05 12:41:08 +03:00
TatianaLopaeva
5412f7b860
Web: NavMenu: Fixed icon path, deleted useless icons from modules.
2021-03-05 11:09:23 +03:00
TatianaLopaeva
e81d2c8bb7
Web: Common: Fixed logoUrl.
2021-03-05 11:01:49 +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
Alexey Kostenko
b0f3a4e426
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-04 17:32:09 +03:00
TatianaLopaeva
b64736c363
Web: Added translation to PeopleSelector.
2021-03-04 14:57:48 +03:00
TatianaLopaeva
5c826bcf29
Web: Added top loading indicator for desktop.
2021-03-04 14:36:31 +03:00
Alexey Kostenko
9e80a2010c
Web: Common/Files/People: Refactoring routing (fixed transition between people module and files module)
2021-03-04 13:13:26 +03:00
Alexey Kostenko
b3a3851d68
Web: Client: Fixed the transition from the people module to the documents module
2021-03-03 19:17:00 +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
fe39c60633
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-03 16:19:09 +03:00
TatianaLopaeva
ada47512f1
Web: Moved PeopleSelector to the Web Client.
2021-03-03 15:41:28 +03:00
efaeaff894
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-03 14:46:45 +03:00
684c0e777f
Web: Refactoring
2021-03-03 14:46:37 +03:00
TatianaLopaeva
7b0faa4747
Web: Moved Main into the Web Client.
2021-03-03 13:02:56 +03:00
TatianaLopaeva
d6cf286cd0
Web: Moved Layout to the Web Client.
2021-03-03 12:47:28 +03:00
TatianaLopaeva
988afe48fd
Web: Moved profile menu to the NavMenu.
2021-03-03 11:25:28 +03:00
TatianaLopaeva
5212633a8d
Web: Moved errors from Common to the Web Client.
2021-03-03 11:15:11 +03:00
d6f593e4d4
Web: Fixed loading NavMenu translations on different pages
2021-03-02 20:21:37 +03:00
bf7f680d08
Web: Moved NavMenu to Web Client
2021-03-02 18:25:20 +03:00
b9ad73b9ce
Web: Added useful imports
2021-03-01 22:59:47 +03:00
94708ed455
Web: Fixed opening /products/(files|people) with /filter (or profile) + proxy
2021-03-01 22:48:48 +03:00
8a6afa8111
Web: Fixed load source maps
2021-03-01 18:21:40 +03:00
79cb70bc1f
Web: Added opportunity to load people page by primary link
2021-03-01 17:00:54 +03:00
Ilya Oleshko
c618740db1
Merge branch 'master' into develop
2021-03-01 16:46:32 +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
Ilya Oleshko
66bb7567aa
web: common: bump version
2021-03-01 16:25:52 +03:00
Ilya Oleshko
cb861508d3
Web: Common: Added getting api url from package.json, fixed "hardcode" from api client.
2021-03-01 16:25:41 +03:00
d280a6dca7
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-01 15:29:00 +03:00
b9b4c4b1e2
Web: Added opportunity to load login page by primary link
2021-03-01 15:28:51 +03:00
Viktor Fomin
6dd4847ea9
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-01 15:16:17 +03:00
Viktor Fomin
149e44b088
Web: Client: fixed loader width
2021-03-01 15:16:09 +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
c52680d4c8
Web: Settings: Fix displaying of icons.
2021-02-28 21:25:14 +03:00
693a633dee
fix auth via password
2021-02-26 22:32:03 +03:00
Viktor Fomin
604ff5d925
Web: Client: added loading shell
2021-02-26 16:49:55 +03:00
TatianaLopaeva
ca0c86f2d4
Web/Common: Fix active title of menu, fix transition without redirect.
2021-02-26 13:50:20 +03:00
96c4d63abe
Web: Fixed Files opening + added devtool: "inline-source-map"
2021-02-26 12:02:54 +03:00
Artem Tarasov
904813031b
Web; People/Files/Login: fix imports
2021-02-26 00:19:04 +03:00
Artem Tarasov
7af174ca65
Web: Client: fix imports
2021-02-26 00:17:25 +03:00
Artem Tarasov
48b3c6b445
Web: Common: fix after merge, fix imports and hierarchy
2021-02-25 17:20:11 +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
55a4a53bbc
Web: Fixed 404 error on translation.json loading
2021-02-25 12:25:16 +03:00
b25dd2d6e2
.net 5
2021-02-25 12:02:28 +03:00
35a4eca247
Web: Login: Fixed translation
2021-02-25 11:44:46 +03:00
4a40c8f894
Fix dependencies
2021-02-25 10:29:57 +03:00
36f6feec83
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-02-24 20:26:01 +03:00
471dcb1de7
Removed useless import
2021-02-24 20:25:54 +03:00
72675eb198
Web: Client: Simplified imports
2021-02-24 20:24:38 +03:00
Artem Tarasov
69dd27fac7
Web: applied new import from appserver/components
2021-02-24 20:11:23 +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
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
5807e0c402
web: common: bump version
2021-02-23 12:50:20 +03:00
7c4c0bd1ce
web: components: bump version
2021-02-23 12:49:56 +03:00
d270048827
Web: Removed commented code
2021-02-23 12:46:33 +03:00
f5d1b6fc2b
Web: Common: Removed redux + fixed storybook start
2021-02-23 12:46:01 +03:00
ef067c6040
Web: Client: Moved translations to public folder
2021-02-23 12:10:31 +03:00
63584c3cc4
Web: Fixed displaying version
2021-02-23 12:06:59 +03:00
c32a2b64dc
Web: Client: Fixed open third-party dialog
2021-02-23 12:01:29 +03:00
7fc22ca874
Web: Fixed cast to boolean
2021-02-23 12:00:44 +03:00
09a600b042
Web: Client: Added config
2021-02-23 11:59:24 +03:00
b9a8f7b178
Web: Common: fixed getting modules
2021-02-20 20:17:27 +03:00
TatianaLopaeva
f3efd89bfc
Web: Added Setting Routing.
2021-02-20 18:41:26 +03:00
TatianaLopaeva
5fdb5c8508
Web: Fix not displaing of icons.
2021-02-20 18:25:46 +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
Artem Tarasov
98d1fb376d
Web: LoginMobile: module moved to experimental
2021-02-20 13:41:59 +03:00
TatianaLopaeva
5d26bd5670
Web: Downgrade rc-tree package.
2021-02-20 13:19:01 +03:00
Artem Tarasov
a0badb257a
Web: LoginMobile: fixed condition for empty pass
2021-02-20 12:52:54 +03:00
TatianaLopaeva
b625eb3647
Web: Home: Revert file changes.
2021-02-20 11:53:29 +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
a0ce9e0dc5
Merge branch 'develop' into feature/not-implemented-page
2021-02-20 11:35:52 +03:00
TatianaLopaeva
30d4c580ac
Web: Added ThemeProvider to the App.
2021-02-20 10:59:40 +03:00
Artem Tarasov
5983dc1e1d
Web: LoginMobile: refactoring, added checking value inside Fields
2021-02-20 03:04:51 +03:00
Artem Tarasov
e72cfce70e
Web: Login/Mobile: added translate
2021-02-20 03:03:13 +03:00
Artem Tarasov
c5cac001c8
Web: LoginMobile: added validation of pass for registration-form
2021-02-20 02:56:59 +03:00
87b1108147
Web: Turned debug in i18n
2021-02-19 21:59:33 +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
Artem Tarasov
1c42ea4165
Web: LoginMobile: refactoring fields
2021-02-19 20:14:54 +03:00
Artem Tarasov
993384c781
Web: LoginMobile: added RegistrationForm
2021-02-19 20:13:39 +03:00
e97ba3a8b3
Web: People: Simplified translation
2021-02-19 19:27:13 +03:00
bc30b1311e
Auth by thirdparty
2021-02-19 19:16:08 +03:00
Artem Tarasov
feba30cb34
Web: LoginMobile: refactoring
2021-02-19 14:06:38 +03:00
Artem Tarasov
6da8c9c0c4
Web: LoginMobile: components refactoring
2021-02-19 13:54:33 +03:00
Artem Tarasov
3070bb1a78
Web: LoginMobile: added TextField
2021-02-19 13:53:56 +03:00
Artem Tarasov
554ebc9d02
Web: LoginMobile: added Main component, refactoring
2021-02-19 13:53:12 +03:00
Ilya Oleshko
1c01c3ce3a
Web: Client: Fixed style for learn more links
2021-02-19 13:26:09 +03:00
Ilya Oleshko
fb25c6adf6
web: common: bump version
2021-02-19 13:22:06 +03:00
Ilya Oleshko
d8d850b089
Web: Client: Open app link allowed only for IOS devices, added learn more links
2021-02-19 13:21:33 +03:00
Ilya Oleshko
e49a502e9a
Web: Common: Added originUrl and helpUrl for modules, added description for dummy modules
2021-02-19 13:20:17 +03:00
Ilya Oleshko
6325ea33f7
web: common: bump version
2021-02-19 11:17:48 +03:00
Ilya Oleshko
38ef5a69bd
Web: Common: Changed position of settings element inside NavMenu
2021-02-19 11:17:37 +03:00
Ilya Oleshko
ebc6d5942e
Web: Client: Changed main container for ComingSoonPage at desktop version
2021-02-19 10:53:04 +03:00
Ilya Oleshko
fcf70b711a
web: common: bump version
2021-02-18 16:38:14 +03:00
Ilya Oleshko
9e95383d63
Web: Common: Fixed of modules order. Added new style for NavItem separator.
2021-02-18 16:38:07 +03:00
Ilya Oleshko
b53557cedc
Merge branch 'develop' into feature/not-implemented-page
2021-02-18 15:56:39 +03:00
Ilya Oleshko
1e10146d3c
web: common: bump version
2021-02-18 15:55:34 +03:00
Ilya Oleshko
cb72f2241b
Web: Added product version badge
2021-02-18 15:55:26 +03:00
Ilya Oleshko
07077ee655
Web: Common: Removed unused property
2021-02-18 15:53:42 +03:00
f36d05ccf4
Web: Fixed work process
2021-02-18 15:52:13 +03:00
Artem Tarasov
3b7ce182ed
Web: LoginMobile: refactoring EmailField, change validation
2021-02-18 14:13:55 +03:00
Artem Tarasov
8b99bf92bb
Web: LoginMobile: layout fix
2021-02-18 14:13:14 +03:00
Artem Tarasov
cd6f4c36e2
Web: LoginMobile: deleted fakeHash
2021-02-18 14:11:21 +03:00
Artem Tarasov
4f949a4e39
Web: LoginMobile: Layout fix
2021-02-18 11:54:04 +03:00
d81b0fd770
Web: Files: fixed treeFolders
2021-02-18 11:23:03 +03:00
Artem Tarasov
ad790e56db
Web: LoginMobile: added title in Registration component
2021-02-18 01:19:53 +03:00
Artem Tarasov
0d28c30636
Web: LoginMobile: replace Header
2021-02-18 00:19:17 +03:00
Artem Tarasov
302e9abe8f
Web: LoginMobile: refactorung, added Router
2021-02-18 00:01:49 +03:00
ca166e3c66
Web: People: Move from redux to mobx completely
2021-02-17 17:53:18 +03:00
Artem Tarasov
5e8293023b
Web: LoginMobile: refactoring
2021-02-17 15:15:59 +03:00
7da0b78e48
CustomingNamingPeople: fix
2021-02-16 21:45:17 +03:00
Ilya Oleshko
d818d2272c
Web: Client: Added new coming soon module page, fixed route, added translations
2021-02-16 16:11:49 +03:00
Ilya Oleshko
81f2458f94
Web: Common: Pages: Restored default coming soon error page
2021-02-16 16:10:46 +03:00
Artem Tarasov
5d6b66e295
Web: LoginMobile: added title for Login page
2021-02-16 13:45:28 +03:00
Artem Tarasov
0b521f6b48
Web: LoginMobile: added Header to App
2021-02-16 13:31:24 +03:00
Artem Tarasov
0298249ab4
Web: LoginMobile: added header
2021-02-16 13:30:35 +03:00
Ilya Oleshko
d204c9b6de
Merge branch 'develop' into feature/not-implemented-page
2021-02-16 13:22:34 +03:00
Artem Tarasov
42cb830a84
Web: LoginMobile: added custim.scss, changed webpack config (alias)
2021-02-16 12:48:35 +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
a1fc390bc2
Web: Files: created formatsStore
2021-02-16 12:01:51 +03:00
Artem Tarasov
b6882bb381
Web: LoginMobile: added module LoginMobile
2021-02-16 11:00:24 +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
68910bfa04
Web: Files: removed redux provider from files
2021-02-15 15:11:26 +03:00
Ilya Oleshko
f2f2fbc07c
Merge branch 'develop' into feature/not-implemented-page
2021-02-15 10:58:34 +03:00
Artem Tarasov
99433c8539
Web: Common: FilterInput: fixed a bug with displaying an item in a hidden and open view at hte same time
2021-02-12 19:05:15 +03:00
Artem Tarasov
6024432747
Web: Components: backdrop: fixed ability to click on content behind the backdrop
2021-02-12 17:47:54 +03:00
Artem Tarasov
c7eb879ea6
web: components: bump version
2021-02-12 16:05:01 +03:00
Artem Tarasov
85be7db0f9
Web: Components: backdrop: fixed inability to close backdrop when tapping
2021-02-12 15:48:15 +03:00
Artem Tarasov
4e0e085bed
web: common: bump version
2021-02-12 13:10:53 +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
Artem Tarasov
22a33cd21b
Web: Common: PeopleSelector: deleted console.log
2021-02-12 13:08:54 +03:00
Artem Tarasov
5646ae7f7a
Web: Common: FilterInput: fixed changing the order of items in the filter when changing or adding PeopleSelector/GroupSelector
2021-02-12 13:08:28 +03:00
b09a9dc96c
Web: Common: Fixed NavMenu click
2021-02-12 10:31:54 +03:00
Artem Tarasov
95d6cd7185
Web: Common: FilterInput: added a function to check the order of elements
2021-02-11 16:51:42 +03:00
Ilya Oleshko
093ffd843c
web: components: bump version
2021-02-11 14:45:25 +03:00
Ilya Oleshko
30813be44a
Web: Components: Icons: Restored services icons after merge
2021-02-11 14:44:40 +03:00
1b585934ec
Studio: fix loginproviders
2021-02-11 12:40:30 +03:00
Viktor Fomin
60032dff9b
web: common: bump version
2021-02-08 16:03:52 +03:00
Viktor Fomin
e1292c0c1c
Web: Common: fixed padding
2021-02-08 15:56:15 +03:00
Viktor Fomin
4c50ae4eb5
Web: Common: fixed padding
2021-02-08 15:45:35 +03:00
Viktor Fomin
4d1beb69dc
Web: Common: fixed article header height
2021-02-08 15:15:27 +03:00
Viktor Fomin
45603744db
Web: Common: fixed padding
2021-02-08 14:38:50 +03:00
Viktor Fomin
8e177e4c1b
Web: Common: fix
2021-02-08 14:06:30 +03:00
fb6b345734
Web: Client: Fixed setDocumentTitle
2021-02-05 14:22:26 +03:00
2f60d7f355
Web: Refactoring: simplified moduleStore
2021-02-05 14:21:52 +03:00
Artem Tarasov
7a0c6ef772
Web: Components/Common: loader/PeopleSelector: fixed required passing of width and height props for Loader, removed console.log() in PeopleSelector
2021-02-05 13:47:17 +03:00