Commit Graph

985 Commits

Author SHA1 Message Date
bc671b4332 Web: Files: fixed pathParts error 2020-07-14 10:14:53 +03:00
88e932a0a7 Merge branch 'master' into feature/files 2020-07-13 16:46:42 +03:00
a347f4e4f3 fix 2020-07-13 16:18:31 +03:00
Alexey
e5b71cff4f Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/store/files/actions.js
2020-07-13 16:00:32 +03:00
a822f9b349 Files: fix 2020-07-13 15:57:39 +03:00
dfd8bbfdb8 Merge branch 'master' into feature/api-defaultvalue 2020-07-13 15:28:11 +03:00
a0fddf446d Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-07-13 13:17:09 +03:00
d109aab32b Web: Files: moved progress to redux 2020-07-13 13:17:00 +03:00
Alexey
3ca42459a1 Web: Files: Separated the logic of the Filter and ViewSelector 2020-07-13 12:10:40 +03:00
b7d79e9a2f Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-07-12 20:48:30 +03:00
4efe98ff9e Revert "Fix Re-rendered because of props changes: props.onClick"
This reverts commit 7c8f84ab8b.
2020-07-12 20:48:15 +03:00
Alexey
e3294771ce Web: Files: Home: Fixed selection of elements on Tile view 2020-07-12 12:49:25 +03:00
Alexey
031788ba50 Web: Files: Home: Fixed init styled TileContent outside render 2020-07-12 11:52:56 +03:00
Alexey
5b027aa170 Web: Files: Home: Removed the header if there are no files or folders. Refactoring 2020-07-12 11:37:25 +03:00
064160a1ea Files: onedrive 2020-07-10 18:37:02 +03:00
Alexey
5423d392f8 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-07-10 16:01:48 +03:00
Ilya Oleshko
63bf62d331 Web: Files: Home: Fixed check event for onEditComplete action 2020-07-10 16:00:09 +03:00
Alexey
b99d3c5e7d Web: Files: Tile: Mobile style fix 2020-07-10 15:41:06 +03:00
45678da8e5 Merge branch 'master' into feature/files 2020-07-10 14:58:37 +03:00
56df9a98ef Files: resources 2020-07-10 14:57:42 +03:00
6f316242cb Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-07-10 14:38:44 +03:00
Ilya Oleshko
2ff6c73876 Web: Files: Home: Fixed context menu actions for edit 2020-07-10 14:40:47 +03:00
d8597a8602 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-07-10 14:15:40 +03:00
7c8f84ab8b Fix Re-rendered because of props changes: props.onClick 2020-07-10 14:15:30 +03:00
Alexey
dbc98c1a84 Web: Files: Home: Fixed onEditComplete function bind for tile 2020-07-10 14:05:46 +03:00
SuhorukovAnton
2925ff25b4 api-defaultvalue: add System.Text.Json 2020-07-10 13:35:24 +03:00
Ilya Oleshko
e55e2414b9 Web: Files: Home: Fixed onEditComplete function bind for row 2020-07-10 13:14:09 +03:00
e48c202528 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-07-10 11:42:14 +03:00
9cbef5763f Web: Files: Added why-did-you-render package (https://github.com/welldone-software/why-did-you-render) 2020-07-10 11:42:06 +03:00
Ilya Oleshko
950eaf2d43 Web: Files: Home: Fixed init styled RowContent outside render 2020-07-10 11:39:55 +03:00
Alexey
c6fa5aecef Web: Files: fixed tile styles 2020-07-10 10:35:36 +03:00
Alexey
132242b06a Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-07-10 08:54:01 +03:00
d0f66c66e7 Web: Files: Implemented CompleteVersion 2020-07-09 22:26:43 +03:00
c9040bd1e3 Files: fix CompleteVersion 2020-07-09 22:26:00 +03:00
SuhorukovAnton
f8e42cbd08 api-defaultvalue: add JsonPropertyNames 2020-07-09 22:06:08 +03:00
SuhorukovAnton
28e70e91f6 api-defaultvalue: add JsonPropertyNames 2020-07-09 18:37:36 +03:00
e48c6077a2 Web: Files: Replace bind to data-api usage 2020-07-09 18:03:44 +03:00
3db51c32e1 Web: Files: Replace bind to data-api usage 2020-07-09 16:28:01 +03:00
ddfe9f05bf Web: Files: Replace bind to data-api usage 2020-07-09 16:20:56 +03:00
8a4d7a4da2 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-07-09 15:59:02 +03:00
Ilya Oleshko
2ef98eee3b Web: Files: Home: Added icon for edit/create action 2020-07-09 15:49:32 +03:00
ecb5613ada Web: Files: fixed duplicate input ids 2020-07-09 15:13:51 +03:00
47ed29b8ad Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-07-09 15:10:12 +03:00
3db03a70e5 Web: Files: Replace bind to data-api usage 2020-07-09 15:09:50 +03:00
447f0b0c98 Web: Files: added link for sharing to social networks 2020-07-09 12:29:44 +03:00
71c267939d Files: fix names and Serializers 2020-07-09 12:02:44 +03:00
5988855b61 Fix License 2020-07-08 18:30:23 +03:00
c2b962f8e6 Web: Files: fixed safari convert icon styles 2020-07-08 16:55:39 +03:00
05ad931149 Web: Files: fixed header styles 2020-07-08 14:24:45 +03:00
ec6236612c Web: Files: fixed confirmation of modal dialogs with empty files 2020-07-08 14:00:17 +03:00
29b8c1e6cc Web: Files: fixed header styles 2020-07-08 13:20:44 +03:00
Alexey
6435d8759b Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
2020-07-08 13:02:01 +03:00
Alexey
1a99461091 Web: Files: Added file view as tiles 2020-07-08 12:26:25 +03:00
66cee95ff1 Web: Files: fixed aside panel styles, fixed moveTo/copyTo error 2020-07-08 11:44:46 +03:00
b8d70657bb Web: Files: fixed convert dialog style 2020-07-08 09:39:17 +03:00
SuhorukovAnton
9d069de30a general-startup: transform GeneralStartup to BaseStartup 2020-07-07 23:00:39 +03:00
a18212da87 Web: Files: added files convert to row, fixed api 2020-07-07 17:55:01 +03:00
a9dec93ad4 Web: Files: refactoring convert 2020-07-07 15:00:50 +03:00
SuhorukovAnton
88cad55450 api-defaultvalue: delete DataMembers 2020-07-07 12:59:12 +03:00
SuhorukovAnton
a43c14dcb3 Merge branch 'master' into feature/api-defaultvalue 2020-07-07 12:38:35 +03:00
02be7f51e4 Web: Files: added file conversion 2020-07-07 10:35:06 +03:00
5121869447 Web: Files: added convert dialog 2020-07-07 10:26:28 +03:00
Alexey
e7b4727b77 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-07-07 07:45:32 +03:00
Alexey
50ed35c9e5 Web: Files: Added folder view as tiles 2020-07-07 07:45:22 +03:00
51c3e533ea Web: Files: fixed TreeFolders selected node style 2020-07-06 11:19:18 +03:00
SuhorukovAnton
00558dd95f general-startup: fix 2020-07-06 10:56:17 +03:00
c8d6ba3cd1 Web: Files: removed duplicate t prop 2020-07-06 10:41:47 +03:00
d3dc618ad9 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-07-06 10:28:44 +03:00
02c40ad657 Web: Files: moved dragging prop to redux, added onDrop function to TreeFolders 2020-07-06 10:28:31 +03:00
b155a850f1 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-07-05 14:35:26 +03:00
51a993b2ea Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json
#	products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json
#	web/ASC.Web.Components/package.json
2020-07-05 14:35:14 +03:00
6cc564b716 Merge branch 'master' into feature/files 2020-07-04 12:47:53 +03:00
2b4d853b77 Files: fix 2020-07-04 12:46:01 +03:00
81ace5028d Merge branch 'master' into feature/files 2020-07-03 18:34:27 +03:00
6c0b91a836 Files: converter fix 2020-07-03 18:33:40 +03:00
9a2c382dfc Merge branch 'master' into feature/files 2020-07-03 17:47:29 +03:00
b9b938cdf8 Files: fix convert 2020-07-03 17:47:01 +03:00
c318086fca Merge branch 'master' into feature/files 2020-07-03 17:37:49 +03:00
9440367b3a FileConvert: fix 2020-07-03 17:37:14 +03:00
7cba451f89 Merge branch 'master' into feature/files 2020-07-03 14:49:26 +03:00
98b007fe35 Files: fix CheckConversion 2020-07-03 14:48:56 +03:00
be99a345f7 Merge branch 'master' into feature/files 2020-07-03 14:24:47 +03:00
13efc06874 Files: fix 2020-07-03 14:19:45 +03:00
2b6ef1e745 Merge branch 'master' into feature/files 2020-07-03 13:37:09 +03:00
ded7034ba7 Files: fix convert 2020-07-03 13:36:31 +03:00
Ilya Oleshko
80deafb3e3 Web: Files: Home: Fixed translation key 2020-07-03 12:37:10 +03:00
151ec90f4c Merge branch 'master' into feature/files 2020-07-03 11:35:09 +03:00
479a4e5896 Files: additional logging 2020-07-03 11:34:36 +03:00
Ilya Oleshko
e9fb8b95e1 Web: Files: Home: Added translations for context options 2020-07-03 11:00:25 +03:00
SuhorukovAnton
6647217371 api-defaultvalue: fix 2020-07-02 23:51:18 +03:00
c9a64ca377 Added NullIfDefault 2020-07-02 18:15:52 +03:00
SuhorukovAnton
5737eca3ad api-defaultvalue: fix 2020-07-02 15:50:31 +03:00
944dbabf40 Web: Files: fixed click event 2020-07-02 13:09:32 +03:00
6a019c6c35 Web: Files: fixed SharingPanel render 2020-07-02 11:50:32 +03:00
SuhorukovAnton
02729b9b37 api-defaultvalue: fix 2020-07-02 10:27:25 +03:00
SuhorukovAnton
cb0cbf99a4 api-defaultvalue: fix 2020-07-02 10:24:01 +03:00
SuhorukovAnton
d185a6143c api-defaultvalue: fix 2020-07-02 10:20:41 +03:00
ba4b16393e Web: Files: fixed badges update, fixed markAsRead 2020-06-30 18:46:19 +03:00
SuhorukovAnton
0ec331db76 api-defaultvalue: fix 2020-06-30 16:56:38 +03:00
d13c4ac3bd Web: Files: fixed markAsRead 2020-06-30 16:54:39 +03:00
0025f3b858 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-06-30 15:00:57 +03:00
5c3ff62d2e Web: Files: added badge click event 2020-06-30 15:00:44 +03:00
Ilya Oleshko
d52c0a67b7 Web: Files: Home: Filter: Fixed init, added translation keys 2020-06-30 11:58:23 +03:00
Ilya Oleshko
c2a9189d4e Web: Files: Home: Filter: Added viewSettings to SortComboBox for mobile devices 2020-06-30 11:43:40 +03:00
Alexey
8cb95b4a64 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-06-30 09:41:04 +03:00
Alexey
a3dd53878e Web: Files/Common: added ViewSelector component 2020-06-30 09:40:09 +03:00
SuhorukovAnton
4ba2223fa1 Merge branch 'master' into feature/api-defaultvalue 2020-06-29 14:20:24 +03:00
SuhorukovAnton
06cc93223f api-defaultvalue-fix 2020-06-29 14:16:23 +03:00
SuhorukovAnton
6869d7c8d1 api-defaultvalue: fix 2020-06-29 13:37:53 +03:00
87f85fdefe Merge branch 'master' into feature/files 2020-06-29 09:53:07 +03:00
da91c97809 Files: added new for subfolder 2020-06-28 19:02:09 +03:00
90aad433a0 Files: fix getshare 2020-06-28 18:45:01 +03:00
57454bae0c References updated 2020-06-28 16:55:21 +03:00
ebfee242dc Web: Files: moved the media viewer visible to redux 2020-06-26 17:17:51 +03:00
792f8ff7a8 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-06-26 15:55:54 +03:00
75f29fe11b Web: Files: added badge for displaying new files 2020-06-26 15:55:34 +03:00
SuhorukovAnton
51be59740e api-defaultvalue 2020-06-26 15:48:41 +03:00
Ilya Oleshko
25793c9570 Web: Files: Home: Added "new" badge for folders 2020-06-26 15:13:13 +03:00
SuhorukovAnton
fc4f073a9b api-defaultvalue: fix 2020-06-26 12:59:39 +03:00
SuhorukovAnton
debb0d2193 api-defaultvalue: first version 2020-06-26 12:53:26 +03:00
5319b905e6 Merge branch 'master' into feature/files 2020-06-26 10:54:17 +03:00
3a00f3e9d0 Files: fix GetNewItems 2020-06-26 10:45:24 +03:00
cfdc6d495e Merge branch 'master' into feature/files 2020-06-26 09:46:04 +03:00
83b05c5b64 Files: added news 2020-06-25 20:17:24 +03:00
25d88203f0 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
2020-06-25 18:13:42 +03:00
8f5889af33 Web: Files: Home: Added version history context menu 2020-06-25 18:12:33 +03:00
Ilya Oleshko
506642b02c Web: Files: Home: Added edit or create check for actions 2020-06-25 17:08:48 +03:00
Ilya Oleshko
a454b51bfe Web: Files: Home: Fixed rerender after selecting elements 2020-06-25 16:31:06 +03:00
d14313c6c1 References updated 2020-06-25 14:38:34 +03:00
f4e8912cc2 Merge branch 'master' into feature/files 2020-06-25 12:34:11 +03:00
0d2dc08ef8 Files: added new 2020-06-25 12:31:35 +03:00
Ilya Oleshko
dff436cbf6 Web: Files: Home: Added context actions 2020-06-25 11:31:32 +03:00
Alexey
edf3cae733 Web: Files: Small refactoring 2020-06-25 11:09:45 +03:00
Alexey
7313c9c35f Web: Files: Updated link for portal users and open media file by link 2020-06-25 10:07:04 +03:00
b64fd26e72 Web: Files: added a panel for new files, removed the fake badge of new files 2020-06-24 13:37:54 +03:00
Ilya Oleshko
dacde04f39 Merge branch 'master' into feature/files 2020-06-23 08:23:07 +03:00
bfcd495815 Web: Files: fixed SharingPanel styles 2020-06-22 16:59:04 +03:00
8b5c7f842a Web: Files: fixed context-menu actions 2020-06-22 15:20:24 +03:00
c9dd9c57d7 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-06-22 14:26:39 +03:00
12aa58e26b Web: Files: fixed TreeFolders render 2020-06-22 14:26:20 +03:00
Alexey
1a93002655 Web: Files: Added translation: "Link for portal users" 2020-06-22 11:27:52 +03:00
Alexey
c8a48b0755 Web: Files: Link for portal users 2020-06-22 10:45:28 +03:00
Ilya Oleshko
59d5b843a1 Web: Files: Home: Fixed home re-rendering after change property for tree 2020-06-19 13:10:43 +03:00
259c004838 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/Body/index.js
2020-06-18 17:50:40 +03:00
235e10a645 Web: Files: VersionHistory: Added simple version viewer 2020-06-18 17:49:07 +03:00
8a62a57de9 Web: Files: Fixed undefined error 2020-06-18 17:46:10 +03:00
2968205e53 Web: Files: fixed TreeFolders styles, added DragAndDrop validation 2020-06-18 16:43:21 +03:00
2cd534e7fb Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-06-18 14:31:46 +03:00
e6108694df Web: Files: VersionHistory: Added back button 2020-06-18 14:31:38 +03:00
2d627baa71 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-06-18 10:42:05 +03:00
19eacb0099 Web: Files: added DragAndDrop to TreeFolders 2020-06-18 10:41:56 +03:00
6d86341900 Web: Files: Added opportunity to go to version history page by click on badge 2020-06-18 10:31:51 +03:00
6121a2c580 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-06-17 17:20:39 +03:00
39a5a75998 UI version page: init 2020-06-17 17:20:32 +03:00
6a241f7f93 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-06-17 11:40:35 +03:00
3a28b9b1ae Web: Files: fixed row mouse click 2020-06-17 11:40:20 +03:00
Ilya Oleshko
51d7984c91 Web: Fixed header icons width to 17px 2020-06-17 11:26:18 +03:00
53bb74f26f Web: Files: Replaced icons in FolderTree 2020-06-17 10:50:30 +03:00
Ilya Oleshko
2bdbb60545 Web: Files: App: Use Studio layout only if we need it 2020-06-16 19:28:09 +03:00
Ilya Oleshko
42f4b01dbf Web: Files: DocEditor: Fixed height after change router 2020-06-16 19:26:54 +03:00
Ilya Oleshko
55574cd2de Web: Files: Home: Fixed first select, added closing menu after operations 2020-06-16 18:21:38 +03:00
dedd754875
Merge pull request #39 from ONLYOFFICE/feature/feed
Feature/feed
2020-06-16 17:44:56 +03:00
4d403544f6 Web: Files: fixed mouseUp function 2020-06-16 17:28:11 +03:00
5357ac0c4f Web: Files: fixed files selection 2020-06-15 15:39:44 +03:00
2b9dbcbe81 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-06-15 13:48:39 +03:00
024b973a1f Web: Files: changed the logic of Drag And Drop, added tooltip of operations 2020-06-15 13:48:27 +03:00
Ilya Oleshko
b6dd65f1c7 Merge branch 'master' into feature/files 2020-06-15 09:22:52 +03:00
1f15d39445 Merge branch 'master' of github.com:ONLYOFFICE/AppServer 2020-06-13 18:32:07 +03:00
a05d0a94c8 Files: fix 2020-06-13 18:31:45 +03:00
Ilya Oleshko
a1f3b4bde0 Web: Removed faker package, updated yarn lock and fixed stories 2020-06-11 15:54:53 +03:00
7ee4237af4 Update storybook packages (Fix ReDoS vulnerability in websocket-extensions) 2020-06-11 15:13:43 +03:00
df0508ee01 Web: Files: fixed drag and drop in the trash folder 2020-06-09 11:14:16 +03:00
0882db7a80 Web: Files: added setSelections function to SelectedFrame, code refactoring 2020-06-09 10:04:03 +03:00
144877ab38 Update yarn.lock files 2020-06-08 12:00:05 +03:00
Ilya Oleshko
be6b6eb3ad Merge branch 'master' into feature/files 2020-06-05 14:25:54 +03:00
635ff124fb Json: fixed enum 2020-06-05 14:05:42 +03:00
Ilya Oleshko
1d53e84d7f Web: Files: Home: Fixed filter type for selector 2020-06-05 12:02:54 +03:00
1a5a7dfab5 Merge branch 'master' into feature/feed 2020-06-05 11:46:12 +03:00
06a7e81a49 Files: feed. FoldersModule 2020-06-04 19:36:43 +03:00
70376338ce Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-06-04 16:48:24 +03:00
004dcc2d4d Merge branch 'master' into feature/files 2020-06-04 16:48:03 +03:00
Ilya Oleshko
d14268ab66 Web: Files: Home: Fixed context menu triggering 2020-06-04 16:47:37 +03:00
fed4d206f7 Revert logger 2020-06-04 16:46:58 +03:00
d7386049dc Merge branch 'master' into feature/files 2020-06-04 16:27:06 +03:00
b55cc7c697 Startup: added command line 2020-06-04 16:26:31 +03:00
Ilya Oleshko
424b8566f9 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-06-04 16:17:04 +03:00
Ilya Oleshko
61a45fcd3d Web: Files: Home: Apply default filter after first page load 2020-06-04 16:15:04 +03:00
Ilya Oleshko
7c5d6da7b1 Web: Files: Article: Fixed go out of page range after tree navigation 2020-06-04 16:14:18 +03:00
ae0fb62add Merge branch 'master' into feature/files 2020-06-04 16:05:12 +03:00
794486f335 Notify: temp log 2020-06-04 16:04:17 +03:00
acfaa84ee8 Web: Files: added DragAndDrop to module Files, refactoring operations panel 2020-06-04 15:54:06 +03:00
99dc0aca98 Web: Files: fixed MoveTo CopyTo translations 2020-06-04 15:51:36 +03:00
2d4dda536c Web: Files: added new translations 2020-06-04 15:34:07 +03:00
87af491e89 Feed: FilesModule 2020-06-04 13:54:13 +03:00
Ilya Oleshko
7be13a76b1 Web: Files: Article: Fixed translation key warning 2020-06-04 11:09:02 +03:00
Ilya Oleshko
99e641bb2f Merge branch 'master' into feature/files 2020-06-03 18:53:04 +03:00
d6274ea3e0 Added Feed.Aggregator 2020-06-03 17:53:58 +03:00
b7969e6bfb Web: Files: fixed tree render 2020-06-03 14:33:40 +03:00
Ilya Oleshko
a09db02952 Web: Files: Home: Fixed restore filter after reload page 2020-06-03 14:05:50 +03:00
Ilya Oleshko
4cf89ef3b5 Web: Files: Home: Fixed filter init 2020-06-03 13:30:28 +03:00
dbfb84786e Files: simplified getHeaders method 2020-06-01 15:16:24 +03:00
a1778b5cdf Packages updated 2020-06-01 14:36:23 +03:00
NikolayRechkin
346be5b443 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files 2020-05-29 09:51:12 +03:00
0599944585 Web: Files: added dropzone uploading, code refactoring 2020-05-29 09:30:49 +03:00
NikolayRechkin
4819c535b6 Merge branch 'master' into feature/files 2020-05-29 00:18:02 +03:00
3d9fd53369 Files: fix FFmpegService, fix download by chunks 2020-05-28 17:05:07 +03:00
0a48d2b179 Merge branch 'master' into feature/files 2020-05-28 09:20:58 +03:00
80dcee7ed4 Files: fix long operations 2020-05-27 18:23:50 +03:00
e7ecaefa3c Added JsonStringEnumConverter 2020-05-27 16:19:58 +03:00
a2b933994e Web: Files: fixed conflictResolveType for files operations 2020-05-27 15:10:33 +03:00
NikolayRechkin
686151c65a Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files 2020-05-26 14:46:53 +03:00
NikolayRechkin
c54af7f933 web: files: do not render the closed media viewer 2020-05-26 14:46:10 +03:00
dc1597825e Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-05-26 14:31:24 +03:00
ead15da793 Web: Files: fixed update tree folders after remove 2020-05-26 14:31:11 +03:00
Ilya Oleshko
4b107b45dd Web: Files: DocEditor: Added mobile view for mobile devices 2020-05-26 12:53:58 +03:00
49de9ec7b9 Web: Files: added progress-bar for empty recycle bin operation 2020-05-21 17:10:58 +03:00
NikolayRechkin
784e78736f Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files 2020-05-21 15:38:31 +03:00
NikolayRechkin
64811dbd39 update yarn.lock files 2020-05-21 15:35:28 +03:00
150e229ee8 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-05-21 15:18:44 +03:00
86a0f456a5 Web: Files: fixed error in files operations, added restore action 2020-05-21 15:18:35 +03:00
Nikolay Rechkin
cbc0332919
Merge pull request #38 from ONLYOFFICE/feature/media-viewer
Feature/media viewer
2020-05-21 14:20:24 +03:00
5d5c67ea3c Merge branch 'master' into feature/files 2020-05-21 11:51:09 +03:00
88f19ced05 Files: fix 2020-05-21 11:24:40 +03:00
NikolayRechkin
e8a0bbcd73 Merge branch 'feature/files' into feature/media-viewer 2020-05-21 10:10:08 +03:00
8f5913929f Web: Files: fixed opening the operation panel 2020-05-20 15:43:27 +03:00
dbc222849d Web: Files: fixed create folder action 2020-05-20 15:24:07 +03:00
08c8caf5de Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-05-20 13:47:08 +03:00
3576dcb7be Web: Files: fixed files and folders deletion actions in contextMenu 2020-05-20 13:46:56 +03:00
a61103e0f8 Merge branch 'master' into feature/files 2020-05-20 12:59:32 +03:00
a064da49f4 Files: fix OpenEdit 2020-05-20 12:58:40 +03:00
1ef138701b Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-05-20 12:00:09 +03:00
761b3cd4f7 Web: Files: added progress to delete dialog 2020-05-20 12:00:02 +03:00
ea9bb3df38 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-05-20 11:28:24 +03:00
68dfa9dcd7 Merge branch 'master' into feature/files 2020-05-20 11:27:52 +03:00
cee180669b Files: added FileEntryWrapperConverter 2020-05-20 11:27:20 +03:00
5207769230 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-05-20 10:55:34 +03:00
bdee7bf455 Web: Files: added MoveTo and Copy actions, code refactoring 2020-05-20 10:54:08 +03:00
0705756719 Merge branch 'master' into feature/files 2020-05-19 23:13:51 +03:00
NikolayRechkin
b63b8edc21 web: files: fix 2020-05-19 09:27:46 +03:00
NikolayRechkin
ea02ee9313 Merge branch 'feature/files' into feature/media-viewer 2020-05-19 00:30:31 +03:00
NikolayRechkin
20cf39f908 web: common: MediaViewer. Refactoring 2020-05-19 00:12:48 +03:00
ecd66902a0 Merge branch 'master' into feature/system-json 2020-05-18 14:16:03 +03:00
609290dcd9 Merge branch 'master' into feature/files 2020-05-18 12:03:38 +03:00
18a7198e8c Web: Files: added error handlers 2020-05-18 12:00:37 +03:00
7e387cf51a Files: fix 2020-05-18 11:59:37 +03:00
4b89f35538 Web: Files: fixed sharing panel selected options 2020-05-18 11:34:07 +03:00
bcd8e1915e Web: Files: fixed download actions 2020-05-18 11:16:45 +03:00
1842076658 Merge branch 'master' into feature/files 2020-05-18 10:51:37 +03:00
f0adf6d38e FileOperation: ProgressStep fixed 2020-05-18 10:43:53 +03:00
550b0dd20e Sln: packages updated 2020-05-18 10:27:22 +03:00
2424924eed Files: optimization 2020-05-17 21:11:56 +03:00
NikolayRechkin
52f687bd65 Merge branch 'feature/files' into feature/media-viewer 2020-05-17 19:16:38 +03:00
47c79d57f0 Optimization 2020-05-17 16:08:20 +03:00
cc64abed6f Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-05-15 21:25:40 +03:00
6e31e618ef Web: Files: fixed download as 2020-05-15 21:25:31 +03:00
8c11f5364c Web: Files: added download files upload with progress 2020-05-15 21:02:56 +03:00
f97e690773 Web: Files: added sharing api 2020-05-15 18:47:35 +03:00
b5e31b63c9 Files: fix RemoveSecurityInfo 2020-05-15 18:12:04 +03:00
787ddf831c Merge branch 'master' into feature/files 2020-05-15 14:03:33 +03:00
78442cd9eb Files: Service fix 2020-05-15 14:02:05 +03:00
aeef09bbc1 Merge branch 'master' into feature/files 2020-05-15 12:58:43 +03:00
19a43e461a Files: createindex fixed 2020-05-15 12:57:40 +03:00
ea03b6428f fix 2020-05-14 20:39:40 +03:00
2c21d99ca2 Files: fix 2020-05-14 19:53:26 +03:00
93f6771f48 Files: serializer 2020-05-14 18:52:06 +03:00
de55454c84 Merge branch 'master' into feature/files 2020-05-14 17:08:59 +03:00
28c09d37f2 Files: fixed DbFilesSecurity keys 2020-05-14 15:43:56 +03:00
17a88df5ac Files: fix download 2020-05-14 13:47:53 +03:00
1d245236ef Merge branch 'master' into feature/files-index 2020-05-14 12:19:34 +03:00
NikolayRechkin
6bfad7069d web: common: MediaViewer. fixed a file deletion 2020-05-14 11:47:57 +03:00
NikolayRechkin
22a0046f1f web: files: MediaViewer. file deletion 2020-05-13 16:20:23 +03:00
NikolayRechkin
b15375d57b web: files: MediaViewer. file download 2020-05-13 11:48:16 +03:00
1205f03a5a Web: Files: added download as dialog 2020-05-13 10:00:04 +03:00
NikolayRechkin
d66e0bc8c1 web: files: changed a playlist creation 2020-05-10 13:40:09 +03:00
NikolayRechkin
a0ea27aa96 web: Files: opening the media viewer 2020-05-09 21:10:14 +03:00
NikolayRechkin
1746b3c361 Files: fixed video conversion 2020-05-09 21:06:53 +03:00
6bf191b161 AddFilesWrapperService -> AddFactoryIndexerFileService, AddFolderWrapperService -> AddFactoryIndexerFolderService, 2020-05-08 18:15:08 +03:00
74e851e01b ElasticSearch: fixed MatchAll 2020-05-08 18:10:53 +03:00
90d93db14c FileService: bat and launchSettings 2020-05-08 11:35:04 +03:00
NikolayRechkin
654572fe46 web: files: fixed a merge 2020-05-08 10:33:48 +03:00
NikolayRechkin
fda955966d Merge branch 'feature/files' into feature/media-viewer 2020-05-08 10:27:58 +03:00
NikolayRechkin
ae5ea8de77 web: Files: Added the MediaViewer 2020-05-08 10:21:38 +03:00
d118c89e9c Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
2020-05-07 16:05:07 +03:00
83fc9dbd89 Web: Files: moved accessOptions to sharing panel 2020-05-07 16:00:14 +03:00
Ilya Oleshko
38f44544b1 Web: Files: Home: Fixed too much rendering 2020-05-07 15:59:20 +03:00
f547df107e Merge branch 'master' into feature/files 2020-05-07 14:40:51 +03:00
7bf739fe09 Optimization 2020-05-07 14:02:29 +03:00
Ilya Oleshko
b3a07d5622 Web: Files: Home: Added Row click file actions 2020-05-07 11:20:17 +03:00
aff67cbc03 Merge branch 'master' into feature/files 2020-05-07 09:16:25 +03:00
eab3a9b2bd Files: fixed download 2020-05-06 19:55:10 +03:00
05d194ba6e Merge branch 'master' into feature/files 2020-05-06 18:22:02 +03:00
c077f0d1d4 Files: added SecurityInfoModel 2020-05-06 18:10:27 +03:00
7cc06c2322 ElasticSearch: state 2020-05-06 14:32:26 +03:00
a2d1ab38eb Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-05-06 12:57:28 +03:00
1297d735c2 Web: Files: refactoring sharing panel, added sharing panel to context menu 2020-05-06 12:57:16 +03:00
02b33bc07b Merge branch 'master' into feature/files-index
# Conflicts:
#	products/ASC.Files/Server/Core/Dao/TeamlabDao/FolderDao.cs
2020-05-06 11:54:26 +03:00
1526d8e502 Common: removed StreamCopyTo 2020-05-06 11:41:27 +03:00
Ilya Oleshko
5aae59fb21 Merge branch 'master' into feature/files 2020-05-06 10:28:36 +03:00
79e2387da4 Files: fixed trash folder 2020-05-06 10:20:10 +03:00
64144e7af9 Web: Files: fixed empty recycle bin folder action 2020-04-30 17:13:40 +03:00
bee4693566 Merge branch 'master' into feature/files 2020-04-30 16:37:57 +03:00
1a269749fc Files: fix removing 2020-04-30 16:34:15 +03:00
fed9141242 Web: Files: fixed delete action 2020-04-30 15:14:15 +03:00
324ea4f8cf Merge branch 'master' into feature/files 2020-04-30 14:19:13 +03:00
bac295c589 Files: fix remove operation 2020-04-30 14:09:27 +03:00
9a7d7ac7c6 Files: fixed transaction 2020-04-30 11:56:55 +03:00
7ffd2c702f Files: search 2020-04-29 19:01:38 +03:00
37b126e5cd Files: search 2020-04-29 17:11:31 +03:00
aa922fa505 Web: Files: fixed endless loading 2020-04-29 15:18:05 +03:00
bcfbac05c6 ElastiSearch: removed Wrapper, WrapperWithDoc 2020-04-29 11:04:19 +03:00
b7314aac04 Web: Files: fixed folder tree after deleting a folder from the recycle bin, added loader after deleting file 2020-04-29 10:06:33 +03:00
e2165ce9d6 Web: Files: fixed input file selection event selecting the same file 2020-04-29 09:44:21 +03:00
b9a432cb89 Files: removed FilesWrapper, FolderWrapper 2020-04-28 20:32:51 +03:00
adab38548a Files: Index Service 2020-04-28 18:11:10 +03:00
6310ea509b Web: Files: added upload setting menu, added translations, code refactoring 2020-04-28 17:43:12 +03:00
40525b2734 Web: Files: fixed tree folders update 2020-04-28 13:46:02 +03:00
4a31b4a53c Web: Files: fixed upload error 2020-04-28 13:15:32 +03:00
36a6f064d7 Web: Files: fixed display progress-bar, added new translation 2020-04-28 12:46:59 +03:00
1ba88b1105 Web: Files: added progress-bar, fixed upload files and folders 2020-04-28 11:59:05 +03:00
c51b40247a Files: service replaced 2020-04-27 20:02:15 +03:00
b5671cc460 Files: Service 2020-04-27 19:59:52 +03:00
fe9c1353be Web: Files: fixed row content links in trash folder 2020-04-27 15:50:35 +03:00
80f6c3a3d4 Web: Files: fixed files empty screen containers 2020-04-27 15:06:31 +03:00
57f4c3788e ElasticSearch: refactoring. Wrapper replaced with ISearchItem 2020-04-27 14:27:58 +03:00
687615f905 Web: Files: added error handling when trying to upload a file with zero size 2020-04-27 14:08:54 +03:00
a338526972 Web: Files: added loader to onBackToParentFolder action 2020-04-27 10:24:23 +03:00
4f17b27b15 Web: Files: fixed rename folder action 2020-04-27 10:22:27 +03:00
97c818d47c Web: Files: fixed treeFolder bug after rename or edit folder 2020-04-27 09:56:39 +03:00
769edd254e Web: Files: added upload files action, added loopTreeFolders selector 2020-04-27 09:54:44 +03:00
e35d95d5d9 Web: Files: fixed rename folder promise error 2020-04-27 09:49:37 +03:00
Ilya Oleshko
54f70b74c8 Web: Files: DocEditor: Fixed editor script path 2020-04-24 11:28:11 +03:00
Ilya Oleshko
4abc9b67e4 Merge branch 'master' into feature/files 2020-04-24 10:18:07 +03:00
Ilya Oleshko
7569b50083 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-04-24 10:17:14 +03:00
Ilya Oleshko
aa56005a72 Web: Files: DocEditor: Added simple editor 2020-04-24 10:17:06 +03:00
Ilya Oleshko
ec1afa6eec Web: Files: Home: Fixed page navigation without filter 2020-04-24 10:14:13 +03:00
Ilya Oleshko
780a9886fe Web: Files: Home: Disabled log for paging 2020-04-24 10:13:06 +03:00
4f025d9931 Files: fixed download 2020-04-23 14:50:34 +03:00
44f84c8056 Files: Service. first version 2020-04-23 12:38:50 +03:00
5738f4bad0 Web: Files: fixed update row with multiple files upload 2020-04-23 12:19:49 +03:00
0e630f722e Web: Files: fixed loader 2020-04-23 12:06:50 +03:00
fa68bedd98 Web: Files: added upload files 2020-04-23 11:55:45 +03:00
bc4a479fc6 Files: DocuSignHandler 2020-04-20 15:32:24 +03:00
c40acf19fb Files: ThirdPartyAppHandler 2020-04-20 15:08:24 +03:00
b55ef3aa37 Merge branch 'master' into feature/files 2020-04-20 11:19:17 +03:00
eef99a3e96 Files: ChunkedUploaderHandler 2020-04-20 11:08:04 +03:00
79771f9d56 Web: Files: added loader to row 2020-04-20 10:30:14 +03:00
cb71beb888 Web: Files: fixed rename action 2020-04-17 15:37:40 +03:00
f7dbf431da Web: Files: fixed cursor shift when entering a row input 2020-04-17 13:53:59 +03:00
Ilya Oleshko
8c349b0ee2 Merge branch 'master' into feature/files 2020-04-16 16:10:55 +03:00
1b0784e3cf Files: updated JWT 2020-04-16 16:07:30 +03:00