|
bef003446e
|
Merge branch 'feature/admin-messages' of github.com:ONLYOFFICE/AppServer into feature/session-lifetime
|
2022-06-07 13:40:56 +03:00 |
|
|
c534db530c
|
Merge branch 'feature/ip-security' of github.com:ONLYOFFICE/AppServer into feature/admin-messages
|
2022-06-07 13:40:14 +03:00 |
|
|
ab0f85d0e3
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/ip-security
|
2022-06-07 13:39:44 +03:00 |
|
|
b9c2b046aa
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-06-03 16:33:17 +03:00 |
|
|
b0f2892664
|
edit translations
|
2022-06-03 16:32:59 +03:00 |
|
|
29fd1b83cf
|
Fixed Bug 53176 - Client.Files.Clouds. Error ‘You cannot update a file which is opened for editing’ at editor
|
2022-06-03 15:52:50 +03:00 |
|
|
2cf70f38ca
|
Web: Client: SmartBanner: show only on touch devices
|
2022-06-03 12:37:55 +03:00 |
|
|
ef10cbfd01
|
edit translations
|
2022-06-03 10:25:03 +03:00 |
|
|
848751220c
|
Files: added logos for rooms
|
2022-06-02 21:41:16 +03:00 |
|
|
8d3320d9d4
|
edit translations
|
2022-06-02 18:45:28 +03:00 |
|
|
4ed473eed8
|
edit translations
|
2022-06-02 18:42:21 +03:00 |
|
|
1d24adba7d
|
edit translations
|
2022-06-02 17:45:25 +03:00 |
|
|
e7d3b081ea
|
update translations
|
2022-06-02 17:05:59 +03:00 |
|
|
68aeaa83dd
|
edit translations
|
2022-06-02 13:22:24 +03:00 |
|
|
1aa605fb98
|
Web: Client: Settings: delete console log
|
2022-06-01 18:27:36 +03:00 |
|
|
8fb5f45d10
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/ip-security
|
2022-06-01 18:25:47 +03:00 |
|
|
a1b7a47e45
|
Web: Client: Settings: fix logic
|
2022-06-01 18:25:23 +03:00 |
|
|
a861268e4f
|
moved from ddf515b8
|
2022-06-01 17:07:08 +03:00 |
|
|
d0b74d4c30
|
Web: Client: Settings: fix logic
|
2022-06-01 14:58:34 +03:00 |
|
|
9a20c4c93e
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-01 14:44:54 +03:00 |
|
|
3ebd67f444
|
merge from develop
|
2022-06-01 14:44:30 +03:00 |
|
|
1de68d0247
|
Web: Fixed dark theme for backup module.
|
2022-06-01 14:43:43 +03:00 |
|
|
8c1cfd2ed8
|
Web: Client: Settings: show error
|
2022-06-01 14:43:00 +03:00 |
|
|
98e318ee11
|
Web: Client: Settings: fix init settings
|
2022-06-01 14:35:36 +03:00 |
|
|
753d0b0605
|
Merge branch 'feature/admin-messages' of github.com:ONLYOFFICE/AppServer into feature/session-lifetime
# Conflicts:
# packages/asc-web-common/store/SettingsStore.js
# web/ASC.Web.Client/public/locales/en/Settings.json
|
2022-06-01 14:26:24 +03:00 |
|
|
c9292331b8
|
Web: Client: add smart banner store, fix layout height
|
2022-06-01 14:11:11 +03:00 |
|
|
d7d21f765e
|
Web: Client: Settings: fix init settings
|
2022-06-01 13:47:42 +03:00 |
|
|
958e13cbb3
|
Merge branch 'feature/ip-security' of github.com:ONLYOFFICE/AppServer into feature/admin-messages
# Conflicts:
# packages/asc-web-common/store/SettingsStore.js
|
2022-06-01 13:36:25 +03:00 |
|
|
349c3cae0e
|
Web: Client: Settings: add support ip range
|
2022-06-01 13:29:23 +03:00 |
|
|
e9b4805a00
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/ip-security
|
2022-06-01 12:29:47 +03:00 |
|
|
4c2064714d
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-31 18:38:13 +03:00 |
|
|
e1dbda363c
|
edit translations
|
2022-05-31 18:37:53 +03:00 |
|
|
aa7d285025
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/ip-security
|
2022-05-31 18:03:11 +03:00 |
|
|
f1225ed3f6
|
Web: Client: fix layout height
|
2022-05-31 14:43:43 +03:00 |
|
|
7c511eb4db
|
Web: Client: SmartBanner: decrease z-index
|
2022-05-31 11:33:36 +03:00 |
|
|
30b89d1ae0
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-30 17:18:53 +03:00 |
|
|
e2a705dce2
|
edit translations
|
2022-05-30 17:18:33 +03:00 |
|
|
52a6b27083
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/ip-security
|
2022-05-30 16:46:25 +03:00 |
|
|
5a26c4f404
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner
|
2022-05-30 15:33:17 +03:00 |
|
|
e4a8c11602
|
Merge branch 'develop' into feature/LDAP-new
|
2022-05-30 14:20:46 +03:00 |
|
mushka
|
5ad2231fc3
|
Merge branch 'release/v1.2' into feature/modal-redesign
|
2022-05-27 15:24:29 +03:00 |
|
|
881a70a540
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-05-27 14:58:43 +03:00 |
|
|
c092ae1d13
|
Fixed Bug 57327: Wrong size of icon on mobile shortcut
|
2022-05-27 14:58:32 +03:00 |
|
|
96518a2ad5
|
edit translations
|
2022-05-27 14:09:16 +03:00 |
|
|
cf8badeea3
|
Api: refactoring
|
2022-05-27 12:32:58 +03:00 |
|
|
470c983e2e
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner
|
2022-05-26 21:46:36 +03:00 |
|
|
325a53579a
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-26 19:22:45 +03:00 |
|
|
d35ae571e2
|
edit translations
|
2022-05-26 19:21:39 +03:00 |
|
|
4bb7ee25e8
|
Web: Client: wait ready translations
|
2022-05-26 18:13:20 +03:00 |
|
|
341749d1db
|
Web: Client: SmartBanner: fix cookies
|
2022-05-26 18:07:32 +03:00 |
|
Nikita
|
54341cb203
|
fixed input and output parameters in Api(LdapController)
|
2022-05-26 17:39:02 +03:00 |
|
|
f3505e2b4a
|
Web: fix smart banner meta
|
2022-05-26 17:35:59 +03:00 |
|
|
dc7d837e46
|
Merge branch 'release/v1.2' into feature/smart-banner
|
2022-05-26 16:57:04 +03:00 |
|
|
7a7b83c78e
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-05-26 18:16:23 +05:00 |
|
|
6b071a8634
|
Web: Campaigns: added react device detect
|
2022-05-26 18:16:09 +05:00 |
|
|
8cb26ba1aa
|
Web: Campaigns: added cross icon
|
2022-05-26 18:15:28 +05:00 |
|
Timofey Boyko
|
1e92d209e1
|
Web:Client:About: fix personal logo color for dark theme
|
2022-05-26 15:33:34 +03:00 |
|
|
07c7439687
|
edit translations
|
2022-05-26 15:00:16 +03:00 |
|
|
76db35e748
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner
|
2022-05-26 13:40:26 +03:00 |
|
|
968e4440ea
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-26 13:18:06 +03:00 |
|
|
0a84d45b58
|
edit translations
|
2022-05-26 13:17:43 +03:00 |
|
|
d24d60a5e6
|
Web:fixed snackbar display delay
|
2022-05-26 15:08:41 +05:00 |
|
|
e7886aff2c
|
Log: refactoring
|
2022-05-26 12:01:54 +03:00 |
|
|
8a935ec96c
|
Web: Client: use translations in SmartBanner
|
2022-05-26 11:29:13 +03:00 |
|
|
4bf2d3ec6f
|
Web: Client: add SmartBanner translation
|
2022-05-26 11:28:47 +03:00 |
|
|
84af332a63
|
Web: Client: fix
|
2022-05-25 22:37:40 +03:00 |
|
|
6c3450e3da
|
Web: Client: add translate for SmartBanner
|
2022-05-25 22:36:07 +03:00 |
|
|
c7003c7984
|
Web: Client: move SmartBanner into folder
|
2022-05-25 22:25:19 +03:00 |
|
|
0296c1f22c
|
Web: Client: delete console log
|
2022-05-25 22:15:43 +03:00 |
|
|
219cd835d3
|
Web: Client: show smart banner only in Documents
|
2022-05-25 22:14:44 +03:00 |
|
|
59f1307223
|
Web: Client: SmartBanner: fix show logic
|
2022-05-25 22:07:50 +03:00 |
|
|
7d42847f60
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner
|
2022-05-25 20:05:01 +03:00 |
|
|
d8c870c599
|
edit translations
|
2022-05-25 18:47:28 +03:00 |
|
|
1850b9bc1b
|
update translations
|
2022-05-25 18:42:21 +03:00 |
|
|
b13fd240ad
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-25 18:11:50 +03:00 |
|
|
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 |
|