|
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 |
|
|
b0f2892664
|
edit translations
|
2022-06-03 16:32:59 +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 |
|
|
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 |
|
|
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 |
|
|
e9b4805a00
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/ip-security
|
2022-06-01 12:29:47 +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 |
|
|
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 |
|
|
d35ae571e2
|
edit translations
|
2022-05-26 19:21:39 +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 |
|
|
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 |
|
|
0a84d45b58
|
edit translations
|
2022-05-26 13:17:43 +03:00 |
|
|
4bf2d3ec6f
|
Web: Client: add SmartBanner translation
|
2022-05-26 11:28:47 +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 |
|
|
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 |
|
|
70a6a44196
|
Web: Client: Disable PWA feature for mobile devices
|
2022-05-25 10:53:39 +03:00 |
|
|
95f356adbd
|
edit translations
|
2022-05-24 14:55:28 +03:00 |
|
|
67a235da5c
|
edit ro-variable
|
2022-05-24 10:32:38 +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 |
|
|
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 |
|