Commit Graph

22501 Commits

Author SHA1 Message Date
fb162af624 Web: Client: Settings: use new tfa api 2022-07-14 14:43:50 +03:00
379ed60458 Web: Common: fix set tfa api 2022-07-14 14:43:29 +03:00
1f01c06185 Tfa: added tfaappwithlink 2022-07-14 12:57:57 +03:00
TimofeyBoyko
564fe335f2 Web:Common:Api: add isRoom params to folder in getRooms method 2022-07-14 07:42:25 +03:00
TimofeyBoyko
7532dc199f Web:Files:Article: remove useless 'type' from onClick and work with folder id 2022-07-14 07:12:31 +03:00
TimofeyBoyko
33780332f7 Web:Components:CatalogItem: delete useless arg 'type' from onClick function 2022-07-14 07:11:57 +03:00
TimofeyBoyko
bfc1422ba7 Merge branch 'develop' into feature/virtual-rooms-page 2022-07-14 06:01:51 +03:00
dfcc00995a Web: People: fix redirect tfa reset 2022-07-13 21:52:09 +03:00
389ae00068
Merge branch 'develop' into bugfix/tfa 2022-07-13 21:09:12 +03:00
42b4d8a59e Web: Common: check password settings 2022-07-13 21:00:42 +03:00
ee9e381b26 fixed async 2022-07-13 20:09:43 +03:00
943895e6b7 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into bugfix/tfa 2022-07-13 19:54:13 +03:00
cccbf540dd Web: People: ResetApplicationDialog: fix redirect and close 2022-07-13 19:48:11 +03:00
615de2bf19 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header 2022-07-13 19:30:50 +03:00
3597114325 Api: fix tfaappnewapp 2022-07-13 18:41:44 +03:00
2aec92c2e0 fix 2022-07-13 18:15:29 +03:00
mushka
41731b9b36 removed Move translation key 2022-07-13 18:07:41 +03:00
mushka
f02c9445c4 removed NotBeUndone translation key 2022-07-13 18:05:57 +03:00
mushka
14222d90a4 removed a modified file from pull request 2022-07-13 18:03:32 +03:00
mushka
f63c570349 fixed ConvertDialog translations 2022-07-13 17:55:30 +03:00
mushka
25941ceb50 fixed missed translation key bug in ConflictResolve dialog 2022-07-13 16:02:11 +03:00
mushka
523b974fc5 deleted unused translation keys 2022-07-13 15:26:52 +03:00
595cfcc2d2 fixed loginevent 2022-07-13 15:15:13 +03:00
ed7ef58b53 Api: fixed loginevent 2022-07-13 14:21:25 +03:00
04d2c2d51c Web: move profile block to common article 2022-07-13 14:03:08 +03:00
b1baddce99 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header 2022-07-13 13:46:36 +03:00
48a743e01e
Merge pull request #722 from ONLYOFFICE/bugfix/Bug53348
Bug 53348 - Client.Account termination. Account deletion confirmation…
2022-07-13 13:43:03 +03:00
552d2adda8 Files: deleted unnecessary 2022-07-13 13:42:40 +03:00
04603f1314 Merge branch 'develop' into bugfix/Bug53348 2022-07-13 13:42:24 +03:00
256885f4e3 Files: fix, deleted unnecessary 2022-07-13 13:42:17 +03:00
a88d5b6d41
Merge pull request #715 from ONLYOFFICE/feature/room_tests
Feature/room tests
2022-07-13 13:03:41 +03:00
ea00433ff1 Files: tests. refactoring 2022-07-13 13:00:08 +03:00
120a57c1bf Merge branch 'develop' into feature/room_tests 2022-07-13 11:56:48 +03:00
62ce169017
Merge pull request #724 from ONLYOFFICE/feature/room-api-refactor
feature/room-api-refactor
2022-07-13 11:49:20 +03:00
e7831d9b94 Files: moved parameter from body to query 2022-07-13 11:47:15 +03:00
06a98c508e Merge branch 'develop' into feature/room_tests
# Conflicts:
#	.gitignore
2022-07-12 22:48:47 +03:00
a8ba7ae685 removed logo test 2022-07-12 22:44:10 +03:00
72caeb475c People: fixed change theme mathod 2022-07-12 20:45:12 +03:00
c9680ae830 fix tfaapp 2022-07-12 19:36:39 +03:00
a2129001c9 Files: added withoutTags, withoutMe parameters, refactor 2022-07-12 19:25:34 +03:00
bab140aaf3 Files: reworked rooms filter, added withoutTags, withoutMe parameters 2022-07-12 19:24:39 +03:00
TimofeyBoyko
77e62baad1 Web:Files:VirtualRooms: add fetching tags after fetching rooms 2022-07-12 19:07:58 +03:00
mushka
30ed90b8e9 Merge branch 'feature/modal-redesign' of github.com:ONLYOFFICE/AppServer into feature/modal-redesign 2022-07-12 18:25:36 +03:00
mushka
9242d571b8 deleted InfoPanel/views folder 2022-07-12 18:25:21 +03:00
536282eaf3 Merge branch 'develop' into feature/modal-redesign 2022-07-12 17:53:37 +03:00
mushka
e4d07810e8 fixed aside height on mobile browser 2022-07-12 17:40:00 +03:00
mushka
f99d8784f1 fixed RecoverAccess dialog 2022-07-12 17:28:13 +03:00
TimofeyBoyko
645be6d794 Web:Files:SelectedFolderStore: set roomType = null if roomType doesnt exists in selectedFolder 2022-07-12 17:19:52 +03:00
TimofeyBoyko
c59ffe797a Web:People: fix filter after refactoring 2022-07-12 17:04:30 +03:00
TimofeyBoyko
09122918f6 Merge branch 'develop' into feature/virtual-rooms-page 2022-07-12 16:19:00 +03:00