|
6b1656ff10
|
Files: settings
|
2021-06-11 14:33:07 +03:00 |
|
|
61e957d00a
|
Files: added /subfolders request
|
2021-06-11 14:24:01 +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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
d585c0a785
|
Web: Bumped version to 0.1.10
|
2021-05-29 21:26:13 +03:00 |
|
|
12bcf816b5
|
Web: Client: added new translations keys
|
2021-05-28 12:09:10 +03:00 |
|
|
d0bbcb8d5a
|
Files: moved from 08a01422
|
2021-05-28 11:22:35 +03:00 |
|
|
bda786f844
|
WebStudio: moved from 08a01422
|
2021-05-27 20:13:24 +03:00 |
|
|
3252372a77
|
Web: Files: fixed rename folder action
|
2021-05-27 16:16:30 +03:00 |
|
|
2cf57ece75
|
Web: Files: fixed files filter
|
2021-05-27 14:49:40 +03:00 |
|
|
a088e020ad
|
Web: Delete useless code and Refactoring.
|
2021-05-27 13:22:53 +03:00 |
|
|
d8539a140b
|
WEb: Files: SelectedFolder: Added required propTypes.
|
2021-05-27 13:11:25 +03:00 |
|
Artem Tarasov
|
102f26ed3c
|
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
# Conflicts:
# public/locales/de/Common.json
# public/locales/en/Common.json
# public/locales/ru/Common.json
|
2021-05-27 11:58:53 +03:00 |
|
Artem Tarasov
|
46d80f7b34
|
Web: moved translation keys "ByFirstNameSorting", "ByLastNameSorting" to "static/locales/{lng}/Common.json"
|
2021-05-27 11:57:20 +03:00 |
|
|
00957a65ad
|
Web: moved translation keys "LblSelect", "EditUserDialogTitle", "Version"
|
2021-05-27 11:51:32 +03:00 |
|
|
30cf4f8cde
|
Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations
|
2021-05-27 11:14:31 +03:00 |
|
|
25ac98e272
|
Merge branch 'develop' into feature/translations
# Conflicts:
# products/ASC.Files/Client/public/locales/en/DeleteDialog.json
# products/ASC.Files/Client/public/locales/en/Home.json
# products/ASC.Files/Client/public/locales/ru/DeleteDialog.json
# products/ASC.Files/Client/public/locales/ru/Home.json
|
2021-05-27 11:13:41 +03:00 |
|
|
178767a2b5
|
Web: Files: fixed translations
|
2021-05-27 11:03:12 +03:00 |
|
|
8d2f6f1608
|
Web: Files: SelectedFolder: Refactoring.
|
2021-05-27 10:43:34 +03:00 |
|
|
d752424200
|
Web: Files: SelectedFolder: Added getFolderPath method and Refactoring component.
|
2021-05-27 10:37:27 +03:00 |
|
|
e13fded90e
|
Web: Files: SelectedFolder: Refactoring.
|
2021-05-26 19:19:24 +03:00 |
|
|
fe18e7e55c
|
Web: moved translation key "LblSelect"
|
2021-05-26 17:53:36 +03:00 |
|
|
151ffc7b26
|
Web: moved translation key "Active"
|
2021-05-26 17:46:09 +03:00 |
|
|
e437c7a035
|
Web: moved translationKeys "Size", "View", "Review"
|
2021-05-26 17:37:03 +03:00 |
|
|
3cb0ff476c
|
Files: resources
|
2021-05-26 17:23:48 +03:00 |
|
|
d8adef733c
|
ASC.Files: moved from 08a01422
|
2021-05-26 16:54:46 +03:00 |
|
|
364fc6bbeb
|
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
|
2021-05-26 16:40:10 +03:00 |
|
|
541b14c8fe
|
Web: moved translationKeys "DisableUserButton", "NotFoundLanguage"
|
2021-05-26 16:40:02 +03:00 |
|
Artem Tarasov
|
be2825c3cc
|
Web: fixed syntax in OperationsPanel.json
|
2021-05-26 16:34:49 +03:00 |
|
Artem Tarasov
|
55bbd5d28d
|
Web: moved translation key "Restore"
|
2021-05-26 16:32:33 +03:00 |
|
|
2c5b95e352
|
Web: moved translationKeys "ProjectsProduct", "InviteLinkTitle", MoveConfirmationMessage"
|
2021-05-26 16:06:40 +03:00 |
|
Artem Tarasov
|
f902c4f79e
|
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
# Conflicts:
# products/ASC.Files/Client/public/locales/de/Translations.json
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
|
2021-05-26 15:45:18 +03:00 |
|
Artem Tarasov
|
202d50f891
|
Web: moved translationKey "Copy"
|
2021-05-26 15:42:54 +03:00 |
|
|
dc4872129b
|
Web: moved translationKeys "More", "Search", "AddFilter", "Comments"
|
2021-05-26 15:15:43 +03:00 |
|
|
252fef7ae3
|
Web: moved translationKeys "AboutCompanyTitle", "ClearButton", "CommunityProduct", "EmptyFieldError"
|
2021-05-26 14:36:58 +03:00 |
|