Artem Tarasov
9de3ebe20b
Web: Files: deleted unnecessary code
2021-06-29 17:00:52 +03:00
Artem Tarasov
6466432c9c
Merge branch 'develop' into feature/thumbnails
2021-06-29 15:49:11 +03:00
Artem Tarasov
3385d367d4
Web: Files: refactoring
2021-06-29 15:48:17 +03:00
Artem Tarasov
0cae3990cc
Web: Files: added usage ViewSelector
2021-06-29 15:32:48 +03:00
b0f64ca924
Merge branch 'develop' into feature/personal
2021-06-29 14:50:51 +03:00
9870859fe1
Web: Files: fixed dragging
2021-06-29 13:36:04 +03:00
73cdaad3fb
Web: Files: added hiding group file menu
2021-06-29 13:13:05 +03:00
c6ede6fff7
Merge branch 'develop' into feature/remove_itemList
2021-06-29 12:47:56 +03:00
c906c2c419
remove itemList in tests
2021-06-29 12:47:32 +03:00
6590529260
Web: Files: removed margin for privacy folder
2021-06-29 12:32:59 +03:00
78595cf513
Web: Files: fixed PrivateRoomSupport translation
2021-06-29 12:27:46 +03:00
Artem Tarasov
4d7fe086b5
Web: Files: fixed reset seletion
2021-06-28 14:38:17 +03:00
e47e43afcd
Merge branch 'develop' into feature/privacy-rooms-page
2021-06-28 14:37:23 +03:00
2cd83d0897
Web: Files: refactoring private rooms page
2021-06-28 14:36:38 +03:00
Artem Tarasov
42f30be69c
Web: Files: fixed display of the canWebEditIcon if the file is already open
2021-06-28 14:29:06 +03:00
Artem Tarasov
4e7480c481
Web: Files: Thumbnails: fixed the display of the thumbnail if the resource could not be loaded
2021-06-28 14:21:52 +03:00
1b685a7b5e
Web: Files: fixed PrivacyDescriptionConnect translations
2021-06-28 13:37:38 +03:00
3f26df9d49
Web: Files: fixed FileCreated translation
2021-06-28 13:09:24 +03:00
a3cccc4044
crm: migrate from FromForm to FromBody attribute
2021-06-28 12:42:42 +03:00
Artem Tarasov
01df3101e0
Web: Files: Thumbnails: added alt attr for thumbnail image
2021-06-28 12:39:06 +03:00
Artem Tarasov
ff5a165638
Web: Files: Thumbnails: fixed position of TileCOntainer, fixed readme ThileLoader
2021-06-28 11:25:23 +03:00
d2bb6daf3d
Web: Files: fixed empty screen for privacy folder
2021-06-28 10:45:36 +03:00
Artem Tarasov
3d1a7713e3
Merge branch 'develop' into feature/thumbnails
2021-06-28 10:40:33 +03:00
Artem Tarasov
5f984327dd
Web: Files" THumbnails: fixed double opening docEditor, when click on svg
2021-06-28 10:27:41 +03:00
Artem Tarasov
c5ec80c802
Web: Files: Thumbnails: fixed highlight tile when clickin on context button for chrome and android
2021-06-28 10:01:57 +03:00
0fec9b3587
Merge branch 'develop' into feature/privacy-rooms-page
2021-06-28 09:10:44 +03:00
Artem Tarasov
4c1b5bcad6
Web: Files: Thumbnails: fixed the reset of the page scroll position when clicking on the checkbox
2021-06-27 21:39:59 +03:00
9c79e2803c
Web: Files: added a page loader for the private rooms page
2021-06-27 10:34:57 +03:00
2d0807fa17
Web: Files: hidden privacy folder data for mobile devices
2021-06-27 09:35:15 +03:00
99f9d27fd0
Web: Files: added checkProtocol helper, fixed toast
2021-06-27 09:31:07 +03:00
3f2dfeb5a9
crm: started migrate from FromForm to FromBody attribute. bugfix
2021-06-25 16:58:42 +03:00
Artem Tarasov
52bf73df20
Web: Files: Thumbnails: fixed canConvert badge
2021-06-25 16:41:15 +03:00
Artem Tarasov
2691e9c724
Web: Files: hoc: fixed opening floder or file when double click on renaming/creation item
2021-06-25 16:40:29 +03:00
Artem Tarasov
930cd48583
Web: Files: Thumbnails: fixed double opening docEditor when click on thumbnail
2021-06-25 15:39:36 +03:00
715907f114
Merge branch 'develop' into feature/privacy-rooms-page
2021-06-25 15:01:19 +03:00
Artem Tarasov
50556cb428
Web: Thumbnails: deleted unnecessary code, refactoring
2021-06-25 14:30:14 +03:00
fbcdba3b17
Merge branch 'develop' into feature/personal
2021-06-25 11:10:49 +03:00
3217c2acb1
Web: Files: fixed PrivateRoomsPage route
2021-06-25 09:45:43 +03:00
Artem Tarasov
af77facf99
Web: Files: Thumbnails: deleted unnecessary code
2021-06-24 19:53:48 +03:00
Artem Tarasov
ac288d3027
Web: Files: Thumbnails: refactoring styles
2021-06-24 19:48:26 +03:00
Artem Tarasov
2c1a39bcdb
Web: Files: Thumbnails: refactoring
2021-06-24 19:46:46 +03:00
bf67b5c296
Web: Files: added PrivateRoomsPage
2021-06-24 16:23:14 +03:00
Artem Tarasov
e996f17552
Merge branch 'develop' into feature/thumbnails
2021-06-24 16:22:14 +03:00
37a676cb5a
Tenant: removed Public, PublicVisibleProducts
2021-06-24 15:55:12 +03:00
Artem Tarasov
8310bff1b7
Web: Files: THumbnails: fixed unable to choose file selection
2021-06-24 15:35:50 +03:00
d32c68b617
Web: Files: fixed context menu options for private rooms, fixed access rights for sharing
2021-06-24 12:06:03 +03:00
Artem Tarasov
0403801270
Web: Files: Thumbnails: added validation for thumbnailStatus, fixed styles
2021-06-24 11:33:21 +03:00
6e9d64da7a
Merge branch 'develop' into feature/remove_itemList
2021-06-24 11:21:46 +03:00
Artem Tarasov
fdae8372ef
Web: Files: Thumbnails: fixed drag style, deleted console.log
2021-06-24 01:52:47 +03:00
Artem Tarasov
ffe1b89569
Merge branch 'develop' into feature/thumbnails
2021-06-24 01:04:45 +03:00
Artem Tarasov
81c6a04b0d
Web: Files: Thumbnails: fixed file action
2021-06-24 01:00:51 +03:00
Artem Tarasov
aac415adbb
Web: Files: Thumbnails: fixed size of badges
2021-06-24 00:42:50 +03:00
Artem Tarasov
d017052e9b
Web: Files: Thumbnails: added usage thumbnailStatus
2021-06-24 00:29:53 +03:00
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
NikolayRechkin
e42cfc2945
Calendar: core: deleted unused code
2021-06-23 17:30:53 +03:00
ce15c26c50
Web: Files: added display of privacy room files
2021-06-23 17:02:06 +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
c8184e9dc0
Web: Files: fixed privacy bugs
2021-06-23 15:39:43 +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
282738cb13
Merge branch 'develop' into feature/personal
2021-06-22 18:44:12 +03:00
Artem Tarasov
28614d8f39
Web: Files: THumbnails: fixed opened folder when click on context menu
2021-06-22 15:14:02 +03:00
2cdcd36020
Web: Commented annoying logs
2021-06-22 13:43:18 +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
43fe4995f4
Web: Files: fixed SharingPanel translations
2021-06-22 10:29: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
b088c925d6
Merge branch 'develop' into feature/personal
...
# Conflicts:
# products/ASC.Files/Client/src/components/dialogs/ConnectDialog/index.js
# products/ASC.Files/Client/src/pages/Home/index.js
# products/ASC.Files/Client/src/store/FilesStore.js
2021-06-17 15:47:33 +03:00
0aa2eb3e85
Web: Files: removed react-selectable-fast library
2021-06-17 14:27:41 +03:00
6118e95028
Merge branch 'develop' into feature/personal
2021-06-17 14:25:09 +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
65378cc089
Merge branch 'develop' into feature/personal
...
# Conflicts:
# products/ASC.CRM/Client/public/index.html
# products/ASC.Calendar/Client/public/index.html
# products/ASC.Files/Client/public/index.html
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/pages/Home/index.js
# products/ASC.Mail/Client/public/index.html
# products/ASC.People/Client/public/index.html
# products/ASC.People/Client/src/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
# products/ASC.Projects/Client/public/index.html
2021-06-15 11:49:39 +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
bac090e180
Merge branch 'develop' into feature/personal
...
# Conflicts:
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
2021-06-11 13:11:08 +03:00
c9012e3ba8
refactoring
2021-06-11 12:53:41 +03:00
864ef2ff64
Web: Files: changed the logic of opening the folder tree
2021-06-11 12:50:33 +03:00
a9e55b49ec
Web: Files: hid the display of folders for the recycle bin
2021-06-11 12:04:23 +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
7501e91ae3
Web: Client: Files: Fixed share option for not edited items
2021-06-10 14:19:26 +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
ffbbcc6ac2
Web: People: change trans on t
2021-06-08 13:34:41 +03:00
af6d7cd160
Web: People: fixed
2021-06-08 13:26:04 +03:00
Artem Tarasov
46a76abef3
Web: People: added withLoader to ProfileAction
2021-06-08 13:25:43 +03:00
Artem Tarasov
b32edbc3f5
Web: People: added wtihLoader to GroupAction header
2021-06-08 13:06:01 +03:00
Artem Tarasov
d0995aa9a9
Web: People: added withLoader to GroupAction
2021-06-08 13:01:16 +03:00
ffb5dace5d
Web: People: fixed
2021-06-08 12:28:51 +03:00
Artem Tarasov
5dc279b5a9
Web: People: added withLoader to Profile
2021-06-08 12:28:19 +03:00
Artem Tarasov
81b6ea3d02
Web: People: refactoring withLoader, applied for Home
2021-06-08 02:49:34 +03:00
Artem Tarasov
a317b02e2e
Web: People: added and applied LoadingStore
2021-06-08 01:22:28 +03:00
b8f7cb1b61
Web: Client: fixed sharing panel in editor
2021-06-07 18:21:02 +03:00
31423ddbc6
Web: Files: fixed upload panel visibility
2021-06-07 18:05:02 +03:00
b925943cb6
merge from develop
2021-06-07 17:23:25 +03:00
4d9c26545e
Web: Files: added conversion progress
2021-06-07 16:20:18 +03:00
Vladislav Makhov
789d96d21e
Merge branch 'feature/personal' of github.com:ONLYOFFICE/AppServer into feature/personal
2021-06-07 14:28:30 +03:00
Vladislav Makhov
b6fa346fc0
web: my profile: fix onBack navigation in updateUserForm
2021-06-07 14:28:14 +03:00
fd485e06e4
remove_binary_formatter
2021-06-07 13:54:17 +03:00
2d56421dd2
Web: Files: fixed mobx warnings
2021-06-07 13:52:01 +03:00
9a6f281a50
Web: Files: fixed conversion of files, added conversion loaders
2021-06-07 12:44:59 +03:00
54d5c658bd
Merge branch 'develop' into feature/two-factor-auth
2021-06-07 11:54:06 +03:00
Artem Tarasov
b3bccbb98d
Web: People: added usage setFirsLoad
2021-06-07 01:15:07 +03:00
Artem Tarasov
6d7361ecd0
Web: People: added HOC withLoader
2021-06-07 01:09:13 +03:00
Artem Tarasov
9f21862f51
Merge branch 'develop' into bugfix/fixed-styles
2021-06-07 00:24:19 +03:00
Artem Tarasov
fac8dafe1e
Web: Files: fixed width of unselected node in settings tree
2021-06-07 00:21:40 +03:00
Artem Tarasov
acd4a3893c
Web: added rule to webpack.config for woff, woff2
2021-06-06 23:39:52 +03:00
fc20a742a1
crm: refactoring
2021-06-04 19:27:44 +03:00
58e7e41cdd
crm: code cleanup
2021-06-04 17:38:42 +03:00
5754a9b753
Merge branch 'feature/personal' of github.com:ONLYOFFICE/AppServer into feature/personal
2021-06-04 14:43:10 +03:00
d01ef10cc5
Web: NavMenu/PageLayout: Was done:
...
- fixed loaders: two rectangle loader combined into one
- fixed loaders at index.html: two rectangle loader combined into one
- hide NavItem component
- hide click on Headline component
- fixed article padding style for desktop
- added new logo.
2021-06-04 14:42:21 +03:00
a4ee59974e
Web: People: Profile: Fixed displaying user information for "personal" setting
2021-06-04 12:47:37 +03:00
914b975ada
Web: Files: Store: Fixed files and folders actions for "personal" setting
2021-06-04 11:28:44 +03:00
Vladislav Makhov
da8503612e
web: files: private room: fix upload dialog
2021-06-04 11:23:00 +03:00
209f3b174c
Web: Files: added tReady to ConvertDialog
2021-06-03 17:29:06 +03:00
531233a9a8
Web: Files: added new translations, fixed conversion
2021-06-03 15:56:14 +03:00
c04dc44e36
crm: refacroting
2021-06-03 15:51:29 +03:00
Vladislav Makhov
a071470ff2
Merge branch 'feature/personal' of github.com:ONLYOFFICE/AppServer into feature/personal
2021-06-03 14:30:10 +03:00
Vladislav Makhov
e209f2c4b1
web: files: hide tp settings in personal
2021-06-03 14:29:54 +03:00
Vladislav Makhov
6f5c5d2524
web: files: move files setting fetching to store
2021-06-03 14:29:30 +03:00
62b57fa313
Web: Files: refactoring UploadDataStore
2021-06-03 14:23:25 +03:00
cefc4c417a
Web: Files: hide share button in upload panel
2021-06-03 12:53:08 +03:00
43de25b62a
Merge branch 'develop' into feature/remove-unused-dep
...
# Conflicts:
# common/ASC.Data.Storage/ASC.Data.Storage.csproj
# common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj
2021-06-03 12:52:21 +03:00
a7edb118ac
Web: Files: added conversion for upload action
2021-06-03 12:50:01 +03:00
e62d8c7ec9
Web: Files: sharing dialog for personal
2021-06-03 12:46:36 +03:00
Vladislav Makhov
bdaeb27fd1
web: files: filter options for personal
2021-06-03 11:01:19 +03:00
Vladislav Makhov
dbb6562b88
web: files: rename isPersonal to personal according to settings api key
2021-06-03 10:34:53 +03:00
Vladislav Makhov
30bb8e7e02
web: files: Can connect a third-party service only in My Documents, if personal mode
2021-06-03 08:22:42 +03:00
c6f85ef4ce
Merge branch 'develop' into feature/two-factor-auth
2021-06-02 23:57:00 +03:00
581df1cdcf
Web: Files: added update after converting the file
2021-06-02 18:41:15 +03:00
e75e048e49
crm: fixed build
2021-06-02 18:24:49 +03:00
Vladislav Makhov
e260207954
web: files: fix translate loading when open direct link
2021-06-02 17:14:53 +03:00
ce77c270de
Web: Files: added conversion progress for file
2021-06-02 16:56:27 +03:00
5e8751d9f1
Web: Files: added convert file icon, refactoring convert dialog
2021-06-02 16:03:46 +03:00
Artem Tarasov
d960ae6220
Merge branch 'develop' into bugfix/fixed-styles
...
# Conflicts:
# web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
2021-06-02 15:09:03 +03:00
Artem Tarasov
fbab4041c9
Merge branch 'develop' into feature/thumbnails
...
# Conflicts:
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FilesTileContainer.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FilesTileContent.js
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Server/DocStore
2021-06-02 15:07:40 +03:00
4d44ccad12
Merge branch 'develop' into feature/restore-files-convertation
...
# Conflicts:
# products/ASC.Files/Client/src/store/UploadDataStore.js
2021-06-02 14:28:42 +03:00
bd299a718b
Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations
2021-06-02 13:55:19 +03:00
62ac315c8d
Web: i18n: Replaced i18т config load: from "languageOnly" to "all" and added new utils function loadLanguagePath() + Refactoring
2021-06-02 13:55:11 +03:00
f9e53d038f
Web: People: fixed onDeletePersonalDataClick
2021-06-02 13:46:25 +03:00
d187b2767a
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
2021-06-02 12:04:36 +03:00
60a7e84f60
Web: ProfileAction : Added locale usage for DateInput
2021-06-02 12:04:26 +03:00
33ccfa550b
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
...
# Conflicts:
# products/ASC.People/Client/public/locales/en/Translations.json
# products/ASC.People/Client/public/locales/ru/Translations.json
2021-06-02 11:53:29 +03:00
c4a89a9e50
Web: People: fixed translation of "Birthdate", duplicated translation of "Birthdate" moved to a common file
2021-06-02 11:49:35 +03:00
Artem Tarasov
5df2788783
Web: added new translation key "SuccessDeletePersonalData" for "delete-personal-data" in context options
2021-06-02 11:36:23 +03:00
Artem Tarasov
cc338e62d0
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
2021-06-02 11:23:47 +03:00
Artem Tarasov
883130c002
Web: added new translation key "ChangePhoneInstructionSent" for ChangePhoneDialog
2021-06-02 11:23:02 +03:00
929adc773a
Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations
2021-06-02 10:59:15 +03:00
908310041f
Web: Added new translation for toasts ("EncryptingFile", "EncryptionKeysReload", "EncryptionFilePreparing")
2021-06-02 10:59:07 +03:00
ad12ac19c3
Web: Files: removed useless toast translations
2021-06-02 10:46:17 +03:00
Artem Tarasov
a38195d506
Merge branch 'develop' into bugfix/fixed-styles
...
# Conflicts:
# products/ASC.CRM/Client/src/custom.scss
# products/ASC.Calendar/Client/src/custom.scss
# products/ASC.Files/Server/DocStore
# products/ASC.Mail/Client/src/custom.scss
# products/ASC.People/Client/src/custom.scss
# products/ASC.Projects/Client/src/custom.scss
# web/ASC.Web.Client/src/custom.scss
# web/ASC.Web.Login/src/custom.scss
2021-06-02 10:23:08 +03:00
95dbfb8c5c
Merge branch 'develop' into feature/translations
2021-06-01 20:02:48 +03:00
23e1083be7
Web: Removed empty translations keys
2021-06-01 13:49:37 +03:00
76d8ebb459
Tests moved to separate projects.
...
Removed unused dependepcies
2021-06-01 12:21:51 +03:00
de98856728
Web: Tests: Added new 'sk' translations;
2021-06-01 11:21:39 +03:00
8e532bc8b9
Web: Tests: Added new 'ro' translations;
2021-06-01 11:20:14 +03:00
3d62da4422
Web: Tests: Added new 'pt-BR' translations;
2021-06-01 11:19:13 +03:00
c5a5072aa7
Web: Tests: Added new 'lo' translations;
2021-06-01 11:17:19 +03:00
8eb62d8079
Web: Tests: Added new 'it' translations;
2021-06-01 11:15:24 +03:00
a0fc465678
Web: Tests: Added new 'fr' translations;
2021-06-01 11:13:50 +03:00
e3b5ac774a
Web: Tests: Added new 'de' translations;
2021-06-01 10:56:47 +03:00
ce9f697d6e
Merge branch 'develop' into feature/restore-files-convertation
2021-06-01 10:52:07 +03:00
7beccd192b
Web: Added not found keys in 'de' language translation files (fix NotTranslatedKeysTest issue)
2021-05-31 20:33:12 +03:00
2018820472
Merge branch 'develop' into feature/crm-migrate
2021-05-31 19:37:51 +03:00
d7e3e71194
crm: removed DataContract attribute.
2021-05-31 19:37:00 +03:00
ccd30b7b90
crm: refactoring. used JsonPropertyName instead of DataMember
2021-05-31 19:14:59 +03:00
061b4e46e7
Web: Added not found 'de' language translation files (fix NotAllLanguageTranslatedTest issue)
2021-05-31 19:11:58 +03:00