Commit Graph

17743 Commits

Author SHA1 Message Date
b016e3b38f Web: Components: Calendar: Added fixedDirection property 2022-02-25 16:07:54 +03:00
d21bb11939 Web: Components: Combobox: Added fixedDirection property 2022-02-25 16:07:39 +03:00
de742ef46d Web: Components: DropDown: Added fixedDirection property 2022-02-25 16:07:18 +03:00
f07aa0a183 Merge branch 'develop' into feature/backup
# Conflicts:
#	common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs
#	config/nginx/onlyoffice.conf
#	packages/asc-web-common/constants/index.js
#	products/ASC.Files/Client/src/components/panels/StyledPanels.js
#	products/ASC.Files/Client/webpack.config.js
#	web/ASC.Web.Api/Models/SettingsWrapper.cs
#	web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
2022-02-25 16:05:43 +03:00
c693e92e13 Merge branch 'feature/backend-refactor' into feature/refactoring-VoipService 2022-02-25 15:50:16 +03:00
bc78804ac6 refactoring: voipService 2022-02-25 15:50:00 +03:00
73dfb927cf Web: Components: DropDown: Fixed position checking for non portal 2022-02-25 15:30:30 +03:00
7e50d1b097 Web: People: Profile: fixed help-icon styles 2022-02-25 13:41:47 +03:00
9c3274b5bd FilesCore: refactor 2022-02-25 13:38:21 +03:00
85b03b508a FilesCore: added IServiceScopeFactory, refactor 2022-02-25 13:04:37 +03:00
63d10f291f Web: Files: RowView: Fixed editing input style for screens less than small tablet 2022-02-25 12:18:27 +03:00
f2a8867a4c Merge branch 'bugfix/fixed-dates-in-profile' of github.com:ONLYOFFICE/AppServer into bugfix/fixed-dates-in-profile 2022-02-25 12:18:22 +03:00
d255872c2a Web: Components: Combobox: added displaySelectedOption prop 2022-02-25 12:18:10 +03:00
6c0f8c18e1 Web: Files: EditingWrapperComponent: Fixed padding for table view 2022-02-25 12:16:12 +03:00
d9a8fd58ba Web: Backup: Added max length to the text. 2022-02-25 12:05:43 +03:00
47faaf1653 Web: Backup: Added description of modules. 2022-02-25 11:54:21 +03:00
4b55c185f4 bugfix: socket.io 2022-02-25 11:46:47 +03:00
a5a72e3e9d Web: Backup: Changed styles. 2022-02-25 11:38:07 +03:00
2eeed99efa Web: Client: Main: Removed --vh parameter from global styles for non IOS devices 2022-02-25 11:28:23 +03:00
88c7f5ba72 Merge branch 'feature/backend-refactor' into feature/winsw 2022-02-25 11:18:26 +03:00
64473bb70e Merge branch 'develop' into bugfix/fixed-dates-in-profile 2022-02-25 11:15:20 +03:00
c35cfba820
Merge pull request #563 from ONLYOFFICE/bugfix/refactoring-table-view
Bugfix/refactoring table view
2022-02-25 11:11:43 +03:00
e319a5e31f Web: Files: EditingWrapperComponent: Fixed padding for cancel button 2022-02-25 11:07:08 +03:00
56caa47575 Web: Backup: Added desktop view. 2022-02-25 10:46:14 +03:00
178671ea56 FilesService: add implicit 2022-02-24 23:55:29 +03:00
ad30ce26ce FilesService: refactor 2022-02-24 23:28:07 +03:00
6d4f615350 FilesCore: used files-scoped namespaces 2022-02-24 22:34:26 +03:00
b6b8c4c7b5 FilesCore: privated properties replaced by private fields, added braces 2022-02-24 21:36:57 +03:00
8da91b7f8f Web: Files: VersionHistory fixed Ipad styles 2022-02-24 19:29:01 +03:00
cce054e1f3
Merge branch 'develop' into bugfix/fixed-dates-in-profile 2022-02-24 19:26:11 +03:00
159dfe0028 Web: Files: fixed VersionHistory page styles 2022-02-24 19:13:40 +03:00
4be97f77e7 Merge branch 'bugfix/refactoring-table-view' of github.com:ONLYOFFICE/AppServer into bugfix/refactoring-table-view 2022-02-24 18:55:09 +03:00
9f5bae12ad Web: Files: fixed EditingWrapperComponent styles 2022-02-24 18:54:55 +03:00
7377507481 Web: Files: RowView: Fixed right margin for last badge item 2022-02-24 18:03:27 +03:00
7bc4e141fa Web: Files: RowView: Fixed displaying for quick buttons for small tablet width 2022-02-24 17:43:37 +03:00
42e5f2bd71
Merge branch 'develop' into bugfix/refactoring-table-view 2022-02-24 17:39:25 +03:00
d40d73a3a5 GoogleAuth: fix 94 issue 2022-02-24 17:36:44 +03:00
63d163cba6 winsw: socket.io 2022-02-24 16:50:02 +03:00
49f7ecf5f8 refactoring and bugfix 2022-02-24 16:49:34 +03:00
7995f38ef9 Web: Files: Badges/QuickButtons: Restored show logic after merge 2022-02-24 16:36:06 +03:00
ba0bfe7260 Merge branch 'develop' into bugfix/fixed-dates-in-profile
# Conflicts:
#	packages/asc-web-components/calendar/index.js
#	products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
2022-02-24 15:59:56 +03:00
2e000f1d9d Web: People: fixed profile dates 2022-02-24 15:48:02 +03:00
6b7fe6461f fix socketio 2022-02-24 14:57:21 +03:00
d7566d0743 Merge branch 'develop' into feature/backend-refactor 2022-02-24 14:55:31 +03:00
0814ce13cc Merge branch 'develop' into bugfix/refactoring-table-view 2022-02-24 14:53:43 +03:00
7f70d0be04 Merge branch 'feature/backend-refactor' into feature/winsw 2022-02-24 14:50:18 +03:00
707739813c winsw: SsoAuth 2022-02-24 14:46:55 +03:00
6fb3547652 Files: fix sql 2022-02-24 14:45:58 +03:00
a3ba7e2ecc bugfix and refactoring urlShortener 2022-02-24 14:45:52 +03:00
51f79fa0e9 Files: fix track 2022-02-24 14:35:14 +03:00