Commit Graph

10089 Commits

Author SHA1 Message Date
TimofeyBoyko
5926b22dbb Web:Files:Store: remove pin option from archived folder 2022-07-21 10:22:51 +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
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
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
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
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
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
2da8d83a8a add new keys 2022-07-15 16:34:46 +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
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
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