|
ec80b996e7
|
Web: Common: add confirmKey for validate tfa
|
2022-07-14 15:27:48 +03:00 |
|
|
a48dbeaeae
|
fix tfaapp/validate
|
2022-07-14 14:58:49 +03:00 |
|
|
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 |
|
Vashchuk Nikita
|
6507c4b999
|
Merge branch 'develop' into feature/migrations-fix
# Conflicts:
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.cs
# web/ASC.Web.Core/GlobalUsings.cs
|
2022-07-14 11:56:07 +03:00 |
|
|
586b3e941c
|
Merge branch 'develop' into feature/integration-system
|
2022-07-14 11:35:43 +03:00 |
|
|
c1f0af9fd7
|
Web: Integration: Added methods initFrame and getConfig. Fixed config merging when passing it directly to initFrame method. Remove post messages events
|
2022-07-14 11:34:50 +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 |
|
Artem Tarasov
|
b8e4f56862
|
Web: Doceditor: fixed start script
|
2022-07-14 03:41:50 +03:00 |
|
Artem Tarasov
|
c47a265eff
|
Web: Doceditor: added initDoceditor, api, requestManager
|
2022-07-14 03:39:56 +03:00 |
|
Artem Tarasov
|
12ed025fad
|
Web: Doceditor: editor render fix
|
2022-07-14 03:39:09 +03:00 |
|
Artem Tarasov
|
0fe7836f65
|
Web: Doceditor: added global styles
|
2022-07-14 03:38:34 +03:00 |
|
Artem Tarasov
|
5364dceb53
|
Web: Doceditor: added Websocket to implement Live Reloading
|
2022-07-14 00:25:15 +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 |
|
|
34e4f2e47f
|
Merge branch 'develop' into feature/async-fix
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
|
2022-07-13 19:39:05 +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 |
|
Artem Tarasov
|
1e321859d7
|
Web: Doceditor: added ejs
|
2022-07-13 14:08:20 +03:00 |
|
Artem Tarasov
|
776c0874d1
|
Web: Doceditor: added babel.config.js to be able to use import in server
|
2022-07-13 14:07:49 +03:00 |
|
Artem Tarasov
|
a612c8490a
|
Web: Doceditor: rewrite server to CommonJs
|
2022-07-13 14:06:03 +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 |
|
Vashchuk Nikita
|
9348ad1a46
|
fix files tests
|
2022-07-13 12:52:13 +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 |
|