|
|
72390a09da
|
Web: Common: Fixed help url.
|
2022-03-15 18:04:00 +03:00 |
|
|
|
1d6281b4dd
|
Web: Common: Deleted useless code.
|
2022-03-15 11:26:37 +03:00 |
|
|
|
8cbc15a15d
|
Web: Backup: Fixed language for weekdays and for help url.
|
2022-03-15 09:09:22 +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 |
|
|
|
5e12bf583c
|
Fix Bug 54825 - Client.Clouds.‘Uncaught (in promise) undefined’
|
2022-02-15 18:39:14 +03:00 |
|
|
|
40d56075f1
|
Merge branch 'develop' into feature/backup
# Conflicts:
# common/ASC.Data.Backup.Core/EF/BackupsContext.cs
# common/ASC.Data.Backup.Core/Service/BackupWorker.cs
# common/services/ASC.Data.Backup/Controllers/BackupController.cs
# common/services/ASC.Data.Backup/Startup.cs
# packages/asc-web-common/components/PageLayout/sub-components/section-header.js
# products/ASC.Files/Client/public/locales/en/OperationsPanel.json
# products/ASC.Files/Client/public/locales/en/Settings.json
# products/ASC.Files/Client/public/locales/ru/Settings.json
# products/ASC.Files/Client/src/components/SimpleFileInput/StyledSimpleFileInput.js
# products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFolderInput/StyledSelectFolderInput.js
# products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js
# products/ASC.Files/Client/src/components/panels/StyledPanels.js
# products/ASC.Files/Client/webpack.config.js
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
# web/ASC.Web.Client/webpack.config.js
|
2022-02-07 12:40:50 +03:00 |
|
|
|
1a8d88345a
|
Merge branch 'hotfix/v1.1.1' into feature/socket-io
# Conflicts:
# products/ASC.Files/Client/src/store/FilesStore.js
# yarn.lock
|
2022-01-17 19:02:40 +03:00 |
|
|
|
77937390ef
|
Web: Fix crash of Wizard with default en-US language
|
2022-01-14 19:12:58 +03:00 |
|
|
|
8b327ceb66
|
Web: Socket.IO: Extended /api/2.0/settings with socketUrl + refactoring of client socket usage
|
2022-01-12 20:13:30 +03:00 |
|
|
|
27e732e9a3
|
Web: Login: Added usage of new API /authentication.json parameter "session"
|
2021-12-01 10:56:50 +03:00 |
|
|
|
39c3d57781
|
Web: Common: AuthStore: Added reset auth-store after login with app code
|
2021-11-15 14:29:02 +03:00 |
|
|
|
e917b4bb56
|
Fix Bug 53454 - Client: Sign out. Error on api/2.0/people/@self.json
|
2021-11-10 15:52:36 +03:00 |
|
|
|
f5da85049c
|
Fix Bug 53524 - Client.Profile|List: User's display name with diacritics invalid
|
2021-11-09 19:32:15 +03:00 |
|
|
|
773419f3ef
|
Web: Common: AuthStore: Added added url at response parameters
|
2021-11-03 12:18:28 +03:00 |
|
|
|
8ba2f0c694
|
Merge branch 'develop' into feature/backup
# Conflicts:
# packages/asc-web-common/api/settings/index.js
# web/ASC.Web.Api/Models/SettingsWrapper.cs
|
2021-10-25 11:02:42 +03:00 |
|
|
|
e734f222f5
|
Merge branch 'release/1.0.0' into bugfix/profile-form-validation
|
2021-10-06 13:32:50 +03:00 |
|
|
|
57e050ba92
|
Web: Desktop: Changed provider to "onlyoffice" and renamed guid to cryptoEngineId
|
2021-10-06 11:26:06 +03:00 |
|
|
|
5b64ba0044
|
Web: Refactoring.
|
2021-10-06 11:22:00 +03:00 |
|
|
|
66e2fc8663
|
Web: Refactoring.
|
2021-10-06 11:04:29 +03:00 |
|
|
|
15b475677f
|
Web: Added RegExp constant for checking folder name.
|
2021-10-05 17:45:33 +03:00 |
|
|
|
a02926532c
|
Web: People: Added constants for RegExp.
|
2021-10-05 17:38:29 +03:00 |
|
|
|
5d3d8f4d45
|
Web: Changed opportunity to show/hide DebugInfo to appsettings.json param "debug-info:enabled" and 'api/2.0/settings.json'
|
2021-10-05 11:13:38 +03:00 |
|
|
|
9ce696e624
|
Web: Studio: Init Debug Info
+ Added About version from package.json
+ Fix DocumentServer version
|
2021-10-04 17:08:03 +03:00 |
|
|
|
aa6c02b190
|
Merge branch 'develop' into feature/backup
# Conflicts:
# common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
# common/ASC.Data.Backup.Core/Service/BackupWorker.cs
# common/services/ASC.Data.Backup/Controllers/BackupController.cs
# packages/asc-web-common/api/settings/index.js
# packages/asc-web-common/components/PrivateRoute/index.js
# packages/asc-web-common/store/SettingsStore.js
# products/ASC.Files/Client/public/locales/en/SelectFile.json
# products/ASC.Files/Client/public/locales/ru/SelectFile.json
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileInput/index.js
# products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js
# products/ASC.Files/Client/src/components/panels/StyledPanels.js
# products/ASC.Files/Client/webpack.config.js
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Client/src/Shell.jsx
|
2021-09-20 16:26:34 +03:00 |
|
|
|
e2f977ce17
|
Merge branch 'develop' into feature/optimization
|
2021-09-15 11:47:29 +03:00 |
|
|
|
03d8d560ba
|
Web: Hide internal login from personal mode
|
2021-09-14 16:44:39 +03:00 |
|
|
|
551c623541
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/new-campaigns
# Conflicts:
# packages/asc-web-components/campaigns-banner/index.js
# products/ASC.Files/Client/src/components/Article/Body/index.js
|
2021-09-08 14:36:10 +03:00 |
|
|
|
fa1d016554
|
Web: Common: fixed banner translations
|
2021-09-07 18:34:30 +03:00 |
|
|
|
6ee8033097
|
Web: Common: fixed warning
|
2021-09-06 12:30:58 +03:00 |
|
|
|
f53d7eb718
|
Web: Common: fixed article unpin
|
2021-08-18 17:17:45 +03:00 |
|
|
|
b7df3903dd
|
Web: Files: fixed the hiding of the article
|
2021-08-18 15:52:27 +03:00 |
|
|
|
48c6d35a20
|
Web: AuthStore: Removed useless code
|
2021-08-17 16:32:19 +03:00 |
|
|
|
e60815b15d
|
Web: Refactoring and API calls optimization
|
2021-08-13 20:32:50 +03:00 |
|
|
|
17eaf17b7d
|
Web: Common: Add check if store is initialized.
|
2021-08-12 14:41:12 +03:00 |
|
|
|
3f56790c85
|
Fix bug 51365: update avatar in header
|
2021-08-11 10:18:10 +03:00 |
|
Artem Tarasov
|
deeb497a9e
|
Web: Common: AuthStore: at logout added a condition for going to the login page if personal is true
|
2021-08-03 11:03:19 +03:00 |
|
|
|
e81c3df0be
|
Added displaying version from appsettings.json (api/2.0/settings.json)
|
2021-07-14 17:31:06 +03:00 |
|
|
|
b4c4625f3f
|
Moved getting firebase config to API method /api/2.0/settings.json
|
2021-07-09 18:28:08 +03:00 |
|
|
|
3d662a53ee
|
Web: Added transition to the preparation page.
|
2021-07-01 12:12:09 +03:00 |
|
|
|
bac090e180
|
Merge branch 'develop' into feature/personal
# Conflicts:
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
|
2021-06-11 13:11:08 +03:00 |
|
|
|
0663ed7f16
|
Merge branch 'develop' into feature/backup
# Conflicts:
# packages/asc-web-common/api/settings/index.js
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
|
2021-06-10 11:56:32 +03:00 |
|
|
|
41ef020616
|
Web: Common: added backupCodes in tfa store
|
2021-06-08 14:19:36 +03:00 |
|
Vladislav Makhov
|
61abe6a2fc
|
web: common: fix default page
|
2021-06-03 15:52:07 +03:00 |
|
Vladislav Makhov
|
4a3b61dda8
|
web: common: fix default page
|
2021-06-03 15:48:19 +03:00 |
|
Vladislav Makhov
|
889bba78b1
|
web: common: fix default value
|
2021-06-03 10:32:33 +03:00 |
|
Vladislav Makhov
|
2ae98f6cf4
|
web: common: rename isPersonal to personal according to settings api key
|
2021-06-03 10:30:09 +03:00 |
|
Vladislav Makhov
|
1e8563ed2a
|
web: common: add isPersonal key
|
2021-06-02 16:42:59 +03:00 |
|
|
|
7026b19db0
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
|
2021-05-31 09:23:53 +03:00 |
|
|
|
49c77907bd
|
Web: Common: fixed error message
|
2021-05-30 22:48:04 +03:00 |
|
