Commit Graph

9180 Commits

Author SHA1 Message Date
9a20c4c93e Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-06-01 14:44:54 +03:00
1de68d0247 Web: Fixed dark theme for backup module. 2022-06-01 14:43:43 +03:00
c9292331b8 Web: Client: add smart banner store, fix layout height 2022-06-01 14:11:11 +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
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
5a26c4f404 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner 2022-05-30 15:33:17 +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
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
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
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
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