|
|
cf1b168dd6
|
Web: move locales to Common
|
2022-07-20 12:22:38 +03:00 |
|
|
|
75042eedf0
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header
# Conflicts:
# packages/asc-web-common/components/Article/styled-article.js
|
2022-07-20 10:00:32 +03:00 |
|
|
|
df26c82593
|
Tfa: fix reset cookie
|
2022-07-20 09:56:24 +03:00 |
|
Artem Tarasov
|
37dbf5e38f
|
Web: Doceditor: fixed render SelectFolderDialog
|
2022-07-20 02:19:40 +03:00 |
|
Artem Tarasov
|
aafb79500f
|
Web: Doceditor: moved client i18n initialization from developer, fixed render SelectFileDialog
|
2022-07-20 00:52:49 +03:00 |
|
Artem Tarasov
|
3f8a1d9f99
|
Web: Doceditor: fixed render dialogs, added MobxProvider
|
2022-07-20 00:17:37 +03:00 |
|
Artem Tarasov
|
040880d3c7
|
Web: Doceditor: fixed font loading
|
2022-07-19 23:12:38 +03:00 |
|
Artem Tarasov
|
4ddffad7b2
|
Merge branch 'develop' into feature/doceditor-ssr
|
2022-07-19 18:22:16 +03:00 |
|
|
|
66b0e8c303
|
Merge branch 'develop' into bugfix/tfa
|
2022-07-19 18:17:22 +03:00 |
|
|
|
067e105814
|
Merge branch 'develop' into feature/modal-redesign
|
2022-07-19 16:58:02 +03:00 |
|
|
|
b98524532f
|
Merge branch 'develop' into feature/migrations-fix
# Conflicts:
# common/ASC.Core.Common/EF/Model/CRM/DbVoipCall.cs
# common/ASC.Core.Common/EF/Model/CRM/VoipNumber.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20220711152836_VoipDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/MySqlVoipDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/PostgreSql/VoipDbContextPostgreSql/20220711152837_VoipDbContextPostgreSql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/VoipDbContextPostgreSql/PostgreSqlVoipDbContextModelSnapshot.cs
|
2022-07-19 16:04:29 +03:00 |
|
|
|
c17817eed8
|
Web: Client: NavMenu: delete email
|
2022-07-19 14:35:48 +03:00 |
|
|
|
0c2d54638f
|
Web: Client: NavMenu: fix button size
|
2022-07-19 14:10:36 +03:00 |
|
|
|
7f241f4c90
|
Web: Client: add profile actions
|
2022-07-19 14:08:06 +03:00 |
|
|
|
ad4767d572
|
Web: Client: move debug dialog to shell
|
2022-07-19 12:35:08 +03:00 |
|
Artem Tarasov
|
3da9439f0f
|
Web: Doceditor: fixed webpack config
|
2022-07-19 10:58:50 +03:00 |
|
Artem Tarasov
|
9f19891d0b
|
Web: Doceditor: fix after merge
|
2022-07-19 10:48:26 +03:00 |
|
|
|
a82f4293e7
|
Web: Client: ProfileActionsStore: add urls, fix about
|
2022-07-18 22:09:38 +03:00 |
|
|
|
93fc644a6a
|
Web: Client: NavMenu: use profile actions store
|
2022-07-18 22:09:07 +03:00 |
|
|
|
7b6b252a09
|
Web: Client: create profile actions store, del about store
|
2022-07-18 21:46:43 +03:00 |
|
|
|
8648b588fa
|
Web:Studio:Сolor palette stylization.
|
2022-07-18 18:48:21 +03:00 |
|
Artem Tarasov
|
10f2cde731
|
Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
# .gitignore
|
2022-07-18 17:05:53 +03:00 |
|
Artem Tarasov
|
d4968b3225
|
Web: Doceditor: refactoring
|
2022-07-18 16:13:45 +03:00 |
|
Artem Tarasov
|
8c46fc661d
|
Web: Doceditor: added i18n initialization
|
2022-07-18 16:07:22 +03:00 |
|
|
|
18c1fdc0d2
|
Web: Added the loader display with a delay so that there are no content jumps.
|
2022-07-18 15:29:16 +03:00 |
|
|
|
24423a2cb4
|
Web: RestoreBackup: Added new loader.
|
2022-07-18 14:39:11 +03:00 |
|
|
|
005b72216d
|
Web: Client: move about dialog to shell
|
2022-07-18 14:09:09 +03:00 |
|
Artem Tarasov
|
d70e2df443
|
Web: Doceditor: added logger
|
2022-07-18 13:56:22 +03:00 |
|
|
|
47f8e166c5
|
Web: RestoreBackup: Added blocking of actions when the option is not enabled.
|
2022-07-18 13:25:45 +03:00 |
|
|
|
f190701f0b
|
Web: Deleted useless code.
|
2022-07-18 12:53:45 +03:00 |
|
|
|
dd57b55be0
|
Web: ManualBackup: The button is disabled if the folder of a third-party account is not selected.
|
2022-07-18 12:52:16 +03:00 |
|
|
|
43d8788558
|
Web: Added URL for each section.
|
2022-07-18 12:50:14 +03:00 |
|
|
|
d94904b6af
|
removed voip
|
2022-07-18 12:24:12 +03:00 |
|
|
|
a31a038b9f
|
Web: AutoBackup: Added blocking of actions when the option is not enabled.
|
2022-07-18 11:16:12 +03:00 |
|
|
|
99aaa3a575
|
Web: Added error handler.
|
2022-07-18 10:56:44 +03:00 |
|
Artem Tarasov
|
e06f4bd7b3
|
Web: Doceditor: modified run dev scripts
|
2022-07-17 13:01:49 +03:00 |
|
Artem Tarasov
|
ca7809ba52
|
Web: Doceditor: refactoring client (fix warnings, optimization component)
|
2022-07-17 12:48:23 +03:00 |
|
Artem Tarasov
|
de7b320f06
|
Web: Doceditor: modified webpack config (deleted unnecessary plugins, optimization)
|
2022-07-17 12:47:03 +03:00 |
|
Artem Tarasov
|
3ac7597ef7
|
Web: Doceditor: refactoring server
|
2022-07-17 12:46:17 +03:00 |
|
|
|
6fa0a14a33
|
Web:Studio:Сolor palette stylization.
|
2022-07-16 22:12:38 +03:00 |
|
|
|
57cef8663e
|
Web:Studio:Adding HexColorPickerComponent, adding props nodeButtonsColor, nodeAccentColor, nodeHexColorPickerAccent, nodeHexColorPickerButtons in ColorSchemeDialog.
|
2022-07-16 17:44:48 +03:00 |
|
Artem Tarasov
|
4d9422ef0d
|
Web: Doceditor: modified webpack config for client
|
2022-07-15 18:50:57 +03:00 |
|
|
|
e2b1e48fa9
|
removed voip service
|
2022-07-15 18:46:52 +03:00 |
|
|
|
42bbecd463
|
Web: Backup: Added loaders.
|
2022-07-15 15:54:30 +03:00 |
|
|
|
bb51d53cc4
|
add new keys-17
|
2022-07-15 15:02:07 +03:00 |
|
Artem Tarasov
|
8172c832bf
|
Web: Doceditor: modified webpack config for server
|
2022-07-15 14:37:58 +03:00 |
|
|
|
a478d7760b
|
Web:Studio:Сolor palette stylization.
|
2022-07-15 10:22:56 +03:00 |
|
|
|
aa17b6d882
|
fix
|
2022-07-14 16:18:23 +03:00 |
|
|
|
5005bfec3d
|
Web: Client: Confirm: use confirmHeader
|
2022-07-14 15:28:14 +03:00 |
|
|
|
5bc309ed11
|
Web:Studio:Add header, selectedAccentColorAndButtonsMain props to ColorSchemeDialog.
|
2022-07-14 15:07:39 +03:00 |
|
|
|
a48dbeaeae
|
fix tfaapp/validate
|
2022-07-14 14:58:49 +03:00 |
|
|
|
fb162af624
|
Web: Client: Settings: use new tfa api
|
2022-07-14 14:43:50 +03:00 |
|
|
|
1f01c06185
|
Tfa: added tfaappwithlink
|
2022-07-14 12:57:57 +03:00 |
|
Vashchuk Nikita
|
6507c4b999
|
Merge branch 'develop' into feature/migrations-fix
# Conflicts:
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.cs
# web/ASC.Web.Core/GlobalUsings.cs
|
2022-07-14 11:56:07 +03:00 |
|
Artem Tarasov
|
b8e4f56862
|
Web: Doceditor: fixed start script
|
2022-07-14 03:41:50 +03:00 |
|
Artem Tarasov
|
c47a265eff
|
Web: Doceditor: added initDoceditor, api, requestManager
|
2022-07-14 03:39:56 +03:00 |
|
Artem Tarasov
|
12ed025fad
|
Web: Doceditor: editor render fix
|
2022-07-14 03:39:09 +03:00 |
|
Artem Tarasov
|
0fe7836f65
|
Web: Doceditor: added global styles
|
2022-07-14 03:38:34 +03:00 |
|
Artem Tarasov
|
5364dceb53
|
Web: Doceditor: added Websocket to implement Live Reloading
|
2022-07-14 00:25:15 +03:00 |
|
|
|
615de2bf19
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header
|
2022-07-13 19:30:50 +03:00 |
|
|
|
3597114325
|
Api: fix tfaappnewapp
|
2022-07-13 18:41:44 +03:00 |
|
|
|
3cb56da496
|
Web:Studio:Сolor palette stylization.
|
2022-07-13 17:59:54 +03:00 |
|
Artem Tarasov
|
1e321859d7
|
Web: Doceditor: added ejs
|
2022-07-13 14:08:20 +03:00 |
|
Artem Tarasov
|
776c0874d1
|
Web: Doceditor: added babel.config.js to be able to use import in server
|
2022-07-13 14:07:49 +03:00 |
|
Artem Tarasov
|
a612c8490a
|
Web: Doceditor: rewrite server to CommonJs
|
2022-07-13 14:06:03 +03:00 |
|
|
|
b1baddce99
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header
|
2022-07-13 13:46:36 +03:00 |
|
|
|
bfac83d53c
|
Web:Adding the react-colorful library.
|
2022-07-13 12:37:22 +03:00 |
|
|
|
4be3a1f937
|
Web:Studio:Adding a theme, editing a theme.
|
2022-07-13 12:32:28 +03:00 |
|
|
|
cad67a6f57
|
Web: RestoreBackup: Refactoring.
|
2022-07-13 12:20:33 +03:00 |
|
|
|
b0eb883e20
|
Web: Fixed saving settings, refactoring.
|
2022-07-13 12:20:33 +03:00 |
|
|
|
48ac6f24d3
|
Web: Moved the function to a shared file.
|
2022-07-13 12:20:33 +03:00 |
|
|
|
20bb2d107d
|
Web: Part of the code moved in a shared file.
|
2022-07-13 12:20:32 +03:00 |
|
|
|
50f8dbd6dd
|
Web: AutoBackup: Fixed width pf toggle wrapper, added the same length if button turn on and turn off.
|
2022-07-13 12:20:31 +03:00 |
|
|
|
57d583687f
|
Web: RestoreBackup: Added new option for third-party accounts.
|
2022-07-13 12:20:31 +03:00 |
|
|
|
51418fc141
|
WEb: AutoBackup: Added new option for third-party accounts.
|
2022-07-13 12:20:30 +03:00 |
|
|
|
05db277f00
|
Web: AutoBackup: Added disable input if folder was deleted, added removing folder when switch between options.
|
2022-07-13 12:20:30 +03:00 |
|
|
|
41a2c421b1
|
Web: ManualBackup: Added new option for Third-party accounts.
# Conflicts:
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/DesktopView.js
|
2022-07-13 12:20:29 +03:00 |
|
|
|
1eb930583c
|
Web: Restore: Refactoring storage container.
# Conflicts:
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/index.js
|
2022-07-13 12:20:17 +03:00 |
|
|
|
879b8e1dcb
|
Web: Refactoring storage containers.
|
2022-07-13 12:19:59 +03:00 |
|
|
|
7140c667e6
|
Web: AutoBackup: Deleted useless code.
|
2022-07-13 12:19:59 +03:00 |
|
|
|
8f92458307
|
Web: AutoBackup: Moved the parameter to the store.
|
2022-07-13 12:19:58 +03:00 |
|
|
|
c894454bfc
|
Web: Deleted useless state.
|
2022-07-13 12:19:58 +03:00 |
|
|
|
b94989f5a9
|
Web: Optimization amazon container of manual backup.
|
2022-07-13 12:19:57 +03:00 |
|
|
|
fdd467f369
|
Web: Optimization amazon container of auto backup.
|
2022-07-13 12:19:57 +03:00 |
|
|
|
02ec398cc0
|
Web: Rewrote logic of amazon settings container.
|
2022-07-13 12:19:56 +03:00 |
|
|
|
4addb0e64d
|
Web: Fixed settings title.
|
2022-07-13 12:19:56 +03:00 |
|
|
|
d9b20300e2
|
Web: Settings: Added tips.
# Conflicts:
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
|
2022-07-13 12:19:55 +03:00 |
|
|
|
78c9bbbc3e
|
Web: ManualBackup: Added new options for Amazon storage.
|
2022-07-13 12:18:45 +03:00 |
|
|
|
39557164d8
|
Web: Added restore backup to the article.
|
2022-07-13 12:18:45 +03:00 |
|
|
|
10c37ee2d6
|
Web: ManualBackup: Added new input methods.
|
2022-07-13 12:18:44 +03:00 |
|
|
|
bc472af290
|
Web: Redesign manual backup and auto backup modules.
# Conflicts:
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/auto-backup/index.js
|
2022-07-13 12:12:19 +03:00 |
|
|
|
c9680ae830
|
fix tfaapp
|
2022-07-12 19:36:39 +03:00 |
|
|
|
536282eaf3
|
Merge branch 'develop' into feature/modal-redesign
|
2022-07-12 17:53:37 +03:00 |
|
mushka
|
f99d8784f1
|
fixed RecoverAccess dialog
|
2022-07-12 17:28:13 +03:00 |
|
|
|
c1be6ecb61
|
Settings: ignore id
|
2022-07-12 15:33:46 +03:00 |
|
|
|
72b00ffe94
|
Merge branch 'develop' into feature/modal-redesign
|
2022-07-12 14:24:11 +03:00 |
|
mushka
|
45f2e63836
|
changed ConnectCloud dark theme and fixed ConsumerModalDialolg
|
2022-07-12 14:19:04 +03:00 |
|
|
|
404e014a59
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header
# Conflicts:
# products/ASC.Files/Client/src/Files.jsx
|
2022-07-12 14:18:29 +03:00 |
|
|
|
a9d5080f5d
|
Web: Client: Settings: disabled autofocus
|
2022-07-12 13:50:55 +03:00 |
|
|
|
7b19b2f730
|
Web: Client: Settings: SessionLifetime: fix show reminder
|
2022-07-12 13:41:50 +03:00 |
|
mushka
|
6f5b84308d
|
fixed translation on Register dialog
|
2022-07-12 13:08:29 +03:00 |
|
|
|
0d0eed6d1a
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/security-settings
|
2022-07-12 12:57:57 +03:00 |
|
mushka
|
a222f836c4
|
fixed ConsumerModalDialog compennt
|
2022-07-12 12:50:08 +03:00 |
|
mushka
|
96e85f9cb3
|
Merge branch 'develop' into feature/modal-redesign
|
2022-07-12 12:34:43 +03:00 |
|
|
|
e9a15cc2a4
|
added [HttpGet("iprestrictions/settings")]
|
2022-07-12 12:20:59 +03:00 |
|
|
|
fd986320f2
|
Api: fixed maildomainsettings
|
2022-07-12 11:47:05 +03:00 |
|
|
|
61d824db3c
|
Web: Client: Main: fix height
|
2022-07-11 23:11:27 +03:00 |
|
mushka
|
83cb430911
|
small tweaks on DebugInfo
|
2022-07-11 22:15:53 +03:00 |
|
mushka
|
96a2d4530e
|
fixed DebugInfo styles
|
2022-07-11 22:11:55 +03:00 |
|
mushka
|
9d13e3a4c4
|
Merge branch 'develop' into feature/modal-redesign
|
2022-07-11 17:39:20 +03:00 |
|
Artem Tarasov
|
a77f413e9a
|
Web: Doceditor: modified webpack config
|
2022-07-11 17:33:22 +03:00 |
|
Artem Tarasov
|
68b375faf3
|
Web: Doceditor: updated webpack version, updated yarn.lock
|
2022-07-11 17:32:22 +03:00 |
|
|
|
e3c039942d
|
Web: Client: hide header on desktop
|
2022-07-11 15:17:48 +03:00 |
|
|
|
136a0d45bf
|
Web: Client: TfaActivation: fix layout
|
2022-07-11 14:47:57 +03:00 |
|
|
|
65a739d871
|
Removed ASC.Web.Campaigns (moved to separated repository)
|
2022-07-11 14:15:51 +03:00 |
|
|
|
3cbfa3d952
|
Web: Client: TfaAuth: fix layout
|
2022-07-11 13:57:58 +03:00 |
|
mushka
|
2fb38338e5
|
fixed backdrop and Debug dialog
|
2022-07-11 13:30:55 +03:00 |
|
Vashchuk Nikita
|
e49d082fa3
|
Merge branch 'develop' into feature/migrations-fix
# Conflicts:
# common/ASC.Core.Common/EF/Model/Core/Acl.cs
# common/ASC.Core.Common/GlobalUsings.cs
# common/ASC.Core.Common/Messaging/EventMessage.cs
# common/ASC.Core.Common/Messaging/LoginEvent.cs
# common/ASC.Core.Common/Messaging/MessageTarget.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20211012145320_CoreDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20220708104408_FilesDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20220708104408_FilesDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20220708104428_MessagesContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20220708104428_MessagesContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20211012145322_UserDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20220708104402_UserDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/MySqlUserDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/PostgreSql/CoreDbContextPostgreSql/20211012145321_CoreDbContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20220708104409_FilesDbContextPostgreSql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20220708104409_FilesDbContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20211012145335_MessagesContextPostgreSql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20211012145335_MessagesContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20220708104429_MessagesContextPostgreSql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20220708104429_MessagesContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/TenantDbContextPostgreSql/20211012145343_TenantDbContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/UserDbContextPostgreSql/20211012145323_UserDbContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/UserDbContextPostgreSql/20220708104403_UserDbContextPostgreSql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/UserDbContextPostgreSql/PostgreSqlUserDbContextModelSnapshot.cs
# common/ASC.Data.Backup.Core/Migrations/MySql/BackupsContextMySql/20220708104422_BackupsContextMySql.Designer.cs
# common/ASC.Data.Backup.Core/Migrations/PostgreSql/BackupsContextPostgreSql/20220708104423_BackupsContextPostgreSql.Designer.cs
# common/ASC.MessagingSystem/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.Designer.cs
# common/ASC.MessagingSystem/Migrations/PostgreSql/MessagesContextPostgreSql/20211012145335_MessagesContextPostgreSql.Designer.cs
# common/ASC.Resource.Manager/ResourceData.cs
# common/services/ASC.AuditTrail/GlobalUsings.cs
# products/ASC.Files/Core/Core/EF/DbFilesThirdpartyAccount.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
# products/ASC.Files/Core/Migrations/PostgreSql/FilesDbContextPostgreSql/20211022170841_FilesDbContextPostgreSql.cs
# products/ASC.Files/Core/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
# web/ASC.Web.Api/GlobalUsings.cs
|
2022-07-11 13:28:49 +03:00 |
|
|
|
b3324ad875
|
Web: Client: NavMenu: fix namespace
|
2022-07-11 11:28:25 +03:00 |
|
Artem Tarasov
|
05cf3b7d18
|
Web: Doceditor: fixed deletion of initial state
|
2022-07-10 13:01:18 +03:00 |
|
Artem Tarasov
|
a9c9649197
|
Web: Doceditor: refactoring server, deleted unnecessary code
|
2022-07-10 12:57:07 +03:00 |
|
Artem Tarasov
|
a1d599ee43
|
Web: Doceditor: modified webpack dev config
|
2022-07-10 12:53:58 +03:00 |
|
Artem Tarasov
|
2a74e0e8cd
|
Web: Doceditor: deleted unnecessary files
|
2022-07-10 12:47:15 +03:00 |
|
Artem Tarasov
|
120f5f7b17
|
Web: Files/People/Client/Login: updated version webpack-cli 4.9.0 -> 4.10.0
|
2022-07-10 12:34:16 +03:00 |
|
Artem Tarasov
|
55198d0e7f
|
Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
# web/ASC.Web.Editor/src/i18n.js
# web/ASC.Web.Editor/webpack.config.js
# yarn.lock
|
2022-07-10 11:23:44 +03:00 |
|
mushka
|
58e68c1c12
|
Merge branch 'develop' into feature/modal-redesign
|
2022-07-08 17:23:02 +03:00 |
|
|
|
1f3dfb9ccc
|
Web: Client: AdminMessage: fix save
|
2022-07-08 16:46:26 +03:00 |
|
|
|
f69194b034
|
Web: Client: TfaActivation: fix error
|
2022-07-08 16:22:30 +03:00 |
|
|
|
6a690fc175
|
Web: Client: fix confirmLinkData
|
2022-07-08 16:22:08 +03:00 |
|
Vashchuk Nikita
|
4628769136
|
fix Contexts,
fix migrations,
removed MailDbContext.cs,
moved ResourceDbContext.cs
|
2022-07-08 14:24:18 +03:00 |
|
|
|
0da612710d
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/security-settings
|
2022-07-07 19:39:12 +03:00 |
|
|
|
7af929fee8
|
Merge branch 'release/v1.2' into develop
# Conflicts:
# common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs
# common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
# products/ASC.People/Server/Controllers/PeopleController.cs
# products/ASC.People/Server/Models/MemberModel.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
|
2022-07-07 17:41:41 +03:00 |
|
|
|
47371fc82d
|
Push: api
|
2022-07-07 16:58:59 +03:00 |
|
|
|
cac16ace79
|
Push: api
|
2022-07-07 14:46:35 +03:00 |
|
|
|
baa72db316
|
removed referencies
|
2022-07-06 18:47:16 +03:00 |
|
|
|
a615053d88
|
Fix Bug 58025 - Client.Profile. The languages listed in the profile are not in alphabetical order.
|
2022-07-06 18:26:25 +03:00 |
|
mushka
|
3fd65e887d
|
Merge branch 'release/v1.2' into feature/modal-redesign
|
2022-07-06 18:13:33 +03:00 |
|
TimofeyBoyko
|
545e4c0142
|
Web:Client:ProfileMenu: delete useless code
|
2022-07-05 19:48:46 +03:00 |
|
TimofeyBoyko
|
02938b9486
|
Fixed Bug 57943 - Mobile. Available to scroll an inactive section with the 'Profile' menu open
|
2022-07-05 18:57:36 +03:00 |
|
|
|
aeac8613a8
|
Merge branch 'develop' into features/enum_generator
|
2022-07-05 17:22:43 +03:00 |
|
|
|
1218d31a42
|
enum generator
|
2022-07-05 16:58:11 +03:00 |
|
mushka
|
6566ca8645
|
removed unnecessary extra margin from second button on several dialogs
|
2022-07-05 15:31:17 +03:00 |
|
mushka
|
9f002e3249
|
Merge branch 'release/v1.2' into feature/modal-redesign
|
2022-07-05 12:17:58 +03:00 |
|
TimofeyBoyko
|
6acc0ac769
|
Fixed Bug 57976 - Mobile. Blur effect for all portal page content after screen rotation with 'Profile' menu open
|
2022-07-05 11:18:29 +03:00 |
|
|
|
90fe1383b7
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-07-04 18:04:06 +03:00 |
|
|
|
596ae3b06e
|
Web: Client: Fix Error pages translation
|
2022-07-04 17:48:06 +03:00 |
|
|
|
d8a459f397
|
Web: i18n: Replaced i18next-http-backend package with custom realization from @appserver/common/utils/i18next-http-backend (fix issue: too many same translations files are loading at once)
|
2022-07-04 17:47:12 +03:00 |
|
|
|
9a5e05a1f9
|
Fixed Bug 57948 - Mobile. Hid the click area on the burger
|
2022-07-04 17:16:02 +03:00 |
|
|
|
fb09f62881
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-07-04 11:39:38 +03:00 |
|
|
|
0f901bf6e3
|
added hy-AM
|
2022-07-04 11:38:57 +03:00 |
|
|
|
d6b7db91e3
|
Web: Translations: Added translations minimization
|
2022-07-03 13:25:41 +03:00 |
|
Artem Tarasov
|
5fec344fe1
|
Web: Doceditor: fix after merge
|
2022-07-02 00:01:07 +03:00 |
|
Artem Tarasov
|
2ef94f75da
|
Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
# products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
# web/ASC.Web.Editor/package.json
# web/ASC.Web.Editor/src/Editor.jsx
# web/ASC.Web.Editor/webpack.config.js
# yarn.lock
|
2022-07-01 23:41:10 +03:00 |
|
Artem Tarasov
|
afce89dda2
|
Web: Doceditor: refactoring, changed hierarchy, added hmr, global styles
|
2022-07-01 23:33:35 +03:00 |
|
|
|
a289f9594a
|
modified LdapNotifyHelper to BackgroundService
|
2022-07-01 14:49:59 +03:00 |
|
Vashchuk Nikita
|
5a0acc8eaa
|
Renaming folders for contexts and models
|
2022-07-01 14:23:07 +03:00 |
|
|
|
329ec57aa2
|
Merge branch 'develop' into feature/LDAP-new
|
2022-07-01 13:15:52 +03:00 |
|
|
|
6226340b3b
|
Web: Client: add locales for Help center key
|
2022-07-01 13:00:57 +03:00 |
|
|
|
942030614f
|
Fix Bug 57840: add community forum and help center buttons
|
2022-07-01 12:33:46 +03:00 |
|
|
|
ba6c4069c9
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-07-01 10:10:52 +03:00 |
|
|
|
224f928ee4
|
Web: Layout: Fixed page shift when focusing in a row when renaming. (iOS, Chrome)
|
2022-07-01 10:10:29 +03:00 |
|
|
|
45cd9434f4
|
fix Bug 57888
|
2022-06-30 19:41:17 +03:00 |
|
|
|
74d238bde8
|
Merge branch 'release/v1.2' into develop
# Conflicts:
# common/ASC.Common/Caching/KafkaCache.cs
# common/ASC.Common/Logging/Log.cs
# common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs
# common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs
# common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj
# common/ASC.Data.Backup.Core/BackupResource.Designer.cs
# common/ASC.Data.Storage/ChunkedUploader/CommonChunkedUploadSession.cs
# common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
# common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
# common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
# common/ASC.Data.Storage/S3/S3Storage.cs
# common/ASC.Notify.Textile/ASC.Notify.Textile.csproj
# common/services/ASC.AuditTrail/ASC.AuditTrail.csproj
# products/ASC.Files/Core/ASC.Files.Core.csproj
# products/ASC.Files/Core/Core/Compress/CompressToArchive.cs
# products/ASC.Files/Core/Core/Compress/CompressToTarGz.cs
# products/ASC.Files/Core/Core/Compress/CompressToZip.cs
# products/ASC.Files/Core/Core/Compress/ICompress.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
# products/ASC.Files/Core/Helpers/Global.cs
# products/ASC.Files/Core/Resources/FilesJSResource.Designer.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# web/ASC.Web.Api/ASC.Web.Api.csproj
# web/ASC.Web.Core/Notify/StudioNotifyServiceHelper.cs
# web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
|
2022-06-30 16:13:31 +03:00 |
|
|
|
3871712357
|
Fixed Bug 57873: Scrolling of the page body is disabled.
|
2022-06-30 15:54:58 +03:00 |
|
|
|
35ab5a3531
|
fix order
|
2022-06-29 19:43:29 +03:00 |
|
|
|
605c78f5dd
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-06-29 17:16:18 +03:00 |
|
|
|
11e4595939
|
Fix bug: the site header shifts if you open the keyboard on an android phone
|
2022-06-29 17:16:09 +03:00 |
|
|
|
5f6851253f
|
fix bug 57725
|
2022-06-29 15:10:56 +03:00 |
|
|
|
9e05dc641a
|
notify: temp logs
|
2022-06-28 23:32:33 +03:00 |
|
|
|
4415df375f
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-06-28 19:31:38 +03:00 |
|
|
|
2512820217
|
Web: Editor: Added opportunity to work with created docEditor from window.ASC.Files.Editor.docEditor (Mobile App Back button issue)
|
2022-06-28 19:31:28 +03:00 |
|
|
|
d4a5ec5315
|
notify: logs
|
2022-06-28 16:55:35 +03:00 |
|
|
|
772b42f636
|
Merge pull request #702 from ONLYOFFICE/feature/settings-docspace-mode
feature/settings-docspace-mode
|
2022-06-28 14:51:57 +03:00 |
|
|
|
933b0696ef
|
WebApi: added docspace in settings
|
2022-06-28 14:47:28 +03:00 |
|
|
|
e17f49e344
|
Merge branch 'develop' into feature/LDAP-new
# Conflicts:
# ASC.Web.sln
# common/ASC.Core.Common/EF/Context/WebstudioDbContext.cs
# web/ASC.Web.Api/ASC.Web.Api.csproj
# web/ASC.Web.Api/GlobalUsings.cs
|
2022-06-28 14:30:40 +03:00 |
|
|
|
95a694ac10
|
Web: Client: fixed error two children with the same key, index.
|
2022-06-28 13:12:28 +03:00 |
|
|
|
2b48707f5c
|
sso: fix
|
2022-06-28 12:36:34 +03:00 |
|
|
|
097290e8a2
|
Fix Bug 57787 - Selected user's theme option is used for Desktop Editors
|
2022-06-27 19:22:59 +03:00 |
|
Artem Tarasov
|
e38c15af56
|
Web: Client: Layout: deleted unnecessary code
|
2022-06-27 15:05:49 +03:00 |
|
Artem Tarasov
|
be438745a9
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-27 14:57:48 +03:00 |
|
Artem Tarasov
|
bba5c2a07a
|
Web: Client: Layout: Bug 57712 - Mobile. Section title goes outside the workspace when scrolling the page
|
2022-06-27 14:57:29 +03:00 |
|
|
|
6d98440200
|
az resources
|
2022-06-27 14:00:23 +03:00 |
|
|
|
3355c3ce99
|
Fix Bug 57772: add back arrow for about page
|
2022-06-27 11:40:17 +03:00 |
|
|
|
b58422cfee
|
Merge branch 'develop' into feature/branding
|
2022-06-24 18:51:33 +03:00 |
|
mushka
|
a5650bcf48
|
removed unused SystemThemeDetector component
|
2022-06-23 17:06:06 +03:00 |
|
mushka
|
da27de2cac
|
Fixed Bug 57722 - Now app theme will change with system theme without reloading
|
2022-06-23 16:54:22 +03:00 |
|
|
|
45e791a092
|
removed unused code
|
2022-06-23 16:00:24 +03:00 |
|
|
|
96775f7a0a
|
fix for eb896018d4 2b19ec7997
|
2022-06-23 15:43:22 +03:00 |
|
mushka
|
2e187f6605
|
removed unused console.log
|
2022-06-22 14:48:24 +03:00 |
|
mushka
|
c4a0c109e6
|
Fixed Bug 57721: Web: Files: Removed burger menu button from header in OFORM Gallery
|
2022-06-22 14:45:25 +03:00 |
|
|
|
f2da6fc55c
|
Merge pull request #693 from ONLYOFFICE/feature/docspace
Feature/docspace
|
2022-06-22 11:55:36 +04:00 |
|
|
|
bbcd5b7382
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-06-21 19:45:30 +03:00 |
|
|
|
2d9bd5943d
|
fix Bug 57661
|
2022-06-21 18:13:21 +03:00 |
|
Artem Tarasov
|
93b6e3174d
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-21 17:45:10 +03:00 |
|
Artem Tarasov
|
96fd3734e4
|
Web: Client: Layout: Fixed Bug 57666 - Mobile. Content is not displayed in the horizontal position of the screen (ios, chrome)
|
2022-06-21 17:44:23 +03:00 |
|
|
|
01a03674ef
|
Web: Client: Wizard: fix translate ns
|
2022-06-21 17:27:22 +03:00 |
|
|
|
d4f459740f
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-06-21 16:30:15 +03:00 |
|
|
|
87839bfb7f
|
Web: Translations: Fix NotFoundKeysTest
|
2022-06-21 13:29:37 +03:00 |
|
|
|
9d82ae8719
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-21 13:25:08 +03:00 |
|
|
|
793f999fe9
|
Web:Studio:Added styles to Preview.
|
2022-06-21 13:23:00 +03:00 |
|
