Timofey Boyko
b1b78068d6
Web:Common:Constants: add new constant 'ThemeKeys'
2022-04-21 10:17:15 +03:00
mushka
cd82919062
merge with feature/virtual-rooms-1.2
2022-03-24 18:00:31 +03:00
26272fc2a5
Web: Separated BackupTypes constant.
2022-03-21 12:06:10 +03:00
1fce535cfb
WEb: Backup: Added constants.
2022-03-04 17:00:04 +03:00
d6fe627217
Web: AutoBackup: Refactoring.
2022-03-04 16:12:06 +03:00
mushka
384a92c30f
finished merging
2022-03-04 12:52:34 +03:00
mushka
807fe75b72
change code formatting 3
2022-03-03 14:25:10 +03:00
mushka
6b88a2dd43
change code formatting 2
2022-03-03 13:59:20 +03:00
mushka
424a7a7e3c
change code formatting
2022-03-03 13:43:43 +03:00
f07aa0a183
Merge branch 'develop' into feature/backup
...
# Conflicts:
# common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs
# config/nginx/onlyoffice.conf
# packages/asc-web-common/constants/index.js
# products/ASC.Files/Client/src/components/panels/StyledPanels.js
# products/ASC.Files/Client/webpack.config.js
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
2022-02-25 16:05:43 +03:00
4b06ae5f0e
Web: Files: Common: Added redirect to preparation portal.
2022-02-18 10:01:55 +03:00
fecb7d5e37
Fix Bug 49777 - Docs. The version icon does not appear next to the file name after it has been created and edited.
2022-02-10 19:49:44 +03:00
mushka
82c1c47be6
working RoomInfoStore
2022-02-09 21:08:22 +03:00
c82b931cc6
Web: Changed constants.
2021-10-05 19:20:21 +03:00
01879779cd
Merge branch 'develop' into feature/backup
2021-10-04 15:21:45 +03:00
335eaeaba7
Web: Common: Added third party storages enum.
2021-09-28 18:10:11 +03:00
Artem Tarasov
ae64556bb0
web: common/people/login: renamed providers to lowercase (client)
2021-09-27 09:55:44 +03:00
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
38242e83c1
Web: Moved other common dependencies to sharedDependencies.js
2021-09-13 12:29:44 +03:00
74011d7328
Fixed Bug 52443 - Client.Files. Fixed downloadAs action
2021-09-13 11:09:59 +03:00
a47c73b5ce
Web: Moved "mobx", "moment", prop-types" to sharedDependencies.js
2021-09-10 16:50:23 +03:00
956c9b3467
Web: Moved "react", "react-dom", "react-router", "react-router-dom", "styled-components" to sharedDependencies.js
2021-09-10 15:57:14 +03:00
d2f3c93c14
Web: Moved "@babel/runtime", "i18next", "i18next-http-backend", "react-i18next" to sharedDependencies.js
2021-09-10 15:15:51 +03:00
46161eef95
Web: Moved axios to sharedDependencies.js
2021-09-10 14:49:20 +03:00
f0c7a09a6c
Web: Moved common shared dependencies to sharedDependencies.js + moved workbox-window
2021-09-10 14:20:19 +03:00
62ac315c8d
Web: i18n: Replaced i18т config load: from "languageOnly" to "all" and added new utils function loadLanguagePath() + Refactoring
2021-06-02 13:55:11 +03:00
1e954b15d7
Web: Moved translationKeys "PasswordLimitLength", "PasswordLimitMessage", "PasswordLimitDigits", "PasswordLimitSpecialSymbols" and "PasswordLimitUpperCase" to "/static/locales/{lng}/Common.json"
2021-05-24 19:05:29 +03:00
14214f2ad8
Web: Fixed translation usage for keys: "SignInWithFacebook", "SignInWithGoogle", "SignInWithLinkedIn", "SignInWithTwitter"
2021-05-21 15:00:30 +03:00
35ef6c27bf
Web: Files: removed file format for unselected items
2021-05-04 17:42:06 +03:00
026306d7ca
Web: Login: Fix hard-coded list of trusted domains on registration
2021-05-04 15:35:09 +03:00
Alexey Kostenko
b1ef3639c6
Fix
2021-04-22 16:13:02 +03:00
Alexey Kostenko
691e7d5498
Merge branch 'develop' into feature/oauth2.0
2021-04-21 15:04:26 +03:00
Alexey Kostenko
d9860256ec
Web: Common/Components: FacebookButton style fix
2021-04-19 09:49:47 +03:00
a289256846
Web: Files: added ConflictResolveDialog, refactoring files operations
2021-04-16 16:04:50 +03:00
Alexey Kostenko
cf7072a714
Refactoring
2021-04-12 10:57:21 +03:00
b9fe2c338f
Added New Proxy settings
2021-04-05 15:49:02 +03:00
a8a6121e59
Web: Proxy fixes
2021-03-22 17:35:33 +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
Artem Tarasov
fe7cb5364d
Web: Common: chsnged component hierarchy
2021-02-25 11:04:22 +03:00
