Commit Graph

11 Commits

Author SHA1 Message Date
1ca554f82d Merge branch 'develop' into release/1.0.0
# Conflicts:
#	packages/asc-web-components/campaigns-banner/index.js
#	web/ASC.Web.Client/src/Shell.jsx
2021-09-15 14:45:33 +03:00
03d8d560ba Web: Hide internal login from personal mode 2021-09-14 16:44:39 +03:00
b70a9cd115 Web: Common: Fixed response for response type "text". 2021-09-10 11:52:06 +03:00
1501c1d91e FIx Bug 52243 Client.Editor. There is no prompt message indicating that the file was saved successfully when using Save Copy As. 2021-09-08 15:46:52 +03:00
c81a28f48f Web: Common: fixed onError 2021-08-25 17:54:08 +03:00
e60815b15d Web: Refactoring and API calls optimization 2021-08-13 20:32:50 +03:00
996b438a6b Web: Api: Added opportunity to skipLogout on 401 error 2021-08-13 19:24:48 +03:00
8785f6151a Web: Common: fixed reloading login page 2021-05-19 17:17:07 +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
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
Artem Tarasov
fe7cb5364d Web: Common: chsnged component hierarchy 2021-02-25 11:04:22 +03:00