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