Commit Graph

9230 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
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
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
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
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
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
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
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
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
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