Commit Graph

9256 Commits

Author SHA1 Message Date
83fc657f4b Web: Client: Settings: add mobile security loader 2022-06-08 16:13:44 +03:00
1472644f04 Web: Client: Settings: add loader 2022-06-08 15:35:22 +03:00
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
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
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
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
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