|
|
8d89d8e8f2
|
Common: added dbcontext pool
|
2022-07-28 15:29:03 +03:00 |
|
|
|
53737a06e8
|
Merge branch 'develop' into refactoring/client
# Conflicts:
# packages/editor/src/client/components/DynamicComponent.js
# packages/editor/src/client/components/Editor.js
# packages/editor/src/client/components/SelectFileDialog.js
# packages/editor/src/client/components/SelectFolderDialog.js
# packages/editor/src/client/components/SharingDialog.js
# packages/editor/src/client/helpers/utils.js
# packages/editor/src/client/helpers/withDialogs.js
# packages/editor/src/server/lib/helpers/index.js
|
2022-07-28 10:38:29 +03:00 |
|
|
|
ddcde5f7ed
|
Web: Backup: Added error handlers, filtered the list of accounts in the correct order, removed base folder selection .
|
2022-07-27 18:29:27 +03:00 |
|
|
|
0c1ff6ffd7
|
union tests GetLink and ShareRoomByLink
|
2022-07-27 18:22:51 +03:00 |
|
|
|
12e167ca84
|
Files: fix archive folder for WebDav
|
2022-07-27 17:34:10 +03:00 |
|
mushka
|
0bfd5a321e
|
imported new translation keys
|
2022-07-26 20:34:26 +03:00 |
|
mushka
|
f93bf38f82
|
added translation keys and values on ru
|
2022-07-26 20:33:36 +03:00 |
|
mushka
|
d8fac9f0cc
|
disabled iconEditor
|
2022-07-26 19:49:24 +03:00 |
|
mushka
|
67020f4fbf
|
thirdparty dropdown can now go top direction automatically
|
2022-07-26 19:48:56 +03:00 |
|
mushka
|
f8067d87ff
|
enlarged height for dropdownon tablet and >
|
2022-07-26 19:47:51 +03:00 |
|
mushka
|
416bb477ef
|
added loader for creareRoomEvent
|
2022-07-26 19:46:24 +03:00 |
|
|
|
321e44cb94
|
fix SetFilterByTypes
|
2022-07-26 14:55:19 +03:00 |
|
|
|
9a8caeb951
|
backup: update thirdparty
|
2022-07-26 13:50:37 +03:00 |
|
Artem Tarasov
|
2988838060
|
Merge branch 'develop' into bugfix/doceditor-fix
|
2022-07-26 12:32:41 +03:00 |
|
|
|
5dccd8f52c
|
Web: Backup: Added direct third-party connection component.
|
2022-07-26 12:03:35 +03:00 |
|
Artem Tarasov
|
294cdf4881
|
Web: Files/Doceditor: fixed method call SharingPanel.convertSharingUsers (ssr)
|
2022-07-26 11:19:01 +03:00 |
|
mushka
|
7a5fd36201
|
removed unnecessary inject from CreateRoomDialog
|
2022-07-25 18:26:35 +03:00 |
|
mushka
|
400efbcec6
|
added and updated api calls in Files and Tags Stores
|
2022-07-25 18:21:50 +03:00 |
|
mushka
|
63829f01eb
|
integrated new CreateRoomDialog in CreateRoomEvent and added tag functionality
|
2022-07-25 18:20:11 +03:00 |
|
mushka
|
2ce7d29466
|
added clearing output on addTag in TagInput
|
2022-07-25 18:19:24 +03:00 |
|
mushka
|
ccb737f19f
|
new addNewTag and set up for real tag fetching in TagHandler
|
2022-07-25 18:18:11 +03:00 |
|
mushka
|
d9689fd6f9
|
revert of modal callout back to Event method
|
2022-07-25 18:17:22 +03:00 |
|
Artem Tarasov
|
9dcff71504
|
Web: Doceditor/Client: fixed share settings request (ssr)
|
2022-07-25 14:52:18 +03:00 |
|
|
|
8ba9be1208
|
deleted commonfilesdbcontext
|
2022-07-25 14:14:03 +03:00 |
|
|
|
8acb550b08
|
files helpers moved to ASC.Files.Core
|
2022-07-25 14:03:31 +03:00 |
|
|
|
57f797ab24
|
Merge branch 'develop' into feature/migrations-fix
|
2022-07-25 12:59:19 +03:00 |
|
mushka
|
5311ebff5d
|
some fixes and style tweaks in TagInput
|
2022-07-25 04:49:40 +03:00 |
|
mushka
|
720559c759
|
moved checkbox to ThirdpartyComboBox
|
2022-07-25 04:48:58 +03:00 |
|
mushka
|
34aa614127
|
added new components for thirdpartyFolderName param
|
2022-07-25 04:48:27 +03:00 |
|
mushka
|
57c72955b3
|
added thirdpartyFolderName to component state
|
2022-07-25 04:47:20 +03:00 |
|
mushka
|
fc6db0e215
|
overall component structure rebuild + some fixes
|
2022-07-25 03:31:43 +03:00 |
|
mushka
|
80db7bdb0f
|
fixed importing issues
|
2022-07-24 23:46:24 +03:00 |
|
mushka
|
7ba028a12e
|
upwork of tagInput dropdown
|
2022-07-24 23:46:02 +03:00 |
|
mushka
|
e8fec2ada1
|
moved StyledParam to its own file
|
2022-07-24 23:45:09 +03:00 |
|
mushka
|
01ce1e5316
|
fixes on own styled dropdown
|
2022-07-24 23:44:52 +03:00 |
|
mushka
|
55e841a016
|
redo of storage location to a single component
|
2022-07-24 23:44:29 +03:00 |
|
mushka
|
f37ff610b4
|
added rememberStorageLocation to component state
|
2022-07-24 23:42:59 +03:00 |
|
|
|
5877abf2e1
|
thirdparty backup: single connect
|
2022-07-24 22:19:36 +03:00 |
|
mushka
|
42a2ce2292
|
Merge branch 'develop' into feature/create-room
|
2022-07-24 19:03:23 +03:00 |
|
mushka
|
7d7bfb7d03
|
started updating tgiInput with new dropdown component
|
2022-07-24 18:58:11 +03:00 |
|
mushka
|
77f4f6be99
|
imported new styled-component to ThirpartyComboBox
|
2022-07-24 18:57:23 +03:00 |
|
mushka
|
4206f596f6
|
coded out integration with new ModalDialog isScrollLocked prop
|
2022-07-24 18:56:43 +03:00 |
|
mushka
|
fa883c967c
|
moved dropdown styles to its own styled-component
|
2022-07-24 18:55:41 +03:00 |
|
|
|
61ec4a18da
|
migrations moved to external projects
|
2022-07-24 16:02:00 +03:00 |
|
mushka
|
ae78f66b81
|
import fixes
|
2022-07-23 02:09:15 +03:00 |
|
mushka
|
37ade0870f
|
scroll fixation tryouts
|
2022-07-23 02:08:55 +03:00 |
|
mushka
|
83f958ec43
|
changed thirparty param from existing component to my own with custom dropdown
|
2022-07-23 02:08:24 +03:00 |
|
mushka
|
2e54549353
|
fixed styles in TagInput
|
2022-07-23 02:06:28 +03:00 |
|
mushka
|
41ac0b7dfc
|
moved thirparty data to its own file
|
2022-07-23 02:05:57 +03:00 |
|
Vashchuk Nikita
|
db9eaa3b08
|
fix
|
2022-07-22 23:09:16 +03:00 |
|
Vashchuk Nikita
|
b336eafa37
|
Merge branch 'feature/migrations-fix' of github.com:ONLYOFFICE/AppServer into feature/migrations-fix
# Conflicts:
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20220722192649_VoipDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/VoipDbContextPostgreSql/PostgreSqlVoipDbContextModelSnapshot.cs
|
2022-07-22 22:40:58 +03:00 |
|
Vashchuk Nikita
|
94ca41011b
|
recreate migrations
|
2022-07-22 22:34:48 +03:00 |
|
|
|
e7252c4bc4
|
Web: Moved all clients app to packages directory
|
2022-07-22 22:01:25 +03:00 |
|
mushka
|
f5a7b7f6f8
|
finished with TagInput and TagList sub-components
|
2022-07-22 18:16:55 +03:00 |
|
mushka
|
7c39d55118
|
finished ThirpartComboBox
|
2022-07-22 18:14:34 +03:00 |
|
mushka
|
0bbf615c8b
|
added mock fetched tags to tagHandler
|
2022-07-22 18:14:03 +03:00 |
|
mushka
|
f24f2c6bee
|
temporarily disabled room creation api call
|
2022-07-22 18:13:11 +03:00 |
|
|
|
5762bf1b04
|
Files: openedit method extended
|
2022-07-22 17:54:14 +03:00 |
|
|
|
b269b23db3
|
Files: fix initial sharing for private rooms
|
2022-07-22 16:10:57 +03:00 |
|
|
|
beb5628768
|
Files: fix rooms share filter
|
2022-07-22 16:10:27 +03:00 |
|
|
|
0a203dd532
|
Files: added new methods to api
|
2022-07-22 15:55:32 +03:00 |
|
mushka
|
003dc33ba8
|
Merge branch 'develop' into feature/create-room
|
2022-07-22 14:35:47 +03:00 |
|
|
|
7f7b636d9b
|
fix get thirdparty/backup
|
2022-07-22 13:01:23 +03:00 |
|
mushka
|
07e6ccbcf7
|
overall fixes and Image editor tryouts
|
2022-07-22 12:31:26 +03:00 |
|
mushka
|
bf4f2d5bad
|
add ThirpartyComboBox
|
2022-07-22 12:30:53 +03:00 |
|
|
|
df1344b6c1
|
Merge branch 'develop' into feature/private-virtual-rooms
|
2022-07-22 11:57:05 +03:00 |
|
|
|
67f5146d3e
|
Merge branch 'develop' into feature/private-virtual-rooms
|
2022-07-22 11:10:23 +03:00 |
|
TimofeyBoyko
|
d15e4be920
|
Web:Files:TableView: fix table columns for rooms
|
2022-07-22 05:20:30 +03:00 |
|
Artem Tarasov
|
345dad709c
|
Merge branch 'develop' into feature/doceditor-ssr
|
2022-07-21 16:02:48 +03:00 |
|
mushka
|
682b256cbe
|
Merge branch 'develop' into feature/create-room
|
2022-07-21 15:49:10 +03:00 |
|
TimofeyBoyko
|
5d327f39e4
|
Web:Files:FilesStore: remove delete context menu item for room
|
2022-07-21 14:00:14 +03:00 |
|
|
|
31b8cd121e
|
Files: fix
|
2022-07-21 13:40:35 +03:00 |
|
TimofeyBoyko
|
c954aa7f8d
|
Web:Files:FilesStore: fix updateRoomPin for idx === -1
|
2022-07-21 13:09:40 +03:00 |
|
TimofeyBoyko
|
750ecd9e8e
|
Web:Files:ContextOptionsStore: hide delete item from group context menu for rooms
|
2022-07-21 13:04:57 +03:00 |
|
|
|
987788bab7
|
Files: added creating private thirdparty room
|
2022-07-21 12:38:23 +03:00 |
|
TimofeyBoyko
|
77f8eecf78
|
Web:Files: fix header of context menu for rooms
|
2022-07-21 12:01:38 +03:00 |
|
|
|
f92144d9df
|
Files: optimization, refactor
|
2022-07-21 11:49:44 +03:00 |
|
|
|
95323b7fc2
|
Files: added private
|
2022-07-21 11:42:01 +03:00 |
|
|
|
77d311b636
|
Merge branch 'develop' into feature/doceditor-ssr
|
2022-07-21 11:41:42 +03:00 |
|
TimofeyBoyko
|
35cb3027b9
|
Web:Files: fix open archived room
|
2022-07-21 11:34:41 +03:00 |
|
TimofeyBoyko
|
1633d0782a
|
Web:Files:TableView: fix view at room folder when info panel is open
|
2022-07-21 11:24:24 +03:00 |
|
TimofeyBoyko
|
af9011620d
|
Web:People: update filter selected items
|
2022-07-21 10:43:08 +03:00 |
|
TimofeyBoyko
|
5926b22dbb
|
Web:Files:Store: remove pin option from archived folder
|
2022-07-21 10:22:51 +03:00 |
|
mushka
|
98172fc5c9
|
changed overall file structure and improved several components
|
2022-07-21 00:02:42 +03:00 |
|
mushka
|
0ce9f0befa
|
create TagList sub-component for CreateRoom dialog
|
2022-07-21 00:01:16 +03:00 |
|
mushka
|
5b69d83a87
|
coded out interaction with new TagHandler for CreateRoom dialog
|
2022-07-21 00:00:08 +03:00 |
|
mushka
|
30e111c661
|
moved room types data outide of index.js file for CreateRoom dialog
|
2022-07-20 23:59:15 +03:00 |
|
mushka
|
2976b08232
|
created TagHandler form CreateRoom dialog
|
2022-07-20 23:58:19 +03:00 |
|
mushka
|
2cf298bd7d
|
added more translation keys for CreatRoomDialog
|
2022-07-20 23:57:22 +03:00 |
|
TimofeyBoyko
|
602e4af0bb
|
Web:Files: add group delete operation
|
2022-07-20 20:12:08 +03:00 |
|
TimofeyBoyko
|
799d1e7e81
|
Web:Files:Store: after click on pin/unpin update room icon before request is ready
|
2022-07-20 19:18:51 +03:00 |
|
TimofeyBoyko
|
59fb67d3d2
|
Web:Files:Filter: fix clear filter
|
2022-07-20 19:10:27 +03:00 |
|
TimofeyBoyko
|
8c1e727383
|
Web:Files: add default tag 'No tag' for empty tags list of rooms
|
2022-07-20 18:42:42 +03:00 |
|
TimofeyBoyko
|
73598dd0cd
|
Web:Files:Article: fix translate key 'NewRoom'
|
2022-07-20 17:53:20 +03:00 |
|
|
|
a065d9771e
|
Files: added private
|
2022-07-20 17:22:31 +03:00 |
|
TimofeyBoyko
|
6a2f6ff790
|
Web:Files:Filter: fix rooms search
|
2022-07-20 17:04:29 +03:00 |
|
TimofeyBoyko
|
c17aafd658
|
Web:Files:GlobalEvents: restore disabled buttons after onSave click
|
2022-07-20 16:45:50 +03:00 |
|
TimofeyBoyko
|
d2e3bd62f2
|
Web:Files:EmptyContainer: add onCreateRoom func
|
2022-07-20 16:36:06 +03:00 |
|
TimofeyBoyko
|
e505e0f812
|
Web:Files:TilesView: fix position of pin icon for rooms
|
2022-07-20 15:48:26 +03:00 |
|
TimofeyBoyko
|
1495775250
|
Web:Files: add new translation key 'NoTag'
|
2022-07-20 15:25:35 +03:00 |
|
TimofeyBoyko
|
3c199e43be
|
Web:Files:Filter: add withoutMe logic for owner group and fix rooms filter type
|
2022-07-20 15:11:50 +03:00 |
|
TimofeyBoyko
|
7a9114f562
|
Merge branch 'develop' into feature/virtual-rooms-page
|
2022-07-20 14:29:04 +03:00 |
|
|
|
07425ded19
|
Merge pull request #728 from ONLYOFFICE/feature/rooms-filter
Feature/rooms filter
|
2022-07-20 15:17:12 +04:00 |
|
|
|
6ffa21a919
|
fix
|
2022-07-20 14:12:08 +03:00 |
|
TimofeyBoyko
|
6c47a7609d
|
Web:Files:HOCs: disable create files and folders at rooms page
|
2022-07-20 12:49:33 +03:00 |
|
TimofeyBoyko
|
70948c081c
|
Web:Files: add temp creating room dialog
|
2022-07-20 12:45:52 +03:00 |
|
TimofeyBoyko
|
54cf2a5ce4
|
Web:Files:ContextOptionsStore: add group context menu for rooms
|
2022-07-20 09:40:40 +03:00 |
|
TimofeyBoyko
|
3945c50662
|
Web:Files:FilesActionsStore: add changing pin to unpin item for group menu
|
2022-07-20 09:31:17 +03:00 |
|
TimofeyBoyko
|
04daf2b098
|
Web:Files:FilesActionsStore: add group operations for pin and archive rooms
|
2022-07-20 09:24:24 +03:00 |
|
TimofeyBoyko
|
58bbfb4d58
|
Web:Files: add new translation keys for pin/unpin and archive operations
|
2022-07-20 09:23:58 +03:00 |
|
TimofeyBoyko
|
0782af817f
|
Merge branch 'develop' into feature/virtual-rooms-page
|
2022-07-20 08:36:31 +03:00 |
|
mushka
|
fa264ed6f9
|
coded out ChooseRoomDialog and almost finished with ChooseRoomTypeDropdown
|
2022-07-20 02:11:23 +03:00 |
|
mushka
|
370d804ea2
|
added translation keys for header, room titles and descriptions
|
2022-07-20 02:09:31 +03:00 |
|
mushka
|
c8b10fed16
|
updated api requests
|
2022-07-20 02:08:51 +03:00 |
|
|
|
3123ba7993
|
Web: People: fix redirect
|
2022-07-20 00:49:11 +03:00 |
|
|
|
247bd5770f
|
Merge branch 'develop' into feature/async-fix
|
2022-07-19 20:40:52 +03:00 |
|
TimofeyBoyko
|
7d13d8a81a
|
Web:Files: add new translation key 'Owner'
|
2022-07-19 20:36:16 +03:00 |
|
TimofeyBoyko
|
d491829475
|
Web:Files:TableView: fix switch from room list to file list
|
2022-07-19 20:34:00 +03:00 |
|
mushka
|
d99a5b6c5a
|
finished coding interactions of new dialog with other components
|
2022-07-19 20:11:55 +03:00 |
|
mushka
|
3b2d496909
|
Merge branch 'develop' into feature/create-room
|
2022-07-19 19:51:06 +03:00 |
|
mushka
|
1a6f88fcfb
|
added CreateRoomDialog and uipdated dialogsStore
|
2022-07-19 19:50:03 +03:00 |
|
TimofeyBoyko
|
3f8502ab8b
|
Web:Files: add new translation keys for rooms
|
2022-07-19 18:39:44 +03:00 |
|
Artem Tarasov
|
4ddffad7b2
|
Merge branch 'develop' into feature/doceditor-ssr
|
2022-07-19 18:22:16 +03:00 |
|
|
|
66b0e8c303
|
Merge branch 'develop' into bugfix/tfa
|
2022-07-19 18:17:22 +03:00 |
|
mushka
|
676934f4d0
|
commented out print button in BackupCodes dialog
|
2022-07-19 17:54:15 +03:00 |
|
mushka
|
628959b1c4
|
Merge branch 'feature/modal-redesign' of github.com:ONLYOFFICE/AppServer into feature/modal-redesign
|
2022-07-19 17:47:54 +03:00 |
|
TimofeyBoyko
|
4f7a8e2074
|
Web:Files: update rooms translations keys
|
2022-07-19 17:47:42 +03:00 |
|
mushka
|
2f774803f4
|
added close button to Connecting account dialog
|
2022-07-19 17:47:17 +03:00 |
|
TimofeyBoyko
|
d6dd1c4639
|
Web:Files: add new translate keys for checked items of group menu
|
2022-07-19 17:41:26 +03:00 |
|
|
|
067e105814
|
Merge branch 'develop' into feature/modal-redesign
|
2022-07-19 16:58:02 +03:00 |
|
TimofeyBoyko
|
b19839cd9c
|
Web:Files:Header: fix back to parent room
|
2022-07-19 16:47:09 +03:00 |
|
TimofeyBoyko
|
e3aac59cb1
|
Web:Files: fix bug after delete useless page
|
2022-07-19 16:33:12 +03:00 |
|
TimofeyBoyko
|
5a3ec004bd
|
Web:Files: delete useless virtual rooms page and useless store
|
2022-07-19 16:32:02 +03:00 |
|
TimofeyBoyko
|
29f3603703
|
Web:Files:Article: hide buttons for main button mobile for rooms page
|
2022-07-19 16:30:47 +03:00 |
|
|
|
b98524532f
|
Merge branch 'develop' into feature/migrations-fix
# Conflicts:
# common/ASC.Core.Common/EF/Model/CRM/DbVoipCall.cs
# common/ASC.Core.Common/EF/Model/CRM/VoipNumber.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20220711152836_VoipDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/MySqlVoipDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/PostgreSql/VoipDbContextPostgreSql/20220711152837_VoipDbContextPostgreSql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/VoipDbContextPostgreSql/PostgreSqlVoipDbContextModelSnapshot.cs
|
2022-07-19 16:04:29 +03:00 |
|
TimofeyBoyko
|
49825e7c7d
|
Web:Files:Filter: remove filter search withSubfolders and searchInContent for rooms filter
|
2022-07-19 16:02:00 +03:00 |
|
TimofeyBoyko
|
21e641291f
|
Web:Files:Article: delete useless code
|
2022-07-19 15:48:06 +03:00 |
|
TimofeyBoyko
|
228c8ae3fa
|
Web:Files: add new translation key 'NewRoom'
|
2022-07-19 15:43:02 +03:00 |
|
mushka
|
ff24d3f9d3
|
fixed name truncation and restyled dropdown
|
2022-07-19 15:40:06 +03:00 |
|
|
|
0250a43ba6
|
thirdparty backup
|
2022-07-19 14:56:22 +03:00 |
|
TimofeyBoyko
|
614502c888
|
Web:Files:TilesView: fix margin bottom after rooms list
|
2022-07-19 14:02:58 +03:00 |
|
TimofeyBoyko
|
bfada1a415
|
Web:Files:RowsView: disable quickButtons for files and folder at rooms list
|
2022-07-19 13:57:29 +03:00 |
|
TimofeyBoyko
|
f51f2fbb9c
|
Web:Files:TableView: fix displaying rooms with subfolders
|
2022-07-19 13:49:46 +03:00 |
|
TimofeyBoyko
|
7a7e2a2858
|
Web:Files:FilesStore: add sorting folder to filesList
|
2022-07-19 13:39:13 +03:00 |
|
TimofeyBoyko
|
46363072c5
|
Web:Files:Paging: update logic for rooms
|
2022-07-19 12:58:31 +03:00 |
|
mushka
|
e5fa0d399d
|
fixed members tab and added dropdowns
|
2022-07-19 12:54:34 +03:00 |
|
TimofeyBoyko
|
18bc69774a
|
Web:Files:Header: update action menu for rooms
|
2022-07-19 12:37:47 +03:00 |
|
TimofeyBoyko
|
50ac0f5add
|
Web:Files:Article: update main button for rooms
|
2022-07-19 12:22:57 +03:00 |
|
TimofeyBoyko
|
9b7df9abb4
|
Web:Files:Images: add icon for create room action
|
2022-07-19 12:21:57 +03:00 |
|
TimofeyBoyko
|
c5d47efeaf
|
Web:Files:FilesStore: update canCreate for rooms
|
2022-07-19 12:21:36 +03:00 |
|
TimofeyBoyko
|
a5b57add2a
|
Web:Files:Filter: add withSubfolder and searchInContent for filter
|
2022-07-18 20:26:46 +03:00 |
|
TimofeyBoyko
|
96f3c74f00
|
Web:Files:Utils: add new helpers getDefaultRoomsName
|
2022-07-18 20:08:09 +03:00 |
|
TimofeyBoyko
|
f305990514
|
Web:Files:Constants: add new constatns for filter keys and groups
|
2022-07-18 20:07:45 +03:00 |
|
|
|
a2037eb91d
|
fix build
|
2022-07-18 18:30:08 +03:00 |
|
|
|
1d0db523a8
|
Merge branch 'develop' into feature/rooms-filter
|
2022-07-18 17:27:57 +03:00 |
|
mushka
|
b72b24beb3
|
fixed InfoPanel header
|
2022-07-18 17:19:26 +03:00 |
|
|
|
e849ccd635
|
Files: refactor
|
2022-07-18 17:15:17 +03:00 |
|
|
|
cab55d68f3
|
Files: fix filter, refactor, removed unnecessary
|
2022-07-18 17:11:50 +03:00 |
|
Artem Tarasov
|
10f2cde731
|
Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
# .gitignore
|
2022-07-18 17:05:53 +03:00 |
|
mushka
|
f77d424526
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-07-18 14:58:18 +03:00 |
|
|
|
3bde5f83c9
|
removed ASC.Thumbnails.Svc
fix ASC.Data.Storage.Encryption
fixed ASC.Projects
|
2022-07-18 14:25:25 +03:00 |
|
|
|
ccbac1d3fa
|
consolidated packages
|
2022-07-18 13:50:05 +03:00 |
|
TimofeyBoyko
|
cd6c60c5d7
|
Web:Files:Home: update filter for selected items under filter row
|
2022-07-18 13:33:59 +03:00 |
|
|
|
d94904b6af
|
removed voip
|
2022-07-18 12:24:12 +03:00 |
|
TimofeyBoyko
|
fb05e22bb7
|
Web:Files:Store: add new tagsStore
|
2022-07-17 14:29:24 +03:00 |
|
TimofeyBoyko
|
8832aece23
|
Web:Files: move logic from virtual room page to home page
|
2022-07-16 09:50:32 +03:00 |
|
TimofeyBoyko
|
5074451a98
|
Web:Files:add room logo
|
2022-07-16 09:49:22 +03:00 |
|
|
|
c713d909b3
|
Files: added sharing for admins
|
2022-07-15 16:37:05 +03:00 |
|
|
|
2da8d83a8a
|
add new keys
|
2022-07-15 16:34:46 +03:00 |
|
|
|
1c682bf162
|
Files: refactor
|
2022-07-15 16:33:42 +03:00 |
|
|
|
fe993907ad
|
Merge branch 'feature/modal-redesign' of https://github.com/ONLYOFFICE/AppServer into feature/add-17keys
|
2022-07-15 15:09:49 +03:00 |
|
|
|
bb51d53cc4
|
add new keys-17
|
2022-07-15 15:02:07 +03:00 |
|
|
|
d8980cc3a7
|
fix 57917
|
2022-07-14 20:00:43 +03:00 |
|
mushka
|
d106647ecf
|
tweaked DownloadDialog and fixed overall aside body scroll
|
2022-07-14 17:45:18 +03:00 |
|
mushka
|
1b895976f5
|
fixed DownloadAs panel
|
2022-07-14 17:26:21 +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 |
|
TimofeyBoyko
|
7532dc199f
|
Web:Files:Article: remove useless 'type' from onClick and work with folder id
|
2022-07-14 07:12:31 +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 |
|
|
|
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 |
|
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
|
f63c570349
|
fixed ConvertDialog translations
|
2022-07-13 17:55:30 +03:00 |
|
|
|
1c491af30c
|
Files: refactor
|
2022-07-13 17:11:06 +03:00 |
|
|
|
5116642b95
|
Files: added private
|
2022-07-13 17:10:51 +03:00 |
|
|
|
c03e1a443a
|
Files: added restrictions on sharing for private rooms
|
2022-07-13 16:33:44 +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 |
|
|
|
552d2adda8
|
Files: deleted unnecessary
|
2022-07-13 13:42:40 +03:00 |
|
|
|
256885f4e3
|
Files: fix, deleted unnecessary
|
2022-07-13 13:42:17 +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 |
|
|
|
cad67a6f57
|
Web: RestoreBackup: Refactoring.
|
2022-07-13 12:20:33 +03:00 |
|
|
|
b0eb883e20
|
Web: Fixed saving settings, refactoring.
|
2022-07-13 12:20:33 +03:00 |
|
|
|
51418fc141
|
WEb: AutoBackup: Added new option for third-party accounts.
|
2022-07-13 12:20:30 +03:00 |
|
|
|
05db277f00
|
Web: AutoBackup: Added disable input if folder was deleted, added removing folder when switch between options.
|
2022-07-13 12:20:30 +03:00 |
|
|
|
41a2c421b1
|
Web: ManualBackup: Added new option for Third-party accounts.
# Conflicts:
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/DesktopView.js
|
2022-07-13 12:20:29 +03:00 |
|
|
|
120a57c1bf
|
Merge branch 'develop' into feature/room_tests
|
2022-07-13 11:56:48 +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 |
|
|
|
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 |
|
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 |
|
|
|
c1be6ecb61
|
Settings: ignore id
|
2022-07-12 15:33:46 +03:00 |
|
|
|
72b00ffe94
|
Merge branch 'develop' into feature/modal-redesign
|
2022-07-12 14:24:11 +03:00 |
|
|
|
fa8898d522
|
Files: fixed converter
|
2022-07-12 14:18:26 +03:00 |
|
TimofeyBoyko
|
9bfb54bcc3
|
Web:Files:VirtualRooms: add group menu for virtual room pages
|
2022-07-12 14:05:51 +03:00 |
|
mushka
|
96e85f9cb3
|
Merge branch 'develop' into feature/modal-redesign
|
2022-07-12 12:34:43 +03:00 |
|
TimofeyBoyko
|
1bee56d3aa
|
Web:Files:VirtualRooms: disable open archived rooms and fix logo
|
2022-07-12 10:22:46 +03:00 |
|
|
|
b2b55bfa5b
|
fixed subfolders method
|
2022-07-11 22:22:56 +03:00 |
|
mushka
|
75a3a741c6
|
fixed SelectFile and SelectFolder styles
|
2022-07-11 21:20:52 +03:00 |
|
mushka
|
35bde337bc
|
fixed dialogs for create and rename global actions
|
2022-07-11 19:31:59 +03:00 |
|
Vashchuk Nikita
|
5cfb69ae48
|
recreated all migrations
|
2022-07-11 18:33:57 +03:00 |
|
Vashchuk Nikita
|
bc0ad53e8f
|
changed int type to tinyint(1) for bool
|
2022-07-11 18:31:00 +03:00 |
|
mushka
|
9d13e3a4c4
|
Merge branch 'develop' into feature/modal-redesign
|
2022-07-11 17:39:20 +03:00 |
|
TimofeyBoyko
|
58bd9509a1
|
Web:Files:Hocs: fix keyup on create docx after merge
|
2022-07-11 17:13:51 +03:00 |
|
|
|
1face3ea40
|
Files: added searching rooms without tags only
|
2022-07-11 17:13:30 +03:00 |
|
TimofeyBoyko
|
a0651ecca4
|
Web:Files:HOCs: fix create operation with hotkeys
|
2022-07-11 16:36:46 +03:00 |
|
TimofeyBoyko
|
76dd9dd97d
|
Web:Files:VirtualRooms: add open room action to all view
|
2022-07-11 16:23:02 +03:00 |
|
TimofeyBoyko
|
8838d7282a
|
Web:Files:Store: add onOpenRoom action
|
2022-07-11 16:22:37 +03:00 |
|
TimofeyBoyko
|
cdd6bc40b5
|
Web:Files:Home: refactoring section header
|
2022-07-11 16:20:59 +03:00 |
|
TimofeyBoyko
|
67d1a49ffa
|
Web:Files:Home: upgrage onClickFolder at section header to work with rooms
|
2022-07-11 16:09:27 +03:00 |
|
TimofeyBoyko
|
a754d7fb71
|
Web:Files:Home: upgrage onBackToParentFolder at section header to work with rooms
|
2022-07-11 15:57:39 +03:00 |
|
Vashchuk Nikita
|
f13263c75a
|
fix contexts after merge
|
2022-07-11 15:43:06 +03:00 |
|
TimofeyBoyko
|
95e03a49d2
|
Merge branch 'develop' into feature/virtual-rooms-page
|
2022-07-11 14:55:50 +03:00 |
|
TimofeyBoyko
|
91ca312871
|
Merge branch 'develop' into feature/create-from-modal
|
2022-07-11 14:51:45 +03:00 |
|
TimofeyBoyko
|
5f41dc12ed
|
Web:Files:Store: delete useless selectedRoomsStore
|
2022-07-11 14:21:47 +03:00 |
|
TimofeyBoyko
|
50620640eb
|
Web:Files:SelectedFolderStore: add isPinned and roomType
|
2022-07-11 14:21:21 +03:00 |
|
TimofeyBoyko
|
4e63873bc4
|
Web:Files:FilesStore: add isRoom and isRootRoom for navigationPath at fetchFiles
|
2022-07-11 14:20:47 +03:00 |
|
|
|
45ae2510ab
|
Merge branch 'bugfix/fix-rooms-filter' into feature/rooms-api
|
2022-07-11 13:41:43 +03:00 |
|
Vashchuk Nikita
|
e49d082fa3
|
Merge branch 'develop' into feature/migrations-fix
# Conflicts:
# common/ASC.Core.Common/EF/Model/Core/Acl.cs
# common/ASC.Core.Common/GlobalUsings.cs
# common/ASC.Core.Common/Messaging/EventMessage.cs
# common/ASC.Core.Common/Messaging/LoginEvent.cs
# common/ASC.Core.Common/Messaging/MessageTarget.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20211012145320_CoreDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20220708104408_FilesDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20220708104408_FilesDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20220708104428_MessagesContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20220708104428_MessagesContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20211012145322_UserDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20220708104402_UserDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/MySqlUserDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/PostgreSql/CoreDbContextPostgreSql/20211012145321_CoreDbContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20220708104409_FilesDbContextPostgreSql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20220708104409_FilesDbContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20211012145335_MessagesContextPostgreSql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20211012145335_MessagesContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20220708104429_MessagesContextPostgreSql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20220708104429_MessagesContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/TenantDbContextPostgreSql/20211012145343_TenantDbContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/UserDbContextPostgreSql/20211012145323_UserDbContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/UserDbContextPostgreSql/20220708104403_UserDbContextPostgreSql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/UserDbContextPostgreSql/PostgreSqlUserDbContextModelSnapshot.cs
# common/ASC.Data.Backup.Core/Migrations/MySql/BackupsContextMySql/20220708104422_BackupsContextMySql.Designer.cs
# common/ASC.Data.Backup.Core/Migrations/PostgreSql/BackupsContextPostgreSql/20220708104423_BackupsContextPostgreSql.Designer.cs
# common/ASC.MessagingSystem/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.Designer.cs
# common/ASC.MessagingSystem/Migrations/PostgreSql/MessagesContextPostgreSql/20211012145335_MessagesContextPostgreSql.Designer.cs
# common/ASC.Resource.Manager/ResourceData.cs
# common/services/ASC.AuditTrail/GlobalUsings.cs
# products/ASC.Files/Core/Core/EF/DbFilesThirdpartyAccount.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
# products/ASC.Files/Core/Migrations/PostgreSql/FilesDbContextPostgreSql/20211022170841_FilesDbContextPostgreSql.cs
# products/ASC.Files/Core/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
# web/ASC.Web.Api/GlobalUsings.cs
|
2022-07-11 13:28:49 +03:00 |
|
|
|
7dfaf60592
|
Files: refactoring
|
2022-07-10 22:21:09 +03:00 |
|
Artem Tarasov
|
120f5f7b17
|
Web: Files/People/Client/Login: updated version webpack-cli 4.9.0 -> 4.10.0
|
2022-07-10 12:34:16 +03:00 |
|
Artem Tarasov
|
55198d0e7f
|
Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
# web/ASC.Web.Editor/src/i18n.js
# web/ASC.Web.Editor/webpack.config.js
# yarn.lock
|
2022-07-10 11:23:44 +03:00 |
|
TimofeyBoyko
|
42cc6dc5a5
|
Web:Files:Home: remove useless sorting from section body of tile view
|
2022-07-08 18:06:52 +03:00 |
|
|
|
70c1476686
|
Files: added sorting by room type/tags
|
2022-07-08 17:31:37 +03:00 |
|
mushka
|
58e68c1c12
|
Merge branch 'develop' into feature/modal-redesign
|
2022-07-08 17:23:02 +03:00 |
|
|
|
63c2c34d44
|
refactoring tests
|
2022-07-08 15:31:07 +03:00 |
|
TimofeyBoyko
|
fffe60a1c7
|
Web:Files:VirtualRooms:TileView/TableView: add select tag to filter function
|
2022-07-08 15:00:30 +03:00 |
|
TimofeyBoyko
|
ee572da527
|
Web:Files:RoomsActionsStore: add onSelectTag action
|
2022-07-08 14:41:55 +03:00 |
|
TimofeyBoyko
|
a6a0bb9cc2
|
Web:Files:Store: init roomsActionsStore
|
2022-07-08 14:41:32 +03:00 |
|
|
|
cc052101e7
|
Files: added blocking rewriting for encrypted files
|
2022-07-08 14:34:13 +03:00 |
|
Vashchuk Nikita
|
4628769136
|
fix Contexts,
fix migrations,
removed MailDbContext.cs,
moved ResourceDbContext.cs
|
2022-07-08 14:24:18 +03:00 |
|
|
|
b294b557b0
|
removed ConfigureAwait
|
2022-07-08 13:39:07 +03:00 |
|
|
|
e80613e8db
|
Files: fix
|
2022-07-08 13:28:27 +03:00 |
|
TimofeyBoyko
|
4a2aa14722
|
Web:Files:Article: delete useless code after merge
|
2022-07-08 13:23:06 +03:00 |
|
mushka
|
3facc47665
|
removed reasssign data link and unuseful comment from DeleteUser and ConnectCloud
|
2022-07-08 12:50:44 +03:00 |
|
TimofeyBoyko
|
c8feb7899b
|
Merge branch 'develop' into feature/virtual-rooms-page
|
2022-07-08 12:32:26 +03:00 |
|
TimofeyBoyko
|
f85b116721
|
Web:Files:Home: refactoring section filter
|
2022-07-08 12:23:57 +03:00 |
|
TimofeyBoyko
|
723716dbc8
|
Web:Files:VirtualRooms: update filter
|
2022-07-08 12:10:17 +03:00 |
|
TimofeyBoyko
|
f46add9687
|
Web:Files:RoomsStore: add filterRooms, sortRooms, searchRoom
|
2022-07-08 12:09:57 +03:00 |
|
|
|
0504838691
|
fix tests
|
2022-07-08 11:46:34 +03:00 |
|
|
|
59a78409b4
|
Files: optimization
|
2022-07-08 11:17:11 +03:00 |
|
TimofeyBoyko
|
0ecb0ed9f7
|
Web:Files:VirtualRooms: delete tag from row info
|
2022-07-08 10:49:53 +03:00 |
|
mushka
|
89dd7ab365
|
fixed translations, styles and dark theme for ConnectCloud
|
2022-07-07 19:25:31 +03:00 |
|
|
|
4dcd8ba31a
|
Merge branch 'develop' into feature/async-fix
# Conflicts:
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
|
2022-07-07 19:09:35 +03:00 |
|
|
|
b8a2cf5292
|
Files: update docstore submodule
- update en demo templates
- update empty az
- added gl-ES, eu-ES, hy-AM, ms-MY
|
2022-07-07 18:11:42 +03:00 |
|
|
|
c78370b5b1
|
Merge branch 'develop' into feature/private-virtual-rooms
|
2022-07-07 17:58:04 +03:00 |
|
|
|
c8458858e0
|
Merge branch 'develop' into feature/room_tests
|
2022-07-07 17:56:40 +03:00 |
|
|
|
f8c27acc7d
|
Merge branch 'develop' into feature/room_tests
|
2022-07-07 17:56:15 +03:00 |
|
|
|
912bb3ed36
|
Merge pull request #711 from ONLYOFFICE/feature/rooms-archive-delete-after
Feature/rooms-archive-delete-after
|
2022-07-07 17:55:40 +03:00 |
|
mushka
|
4ef6970583
|
fixed translations and styles on ThirdPartyMove dialog
|
2022-07-07 17:54:28 +03:00 |
|
|
|
2bc07e0a1d
|
Files: added DeleteAfter for archiving/unarchiving rooms
|
2022-07-07 17:52:20 +03:00 |
|
|
|
b5d082d816
|
room tests:first version
|
2022-07-07 17:45:23 +03:00 |
|
|
|
7af929fee8
|
Merge branch 'release/v1.2' into develop
# Conflicts:
# common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs
# common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
# products/ASC.People/Server/Controllers/PeopleController.cs
# products/ASC.People/Server/Models/MemberModel.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
|
2022-07-07 17:41:41 +03:00 |
|
mushka
|
2ba523da5f
|
fixed translations in ConflictResolve, Convert, MoveToTrash, DeleteUser and DeleteUsers dialogs
|
2022-07-07 17:40:23 +03:00 |
|
|
|
c3b505f08e
|
fix Bug 58035
|
2022-07-07 16:34:47 +03:00 |
|
|
|
f52162827e
|
Files: added DeleteAfter for rooms
|
2022-07-07 16:20:44 +03:00 |
|
|
|
f28a372418
|
Fix Bug 58040: active download button
|
2022-07-07 14:52:26 +03:00 |
|
|
|
75251220ba
|
Web: Files: ThirdPartyDialog: fix condition
|
2022-07-07 13:45:26 +03:00 |
|
mushka
|
a75fdc7690
|
fixed ChangedStatus and DeleteUsers
|
2022-07-07 13:36:50 +03:00 |
|
|
|
a171129d5f
|
Fix Bug 58041: add cloud button not work
|
2022-07-07 13:36:19 +03:00 |
|
|
|
a04ae63a82
|
MemberModel: CultureName
|
2022-07-07 12:05:31 +03:00 |
|
|
|
0b21b748fc
|
Merge branch 'develop' into feature/private-virtual-rooms
|
2022-07-07 11:28:57 +03:00 |
|
|
|
12eb702d2d
|
Merge branch 'develop' into bugfix/fix-rooms-filter
|
2022-07-07 10:28:11 +03:00 |
|
|
|
ca799f867f
|
Fix Bug 57980: wrong tip position
|
2022-07-07 00:20:22 +03:00 |
|
|
|
1867ec9822
|
Files: fixed type/tags filters with subfolders
|
2022-07-06 23:14:45 +03:00 |
|
|
|
45466dad44
|
Files: removed unnecessary
|
2022-07-06 23:13:43 +03:00 |
|
|
|
baa72db316
|
removed referencies
|
2022-07-06 18:47:16 +03:00 |
|
|
|
e06c076f80
|
Fix Bug 58009 - Client.Clouds.AsNew. The New label of a third-party storage folder will not disappear after marking Mark all as read by the icon next to the folder.
|
2022-07-06 18:46:17 +03:00 |
|
mushka
|
3fd65e887d
|
Merge branch 'release/v1.2' into feature/modal-redesign
|
2022-07-06 18:13:33 +03:00 |
|
|
|
398a87fc3d
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-07-06 18:07:22 +03:00 |
|
|
|
27109aae4a
|
Fix Bug 57965: Added a scrollbar for the list of formats.
|
2022-07-06 18:06:32 +03:00 |
|
mushka
|
b80f1c3237
|
redesigned SendInviteDialog and fixed VersionHistory
|
2022-07-06 18:01:38 +03:00 |
|
|
|
671addab40
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-07-06 17:56:59 +03:00 |
|
|
|
fcb184a036
|
Fixed Bug 57646 - Removed the hanging of loaders when creating files sequentially.
|
2022-07-06 17:56:32 +03:00 |
|
|
|
771dffbcce
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-07-06 17:47:15 +03:00 |
|
|
|
58c9da7e52
|
Fix Bug 58006 - Client.Files.Clouds. The edit icon for the file 'pencil' in the third-party storage folder only disappears after a page refresh.
|
2022-07-06 17:47:01 +03:00 |
|
|
|
31e5027d74
|
edit it (Translations.json)
|
2022-07-06 14:52:53 +03:00 |
|
|
|
600487e25d
|
Fixed Bug 58011 - Client.Files. Fixed file selection after renaming
|
2022-07-06 14:34:52 +03:00 |
|
|
|
1a00edc87c
|
Fixed Bug 57639: Added new icons for form actions. Fixed accordion menu sublevel padding and restored icons displaying.
|
2022-07-06 14:23:27 +03:00 |
|
mushka
|
a1b9fe1523
|
redesigned ThirdPartyMove and fixed radio buttons on ConflictResolve
|
2022-07-06 13:49:56 +03:00 |
|
|
|
2b5bd41a9a
|
Web: Files: removed duplicate openDocEditor function, changed file status after opening file
|
2022-07-06 13:14:01 +03:00 |
|
mushka
|
ce4e9c26fd
|
removed divider from ConflicResolve and added second btn to ChangeEmail and ChangePassword
|
2022-07-06 13:02:52 +03:00 |
|
|
|
a58cf941d3
|
fixed finalize version
|
2022-07-06 11:50:50 +03:00 |
|
|
|
a9004e30dc
|
Fix Bug 58003: editing component background
|
2022-07-06 11:39:37 +03:00 |
|
TimofeyBoyko
|
459b812d16
|
Web:Files:VirtualRooms: update section directory
|
2022-07-06 11:01:23 +03:00 |
|
|
|
c7d1850f58
|
Fix Bug 57999: footer on ThirdPartyDialog
|
2022-07-05 23:36:24 +03:00 |
|
|
|
dc711916a6
|
Fix Bug 57944 - Client.Files.Thumbnails. Instead of a preview of the document, the file icon is displayed after editing it.
|
2022-07-05 22:39:34 +03:00 |
|
|
|
373ece222e
|
Fix Bug 57945 - Client.Files.Thumbnails. Icons 'pencil' and icon-button 'share' are disappear after thumbnail has been created
|
2022-07-05 18:55:47 +03:00 |
|
|
|
82f1759813
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-07-05 17:25:12 +03:00 |
|
|
|
7f38577332
|
Web: Translations: Removed useless translation key 'SharingSettings' (Replaced with "SharingPanel:SharingSettingsTitle")
|
2022-07-05 17:25:06 +03:00 |
|
mushka
|
cdcfdccb57
|
fixed SelectFile and SelectFolder panels && moved their footers to ModalDialog.Footer subcomponent
|
2022-07-05 17:23:59 +03:00 |
|
|
|
aeac8613a8
|
Merge branch 'develop' into features/enum_generator
|
2022-07-05 17:22:43 +03:00 |
|
|
|
69fccb5086
|
fix Bug 57979
|
2022-07-05 17:17:50 +03:00 |
|
|
|
e45541e8f8
|
Web: Translations: Removed useless translation key 'DeleteThirdParty'
|
2022-07-05 17:07:40 +03:00 |
|
|
|
1218d31a42
|
enum generator
|
2022-07-05 16:58:11 +03:00 |
|
|
|
ed45bb0118
|
Fix Bug 57978 - Client.Clouds. Rename button 'Delete third-party' to 'Disconnect'
|
2022-07-05 16:58:05 +03:00 |
|
|
|
393282ea92
|
Push: resources
|
2022-07-05 16:40:16 +03:00 |
|
|
|
e7ece44c01
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-07-05 16:37:57 +03:00 |
|
|
|
ac38e7c9a9
|
fix
|
2022-07-05 16:37:28 +03:00 |
|
|
|
077dfbd334
|
Web: Translations: Removed useless translations (key "MoveConfirmationAlert").
|
2022-07-05 16:35:49 +03:00 |
|
|
|
e9f790e95c
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-07-05 16:31:09 +03:00 |
|
|
|
4d62881a3c
|
Fixed Bug 57984: Tapping on folder title after canceling creation of form from file leads to an error
|
2022-07-05 16:30:59 +03:00 |
|
|
|
f54fd4ef71
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-07-05 16:19:13 +03:00 |
|
|
|
5c550849e2
|
Web: Files: Deleted useless code.
|
2022-07-05 16:19:02 +03:00 |
|
|
|
b7ca559bd4
|
fix
|
2022-07-05 16:03:31 +03:00 |
|
|
|
6ddb05512a
|
Fixed Bug 57973 - Web: Files: Changed view for "Move to" dialog.
|
2022-07-05 15:56:26 +03:00 |
|
|
|
273854bf84
|
Push: fix FirebaseHelper
|
2022-07-05 15:55:46 +03:00 |
|
mushka
|
6566ca8645
|
removed unnecessary extra margin from second button on several dialogs
|
2022-07-05 15:31:17 +03:00 |
|
mushka
|
6c13d87e92
|
fixed MoveFileToTrash dialog
|
2022-07-05 14:05:00 +03:00 |
|
mushka
|
3efe86b053
|
Merge branch 'feature/modal-redesign' of github.com:ONLYOFFICE/AppServer into feature/modal-redesign
|
2022-07-05 13:55:08 +03:00 |
|
mushka
|
58aa87ff19
|
fixed Article CloseBtn and Header offset
|
2022-07-05 13:53:43 +03:00 |
|
|
|
a15fdeb4f1
|
Fixed Bug 57986 - Client.Files. Fixed file selection after clicking on the context menu
|
2022-07-05 13:35:29 +03:00 |
|
|
|
36ea73cbdc
|
Web: People: ProfileInfo: add offsetLeft
|
2022-07-05 13:34:50 +03:00 |
|
|
|
9841588f65
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-07-05 13:09:42 +03:00 |
|
|
|
62e6a84b51
|
Fix Bug 57964 - Client.Files.Share. Rename Sharing setting on 'ru'
|
2022-07-05 13:09:35 +03:00 |
|
|
|
422ec8baf2
|
Fix Bug 57982: console error if filter by missing file types
|
2022-07-05 13:05:59 +03:00 |
|
|
|
04b211f1bd
|
fix
|
2022-07-05 12:59:15 +03:00 |
|
|
|
c8c40948a2
|
Fixed Bug 57789 - Mobile. Redesigned delete dialog
|
2022-07-05 12:57:36 +03:00 |
|
mushka
|
15d1c4d65b
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-07-05 12:54:41 +03:00 |
|
mushka
|
34ac4b7e5d
|
Fix Bug 57981: changed wrong icon on Open location ContextMenu action
|
2022-07-05 12:54:33 +03:00 |
|
|
|
f041359d3a
|
Fix Bug 57953: show new badge on folder tile
|
2022-07-05 12:54:27 +03:00 |
|
|
|
c7b556131e
|
Web: Files: Header: Fixed translation keys for sublevel of creating menu
|
2022-07-05 12:43:09 +03:00 |
|
|
|
7391469381
|
Web: Files: Article: Fixed displaying icons on sublevel
|
2022-07-05 12:42:11 +03:00 |
|
mushka
|
9f002e3249
|
Merge branch 'release/v1.2' into feature/modal-redesign
|
2022-07-05 12:17:58 +03:00 |
|
mushka
|
b179390243
|
fix of DeleteForever dialog
|
2022-07-05 12:12:44 +03:00 |
|
TimofeyBoyko
|
5be87292a4
|
Web:Files:Store: update rooms store and context options store, add rooms actions store and selected rooms store
|
2022-07-05 10:05:56 +03:00 |
|
TimofeyBoyko
|
3bd7b6f465
|
Web:Files:VirtualRooms: add filter for rooms
|
2022-07-05 10:05:17 +03:00 |
|
TimofeyBoyko
|
c6eaa0f41a
|
Web:Files:VirtualRooms: refactoring tile view
|
2022-07-05 10:04:41 +03:00 |
|
TimofeyBoyko
|
65819730b9
|
Web:Files:VirtualRooms: refactoring table view and add sorting
|
2022-07-05 10:04:19 +03:00 |
|
|
|
90fe1383b7
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-07-04 18:04:06 +03:00 |
|
|
|
ba8b14273a
|
Web: Files: SharingPanel: delete useless import
|
2022-07-04 17:53:26 +03:00 |
|
|
|
f95f91d737
|
Fix Bug 53335: disable save button if no change
|
2022-07-04 17:51:14 +03:00 |
|
|
|
d8a459f397
|
Web: i18n: Replaced i18next-http-backend package with custom realization from @appserver/common/utils/i18next-http-backend (fix issue: too many same translations files are loading at once)
|
2022-07-04 17:47:12 +03:00 |
|
|
|
b2779ff9ac
|
Fix Bug 57955: click new badge error
|
2022-07-04 17:28:53 +03:00 |
|
|
|
45406dec07
|
fix total
|
2022-07-04 16:42:29 +03:00 |
|
|
|
1e0962a11a
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-07-04 15:49:11 +03:00 |
|
|
|
421070f3a3
|
Fix Bug 57864: For phones in landscape orientation, shifting the list of access rights to the right in ExternalLink to personal.
|
2022-07-04 15:48:42 +03:00 |
|
|
|
19095f9108
|
files: async fix
|
2022-07-04 14:51:17 +03:00 |
|
|
|
1576609ed9
|
Fix Bug 57951: clear trash doesn't work on mobile
|
2022-07-04 14:27:36 +03:00 |
|
|
|
18c415c9d3
|
Fix Bug 57947: show cancel button
|
2022-07-04 14:07:13 +03:00 |
|
TimofeyBoyko
|
5789eb1f1f
|
Web:Files:VirtualRooms: update virtual rooms section header with selected store
|
2022-07-04 14:05:28 +03:00 |
|
|
|
d8af680616
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-07-04 13:55:47 +03:00 |
|
|
|
630ae2489b
|
Fixed Bug 57681 - Client. Removed the checkbox when opening the context menu
|
2022-07-04 13:55:38 +03:00 |
|
mushka
|
24c0397ef0
|
fixed DeleteProfileEver and DeleteUsersDialog + fixed ModalDialogComponent
|
2022-07-04 13:20:18 +03:00 |
|
|
|
bff918c442
|
Files: added block trash for deleting files in private virtual rooms
|
2022-07-04 12:38:14 +03:00 |
|
|
|
2f9cada7e2
|
Files: fix
|
2022-07-04 12:36:56 +03:00 |
|
mushka
|
f88b82670a
|
tweaks on ModalDialog component
|
2022-07-04 12:12:02 +03:00 |
|
|
|
fb09f62881
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-07-04 11:39:38 +03:00 |
|
|
|
0f901bf6e3
|
added hy-AM
|
2022-07-04 11:38:57 +03:00 |
|
|
|
5ea7dfcb0c
|
Web: Files: MainButton: use withoutIcon
|
2022-07-04 07:24:32 +03:00 |
|
|
|
c6691b5de6
|
Web: Files: MainButton: add submenu for mobile
|
2022-07-04 07:10:07 +03:00 |
|
|
|
d37a6eaede
|
Web: Files: Header: add submenu for plus
|
2022-07-04 06:17:00 +03:00 |
|
TimofeyBoyko
|
8b87d68924
|
Web:Files:VirtualRooms: refactoring
|
2022-07-04 04:58:40 +03:00 |
|
TimofeyBoyko
|
c2356c6f7b
|
Web:Files:VirtualRooms: refactoring tile view
|
2022-07-04 04:51:34 +03:00 |
|
TimofeyBoyko
|
4f627eac5d
|
Web:Files:VirtualRooms: refactoring table view
|
2022-07-04 04:51:20 +03:00 |
|
TimofeyBoyko
|
8326d99c4a
|
Web:Files:VirtualRooms: add row view
|
2022-07-04 04:50:57 +03:00 |
|
|
|
29b8826ab3
|
fix
|
2022-07-03 22:39:43 +03:00 |
|
|
|
0e423430be
|
Merge branch 'develop' into feature/async-fix
# Conflicts:
# products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Security/FileSecurity.cs
# products/ASC.Files/Core/Core/Security/ISecurityDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderTagDao.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Core/Utils/FileMarker.cs
|
2022-07-03 22:19:53 +03:00 |
|
|
|
d6b7db91e3
|
Web: Translations: Added translations minimization
|
2022-07-03 13:25:41 +03:00 |
|
TimofeyBoyko
|
62e8b7d761
|
Web:Files:Article: fix double fetching rooms after change root room
|
2022-07-03 08:11:54 +03:00 |
|
Artem Tarasov
|
2ef94f75da
|
Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
# products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
# web/ASC.Web.Editor/package.json
# web/ASC.Web.Editor/src/Editor.jsx
# web/ASC.Web.Editor/webpack.config.js
# yarn.lock
|
2022-07-01 23:41:10 +03:00 |
|
|
|
5d4715e674
|
fix
|
2022-07-01 17:37:09 +03:00 |
|
|
|
d8291efa30
|
Fixed Bug 57933 - Client.Files.Info. Fixed console error ‘Uncaught (in promise) TypeError: l.findIndex is not a function’
|
2022-07-01 17:30:08 +03:00 |
|
|
|
d1677a8070
|
Web: Files: fixed hotkeys scroll
|
2022-07-01 16:02:14 +03:00 |
|
|
|
c9d3382b34
|
Fixed Bug 57927 - Client.FormsGallary.Info. ‘Something went wrong’ when opening the info-panel
|
2022-07-01 14:58:24 +03:00 |
|
|
|
85ef85df76
|
Web: Translations: Removed useless translations (key "FormTemplateInfo")
|
2022-07-01 14:34:58 +03:00 |
|
|
|
634bae6002
|
Fix Bug 57926 - Client.FormsGallary.Info.The name of the info panel in some languages in two lines.
|
2022-07-01 14:33:38 +03:00 |
|
Vashchuk Nikita
|
bdbd6bd65e
|
Recreating and fixing migrations
|
2022-07-01 14:27:28 +03:00 |
|
Vashchuk Nikita
|
5a0acc8eaa
|
Renaming folders for contexts and models
|
2022-07-01 14:23:07 +03:00 |
|
|
|
3a85143514
|
Files: added block removing to trash from private virtual room
|
2022-07-01 14:02:08 +03:00 |
|
|
|
381d9165cb
|
Fix Bug 57920: Fixed clearing selection after update items list on delete elements
|
2022-07-01 13:00:48 +03:00 |
|
|
|
7e34e45371
|
ElasticSearch: disabled by default
|
2022-07-01 12:53:18 +03:00 |
|
TimofeyBoyko
|
b107cad79b
|
Web:Files:Store: update context menu archive item for archived rooms
|
2022-07-01 11:48:11 +03:00 |
|
TimofeyBoyko
|
bca685850a
|
Merge branch 'feature/virtual-rooms-page' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-page
|
2022-07-01 11:22:56 +03:00 |
|
|
|
45ce1387ba
|
Web: Files: hidden context menu button for editing component
|
2022-07-01 10:43:07 +03:00 |
|
TimofeyBoyko
|
3e07ef1efc
|
Merge branch 'develop' into feature/virtual-rooms-page
|
2022-07-01 10:09:47 +03:00 |
|
