|
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 |
|
|
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 |
|
|
fa1d016554
|
Web: Common: fixed banner translations
|
2021-09-07 18:34:30 +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 |
|
|
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 |
|
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 |
|
|
f9feb35afc
|
Merge branch 'develop' into feature/backup
|
2021-05-30 20:57:01 +03:00 |
|
|
fc822e5ad5
|
Web: Fix setModuleInfo usage
|
2021-05-20 11:27:50 +03:00 |
|
|
0f07cdb9e9
|
Web: Settings: Backup: Added learn more ink to the third party resource component.
|
2021-05-06 12:41:58 +03:00 |
|
|
026306d7ca
|
Web: Login: Fix hard-coded list of trusted domains on registration
|
2021-05-04 15:35:09 +03:00 |
|
|
3ede66f9cd
|
Web: Settings: Backup: Added input with folder path. Added panel with only common documents.
|
2021-04-29 19:39:35 +03:00 |
|
Alexey Kostenko
|
707f9bab50
|
Web: Common: Added proxy to OAuth login URL
|
2021-04-23 13:17:40 +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 |
|
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 |
|
|
0b0dbb971f
|
Web: Settings: Fix enabledJoin setup
|
2021-04-19 18:39:00 +03:00 |
|
TatianaLopaeva
|
ab10641b45
|
Web: Rename teamTemplate.
|
2021-04-16 17:10:37 +03:00 |
|
TatianaLopaeva
|
052157d1fe
|
Web: Rename functions.
|
2021-04-16 15:35:02 +03:00 |
|
TatianaLopaeva
|
e738cab4a2
|
Web: Added Error message & Added loader.
|
2021-04-15 19:51:59 +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 |
|
Alexey Kostenko
|
ec6c1df3cf
|
Merge branch 'develop' into feature/oauth2.0
|
2021-04-08 11:59:08 +03:00 |
|
|
96d67be68c
|
Web: Fix hashSettings setup
|
2021-04-08 10:24:06 +03:00 |
|
|
c314b6e192
|
Web: Change bad language setup
|
2021-04-07 16:33:00 +03:00 |
|
TatianaLopaeva
|
cdef097fdd
|
Web: Fixed hiding header when switching group.
|
2021-04-07 13:35:32 +03:00 |
|
Alexey Kostenko
|
866a1bfa68
|
Web: People: Removed unused method
|
2021-04-05 13:36:04 +03:00 |
|
Alexey Kostenko
|
e333e7e82d
|
Web: People: Clear interval if getter token window is closed (connecting providers)
|
2021-04-04 16:53:27 +03:00 |
|
Alexey Kostenko
|
df635f3bfd
|
Web: Login/Common: Clear interval if getter token window is closed
|
2021-04-04 16:39:35 +03:00 |
|
Vladislav Makhov
|
555bb28e47
|
web: common: remove unused imports
|
2021-04-02 15:36:40 +03:00 |
|
Vladislav Makhov
|
ff04684f53
|
web: remove unused code
|
2021-04-02 13:49:42 +03:00 |
|
Vladislav Makhov
|
cb10e850cd
|
web: common: switch to makeAutoObservable, add action setIsEncryptionSupport
|
2021-04-01 12:42:23 +03:00 |
|
Vladislav Makhov
|
1a66373c16
|
web: fix defaultPage
|
2021-03-30 15:01:25 +03:00 |
|
Vladislav Makhov
|
be3c97bce2
|
web: fix opening Files as default page, if desktop client uses
|
2021-03-30 13:05:52 +03:00 |
|
Alexey Kostenko
|
1e17f4c4ae
|
Web: Common: Added api for oauth login
|
2021-03-24 16:49:42 +03:00 |
|
|
a8a6121e59
|
Web: Proxy fixes
|
2021-03-22 17:35:33 +03:00 |
|