Commit Graph

12513 Commits

Author SHA1 Message Date
16f3b4b791 Merge branch 'feature/two-factor-auth' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth 2021-05-19 18:04:59 +03:00
ee8119eb6d Web: Client: submit by enter 2021-05-19 18:04:44 +03:00
e14948944f Tfa: added validation 2021-05-19 18:04:32 +03:00
1f54f301c5 Web: Client: added input error, max length 2021-05-19 18:03:50 +03:00
e268b077df Web: Files: Store: Fixed displaying edit action for files with low access 2021-05-19 17:54:29 +03:00
666cc00a52 Web: Files: Store: Fixed copy action for shared files inside root. Added view action for edited files 2021-05-19 17:48:23 +03:00
3f1ae6ae60 Web: Client: fixed tfa login 2021-05-19 17:25:05 +03:00
8785f6151a Web: Common: fixed reloading login page 2021-05-19 17:17:07 +03:00
03a71ae131 Merge branch 'bugfix/context-actions' of https://github.com/ONLYOFFICE/AppServer into bugfix/context-actions
# Conflicts:
#	products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
2021-05-19 17:11:46 +03:00
23c075859b Web: Files: moved mark as read to actions 2021-05-19 17:11:10 +03:00
1003c6fe15 Web: Files: Dialog: Added unsubscribe action for DeleteDialog 2021-05-19 17:03:03 +03:00
e5f066e074 Web: Files: Store: Added unsubscribeAction for FilesActionsStore 2021-05-19 16:54:17 +03:00
cf49743054 Web: Files: Store: Added unsubscribe mark for Dialog 2021-05-19 16:53:32 +03:00
98d9fb4e33 Web: Files: HOC: Added unsubscribe action 2021-05-19 16:52:38 +03:00
3c6f831618 Web: Common: Api: Added removeShareFiles api method 2021-05-19 16:51:43 +03:00
e4f10d16cb Server: Files: Controller: FilesController: Fixed model parse for delete share 2021-05-19 16:50:08 +03:00
2cd59d9014 Merge branch 'bugfix/context-actions' of https://github.com/ONLYOFFICE/AppServer into bugfix/context-actions 2021-05-19 13:55:13 +03:00
d5ff576188 Web: Files: Store: Added mark read action, added remove from list and mark read icons 2021-05-19 13:54:45 +03:00
49e70d1ccc Web: Files: removed useless code 2021-05-19 13:46:53 +03:00
d55c953805 Web: Files: fixed MediaViewer propTypes 2021-05-19 13:45:37 +03:00
60557cdfce Merge branch 'develop' into bugfix/context-actions 2021-05-19 12:28:32 +03:00
5d94113e23 Backup: fix 2021-05-19 11:31:50 +03:00
536c6c2f5e Web: Moved custom.scss to @appserver/common
+ Added missing ErrorBoundary
+ Removed useless commented code
2021-05-19 11:14:44 +03:00
86952dd71e Merge branch 'develop' into bugfix/context-actions 2021-05-19 10:19:17 +03:00
3433c074d7 Merge branch 'develop' into feature/my-profile
# Conflicts:
#	products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
2021-05-19 10:16:40 +03:00
b1b6bdc516 Web: Common: refactoring tfa store 2021-05-19 03:48:13 +03:00
b5578b943a Web: Client: added toastr 2021-05-19 03:27:55 +03:00
b9c52c526e Fixed DistributedTask 2021-05-18 21:24:22 +03:00
1b4807c07a Files: fixed SetTagsNew for thirdparty 2021-05-18 20:10:48 +03:00
2f7b9102ee Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop 2021-05-18 20:06:42 +03:00
d9e17af9d5 OneDrive: fix DI 2021-05-18 20:06:06 +03:00
c4c4d940a0
Merge pull request #252 from ONLYOFFICE/feature/remove-wq
Feature/remove wq
2021-05-18 19:04:34 +03:00
619b33caf3 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop 2021-05-18 18:51:23 +03:00
06928a7896 People: fixed group cache 2021-05-18 18:50:48 +03:00
5f36009630 Web: Moved translationKeys "LoadingDescription" and "LoadingLabel" to "/static/locales/{lng}/Common.json" 2021-05-18 18:35:03 +03:00
4f1371370c
Merge pull request #260 from ONLYOFFICE/bugfix/fixed-firefox-header
Bugfix/fixed firefox header
2021-05-18 18:27:07 +03:00
8ad59d282b Web: Files: Store: Added mark read button 2021-05-18 18:18:38 +03:00
84565d46c6 Merge branch 'develop' into bugfix/fixed-firefox-header 2021-05-18 18:08:53 +03:00
bc901b8a4a Web: People: disabled user type change 2021-05-18 18:00:29 +03:00
07934f6cd9 Web: Common: fixed firefox header 2021-05-18 17:59:34 +03:00
2c6d06f304 Web: Files: fixed drag 2021-05-18 17:59:02 +03:00
6c51f15d28 Web: Components: fixed toggle-button styles 2021-05-18 17:58:45 +03:00
db7e2b8700 People: fixed query 2021-05-18 16:16:17 +03:00
df1ebc8d77 Web: Moved translationKeys "OpenApp" and "ViewWeb" to "/static/locales/{lng}/Common.json" 2021-05-18 15:23:12 +03:00
f6ecc35ae7 Web: Moved translationKeys "LearnMore" and "ComingSoon" to "/static/locales/{lng}/Common.json" 2021-05-18 15:10:20 +03:00
0ae236ad6d Web: Moved translationKey "People" to "/static/locales/{lng}/Common.json" 2021-05-18 14:42:44 +03:00
923f5012bc Web: Moved translationKey "SendButton" to "/static/locales/{lng}/Common.json" 2021-05-18 14:35:54 +03:00
49780cee24 Web: Moved translationKey "Email" to "/static/locales/{lng}/Common.json" 2021-05-18 14:27:59 +03:00
99b86212dd Web: Moved translationKey "Password" to "/static/locales/{lng}/Common.json" 2021-05-18 13:57:17 +03:00
08411cfc3b Web: Moved translationKey "CloseButton" to "/static/locales/{lng}/Common.json" 2021-05-18 13:47:36 +03:00