|
|
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 |
|
|
|
b10beb7e2f
|
Web: Settings: Restore Backup: Fixed not showing files list at aside panel, added styles, Refactoring select file input component.
|
2021-06-22 22:13:59 +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 |
|
|
|
6d21bb2209
|
File: status fix
|
2021-06-22 11:42:29 +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 |
|
|
|
ae17671043
|
Merge branch 'develop' into feature/backup
# Conflicts:
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
# web/ASC.Web.Client/src/store/SettingsSetupStore.js
|
2021-06-18 18:08:38 +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 |
|
|
|
3024cb8fff
|
Web: Files: SelectFileDialog: Rename function.
|
2021-06-18 11:06:12 +03:00 |
|
|
|
a1df9b74db
|
Web: Files: SelectFileDialog: Added loadNextPage and Added new functions for modalView for save and close modal dialog.
|
2021-06-18 11:04:14 +03:00 |
|
|
|
443da941be
|
Web: Files: fixed select for thirdparty folders
|
2021-06-18 11:00:31 +03:00 |
|
|
|
688de9106b
|
Web: Files: SelectFileDialog: Added infinity scroll for files list.
|
2021-06-18 10:58:01 +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 |
|
|
|
39b1b24262
|
Web:Files: SelecFolderDialog: Added store to folderTreeBody.
|
2021-06-17 09:16:33 +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 |
|
|
|
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 |
|
|
|
056d34a66d
|
Web: Files: Added resize listener.
|
2021-06-16 15:35:05 +03:00 |
|
|
|
1250201319
|
Web: Files: fixed upload progress
|
2021-06-16 14:31:13 +03:00 |
|
|
|
c257b501fe
|
Web: Files: SelectFileDialog: Changed api parameters.
|
2021-06-16 14:17:12 +03:00 |
|
|
|
1a0bc83c27
|
Web: Files: Added modal view and aside view for SelectFileDialog component.
|
2021-06-16 14:06:49 +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 |
|
|
|
c18df100ea
|
Web: Settings/Files: Added SelectFile component for the third-party resources module.
|
2021-06-16 09:44:10 +03:00 |
|
|
|
a360e6cb6e
|
Web: Files: SelectedFile: Added loader for files list.
|
2021-06-16 09:39:43 +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 |
|
|
|
3a5d9be209
|
Web: Settings: Restore Backup: Changed the location components of selection files.
|
2021-06-15 18:22:18 +03:00 |
|
|
|
058445461b
|
Web: Files: Added SelectFile component for documents, refactoring.
|
2021-06-15 18:11:48 +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 |
|
|
|
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 |
|
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 |
|
|
|
4c8b086fcd
|
Web: Rename.
|
2021-06-11 17:49:04 +03:00 |
|
|
|
68f880254e
|
Web: Files: added dialog for converting to context actions
|
2021-06-11 17:20:38 +03:00 |
|
|
|
e074c0cf93
|
Web: Files: changed color of conversion
|
2021-06-11 16:56:43 +03:00 |
|
|
|
d8e6a82e96
|
Web:Files: SelectedFolderDialog: Deleted useless code.
|
2021-06-11 16:56:21 +03:00 |
|
|
|
f7e4fd46f7
|
Web: Files/Settings: Added SelectedFolderDialog, refactoring SelectedFoldetInput.
|
2021-06-11 16:54:25 +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 |
|
|
|
6b1656ff10
|
Files: settings
|
2021-06-11 14:33:07 +03:00 |
|
|
|
61e957d00a
|
Files: added /subfolders request
|
2021-06-11 14:24:01 +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 |
|
|
|
bb2ebaafb1
|
Web: Files: SelectedFolder: Fixed translation.
|
2021-06-11 09:19:42 +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
|
c25fa589a9
|
Web: People: deleted fonts with ext .woff, added hash to font name
|
2021-06-08 15:26:56 +03:00 |
|
|
|
3ef16948fc
|
Merge branch 'develop' into feature/backup
# Conflicts:
# common/services/ASC.Data.Backup/Core/NotifyHelper.cs
# products/ASC.Files/Client/public/locales/en/OperationsPanel.json
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Server/DocStore
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
|
2021-06-08 15:03:49 +03:00 |
|
|
|
83d4bfd7a3
|
Web: Files: added conversion for uploaded files
|
2021-06-08 14:24:47 +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 |
|
|
|
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 |
|
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 |
|
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 |
|
|
|
62b57fa313
|
Web: Files: refactoring UploadDataStore
|
2021-06-03 14:23:25 +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 |
|
|
|
581df1cdcf
|
Web: Files: added update after converting the file
|
2021-06-02 18:41:15 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
061b4e46e7
|
Web: Added not found 'de' language translation files (fix NotAllLanguageTranslatedTest issue)
|
2021-05-31 19:11:58 +03:00 |
|
|
|
e2b9561d7b
|
Web: Rewritten all json translation files with sorting of properties alphabetically
|
2021-05-31 18:34:15 +03:00 |
|
|
|
4cabbb7d52
|
Merge branch 'develop' into feature/11.5.2
|
2021-05-31 18:13:08 +03:00 |
|
|
|
f78742ac39
|
Web: Fix UselessModuleTranslationKeysTest issues
|
2021-05-31 17:35:25 +03:00 |
|
|
|
6b56b539c5
|
Web: Update EN language
|
2021-05-31 17:10:34 +03:00 |
|
|
|
afeec1942f
|
Files: fixed news request
|
2021-05-31 15:46:02 +03:00 |
|
|
|
0551bf6b98
|
Web: Files: moved convert dialog to store
|
2021-05-31 15:44:44 +03:00 |
|
|
|
570ede7bba
|
Merge branch 'develop' into feature/11.5.2
# Conflicts:
# common/ASC.Data.Storage/StorageUploader.cs
# common/services/ASC.Data.Backup/Service/BackupWorker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
|
2021-05-31 13:32:51 +03:00 |
|
|
|
e35ab9d886
|
Web: Settings: Backup: Remove styled component to styled-backup and Refactorng.
|
2021-05-31 13:07:34 +03:00 |
|
|
|
4549148d55
|
Web: Settings: Backup: Fixed folder id, added certainFolders prop for SelectedFolder and Refactoring.
|
2021-05-31 12:43:33 +03:00 |
|
|
|
1a6d18fcdc
|
Files: fixed start docs
|
2021-05-31 12:37:13 +03:00 |
|
|
|
f327a89f4a
|
Web: Settings: Manual/ Auto Backup: Added saving folder id for manual backup and Refactoring.
|
2021-05-30 23:36:44 +03:00 |
|
|
|
c8c5b49d1c
|
Files: thumbnails. 2e37dcd0
|
2021-05-30 21:52:32 +03:00 |
|
|
|
f9feb35afc
|
Merge branch 'develop' into feature/backup
|
2021-05-30 20:57:01 +03:00 |
|
|
|
74064fc76d
|
Merge branch 'develop' into feature/translations
|
2021-05-29 21:59:02 +03:00 |
|
|
|
72527ccded
|
Merge branch 'master' into develop
# Conflicts:
# lerna.json
# package.json
# packages/asc-web-common/package.json
# packages/asc-web-components/package.json
# products/ASC.CRM/Client/package.json
# products/ASC.Calendar/Client/package.json
# products/ASC.Files/Client/package.json
# products/ASC.Mail/Client/package.json
# products/ASC.People/Client/package.json
# products/ASC.Projects/Client/package.json
# web/ASC.Web.Client/package.json
# web/ASC.Web.Editor/package.json
# web/ASC.Web.Login/package.json
|
2021-05-29 21:57:42 +03:00 |
|
