Commit Graph

1949 Commits

Author SHA1 Message Date
576e8a6de0 Files: revert 2020-07-16 00:49:25 +03:00
ddf5aa6f19 Files: additional logging 2020-07-15 23:18:35 +03:00
Alexey
965b2e97d3 Web: Common: Tile view temporarily hidden 2020-07-15 19:05:40 +03:00
531b66875f Files: fix 2020-07-15 18:27:46 +03:00
SuhorukovAnton
6da23f477b ASC.Files.Core: refactoring 2020-07-15 18:07:34 +03:00
9ee887d270 DocumentService log error 2020-07-15 18:06:35 +03:00
414e17ac1f DocumentService log error 2020-07-15 17:40:58 +03:00
SuhorukovAnton
83a88d0240 Merge branch 'master' into feature/ASC.Files.Core 2020-07-15 17:38:40 +03:00
Alexey
356a18acc6 Web:Files: Added translation to tile view 2020-07-15 17:04:29 +03:00
a54be3b64c Merge branch 'master' into feature/files 2020-07-15 16:57:14 +03:00
e10ac2ccfa BaseStartup: refactoring 2020-07-15 15:33:44 +03:00
baa71247d8 Merge branch 'master' into feature/general-startup 2020-07-15 13:06:32 +03:00
Alexey
4bf9133851 Web: Files: Tile: fix styles and small refactoring 2020-07-15 11:31:23 +03:00
Alexey
b573555024 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-07-15 08:00:04 +03:00
Alexey
e886437d83 Web: Files: Fix tile styles 2020-07-15 07:30:59 +03:00
SuhorukovAnton
5bf0bd22b6 ASC.Files.Core: first version 2020-07-14 13:03:53 +03:00
bb507b5aeb Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-07-14 10:16:21 +03:00
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
13b1d0140c Web: People: fixed header styles 2020-07-08 14:25:01 +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
a05a058974 Web: People: fixed header styles 2020-07-08 13:21:06 +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
SuhorukovAnton
71d90ebfa2 general-startup: fix 2020-07-03 18:57:59 +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
SuhorukovAnton
2f5491f1ba general-startup: first version 2020-07-03 14:47:27 +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