Commit Graph

7022 Commits

Author SHA1 Message Date
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
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
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