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 |
|
|
|
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 |
|
|
|
0663ed7f16
|
Merge branch 'develop' into feature/backup
# Conflicts:
# packages/asc-web-common/api/settings/index.js
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
|
2021-06-10 11:56:32 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
