|
9e611da373
|
Web: Client: Settings: fix
|
2022-04-14 15:22:28 +03:00 |
|
|
8674260bcb
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/ip-security
# Conflicts:
# web/ASC.Web.Client/tests/action_tests.js
|
2022-04-14 14:42:35 +03:00 |
|
|
1fb08c764f
|
Merge pull request #619 from ONLYOFFICE/bugfix/security-settings
Bugfix/security settings
|
2022-04-14 07:29:20 -04:00 |
|
|
d3dc0ec7b5
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into bugfix/security-settings
|
2022-04-14 13:25:29 +03:00 |
|
|
cc34c5b3c5
|
Web: Client: Tests: add custom scenario for tfa
|
2022-04-14 13:25:09 +03:00 |
|
|
1c8094139f
|
Web: Client: Tests: add mock
|
2022-04-14 13:24:35 +03:00 |
|
|
d2178d4f85
|
Web: Client: Settings: fix tfa logic
|
2022-04-14 12:46:58 +03:00 |
|
|
2359ac34c9
|
Web: Client: SettingsStore: add setIsInit
|
2022-04-14 12:41:59 +03:00 |
|
|
fbb04ea80f
|
Web: Common: TfaStore: delete useless
|
2022-04-14 12:41:24 +03:00 |
|
|
720703cbab
|
Web: Common: fixed filter loader for mobile devices
|
2022-04-14 11:01:00 +03:00 |
|
|
d2098a3020
|
Web: Files: Tile: fixed Drag’nDrop
|
2022-04-13 16:22:17 +03:00 |
|
|
65df8f6bfc
|
Web: Client: Settings: move checkWidth
|
2022-04-13 15:32:15 +03:00 |
|
|
b5845e221c
|
Web: Client: Settings: use isSaving
|
2022-04-13 15:18:23 +03:00 |
|
|
fbe7f11f2b
|
Web: Components: SaveCancelButtons: add isSaving prop
|
2022-04-13 15:03:59 +03:00 |
|
|
81b741f15d
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into bugfix/security-settings
|
2022-04-13 14:52:42 +03:00 |
|
|
816e25772c
|
Web: Client: add command
|
2022-04-13 14:52:30 +03:00 |
|
|
1dcc6b035b
|
Web: Client: Tests: fix action tests
|
2022-04-13 14:52:11 +03:00 |
|
|
6ff7c9b09d
|
Web: Client: Tests: fix mock
|
2022-04-13 14:51:52 +03:00 |
|
|
7a9e914a55
|
Web: Client: Settings: fix init
|
2022-04-13 14:51:14 +03:00 |
|
|
7d233d9a2d
|
Files: Fix s:stop-edit-file wrong file data (rootFolderType always SHARE)
|
2022-04-13 11:53:01 +03:00 |
|
|
fa4318cf24
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/ip-security
|
2022-04-13 11:13:35 +03:00 |
|
|
270731b8ee
|
Web" Client: Tests: fix id
|
2022-04-12 20:56:53 +03:00 |
|
|
4b194e5441
|
Web: Client: Settings: fix user field id
|
2022-04-12 20:50:58 +03:00 |
|
|
a9833a0cbc
|
Web: Client: Settings: init settings
|
2022-04-12 20:44:32 +03:00 |
|
|
3979044564
|
Web: People: added filter loader
|
2022-04-12 11:53:50 +03:00 |
|
|
a7a2eb733b
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/ip-security
|
2022-04-12 10:45:15 +03:00 |
|
|
ce7ac083ca
|
Web: Client: Settings: fix ip regex
|
2022-04-12 10:41:00 +03:00 |
|
|
9ae3945680
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-11 17:46:54 +03:00 |
|
|
ae9ae673cb
|
Web: Files: fixed loader styles for tiles
|
2022-04-11 17:46:46 +03:00 |
|
|
27af58022d
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/ip-security
|
2022-04-11 17:10:12 +03:00 |
|
|
44c2a267d4
|
Web: Client: Settings: fix get ip restriction enable
|
2022-04-11 17:07:05 +03:00 |
|
|
5dd5e22ba5
|
Web: Common: fix ipRestrictions
|
2022-04-11 17:05:55 +03:00 |
|
|
866a6f6c26
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-11 16:37:37 +03:00 |
|
|
0e7eec8221
|
Web: Files: fixed "Duplicate" translation
|
2022-04-11 16:22:23 +03:00 |
|
|
fdfdf4e547
|
Web:Studio:Fix border width.
|
2022-04-11 16:10:12 +03:00 |
|
|
ce5fe18139
|
Web: Files: fixed onClickMakeForm
|
2022-04-11 13:50:33 +03:00 |
|
|
acc0934965
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-11 13:29:33 +03:00 |
|
|
eaf365de0f
|
Web: Client: Settings: add try/catch
|
2022-04-11 13:27:37 +03:00 |
|
Timofey Boyko
|
63c812cbf0
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-11 13:22:22 +03:00 |
|
Timofey Boyko
|
9c01f05de8
|
Web:Studio:Settings: hide article when catalog item changed
|
2022-04-11 13:22:04 +03:00 |
|
|
361e22f5af
|
Web: Components: fixed heading styles for dark theme
|
2022-04-11 13:15:36 +03:00 |
|
|
c33e724a3d
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-11 12:28:02 +03:00 |
|
|
01e745f47b
|
Web:Studio:Fix loaders styles.
|
2022-04-11 12:26:58 +03:00 |
|
|
b33fe33f18
|
Web: Client: Settings: fix show warning
|
2022-04-11 12:15:47 +03:00 |
|
|
f3a144327a
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/ip-security
|
2022-04-11 12:09:59 +03:00 |
|
|
433c684d09
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-11 12:08:50 +03:00 |
|
|
1922fe67d4
|
Web: Files: fixed activateHotkeys
|
2022-04-11 11:53:49 +03:00 |
|
|
002a432b4d
|
Web: fixed info-panel icon
|
2022-04-11 11:11:44 +03:00 |
|
|
90cade35e3
|
Merge pull request #609 from ONLYOFFICE/feature/iprestrictions
iprestrictions
|
2022-04-11 10:54:26 +03:00 |
|
|
3c013939bc
|
Merge branch 'develop' into feature/iprestrictions
|
2022-04-11 10:38:12 +03:00 |
|