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 |
|
|
|
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 |
|
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 |
|
|
|
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 |
|
|
|
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 |
|
