Commit Graph

28953 Commits

Author SHA1 Message Date
3a927973e3
Merge pull request #1018 from ONLYOFFICE/feature/users-payments-filter
Feature/users payments filter
2022-11-29 23:31:37 +04:00
bacde66b72 Merge branch 'develop' into feature/users-payments-filter 2022-11-29 22:24:50 +03:00
a886b1b802
Merge pull request #1019 from ONLYOFFICE/feature/subject-filter
Feature/rooms subject filter
2022-11-29 22:58:11 +04:00
e1e39de101 Merge branch 'develop' into feature/info-panel-history-update 2022-11-29 19:03:53 +03:00
Akmal Isomadinov
1698a443b6 Web:Components:Scrollbar Fixed undefined className 2022-11-29 21:02:02 +05:00
Akmal Isomadinov
1af776dba5 Web:Components:Modal-Dialog:Views:Modal-Aside Fixed undefined className 2022-11-29 21:01:26 +05:00
abbdfefba5
Merge pull request #1090 from ONLYOFFICE/feature/build-document-server-docker-bat
Added run document server docker for development.
2022-11-29 18:52:46 +03:00
5768244870 Added run document server docker for development. 2022-11-29 18:50:50 +03:00
8fb9fd6640 Web: Files: added route to new room, removed useless code 2022-11-29 18:05:44 +03:00
4db7b76f6d refactoring 2022-11-29 17:05:43 +03:00
baedfcc93a fixed performance issue 2022-11-29 16:47:26 +03:00
caa2143203 asc.data.backup: upgrade mysql.data.dll 2022-11-29 16:43:22 +03:00
a5dc7dafdf Merge branch 'develop' into feature/migration_personal 2022-11-29 16:38:49 +03:00
3068359636 refactoring 2022-11-29 16:38:44 +03:00
2b37f66a57
Merge pull request #1088 from ONLYOFFICE/bugfix/fixed-main-button-styles
Web: Files: fixed context-menu styles
2022-11-29 16:28:45 +03:00
Akmal Isomadinov
ad2f23de99 Merge branch 'develop' into release/rc-v1.2.0
# Conflicts:
#	packages/client/src/store/ContextOptionsStore.js
2022-11-29 18:26:29 +05:00
a944f9bd55 Web: Files: fixed context-menu styles 2022-11-29 16:09:03 +03:00
8c7a5d9730
Merge pull request #1086 from ONLYOFFICE/Add-id-for-header-of-main-folders
Add id for header of main folders
2022-11-29 16:00:19 +03:00
Akmal Isomadinov
a19f26310a Web:Client:Store:ContextOptionsStore Added id 2022-11-29 17:51:23 +05:00
Akmal Isomadinov
95b903a28e merge develop 2022-11-29 17:07:54 +05:00
Akmal Isomadinov
73b9a179e9 Web:Client:Components:Dialogs:CreateEditRoomDialog:Sub-Components:ThirdPartyStorage Refactoring and Added className 2022-11-29 16:26:36 +05:00
Akmal Isomadinov
c203ff7f47 Web:Client:Components:Dialogs:CreateEditRoomDialog:Sub-Components:ThirdPartyStorage:ThirdPartyComboBox Added className 2022-11-29 16:25:27 +05:00
Akmal Isomadinov
008aa79c1d Web:Client:Components:Dialogs:CreateEditRoomDialog:CreateRoomDialog Updated button id 2022-11-29 15:56:47 +05:00
649b541adb Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-11-29 13:53:43 +03:00
7cd4c7f737 Web: Removed menu item inside the room. 2022-11-29 13:52:57 +03:00
7fc5da14e3 Web: Files: fixed context-menu styles 2022-11-29 13:52:12 +03:00
Akmal Isomadinov
6de2111331 Web:Client:Components:Dialogs:CreateEditRoomDialog:Sub-Components Refactoring and Updated id 2022-11-29 15:49:42 +05:00
Elyor Djalilov
26d210c8d7 not found keys fixed 2022-11-29 15:32:36 +05:00
Elyor Djalilov
a9188bfd59 not found keys fixed 2022-11-29 15:28:24 +05:00
Mushka Nikita
7ff073a1e4 cleaned up old code 2022-11-29 13:26:13 +03:00
Elyor Djalilov
b6a4a50d7d not found keys fixed 2022-11-29 15:26:07 +05:00
Mushka Nikita
ef7a5fc2df fixed indent commit 2022-11-29 13:24:14 +03:00
Mushka Nikita
feace8a3c4 added indent between day-divided segments 2022-11-29 13:23:45 +03:00
ad51993902 Web: Files: fixed setTreeFolders 2022-11-29 13:20:18 +03:00
Elyor Djalilov
4e63364b6f fixed page crash 2022-11-29 15:17:42 +05:00
b9f45035b9 Merge branch 'release/rc-v1.2.0' into feature/migration_personal
# Conflicts:
#	common/ASC.Data.Backup.Core/Contracts/IBackupService.cs
#	common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
#	common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
2022-11-29 13:07:12 +03:00
Mushka Nikita
c3f35494f5 added new getDateTime func to HistoryHelper and implemented it 2022-11-29 13:00:34 +03:00
49f4fa126b Merge branch 'develop' into release/rc-v1.2.0 2022-11-29 12:54:57 +03:00
39f708128b
Update 4testing-multi-build.yml 2022-11-29 12:54:17 +03:00
Mushka Nikita
8822c5c9e5 created historyHelper with getRelativeDateDay function 2022-11-29 12:47:54 +03:00
Mushka Nikita
5bf963d702 destructured historyBlock to its own component 2022-11-29 12:47:17 +03:00
Mushka Nikita
cfddc54524 updated styles for header and subheader to fixed position behaviour 2022-11-29 12:46:45 +03:00
Mushka Nikita
5740f1b7d3 added "Today" and "Yesterday" translation keys to en and ru 2022-11-29 12:45:39 +03:00
Sergey Kirichenko
a0dcdfdf20
Update 4testing-multi-build.yml
fix action
2022-11-29 12:43:58 +03:00
c3dfe6121a Merge branch 'develop' into release/rc-v1.2.0 2022-11-29 12:27:14 +03:00
Akmal Isomadinov
0bdd059032 Web:Client:Pages:AccountsHome:Section:Header fixed className 2022-11-29 14:27:06 +05:00
a907c659dc Web: Client: InvitePanel: Added missing property for Item access selector 2022-11-29 12:23:24 +03:00
Elyor Djalilov
78e9677237 fixed incorrect key 2022-11-29 14:19:16 +05:00
00c782fcb3 Web.Core: removed unnecessary check, changed validation 2022-11-29 12:11:13 +03:00
Elyor Djalilov
812339b19b not translated toasts fixed 2022-11-29 14:06:46 +05:00