|
903767b3e8
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
# Conflicts:
# web/ASC.Web.Client/public/locales/ro/Error403.json
# web/ASC.Web.Client/public/locales/ro/ErrorInvalid.json
# web/ASC.Web.Client/public/locales/ro/Offline.json
|
2022-05-25 18:07:28 +03:00 |
|
|
8612f14060
|
Web: Client: Fixed displaying page icon for creating page shortcut, fixed page display mode at manifest
|
2022-05-25 18:01:38 +03:00 |
|
|
3276561123
|
edit translations
|
2022-05-25 17:52:59 +03:00 |
|
|
e01858d2e8
|
merge from develop
|
2022-05-25 16:58:31 +03:00 |
|
|
e6d7979e92
|
dbcontext: EnableRetryOnFailure for MySQL provider
|
2022-05-25 16:55:38 +03:00 |
|
|
9a067e524a
|
Merge pull request #678 from ONLYOFFICE/feature/layout-for-banner
Feature/layout for banner
|
2022-05-25 16:19:14 +03:00 |
|
|
5674836f6f
|
Web: Client: SmartBanner: fix force
|
2022-05-25 16:03:28 +03:00 |
|
|
21ceecee4a
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner
|
2022-05-25 15:54:37 +03:00 |
|
|
ceb2e395fe
|
Web: Client: add smart banner
|
2022-05-25 15:53:26 +03:00 |
|
|
17caec2581
|
Web: Translations: Fix some SingleKeyFilesTest issues
|
2022-05-25 14:53:28 +03:00 |
|
|
4789e5e5ce
|
Web: Campaigns: added Docs_7_1 stories
|
2022-05-25 14:56:11 +05:00 |
|
|
9485c2e59e
|
Web: Campaigns: fixed origin for NewYear stories
|
2022-05-25 14:55:39 +05:00 |
|
|
7055ff083f
|
Web: Campaigns: updated yarn lock
|
2022-05-25 14:54:56 +05:00 |
|
|
439d7d8d73
|
Merge branch 'release/v1.2' into feature/layout-for-banner
|
2022-05-25 14:43:51 +05:00 |
|
|
1f18ae7194
|
Web: Campaigns: added NewYear stories
|
2022-05-25 14:41:24 +05:00 |
|
|
3a74878277
|
Web: Campaigns: created Section
|
2022-05-25 14:40:54 +05:00 |
|
|
66a7f48cea
|
Web: Campaigns: created Header
|
2022-05-25 14:40:23 +05:00 |
|
|
189687a537
|
Web: Campaigns: added theme
|
2022-05-25 14:39:43 +05:00 |
|
|
532b4dd36a
|
Web: Campaigns: created Article
|
2022-05-25 14:39:14 +05:00 |
|
|
27c4d9e662
|
Web: Campaigns: created Layout
|
2022-05-25 14:38:49 +05:00 |
|
|
b0bd02044c
|
Web: Campaigns: added storybook
|
2022-05-25 14:26:08 +05:00 |
|
|
11ad1819f2
|
Web: Campaigns: added storybook and styled components
|
2022-05-25 14:25:11 +05:00 |
|
|
1c1aa2b9b6
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-05-25 10:53:54 +03:00 |
|
|
70a6a44196
|
Web: Client: Disable PWA feature for mobile devices
|
2022-05-25 10:53:39 +03:00 |
|
|
6491009d9e
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-25 10:43:27 +03:00 |
|
|
2b86d19122
|
Web: Client: Added <AppLoader />
|
2022-05-25 10:43:19 +03:00 |
|
|
a66c03aa86
|
Merge branch 'develop' into feature/logger-refactoring
# Conflicts:
# common/ASC.Common/Caching/AscCache.cs
# common/ASC.Common/GlobalUsings.cs
# common/ASC.Core.Common/Notify/Telegram/TelegramHelper.cs
# common/ASC.Data.Backup.Core/Service/ProgressItems/RestoreProgressItem.cs
# common/ASC.Data.Storage/GlobalUsings.cs
# common/services/ASC.Data.Backup.BackgroundTasks/GlobalUsings.cs
# common/services/ASC.Data.Backup.BackgroundTasks/IntegrationEvents/EventHandling/BackupDeleteScheldureRequestedIntegrationEventHandler.cs
# common/services/ASC.Data.Backup.BackgroundTasks/Services/BackupSchedulerService.cs
# common/services/ASC.Notify/GlobalUsings.cs
# common/services/ASC.Notify/IntegrationEvents/EventHandling/NotifyInvokeSendMethodRequestedIntegrationEventHandler.cs
# common/services/ASC.Notify/Services/NotifySenderService.cs
# common/services/ASC.TelegramService/GlobalUsings.cs
# common/services/ASC.TelegramService/TelegramHandler.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/GlobalUsings.cs
# products/ASC.Files/Service/Thumbnail/IntegrationEvents/EventHandling/ThumbnailRequestedIntegrationEventHandler.cs
# products/ASC.People/Server/Api/UserController.cs
# web/ASC.Web.Api/Api/Settings/StorageController.cs
|
2022-05-24 23:13:57 +03:00 |
|
|
7aba8f85ca
|
Web: Client: increase progress indicator z-index
|
2022-05-24 19:52:20 +03:00 |
|
|
b411f61ee5
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-24 18:31:49 +03:00 |
|
|
786ff38a98
|
update editor
|
2022-05-24 18:31:24 +03:00 |
|
|
4b6aa555ec
|
Web: Client: Added check of ready prop (Fix translation loading issue)
|
2022-05-24 17:43:25 +03:00 |
|
|
02570e12cf
|
Merge branch 'develop' into feature/cluster-services
|
2022-05-24 17:24:25 +03:00 |
|
|
907d92fcb6
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-24 15:00:26 +03:00 |
|
|
95f356adbd
|
edit translations
|
2022-05-24 14:55:28 +03:00 |
|
Nikita
|
1d2521c399
|
fix
|
2022-05-24 12:59:04 +03:00 |
|
|
ea4b14ac47
|
Merge branch 'release/v1.2' into feature/multiply-thumb
|
2022-05-24 12:29:49 +03:00 |
|
|
6168410931
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-24 10:44:15 +03:00 |
|
|
587ee6240b
|
Fix Bug 57304 - Client. Errors in the console when clicking on the information banner
|
2022-05-24 10:44:09 +03:00 |
|
|
67a235da5c
|
edit ro-variable
|
2022-05-24 10:32:38 +03:00 |
|
|
2a673036ff
|
encryption service: migrate from ICacheNotify to RabbitMQ
|
2022-05-23 22:06:22 +03:00 |
|
|
13ad4381f7
|
Api: removed CustomHttpMethodAttribute
added AllowNotPaymentAttribute
|
2022-05-23 18:48:23 +03:00 |
|
|
d1494ca672
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-23 18:10:09 +03:00 |
|
|
5dd80c1e6a
|
edit translations (SpellCheck)
|
2022-05-23 18:05:51 +03:00 |
|
|
c659e03042
|
update uk
|
2022-05-23 18:04:34 +03:00 |
|
Nikita
|
a7b9b77613
|
fix
|
2022-05-23 16:38:05 +03:00 |
|
|
2b9131330c
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-05-23 15:19:07 +03:00 |
|
|
de0e722776
|
Fixed Bug 55045: Added scroll to current folder where file located in select folder dialog.
|
2022-05-23 15:15:39 +03:00 |
|
|
f791f1206d
|
Merge pull request #674 from ONLYOFFICE/feature/banner-docs_7_1
Feature/banner docs 7 1
|
2022-05-23 14:38:40 +03:00 |
|
|
1b9a0b3c30
|
Web: Client: IOS: fixed logo styles
|
2022-05-23 13:11:25 +03:00 |
|
|
9903f4c439
|
update cs, edit translations (spellCheck)
|
2022-05-23 10:55:02 +03:00 |
|
|
2eaa6bb599
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/ip-security
# Conflicts:
# packages/asc-web-common/store/SettingsStore.js
|
2022-05-22 21:22:59 +03:00 |
|
|
cd802863f6
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/admin-messages
# Conflicts:
# packages/asc-web-common/store/SettingsStore.js
|
2022-05-22 21:21:28 +03:00 |
|
|
8c68b9fb40
|
edit translations (SpellCheck)
|
2022-05-22 13:36:45 +03:00 |
|
|
cefc26b742
|
edit variables
|
2022-05-22 12:29:58 +03:00 |
|
|
e3a834649e
|
update translations (web)
|
2022-05-22 12:23:36 +03:00 |
|
|
357d1f227a
|
update translations (web)
|
2022-05-22 12:15:53 +03:00 |
|
|
5511c14415
|
update translations (web)
|
2022-05-22 11:43:16 +03:00 |
|
|
45f9bc472a
|
edit variables
|
2022-05-22 00:46:59 +03:00 |
|
|
9d1af6d3da
|
update translations
|
2022-05-22 00:38:14 +03:00 |
|
|
dbecb2c72f
|
edit variables
|
2022-05-21 23:38:40 +03:00 |
|
|
6bc4035313
|
update translations
|
2022-05-21 15:25:14 +03:00 |
|
|
3470e70c5e
|
Web.Campaigns: Fix translation for 0d1a0785d5 .
|
2022-05-20 21:00:03 +03:00 |
|
|
732afbd67e
|
Merge branch 'release/v1.2' into feature/banner-docs_7_1
|
2022-05-20 19:53:04 +03:00 |
|
|
7493fe68e6
|
Merge branch 'release/v1.2' into bugfix/ReleaseBugfixes
|
2022-05-20 19:17:43 +03:00 |
|
|
4935dbc8cd
|
Merge branch 'release/v1.2' into feature/update-translation-tests
|
2022-05-20 18:37:42 +03:00 |
|
|
91c4e454c5
|
add loggers
|
2022-05-20 18:24:41 +03:00 |
|
|
49d416bf07
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-20 17:07:13 +03:00 |
|
|
dfe412d876
|
update translations (web)
|
2022-05-20 17:03:27 +03:00 |
|
|
a585a425bc
|
fix
|
2022-05-20 17:02:09 +03:00 |
|
|
75da995099
|
Merge branch 'develop' into feature/logger-refactoring
|
2022-05-20 17:01:51 +03:00 |
|
|
6295c0779d
|
Merge pull request #659 from ONLYOFFICE/feature/logger-Web.Core
Feature/logger web.core
|
2022-05-20 16:18:02 +03:00 |
|
|
682d55e630
|
Fix Bug 57263: use translations
|
2022-05-20 15:54:58 +03:00 |
|
|
cb0879da10
|
update, edit translations
|
2022-05-20 13:48:47 +03:00 |
|
|
baf219f0f5
|
Merge branch 'release/v1.2' into feature/multiply-thumb
|
2022-05-20 10:32:45 +03:00 |
|
Timofey Boyko
|
7cb2d922f2
|
Web:Studio: delete console log
|
2022-05-20 10:01:45 +03:00 |
|
|
4541fa82d1
|
update translations (web, people)
|
2022-05-19 23:35:37 +03:00 |
|
|
b9e98fc3ad
|
update translations (web)
|
2022-05-19 23:07:57 +03:00 |
|
|
9c6d1ae5df
|
update translations (Login, ConvertPasswordDialog)
|
2022-05-19 20:56:48 +03:00 |
|
Timofey Boyko
|
494e8cfd10
|
Web:Studio:Tests: hide text when build project for translation tests
|
2022-05-19 18:47:51 +03:00 |
|
|
770da06191
|
update pl, el
|
2022-05-19 18:21:23 +03:00 |
|
|
9178ec75aa
|
update el, bg, pl
|
2022-05-19 18:06:54 +03:00 |
|
mushka
|
0c69bfdabf
|
Merge branch 'release/v1.2' into bugfix/ReleaseBugfixes
|
2022-05-19 17:56:19 +03:00 |
|
Timofey Boyko
|
15cd2872a6
|
Web:Editor: add build:test.translation:personal script
|
2022-05-19 17:30:41 +03:00 |
|
|
b088a42158
|
Web: Editor: delete console log
|
2022-05-19 15:51:27 +03:00 |
|
|
60a199d54e
|
Fix Bug 57217: editor favicon
|
2022-05-19 15:44:39 +03:00 |
|
Timofey Boyko
|
6c73ad9bbe
|
Web: add scripts for build and start translation tests on personal
|
2022-05-19 15:26:09 +03:00 |
|
|
013532bbb7
|
Fixed Bug 57232 - Client.Files.Share.Editor. Fixed access rights in editor
|
2022-05-19 15:22:52 +03:00 |
|
|
dd490105e5
|
edit it (Login)
|
2022-05-19 14:46:55 +03:00 |
|
|
15f4fb324e
|
update it, edit fr
|
2022-05-19 14:34:56 +03:00 |
|
|
f8a4a7cf7c
|
Merge branch 'release/v1.2' into feature/multiply-thumb
|
2022-05-19 12:27:18 +03:00 |
|
|
41ab332458
|
update translations
|
2022-05-18 19:11:50 +03:00 |
|
|
018e1504b7
|
Merge branch 'release/v1.2' into feature/multiply-thumb
|
2022-05-18 18:38:18 +03:00 |
|
|
9fb495817d
|
update translations
|
2022-05-18 18:25:31 +03:00 |
|
|
a809c083a3
|
update translations (Client)
|
2022-05-18 17:26:33 +03:00 |
|
|
9886081a2e
|
Thumbnailы: added sizes config
|
2022-05-18 17:23:17 +03:00 |
|
|
b37c345985
|
update translations (login)
|
2022-05-18 15:59:18 +03:00 |
|
Nikita
|
b76b97af89
|
Merge branch 'develop' into feature/LDAP-new
|
2022-05-18 13:38:00 +03:00 |
|
Nikita
|
6451ac6329
|
fix
|
2022-05-18 13:36:35 +03:00 |
|
|
0fb61a7889
|
Edit translations - fi, sl
|
2022-05-18 13:18:19 +03:00 |
|
|
5f4d8b3b4c
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-18 12:58:24 +03:00 |
|
|
9180fbe42e
|
update ko
|
2022-05-18 12:58:02 +03:00 |
|
|
90d4a68946
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
# Conflicts:
# web/ASC.Web.Client/public/locales/sl/Settings.json
|
2022-05-18 10:09:44 +03:00 |
|
|
9c824a0bfa
|
Update translation - sl
|
2022-05-18 09:59:02 +03:00 |
|
|
89b607240e
|
edit ro (Confirm)
|
2022-05-17 20:15:19 +03:00 |
|
|
b3e14265e3
|
edit ro (Settings)
|
2022-05-17 20:04:11 +03:00 |
|
|
f6098aea20
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
# Conflicts:
# web/ASC.Web.Client/public/locales/ro/Settings.json
|
2022-05-17 19:57:22 +03:00 |
|
|
f1130c51d9
|
update ro
|
2022-05-17 19:54:47 +03:00 |
|
|
f466fd2fe4
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-17 18:17:17 +03:00 |
|
|
dad9016695
|
Web: Translations: Moved "NotFoundTitle" key from "studio" to "Common": (EnDublicatesByContentTest33ms issue fix)
|
2022-05-17 18:17:11 +03:00 |
|
|
2b804d5ef8
|
edit es, fr, zh-CN, ja, de, ru
|
2022-05-17 17:20:59 +03:00 |
|
|
2ed7b96dd9
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-17 16:43:15 +03:00 |
|
|
cc9d934b13
|
update de, edit en (Confirm)
|
2022-05-17 16:42:54 +03:00 |
|
|
43da9f3949
|
Update translation - fi
|
2022-05-17 15:35:03 +03:00 |
|
|
be3362dbc3
|
update ja, edit fr, es, zh-CN (Settings)
|
2022-05-17 12:56:56 +03:00 |
|
|
36855d656f
|
remove application/x-www-form-urlencoded
|
2022-05-17 12:29:24 +03:00 |
|
|
2e33540486
|
Merge branch 'feature/docspace' into feature/docspace-links
|
2022-05-17 11:53:37 +03:00 |
|
|
606f0bca2a
|
update es (Home), add zh
|
2022-05-16 21:05:58 +03:00 |
|
|
6bfcf86461
|
update es
|
2022-05-16 18:48:11 +03:00 |
|
|
0d1a0785d5
|
Web.Campaigns: Add ONLYOFFICE Docs v7.1 banner.
|
2022-05-16 18:43:26 +03:00 |
|
|
07cf71b1b7
|
Web.Campaigns: Include gatsby-plugin-google-fonts.
|
2022-05-16 18:42:14 +03:00 |
|
|
3818790d1c
|
update ru, fr
|
2022-05-16 18:01:38 +03:00 |
|
|
778f26c1fc
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-16 17:04:28 +03:00 |
|
|
4264a0da16
|
update fr
|
2022-05-16 17:04:04 +03:00 |
|
|
16019a283f
|
Web: Client: Settings: Fixed base header menu component on admin`s settings page
|
2022-05-16 15:41:02 +03:00 |
|
|
fc74762e0a
|
Web: Client: SelectionStore: Hide header menu if selection empty
|
2022-05-16 15:38:37 +03:00 |
|
|
4ad45de4b6
|
Web: Client: NavMenu: fix memory leak
|
2022-05-16 14:37:08 +03:00 |
|
|
5915c6e23e
|
update es
|
2022-05-16 12:51:04 +03:00 |
|
|
d0525e298c
|
thumbnails, notify, telegram: migrate from ICacheNotify to EventBus
|
2022-05-13 22:14:00 +03:00 |
|
|
a962d58b31
|
Web: Translation: Fix WrongTranslationVariablesTest issues
|
2022-05-13 19:44:05 +03:00 |
|
|
d12c6f89e4
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-13 19:33:23 +03:00 |
|
|
93a53092d6
|
Web: Translations: Fix UselessTranslationKeysTest issues
|
2022-05-13 19:33:16 +03:00 |
|
|
025d13557d
|
added a secure link to invite to the portal
|
2022-05-13 19:25:28 +03:00 |
|
|
3bf09b4353
|
add new es-files
|
2022-05-13 18:22:32 +03:00 |
|
|
5131e6df09
|
add loggers
|
2022-05-13 17:48:49 +03:00 |
|
|
294a449d78
|
add new ru-keys, edit en
|
2022-05-13 17:30:51 +03:00 |
|
|
941be273c6
|
add logger
|
2022-05-13 16:09:13 +03:00 |
|
|
b3e1014a71
|
Web: Translations: Fix ParseJsonTest issues
|
2022-05-13 14:29:56 +03:00 |
|
|
ed270d5702
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-13 14:22:19 +03:00 |
|
|
6569c18ec4
|
Web: Settings: Fix translation of Common Settings Header
|
2022-05-13 14:22:13 +03:00 |
|
|
411e3b7f58
|
Sso: fix
|
2022-05-13 11:52:49 +03:00 |
|
|
f76d024042
|
Web: Settings: Added placeholder
|
2022-05-13 11:51:56 +03:00 |
|
|
a956c25d16
|
Merge pull request #639 from ONLYOFFICE/feature/resx-add
Feature/resx add
|
2022-05-13 11:50:54 +03:00 |
|
|
298587ca46
|
Web: Settings: Added 'AutoSavePeriodHelp' key en translation (NotFoundKeysTest issue fix)
|
2022-05-13 11:41:10 +03:00 |
|
|
ea6bb25957
|
Web: Settings: Removed useless placeholder without translation (NotFoundKeysTest issue fix)
|
2022-05-13 11:32:44 +03:00 |
|
|
7fd2245587
|
Web: Translation: Fix NotFoundKeysTest issue -> "White label"
|
2022-05-13 10:51:16 +03:00 |
|
|
7262c4cbb8
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-12 19:00:51 +03:00 |
|
|
e9be6684ae
|
Resources: fixed projects
|
2022-05-12 18:32:39 +03:00 |
|
mushka
|
d2cfff7729
|
finished with ProfileMenu fix
|
2022-05-12 17:48:07 +03:00 |
|
mushka
|
cc41fc36e2
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into bugfix/ReleaseBugfixes
|
2022-05-12 17:22:39 +03:00 |
|
|
300bcf2247
|
Core: Notify. Resource.
|
2022-05-12 15:52:37 +03:00 |
|
|
01783b3598
|
Core: Resources.
|
2022-05-12 15:44:31 +03:00 |
|
|
d7b53943c7
|
Core: resources.
|
2022-05-12 15:41:20 +03:00 |
|
|
0b5d7c9320
|
Core: Resources
|
2022-05-12 15:36:04 +03:00 |
|
|
c1aa4c9541
|
Web: resources
|
2022-05-12 15:33:41 +03:00 |
|
|
3b7309eb6b
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-05-12 15:12:16 +03:00 |
|
|
d75b1344a4
|
Web:Studio:Added loader for ArticleHeaderContent.
|
2022-05-12 15:04:01 +03:00 |
|
|
be926bd7a2
|
Api: Resources.
|
2022-05-12 14:25:01 +03:00 |
|
Timofey Boyko
|
f994bf3f27
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-05-12 11:46:42 +03:00 |
|
Timofey Boyko
|
a8ba24fa0a
|
Web:Client:NavMenu: increase z-index for nav menu when profile actions in opening
|
2022-05-12 11:39:28 +03:00 |
|
Timofey Boyko
|
18f47d0d0e
|
Web:Client:NavMenu: reduce z-index for nav element
|
2022-05-12 11:38:48 +03:00 |
|
Timofey Boyko
|
1e8af919ab
|
Web:Client:NavMenu: add blur for profile menu on mobile devices
|
2022-05-12 10:57:11 +03:00 |
|
|
b2474c409d
|
Web: Translations: Moved "Common" key from "Studio" to "Common" and removed useless "Documents" key (test issue fix)
|
2022-05-11 19:03:33 +03:00 |
|
|
781b0eb3e4
|
Web: Translations: Moved "Info" key from "studio" to "Common": (test issue fix)
|
2022-05-11 17:11:52 +03:00 |
|
|
4ae8a10f7f
|
Web: Translations: Moved "AccessRights" key from "studio" to "Common": (test issue fix)
|
2022-05-11 16:51:37 +03:00 |
|
mushka
|
b23730ead8
|
fixed ProfileMenu and MainButton interaction
|
2022-05-11 12:26:20 +03:00 |
|
|
1d65ca7645
|
Files: thumbnails extension changed to jpg
|
2022-05-09 21:15:27 +03:00 |
|
|
e91bce51da
|
Files: thumbnails. BitDepth changed to Bit8
|
2022-05-09 18:57:07 +03:00 |
|
|
5454eedc78
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-05 19:00:08 +03:00 |
|
|
45c58a029e
|
Files: ThumbnailExtension set to jpg. SixLabors up to 1.0.0-beta0008
|
2022-05-05 18:43:40 +03:00 |
|
|
6d92b5d829
|
fixed Resource
|
2022-05-05 17:34:58 +03:00 |
|
|
e9ee6f1aad
|
Web: Campaigns: Added "firebase:logout" command
|
2022-05-05 17:10:05 +03:00 |
|
Vashchuk Nikita
|
11ac66a1e0
|
refactoring
|
2022-05-05 16:23:05 +03:00 |
|
Timofey Boyko
|
d0b8af9d6c
|
Web:Client:DebugInfo: fix padding-right for aside view
|
2022-05-05 15:49:48 +03:00 |
|
Timofey Boyko
|
dd85148fd4
|
Web:Client:AboutDialog: fix padding-right for aside view
|
2022-05-05 15:47:04 +03:00 |
|
|
bdc5aefe34
|
Web: Client: Layout: fixed layout scroll, fixed IOS height
|
2022-05-05 14:06:22 +03:00 |
|
Timofey Boyko
|
39e859e5f5
|
Resolve conflicts after merge
|
2022-05-05 12:16:56 +03:00 |
|
Timofey Boyko
|
9a3918439f
|
Web:Client: fix display debug info dialog
|
2022-05-05 12:12:57 +03:00 |
|
Timofey Boyko
|
e3a0556d9f
|
Web:Client: fix display about dialog
|
2022-05-05 12:12:43 +03:00 |
|
|
d909dd5f5f
|
Web: Client: Ipad: fixed container height after orientation change
|
2022-05-04 16:24:42 +03:00 |
|
|
fe4b4d3c2d
|
Merge branch 'feature/admin-messages' of github.com:ONLYOFFICE/AppServer into feature/session-lifetime
|
2022-05-03 21:22:47 +03:00 |
|
|
01eff8cfa3
|
Merge branch 'feature/ip-security' of github.com:ONLYOFFICE/AppServer into feature/admin-messages
|
2022-05-03 21:22:17 +03:00 |
|
|
860c53378b
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/ip-security
|
2022-05-03 21:18:54 +03:00 |
|
|
3da11e96e1
|
Web:Studio:Added isTablet for styles HeaderContainer.
|
2022-04-29 19:23:22 +03:00 |
|
Vashchuk Nikita
|
44cf5d7f80
|
fix
|
2022-04-29 18:25:49 +03:00 |
|
|
17282d4915
|
Web:Studio:Changed line-height for HeaderContainer for studio settings.
|
2022-04-29 17:44:55 +03:00 |
|
|
a27933b669
|
Web:Studio:Added props settingsStudio.
|
2022-04-29 17:43:12 +03:00 |
|
Vashchuk Nikita
|
fd472da6bc
|
added JsonPropertyName
|
2022-04-29 14:56:40 +03:00 |
|
|
3f4a828771
|
Web:Studio:Added placeholder "EnterName".
|
2022-04-29 12:52:06 +03:00 |
|
|
26b84622cf
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-04-29 12:34:37 +03:00 |
|
|
7cadbeb99e
|
Web:Studio:Rewrote whiteLabel to a functional component.
|
2022-04-29 12:33:52 +03:00 |
|
|
5b2f1e2636
|
Web:Studio:Added whiteLabel, setLogoText, setLogoSizes, setLogoUrls, getWhiteLabelLogoText, getWhiteLabelLogoSizes, getWhiteLabelLogoUrls to CommonStore.
|
2022-04-29 12:28:39 +03:00 |
|
|
5ad9e2c23b
|
Web:Studio:Removed from SettingsSetupStore common, setLogoText, setLogoSizes, setLogoUrls, getWhiteLabelLogoText, getWhiteLabelLogoSizes, getWhiteLabelLogoUrls.
|
2022-04-29 12:26:11 +03:00 |
|
Vashchuk Nikita
|
b8ed834eba
|
fix
|
2022-04-29 10:49:56 +03:00 |
|
Vashchuk Nikita
|
f39a476d06
|
added SsoController, fix
|
2022-04-28 16:56:12 +03:00 |
|
|
d554f0480f
|
Web: Increased stype for Scrollbar (default is mediumBlack)
|
2022-04-28 16:01:28 +03:00 |
|
Vashchuk Nikita
|
442a6bb30a
|
Merge branch 'develop' into feature/SSO-new
# Conflicts:
# config/nginx/onlyoffice.conf
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Studio/Startup.cs
|
2022-04-28 15:45:11 +03:00 |
|
|
89059cf32e
|
Structured Logging
|
2022-04-28 12:15:33 +03:00 |
|
|
282ebd69a8
|
Web: Fix build without --env personal
|
2022-04-28 10:41:27 +03:00 |
|
Vashchuk Nikita
|
4cab782bc8
|
Merge branch 'develop' into feature/LDAP-new
# Conflicts:
# ASC.Web.sln
# common/ASC.Common/Security/Cryptography/InstanceCrypto.cs
# common/ASC.Core.Common/EF/Context/WebstudioDbContext.cs
# web/ASC.Web.Api/ASC.Web.Api.csproj
# web/ASC.Web.Api/Controllers/AuthenticationController.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Program.cs
# web/ASC.Web.Api/Startup.cs
|
2022-04-28 09:41:09 +03:00 |
|
|
d2733a2608
|
Web: Added IS_PERSONAL build parameter (yarn start:personal and yarn build:personal) for hiding useless login and confirm functional
+ removed module federated Login from personal
+ fix potential /login redirect from Editor.jsx
|
2022-04-27 19:53:25 +03:00 |
|
|
19cf415898
|
backend: updated packages version
|
2022-04-27 13:02:17 +03:00 |
|
|
74e8a1fcfd
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-04-26 21:13:58 +03:00 |
|
|
bb7201ef74
|
Web:Studio:WhiteLabel refactoring.
|
2022-04-26 21:13:41 +03:00 |
|
|
13bbce8ea4
|
Custom logger replaced with Microsoft.Extensions.Logging
|
2022-04-26 20:53:48 +03:00 |
|
Vashchuk Nikita
|
a4e9cae742
|
changed work with disturbedTask
|
2022-04-26 17:03:41 +03:00 |
|
Vashchuk Nikita
|
258cf02d27
|
fix ssoHandler
|
2022-04-26 14:10:12 +03:00 |
|
Timofey Boyko
|
784ec51c7a
|
Web:Client:Main: add event listener for resize page when orientation changed
|
2022-04-26 14:05:26 +03:00 |
|
Vashchuk Nikita
|
1431c5ec80
|
fix
|
2022-04-26 12:27:12 +03:00 |
|
Vashchuk Nikita
|
e812d3ec53
|
fix
|
2022-04-26 11:49:55 +03:00 |
|
Vashchuk Nikita
|
62c66e6e1f
|
Merge branch 'feature/SSO-new' of github.com:ONLYOFFICE/AppServer into feature/SSO-new
|
2022-04-25 21:42:36 +03:00 |
|
Vashchuk Nikita
|
422e87af13
|
added ssoHandler
|
2022-04-25 21:41:26 +03:00 |
|
|
97b45d3bd5
|
ILog: refactoring
|
2022-04-25 21:02:18 +03:00 |
|
Timofey Boyko
|
edbfd1e237
|
Web:Client:NavMenu: decrease z-index for header nav menu
|
2022-04-25 12:27:00 +03:00 |
|
Timofey Boyko
|
258f994a13
|
Web:Client:Components: delete useless code
|
2022-04-25 11:43:21 +03:00 |
|
|
c34dac5e60
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-04-22 21:21:07 +03:00 |
|
|
5cf373a7cf
|
Web:Studio:Fix Welcome Page Settings, Portal Renaming.
|
2022-04-22 21:19:45 +03:00 |
|
|
379b8c0194
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-04-22 17:52:21 +03:00 |
|
|
753f1fe579
|
Web: Client: NavMenu: hide useless burger
|
2022-04-22 17:52:12 +03:00 |
|
|
9fcd01fc19
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-04-22 17:39:58 +03:00 |
|
|
db76c19478
|
Web:Studio:Added "Portal Renaming cancel button test", "Portal Renaming save button test", "Portal Renaming error PortalNameLength test", "Portal Renaming error PortalNameIncorrect test", "Portal Renaming mobile render test".
|
2022-04-22 17:38:47 +03:00 |
|
|
ba96f1fb16
|
Web: Client: NavMenu: fix menu display position
|
2022-04-22 17:10:53 +03:00 |
|
Timofey Boyko
|
0cc9a30483
|
Web:Common:Article: change height for IOS devices and add padding-bottom
|
2022-04-22 13:45:20 +03:00 |
|
|
9eba173a44
|
Merge branch 'develop' into feature/backend-refactor
# Conflicts:
# common/ASC.Api.Core/Model/EmployeeWraperFull.cs
# common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Model/CreateFileModel.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
# products/ASC.Files/Core/Utils/SocketManager.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Server/Startup.cs
# products/ASC.People/Server/Controllers/PeopleController.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
|
2022-04-21 22:36:29 +03:00 |
|
|
175b934fc8
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/ip-security
# Conflicts:
# packages/asc-web-common/store/SettingsStore.js
|
2022-04-21 20:28:36 +03:00 |
|
|
f9fb0777d1
|
Bump version to v1.2.0
|
2022-04-21 19:15:08 +03:00 |
|
|
78944a490e
|
Merge branch 'feature/virtual-rooms-1.2' into feature/interface-theme
|
2022-04-21 18:55:41 +03:00 |
|
|
fd9dc93fe6
|
Merge branch 'develop' into feature/virtual-rooms-1.2
# Conflicts:
# config/kafka.json
|
2022-04-21 18:54:28 +03:00 |
|
|
0c141bba1a
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-21 18:08:42 +03:00 |
|
|
1f9fa82051
|
Web:Studio:Added validation for setting Portal Renaming. Added locales en "PortalNameEmpty", "PortalNameIncorrect", "PortalNameLength".
|
2022-04-21 18:07:26 +03:00 |
|
|
1dff9e18c4
|
Merge branch 'develop' into feature/backend-refactor
# Conflicts:
# common/ASC.Api.Core/ASC.Api.Core.csproj
# common/ASC.Api.Core/Core/CustomHealthCheck.cs
# common/ASC.Api.Core/Middleware/IpSecurityFilter.cs
# common/ASC.Api.Core/Model/EmployeeWraperFull.cs
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# common/ASC.IPSecurity/IPRestrictionsRepository.cs
# common/ASC.IPSecurity/IPRestrictionsService.cs
# common/ASC.IPSecurity/IPSecurity.cs
# common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# products/ASC.Files/Core/Utils/FileMarker.cs
# products/ASC.Files/Core/Utils/FileSharing.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.People/Server/Controllers/PeopleController.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Core/Users/UserManagerWrapper.cs
|
2022-04-21 17:51:31 +03:00 |
|
|
d6feda992b
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-21 17:33:16 +03:00 |
|
Timofey Boyko
|
8c12ec36d5
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-21 16:51:59 +03:00 |
|
Timofey Boyko
|
0428c3d6af
|
Web:Client:Components: set correct height for main and article containers for IOS devices
|
2022-04-21 16:51:51 +03:00 |
|
|
3373a01d9e
|
Web: Client: NavMenu: fix logo pos
|
2022-04-21 16:25:42 +03:00 |
|
|
41c505da8f
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-21 14:48:35 +03:00 |
|
|
596153ac21
|
Web:Studio:Fix reminderTest.
|
2022-04-21 14:47:18 +03:00 |
|
|
92227c45c8
|
refactoring
|
2022-04-21 13:48:22 +03:00 |
|
|
9cd1cdc11b
|
refactoring
|
2022-04-21 13:35:49 +03:00 |
|
Timofey Boyko
|
e33ff6a576
|
Web:Client:Components: return --vh for ios devices
|
2022-04-21 13:06:47 +03:00 |
|
|
301e70e605
|
Api: added continue, suspend, delete portal methods
|
2022-04-21 12:35:51 +03:00 |
|
Timofey Boyko
|
414976c49f
|
Merge branch 'feature/virtual-rooms-1.2' into feature/interface-theme
|
2022-04-21 10:41:06 +03:00 |
|
Timofey Boyko
|
e5ce29f635
|
Web:Studio:Shell: update theme when current user theme changed
|
2022-04-21 10:36:22 +03:00 |
|
|
b4c6e550dc
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-20 18:31:08 +03:00 |
|
|
03f24dacac
|
Web:Studio:Fix location.pathname.
|
2022-04-20 18:29:13 +03:00 |
|
|
49e50093bc
|
Web:Studio:Delete console.log.
|
2022-04-20 18:28:34 +03:00 |
|
|
d703edba81
|
Web:Studio:Added tenantAlias, checkChanges function to PortalRenaming.
|
2022-04-20 18:26:23 +03:00 |
|
Timofey Boyko
|
216ae27b25
|
Merge branch 'feature/virtual-rooms-1.2' into feature/interface-theme
|
2022-04-20 18:04:57 +03:00 |
|
|
8ca6d0d0d5
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-20 17:27:53 +03:00 |
|
Timofey Boyko
|
2c9a22e1d4
|
Web:Studio:NavMenu: increase z-index for header-nav component
|
2022-04-20 16:27:55 +03:00 |
|
|
a4dcddc78d
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-20 14:33:39 +03:00 |
|