|
|
a4aa4843e8
|
crm: started migrate from FromForm to FromBody attribute
|
2021-06-23 22:32:56 +03:00 |
|
|
|
8998a72d8c
|
Files: fixed build
|
2021-06-23 20:56:55 +03:00 |
|
|
|
d41f81e1cd
|
Merge branch 'develop' into feature/remove_binary_formatter
|
2021-06-23 20:27:10 +03:00 |
|
Artem Tarasov
|
a7c4f38a89
|
Merge branch 'develop' into feature/thumbnails
|
2021-06-23 17:47:14 +03:00 |
|
Artem Tarasov
|
1f753cfd6e
|
Web: Files: Thumbnails: added reset selection when clicking on an empty area of the page, fixed the area when clicking on which the file opens
|
2021-06-23 16:57:42 +03:00 |
|
|
|
c941468cdb
|
Files: api. Added thumbnailStatus
|
2021-06-23 16:19:25 +03:00 |
|
|
|
20d1f9a738
|
merge from develop
|
2021-06-23 16:10:46 +03:00 |
|
Artem Tarasov
|
01fb0a6621
|
Web: Files: Thumbnails: deleted unnecessary code
|
2021-06-23 15:34:30 +03:00 |
|
Artem Tarasov
|
f894d4593f
|
Web: Common: Loaders: fixed TilesLoader
|
2021-06-23 15:00:49 +03:00 |
|
Artem Tarasov
|
d5ebaa6247
|
Web: Files: Thumbnails: fixed files style
|
2021-06-23 14:29:12 +03:00 |
|
Artem Tarasov
|
771ff447b0
|
Web: Files: Thumbnails: fixed folder style
|
2021-06-23 14:20:29 +03:00 |
|
Artem Tarasov
|
ed92a79f29
|
Web: Files: Thumbnails: fixed styles, refactoring
|
2021-06-23 11:11:35 +03:00 |
|
Artem Tarasov
|
fe1a1e7e5c
|
Web: Files: THumbnails: fixed view of EditingWrapperComponent for new folder
|
2021-06-23 02:21:27 +03:00 |
|
Artem Tarasov
|
1430dace28
|
Web: fix after merdge
|
2021-06-23 00:00:42 +03:00 |
|
Artem Tarasov
|
2d9c33a8c6
|
Merge branch 'develop' into feature/thumbnails
# Conflicts:
# packages/asc-web-common/components/PageLayout/index.js
|
2021-06-22 23:46:35 +03:00 |
|
|
|
89d9ea6297
|
Test: fix
|
2021-06-22 19:15:04 +03:00 |
|
Artem Tarasov
|
28614d8f39
|
Web: Files: THumbnails: fixed opened folder when click on context menu
|
2021-06-22 15:14:02 +03:00 |
|
Artem Tarasov
|
2b2fddf857
|
Web: Files: Thumbnails: fixed double opening context menu
|
2021-06-22 12:51:44 +03:00 |
|
Artem Tarasov
|
f78aee3f15
|
Merge branch 'develop' into feature/thumbnails
|
2021-06-22 12:16:36 +03:00 |
|
|
|
6d21bb2209
|
File: status fix
|
2021-06-22 11:42:29 +03:00 |
|
|
|
50a2b4b4d1
|
Merge branch 'develop' into feature/changing-selectbox-library
|
2021-06-22 08:56:51 +03:00 |
|
Artem Tarasov
|
baf5cfa069
|
Web: Files: Thumbnails: fixed context menu
|
2021-06-19 10:12:39 +03:00 |
|
Artem Tarasov
|
bb8f09a725
|
Web: Files: Thumbnails: fix call createThumbnails
|
2021-06-19 10:04:08 +03:00 |
|
Artem Tarasov
|
a81ba032fa
|
Web: Files: Thumbnails: removed ThumbnailsStore, createThumbnails func moved to FilesStore, applied createThumbnails func
|
2021-06-19 09:48:30 +03:00 |
|
|
|
b5076ed81c
|
File: fix status
|
2021-06-18 23:35:33 +03:00 |
|
|
|
4a4cab5352
|
Files: FileHelper decorator
|
2021-06-18 23:31:46 +03:00 |
|
|
|
d783bd8ab4
|
crm: fixed warnings
|
2021-06-18 20:38:32 +03:00 |
|
|
|
dd64101332
|
remove itemList
|
2021-06-18 15:56:15 +03:00 |
|
Artem Tarasov
|
83549b62cd
|
Merge branch 'develop' into feature/thumbnails
# Conflicts:
# packages/asc-web-common/api/files/index.js
# products/ASC.Files/Client/src/pages/Home/index.js
|
2021-06-18 12:02:10 +03:00 |
|
|
|
f70794a717
|
Merge branch 'develop' into feature/changing-selectbox-library
|
2021-06-18 11:58:06 +03:00 |
|
|
|
443da941be
|
Web: Files: fixed select for thirdparty folders
|
2021-06-18 11:00:31 +03:00 |
|
|
|
3d3a8a2d6a
|
Merge branch 'develop' into feature/remove_binary_formatter
|
2021-06-18 10:49:07 +03:00 |
|
|
|
a226cca872
|
Files: update document templates
|
2021-06-18 10:45:45 +03:00 |
|
Artem Tarasov
|
d2f77fb06a
|
Web: Files: Thumbnails: fixed styles tile, refactoring, added thumbnailUrl
|
2021-06-18 02:02:30 +03:00 |
|
Artem Tarasov
|
5034495b28
|
Web: Files: Thumbnails: added ThumbnailsStore, api for create thumbs
|
2021-06-18 01:13:49 +03:00 |
|
|
|
249af955d1
|
Web: Files: added onSelect function for selectbox
|
2021-06-17 18:46:22 +03:00 |
|
|
|
df70473ce5
|
Merge branch 'develop' into feature/changing-selectbox-library
|
2021-06-17 17:19:17 +03:00 |
|
|
|
0aa2eb3e85
|
Web: Files: removed react-selectable-fast library
|
2021-06-17 14:27:41 +03:00 |
|
|
|
a3298a49ac
|
Web: Files: fixed createTreeFolders
|
2021-06-17 12:04:01 +03:00 |
|
|
|
d7c8f22ea3
|
Merge branch 'develop' into feature/tree-menu-bugfix
|
2021-06-17 11:09:19 +03:00 |
|
|
|
b6d4408ce0
|
Files: fixed subfolders method
|
2021-06-16 21:53:56 +03:00 |
|
|
|
01639a56cc
|
RazorCompileOnBuild:false<
GenerateMvcApplicationPartsAssemblyAttributes:false
|
2021-06-16 20:08:26 +03:00 |
|
|
|
53ee0ef484
|
fixed warnings
|
2021-06-16 18:00:27 +03:00 |
|
|
|
3018e1822f
|
crm: fix path
|
2021-06-16 17:30:31 +03:00 |
|
|
|
e314f6ff1c
|
Merge pull request #245 from ONLYOFFICE/feature/crm-migrate
Feature/crm migrate
|
2021-06-16 17:02:46 +03:00 |
|
|
|
5fcbdbd7dd
|
added health checks
|
2021-06-16 16:54:36 +03:00 |
|
|
|
1250201319
|
Web: Files: fixed upload progress
|
2021-06-16 14:31:13 +03:00 |
|
|
|
0ff78c5192
|
Merge branch 'develop' into feature/tree-menu-bugfix
|
2021-06-16 13:47:56 +03:00 |
|
|
|
7d0a1d340d
|
Web: Files: fixed files render, removed log
|
2021-06-16 13:47:15 +03:00 |
|
|
|
b738bbc268
|
Web: Files: fixed files render
|
2021-06-16 13:38:18 +03:00 |
|
|
|
db7cfacd62
|
Files: remove warnings
|
2021-06-15 22:46:26 +03:00 |
|
|
|
91e4d844fb
|
Files: fix download
|
2021-06-15 21:40:12 +03:00 |
|
|
|
7d59d8f3a6
|
Web: Files: fixed deleteThirdParty
|
2021-06-15 18:59:07 +03:00 |
|
|
|
456a82a3fc
|
Web: Files: fixed tree menu update
|
2021-06-15 17:23:07 +03:00 |
|
|
|
ee029d557b
|
fixed tests
|
2021-06-15 17:20:53 +03:00 |
|
|
|
ad52d25d28
|
Web: Files: added tree menu update after folder deletion
|
2021-06-15 16:12:15 +03:00 |
|
|
|
dc1afaeafc
|
Merge branch 'develop' into hotfix/package_version_increment
|
2021-06-15 16:01:19 +03:00 |
|
|
|
9c5dee7752
|
Index: separate configs
|
2021-06-15 15:57:16 +03:00 |
|
|
|
605d5ce043
|
removed unused references
|
2021-06-15 15:52:29 +03:00 |
|
|
|
c09a637758
|
Web: Files: changed the logic of opening the folder tree
|
2021-06-15 14:59:51 +03:00 |
|
|
|
d07273cee8
|
Web: Files: fixed display of tree menu, added new api for tree menu
|
2021-06-15 14:15:48 +03:00 |
|
Artem Tarasov
|
f8e28e5952
|
Merge branch 'develop' into feature/thumbnails
# Conflicts:
# products/ASC.Files/Client/src/HOCs/withFileActions.js
|
2021-06-15 14:06:29 +03:00 |
|
|
|
89264cc48d
|
crm: created common project for common services
|
2021-06-15 13:41:17 +03:00 |
|
Artem Tarasov
|
ee4760e899
|
Merge branch 'develop' into feature/thumbnails
# Conflicts:
# products/ASC.Files/Client/src/HOCs/withFileActions.js
|
2021-06-11 18:30:44 +03:00 |
|
|
|
4a154db396
|
Web: removed useless translations
|
2021-06-11 18:07:51 +03:00 |
|
|
|
5db2e8a868
|
Merge branch 'develop' into feature/restore-files-convertation
|
2021-06-11 17:50:28 +03:00 |
|
|
|
68f880254e
|
Web: Files: added dialog for converting to context actions
|
2021-06-11 17:20:38 +03:00 |
|
Artem Tarasov
|
d44f1bee0f
|
Web: fixed loading people/my, fixed Loaders.ProfileView, deleted unnecessary code
|
2021-06-11 16:57:17 +03:00 |
|
|
|
e074c0cf93
|
Web: Files: changed color of conversion
|
2021-06-11 16:56:43 +03:00 |
|
|
|
ef59a2ac47
|
Web: Files: added hideConfirmConvert setting
|
2021-06-11 15:49:32 +03:00 |
|
|
|
cc79e88737
|
increment version
|
2021-06-11 15:27:52 +03:00 |
|
|
|
e0d076a7bc
|
Merge branch 'develop' into feature/restore-files-convertation
|
2021-06-11 15:17:35 +03:00 |
|
Artem Tarasov
|
f181a491fb
|
Merge branch 'develop' into bugfix/fixed-styles
|
2021-06-11 14:56:52 +03:00 |
|
Artem Tarasov
|
1073da9d58
|
Web: deleted unnecessary code
|
2021-06-11 14:55:53 +03:00 |
|
|
|
6b1656ff10
|
Files: settings
|
2021-06-11 14:33:07 +03:00 |
|
|
|
61e957d00a
|
Files: added /subfolders request
|
2021-06-11 14:24:01 +03:00 |
|
Artem Tarasov
|
81b778765f
|
Web: People: navigation profile fix
|
2021-06-11 14:04:26 +03:00 |
|
Artem Tarasov
|
74fba5c2de
|
Web: People: fixed loading Profile, ProfileAction, fixed navigation between them
|
2021-06-11 13:25:09 +03:00 |
|
|
|
c9012e3ba8
|
refactoring
|
2021-06-11 12:53:41 +03:00 |
|
|
|
d619ed1851
|
package version increment
|
2021-06-11 11:58:42 +03:00 |
|
|
|
052ea3b07f
|
package version increment
|
2021-06-11 10:36:13 +03:00 |
|
|
|
64b6c973b1
|
Web: Files: fixed conversion
|
2021-06-10 20:18:30 +03:00 |
|
|
|
a82efce2a1
|
add fileHelper
|
2021-06-10 17:53:06 +03:00 |
|
|
|
9bb8e9bd1d
|
Web: Files: fixed getConversationPercent
|
2021-06-10 17:33:50 +03:00 |
|
|
|
ed161258c3
|
Files: fix convert
|
2021-06-10 15:54:05 +03:00 |
|
|
|
a47b94bd7f
|
Web: Files: removed useless uploadStatus, fixed upload bugs
|
2021-06-09 17:52:28 +03:00 |
|
|
|
fdc71ec359
|
Merge branch 'feature/restore-files-convertation' of github.com:ONLYOFFICE/AppServer into feature/restore-files-convertation
|
2021-06-09 15:02:44 +03:00 |
|
|
|
29733f0ace
|
Wen: Files: fixed upload panel style
|
2021-06-09 15:02:24 +03:00 |
|
|
|
59bab6a085
|
Web: Files: fixed conversion progress
|
2021-06-09 13:28:22 +03:00 |
|
|
|
d5989124f3
|
Web: Files: fixed conversion progress
|
2021-06-08 19:09:00 +03:00 |
|
Artem Tarasov
|
3db9b30e5e
|
Merge branch 'develop' into bugfix/fixed-styles
# Conflicts:
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
|
2021-06-08 17:58:29 +03:00 |
|
|
|
93ba9c5940
|
Web: People: change trans on t
|
2021-06-08 16:09:51 +03:00 |
|
|
|
18cdf1dc95
|
Web: People: fixed translations
|
2021-06-08 15:29:44 +03:00 |
|
Artem Tarasov
|
c25fa589a9
|
Web: People: deleted fonts with ext .woff, added hash to font name
|
2021-06-08 15:26:56 +03:00 |
|
|
|
65936fb856
|
Web: People: fixed translations
|
2021-06-08 15:25:26 +03:00 |
|
|
|
6a06707d18
|
Web: People: fixed translations
|
2021-06-08 15:19:49 +03:00 |
|
|
|
83d4bfd7a3
|
Web: Files: added conversion for uploaded files
|
2021-06-08 14:24:47 +03:00 |
|
|
|
27e6226e66
|
Web: People: get backupCodes from tfa store
|
2021-06-08 14:19:55 +03:00 |
|
Artem Tarasov
|
67feed3cf9
|
Web: People: fix crash Profile
|
2021-06-08 14:01:19 +03:00 |
|
|
|
71564c7348
|
Web: People: deleted duplicate key
|
2021-06-08 13:35:31 +03:00 |
|
