Commit Graph

2664 Commits

Author SHA1 Message Date
22d5a4ef01 add fi 2021-12-01 12:05:52 +03:00
71a5a3cb1a add cs 2021-12-01 12:01:30 +03:00
002af23d9b add ja 2021-12-01 11:26:35 +03:00
685fb5f196 edit fr 2021-12-01 11:16:28 +03:00
4c3845934f edit it 2021-12-01 10:55:33 +03:00
6ca4abf360 edit de 2021-12-01 10:51:35 +03:00
02e5ef9bdc edit ro 2021-11-30 17:23:28 +03:00
db1d482fbc edit ru 2021-11-30 16:22:24 +03:00
3eb2ee20a8 add bg 2021-11-30 16:16:44 +03:00
40d6fcbf3b add uk 2021-11-30 16:15:55 +03:00
a9dc2a08da add zh-CN 2021-11-30 16:14:32 +03:00
7e2b2463ef add es 2021-11-30 12:36:57 +03:00
b2c123d6f4 Merge branch 'release/v1.1.0' into feature/translate-1.1.0 2021-11-30 11:46:22 +03:00
653642e1b1
Merge branch 'develop' into feature/add-table-version 2021-11-26 18:23:49 +03:00
fb637b43f1 Web: added version for table 2021-11-25 17:38:09 +03:00
384e012c5f net 6: remove TryUseWindowsService 2021-11-25 16:48:08 +03:00
08746974f4 Web: SW: Added SW unregister + refactoring 2021-11-25 15:08:18 +03:00
ff9bb93efd Web: Scripts: Hide shx mkdir errors 2021-11-25 15:06:19 +03:00
73d3b00c07 Web: added missing classNames for autotests 2021-11-25 12:11:22 +03:00
13e13f2303 Net: fix requests 2021-11-24 22:34:39 +03:00
b74e4ccfd1 Removed unused dependencies. Fixed tests 2021-11-24 12:39:39 +03:00
59c88e2006 up to 6.0.0 2021-11-23 17:56:27 +03:00
8ca88e4620 Merge branch 'develop' into feature/net6
# Conflicts:
#	common/ASC.Api.Core/Core/BaseStartup.cs
#	common/ASC.Common/ASC.Common.csproj
#	products/ASC.CRM/BackgroundTasks/ASC.CRM.BackgroundTasks.csproj
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Server/ASC.Files.csproj
#	web/ASC.Web.HealthChecks.UI/ASC.Web.HealthChecks.UI.csproj
2021-11-23 16:40:50 +03:00
4b5af5912c Web: People: fixed row-checkbox styles 2021-11-23 12:30:55 +03:00
89e7b494c4 Web: People: Fixed translation ChangeUserStatusDialog, fixed translation ChangeUsersActiveStatus, ChangeUsersDisableStatus for en language 2021-11-23 12:24:24 +03:00
470fd7ffcb Web: People: MainButton: Added missing actions 2021-11-22 11:21:58 +03:00
1004ed5dfb Fixed Bug 53415. Fixed save button 2021-11-22 11:20:01 +03:00
11d527ba03 Merge branch 'master' into hotfix/v1.1.1
# Conflicts:
#	lerna.json
#	packages/asc-web-common/package.json
#	packages/asc-web-components/package.json
#	packages/browserslist-config-asc/package.json
#	packages/debug-info/package.json
#	products/ASC.CRM/Client/package.json
#	products/ASC.Calendar/Client/package.json
#	products/ASC.Files/Client/package.json
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
#	products/ASC.Files/Client/src/store/UploadDataStore.js
#	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-11-21 14:40:24 +03:00
f675415228 Merge branch 'master' into release/v1.1.0
# Conflicts:
#	lerna.json
#	packages/asc-web-common/package.json
#	packages/asc-web-components/package.json
#	packages/browserslist-config-asc/package.json
#	packages/debug-info/package.json
#	products/ASC.CRM/Client/package.json
#	products/ASC.Calendar/Client/package.json
#	products/ASC.Files/Client/package.json
#	products/ASC.Files/Client/public/locales/en/SelectFile.json
#	products/ASC.Files/Client/public/locales/en/SelectFolder.json
#	products/ASC.Files/Client/public/locales/en/Translations.json
#	products/ASC.Files/Client/public/locales/ru/Translations.json
#	products/ASC.Files/Client/src/components/Article/MainButton/index.js
#	products/ASC.Mail/Client/package.json
#	products/ASC.People/Client/package.json
#	products/ASC.People/Client/public/locales/en/Translations.json
#	products/ASC.People/Client/public/locales/ru/Translations.json
#	products/ASC.People/Client/src/components/Article/MainButton/index.js
#	products/ASC.People/Client/src/pages/ProfileAction/Section/Body/createUserForm.js
#	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-11-21 14:26:20 +03:00
d31ea87211 Merge branch 'master' into develop
# Conflicts:
#	packages/asc-web-common/components/PageLayout/sub-components/section-body.js
#	packages/asc-web-components/table-container/TableHeaderCell.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
#	products/ASC.Files/Client/src/store/UploadDataStore.js
2021-11-21 13:57:55 +03:00
56ecbc95ea Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0 2021-11-19 18:18:13 +03:00
4b095ecdd6 Web: People: MainButton: Reworked data model for button items 2021-11-19 18:01:47 +03:00
50fb593b39 Web: People: Changed Email Dialog according to layouts. 2021-11-19 16:09:41 +03:00
9608cabeb0 Web: People: Forced download of translations. 2021-11-19 16:08:17 +03:00
7a2e48d066 Web: People: fix translations 2021-11-18 19:10:51 +03:00
ac09d3691d Web: People: fix translations 2021-11-18 19:03:24 +03:00
Artem Tarasov
f33d99c9c0 Web: People/Common: added sorting of groups in the tree 2021-11-16 19:27:27 +03:00
e0f297bf0a Web: People: add translations 2021-11-16 18:24:02 +03:00
d403fa1dcd Web: People: removed log 2021-11-15 18:37:29 +03:00
7ca1a18a37 Web: People: added translations for column position 2021-11-15 18:35:08 +03:00
b72760c789 Web: People: fixed Paging tReady 2021-11-15 17:44:21 +03:00
5ed03e0351 Web: People: Fix displaying error on Avatar save 2021-11-13 20:31:43 +03:00
cd21a4013d Web: Restored missing translations 2021-11-13 19:15:50 +03:00
2c6e0d45bc Web: Fix wrong braces of variables inside translation files 2021-11-13 19:07:48 +03:00
c7c7267a9a Test: Added new WrongTranslationVariablesTest and fix it's issues 2021-11-13 19:03:10 +03:00
623313e4be Web: Restored missing 'ru' translations 2021-11-12 21:14:44 +03:00
1c8f091dce Web: Fix DublicatesByContentTest translation issues 2021-11-12 20:12:33 +03:00
d8cf12f9d7 translations 2021-11-12 19:00:01 +03:00
17e3e5cb98 bump version to 1.1.1 2021-11-12 15:21:25 +03:00
3809273075 bump version to 1.1.0 2021-11-12 15:19:40 +03:00
3363cb4111 Web: added className to MainButton 2021-11-12 14:17:20 +03:00
9b6d9dac6f Web: People: added classNames for MainButton items 2021-11-12 14:13:47 +03:00
6b299a48e3 Merge branch 'hotfix/v1.0.1' of https://github.com/ONLYOFFICE/AppServer into hotfix/v1.0.1 2021-11-10 21:25:08 +03:00
11769e8c9e Fix Bug 53180 - Client: Profile. Error «.../pt/Common.json 404» on pt-BR language. 2021-11-10 19:59:03 +03:00
cab7603f5b Fixed Bug 53415: Fixed save avatar click 2021-11-10 18:33:21 +03:00
09520f60fb Web: People: fixed styles 2021-11-10 13:59:34 +03:00
eb1db9eea6 Merge branch 'hotfix/v1.0.1' into feature/desktop-login 2021-11-02 18:15:53 +03:00
2bafe9c7c0 Web: People: Profile: Fixed serialized profile property 2021-11-02 18:13:39 +03:00
d37aa52f09 Merge branch 'develop' into feature/catalog 2021-11-02 21:04:46 +08:00
aa79ef2c9d Merge branch 'hotfix/v1.0.1' into feature/desktop-login 2021-11-02 14:03:26 +03:00
4e018d2d71 Web: Bump version to 1.0.1 2021-11-02 14:02:46 +03:00
89391ab385
Merge branch 'develop' into bugfix/tooltip 2021-11-01 15:02:25 +03:00
8cc08045b7 Merge branch 'master' into develop
# Conflicts:
#	packages/asc-web-common/components/PageLayout/sub-components/section-header.js
#	packages/asc-web-components/combobox/index.js
#	packages/asc-web-components/table-container/StyledTableContainer.js
#	packages/asc-web-components/table-container/TableGroupMenu.js
#	packages/asc-web-components/table-container/TableHeader.js
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
#	products/ASC.Files/Client/src/store/FilesStore.js
#	products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
2021-11-01 13:54:40 +03:00
6aa8281ea7 Web: People: add space in tooltip translate 2021-10-29 16:44:48 +03:00
0215599566 merge from develop 2021-10-27 19:37:12 +03:00
403388fbf1 Added solution filter
Removed unused services
replaced sh with bat
start service from source
2021-10-25 14:29:36 +03:00
f715d15473 Merge branch 'develop' into feature/net6 2021-10-25 14:03:31 +03:00
e5e4a89e5b Merge branch 'develop' into feature/net6 2021-10-22 16:10:37 +03:00
72d972d8fb Web: People: Changed styles to match layouts. 2021-10-22 14:19:57 +03:00
5bd9c06c1a Merge branch 'develop' into table-group-menu
# Conflicts:
#	products/ASC.Files/Client/src/store/FilesStore.js
2021-10-22 12:20:20 +03:00
94cbac3c02 Merge branch 'develop' into feature/catalog 2021-10-22 15:43:23 +08:00
e310d5e655 net6: httpClient: add using 2021-10-21 17:56:31 +03:00
657e34d474 Web:Studio:NavMenu: fix showing navigation icons 2021-10-21 20:36:25 +08:00
9aa3fd7047 Web:Common:Catalog: update branch 2021-10-20 22:31:39 +08:00
f35ea7d172 Web: People: delete useless 2021-10-20 11:21:28 +03:00
f04a1a5403 Web: People: fixed table group menu, added new icons 2021-10-19 17:36:47 +03:00
830c0f4208 Web:Files:Catalog: fixed path parts for settings page 2021-10-19 15:59:29 +08:00
7481f3a2d0 Merge branch 'develop' into feature/catalog 2021-10-19 15:51:12 +08:00
36206576e8 Web: People: fixed table styles 2021-10-18 14:30:49 +03:00
b6461e46f4 net6: replacing System.Drawing with ImageSharp 2021-10-18 14:24:05 +03:00
e8f535d710 Web: People: fixed table styles 2021-10-18 13:11:26 +03:00
7428893b2d Web: Common, Components, People: added small section prop for drop down 2021-10-15 18:29:32 +05:00
26b06f778e Web: People: fixed language selection drop down 2021-10-15 16:52:49 +05:00
735a9b60cf net6: warning CA1416
also remove unnecessary usings
2021-10-13 11:07:03 +03:00
66d126410c Login: added desktop param 2021-10-13 10:25:19 +03:00
6e4e3d69aa Merge branch 'release/1.0.0' into bugfix/dropdown-correct-display 2021-10-12 20:26:45 +05:00
5ebf7509da Web: People: fixed drop down displaying in ContactField components 2021-10-12 20:25:32 +05:00
ae9a3187bc net6: warning SYSLIB0014 2021-10-12 13:14:33 +03:00
31570e57d7 Merge branch 'release/1.0.0' into bugfix/fixed-styles-selcted-row 2021-10-07 17:47:54 +03:00
335c580d78 Web: Dev: Downgrade lerna to v3.22.1 and update webpack-dev-server and webpack-cli (yarn start + Ctrl-C stop issue) 2021-10-07 17:32:32 +03:00
554552ccd7 Web: Client: People: Fixed paging displaying, added tReady property. 2021-10-07 17:04:05 +03:00
b0fe6bd9e2 Merge branch 'release/1.0.0' into bugfix/dropdown-correct-display 2021-10-07 15:17:04 +03:00
deffb0c901 Merge branch 'release/1.0.0' into bugfix/fixed-styles-selcted-row 2021-10-06 21:01:53 +03:00
a33d49f356 Web: Files: fixed icons, fixed styles 2021-10-06 15:23:12 +03:00
32890cffc8 Web: people: fixed validation. 2021-10-06 13:32:17 +03:00
55cb1e875e Web: fixed header height 2021-10-06 12:22:28 +03:00
fed6ab4ac1 Web: fixed constants. 2021-10-06 11:26:25 +03:00
09d7267ca7 Web: fixed. 2021-10-06 11:24:10 +03:00
5b64ba0044 Web: Refactoring. 2021-10-06 11:22:00 +03:00
66e2fc8663 Web: Refactoring. 2021-10-06 11:04:29 +03:00
95d21a2104 Web: People: Added validation form for create user. 2021-10-05 17:39:22 +03:00
a02926532c Web: People: Added constants for RegExp. 2021-10-05 17:38:29 +03:00
4a16633734 Merge branch 'release/1.0.0' into bugfix/dropdown-correct-display 2021-10-05 18:14:15 +05:00
47993da131 Merge branch 'release/1.0.0' into bugfix/profile-form-validation 2021-10-05 16:02:02 +03:00
65a2672b31 Web: People: Replace RegExp 2021-10-05 16:01:03 +03:00
19c8ee34c0 Web: Components: added drop down work in two modes 2021-10-05 16:54:45 +05:00
c54b4ede46
Merge pull request #371 from ONLYOFFICE/bugfix/Bug52895
Fix bug 52895: warning when leaving a page
2021-10-05 13:18:35 +03:00
48395596bc Merge branch 'release/1.0.0' into bugfix/profile-form-validation 2021-10-05 12:57:56 +03:00
f2913de45e Web: People: Fixed translation. 2021-10-05 12:57:22 +03:00
cc74c057f4 Web: People: Added error message. 2021-10-05 12:50:47 +03:00
e12410c238 Web: Added scroll to the error form. 2021-10-05 12:39:07 +03:00
c30dbb5ff3 Web: People: Added form validation. 2021-10-05 12:38:07 +03:00
61bf6e3483 Web: People: Added translations. 2021-10-05 12:17:55 +03:00
1fa824a6e0 Web:People:Catalog: fixed margin top on tablet 2021-10-05 15:40:31 +08:00
6e926eceb9 Web: Removed browserslist (loading bundle issues) 2021-10-05 09:48:08 +03:00
324ca6af20 Web:Common:Catalog: added default width and fix margins 2021-10-04 22:22:06 +08:00
9c0e0db80a Fix bug 52895: warning when leaving a page 2021-10-02 01:18:41 +03:00
076fbcdab7 Web:People: added catalog 2021-09-30 21:17:10 +08:00
97b6fdc6e7 Bug 51393 - Personal: Security. There is possible to know email registered users with help "Signup" 2021-09-28 15:17:06 +03:00
01929aa943 Merge branch 'release/1.0.0' of https://github.com/ONLYOFFICE/AppServer into release/1.0.0 2021-09-27 16:04:50 +03:00
6591080403 Fix Bug 52797 with unsupported browsers. Added new packages/browserslist-config-asc with browserlist.config.js 2021-09-27 16:04:37 +03:00
6ec5581f69 Web: Fixed style setting for smooth movement of the title after exiting the profile 2021-09-27 15:38:44 +03:00
590db7bb67
Merge pull request #347 from ONLYOFFICE/feature/third
Feature/third
2021-09-27 12:35:07 +03:00
790d696a58 Web: Files: fixed view for mobile devices 2021-09-27 11:53:22 +03:00
Artem Tarasov
ae64556bb0 web: common/people/login: renamed providers to lowercase (client) 2021-09-27 09:55:44 +03:00
4531d38e6f Web: Removed duplicates 2021-09-24 21:18:50 +03:00
b69cd151b8 Web: Removed resetProfile for fixed transition for personal. 2021-09-24 17:00:01 +03:00
ef65cc7cb7 Bug 52647 - iOS.Docs.Mobile: Added transition back from profile. 2021-09-24 16:02:23 +03:00
6233ab55a3 Personal: added register method 2021-09-17 17:32:37 +03:00
d4d405df0b Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-09-16 11:34:44 +03:00
2849361259 Web: Files: added tables settings for each user 2021-09-16 11:32:52 +03:00
1ca554f82d Merge branch 'develop' into release/1.0.0
# Conflicts:
#	packages/asc-web-components/campaigns-banner/index.js
#	web/ASC.Web.Client/src/Shell.jsx
2021-09-15 14:45:33 +03:00
bc3ad85a65 Web: People: fix tags in toastr 2021-09-13 16:19:23 +03:00
f6bafac273 Web: People: delete useless translate keys 2021-09-13 16:18:08 +03:00
fe6014a440 Web: Update webpack to v5.52.1 2021-09-13 15:08:48 +03:00
f06e3c076b Fix Bug 52282 - Client.Files. When grabbing the left mouse button, page elements go beyond their boundaries 2021-09-13 12:54:59 +03:00
c7ad040293 Web: Sorted all "package.json" files by vscode-sort-package-json 2021-09-13 12:36:07 +03:00
38242e83c1 Web: Moved other common dependencies to sharedDependencies.js 2021-09-13 12:29:44 +03:00
a47c73b5ce Web: Moved "mobx", "moment", prop-types" to sharedDependencies.js 2021-09-10 16:50:23 +03:00
956c9b3467 Web: Moved "react", "react-dom", "react-router", "react-router-dom", "styled-components" to sharedDependencies.js 2021-09-10 15:57:14 +03:00
d2f3c93c14 Web: Moved "@babel/runtime", "i18next", "i18next-http-backend", "react-i18next" to sharedDependencies.js 2021-09-10 15:15:51 +03:00
46161eef95 Web: Moved axios to sharedDependencies.js 2021-09-10 14:49:20 +03:00
f0c7a09a6c Web: Moved common shared dependencies to sharedDependencies.js + moved workbox-window 2021-09-10 14:20:19 +03:00
f7c46a70fa Web: Updates next dev packages:
- @babel/preset-env
- css-loader
- sass
- sass-loader
- serve
- source-map-loader
- style-loader
- terser-webpack-plugin
- webpack-dev-server
+ Fixed css-loader url resolution issues
2021-09-10 11:30:27 +03:00
15dab2adaa Web: Updated copy-webpack-plugin package 2021-09-09 13:17:27 +03:00
5b880d5b6a Web: Updated clean-webpack-plugin package 2021-09-09 12:58:49 +03:00
d4bd4dcb50 Web: Updated webpack and it's dependencies (new v5.52.0) + moved to new webpack-dev-server v4.1.1 2021-09-09 11:28:52 +03:00
18718aab93 Web: Updated babel packages 2021-09-08 17:40:31 +03:00
bfb85fd05f Web: Removed duplicated dependency declaration (attr-accept) 2021-09-08 17:17:57 +03:00
8c731a1630 Web: Turned off wdyr 2021-09-08 16:57:40 +03:00
8c6de99101 Web: Updated @welldone-software/why-did-you-render, move it to the common devDependencies 2021-09-08 16:52:56 +03:00
fabaaef0f9 Web: Updated react-toastify and extended ModuleFederationPlugin shared section 2021-09-08 16:28:10 +03:00
11aa89a628 Web: Updated @babel/runtime and extended ModuleFederationPlugin shared section 2021-09-08 16:04:05 +03:00
c41eb97a0f Web: Extended ModuleFederationPlugin shared section 2021-09-08 15:41:11 +03:00
67eeb56f16 Web: Removed duplicated dependency declaration (email-addresses) 2021-09-08 13:54:49 +03:00
ef920a2023 Merge branch 'release/1.0.0' into bugfix/mousewheel-opening-files 2021-09-07 12:57:13 +03:00
d51887f642 Web: Common: Fixed Article loaders + added MainButtonLoader 2021-09-07 12:29:55 +03:00
3a4a3de30a Fix Bug 52089 - Client.Files. Elements of the page are not selected using left mouse button. 2021-09-07 11:40:32 +03:00
1ff5eadc8a Web: fixed table view 2021-09-06 16:55:29 +03:00
02d632e835 Web: People: hid the MainButton for users 2021-09-06 15:36:11 +03:00
9772cdbc7b Web: Table: fixed table view for mobile devices 2021-09-06 15:35:17 +03:00
a66e14c954 Fix bug 52324: <b> tag in toast 2021-09-02 13:09:35 +03:00
9cbf8c7140 Fixed Bug 52300 - Client.Profile. Added maxLabelWidth to FieldContainer 2021-09-01 17:07:49 +03:00
6bb9cb2235 Web: People: fixed user access for module People 2021-08-26 17:47:21 +03:00
b791586252 net6 2021-08-25 18:26:13 +03:00
8727b504b7 Merge branch 'develop' into feature/table-view
# Conflicts:
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FileTile.js
2021-08-25 16:48:07 +03:00
d8583662dc People: remove log 2021-08-20 14:42:35 +03:00
cf87addaa3 Security: added new method 2021-08-18 17:04:16 +03:00
f43e64d05d Web: People: fixed table translations 2021-08-18 16:31:51 +03:00
fce37422f4 Web: Components: fixed styled, fixed isViewedSelected error 2021-08-16 12:15:36 +03:00
f5e9e17e11 Merge branch 'develop' into feature/table-view
# Conflicts:
#	products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
2021-08-16 10:53:48 +03:00
b9d242df6f Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into develop 2021-08-12 16:19:23 +03:00
fad2a178d8 Build: Added build.static.bat + change rimraf, mkdirp packages to single shx package (npm command line util) 2021-08-12 16:18:48 +03:00
9aafaa21ea
Merge pull request #319 from ONLYOFFICE/feature/log
Feature/log
2021-08-12 15:00:53 +03:00
4919b34fd0 Web: Webpack: increased performance maxEntrypointSize and maxAssetSize 2021-08-11 20:40:31 +03:00
a26e475c94 Web: fix no license warning 2021-08-11 20:39:24 +03:00
3f56790c85 Fix bug 51365: update avatar in header 2021-08-11 10:18:10 +03:00
546c1872a3 Added asp logging 2021-08-08 16:19:54 +03:00
3c97f8e736 Web: Table: fixed TableGroupMenu resize 2021-08-02 18:16:15 +03:00
050059382b Web: People: added empty screen for table view 2021-08-02 17:00:55 +03:00
578ab81947 Web: People: fixed error with change avatar 2021-08-02 14:41:19 +03:00
8fca0ae6d1 Web: Components: Table: fixed styles, refactoring 2021-08-02 13:17:34 +03:00
eff32de5f3 Web: Components: Table: fixed TableGroupMenu 2021-07-30 18:04:05 +03:00
57b1382a87 Web: fixed article panel resize 2021-07-30 16:08:54 +03:00
562e1f203b Web: Components: Table: added min column width 2021-07-30 14:51:40 +03:00
37b1cf7a3d Web: People: fixed onUserNameClick 2021-07-30 11:10:47 +03:00
6829a2c854 Web: People: added table view, refactoring 2021-07-29 20:21:26 +03:00
4407fffbc5 Web: People: moved header dialog to Dialogs.js, moved header menu to store 2021-07-29 18:13:03 +03:00
e6efbb45b1 Web: People: added new translations, moved translations to Common.json 2021-07-29 16:09:56 +03:00
24a550cf57 Web: People: created new HOCs for people, refactoring 2021-07-28 21:06:14 +03:00
2abbd580c2 Merge branch 'develop' into feature/table-view
# Conflicts:
#	public/locales/en/Common.json
#	public/locales/ru/Common.json
2021-07-28 16:53:23 +03:00
e2d3f3195d Merge branch 'develop' into release/1.0.0 2021-07-26 15:40:05 +03:00
538d65c724 Web: Remove query hash from remoteEntry.js 2021-07-26 14:02:10 +03:00
0f27a6c673 Merge branch 'develop' into release/1.0.0 2021-07-23 17:34:43 +03:00
675fb8de21 Web: Fix caching remoteEntry.js 2021-07-23 17:20:42 +03:00
9b47aa8d4a Merge branch 'develop' into feature/table-view 2021-07-22 16:56:48 +03:00
fa500d094f Merge branch 'develop' into release/1.0.0 2021-07-22 11:12:37 +03:00
13f8f5ef7d Fix sw.js creation 2021-07-21 18:28:56 +03:00
653066af0c Merge branch 'develop' into release/1.0.0
# Conflicts:
#	config/nginx/onlyoffice.conf
2021-07-20 18:21:00 +03:00
eab97bbfed Web: init new single sw.js creation 2021-07-20 12:32:27 +03:00
f9e8b3daa1 Merge branch 'develop' into feature/table-view 2021-07-16 17:44:54 +03:00
075d9232ec Web: People: moved translation "Name" to Common.json 2021-07-16 13:23:52 +03:00
1ebc588a93 Web: Bumped version to 1.0.0 2021-07-14 13:26:36 +03:00
ad57feecd8 Log: fix configuring 2021-07-13 21:17:18 +03:00
4cd1b3fa75 Web: People: Applied prettier style fix 2021-07-09 16:15:13 +03:00
e0b37cfd1b Fix Cancel click on edit profile on personal 2021-07-09 15:30:32 +03:00
a31dc583c1 Merge branch 'develop' into feature/personal
# Conflicts:
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
#	products/ASC.Files/Client/src/pages/Settings/index.js
2021-07-02 16:26:45 +03:00
2a44887b22 Web: hid temp loaders 2021-07-02 14:28:11 +03:00
45920f7535 Web: fixed MainButton loader 2021-07-02 14:05:38 +03:00
4f9e03212f Web: Files: added filter cleaning 2021-07-02 13:44:58 +03:00
513ec04e33 Merge branch 'develop' into feature/translations-loaders
# Conflicts:
#	products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	products/ASC.People/Client/src/components/Article/MainButton/index.js
#	products/ASC.People/Client/src/pages/Home/Section/Header/index.js
2021-07-01 16:47:34 +03:00
b195036cd0 Web: People: added withLoader HOC to Section Header 2021-07-01 16:43:42 +03:00
abfcba8993 Web: People: added withLoader HOC to MainButton 2021-07-01 15:48:26 +03:00
2c1bdf086a Web: People: added loaders to people translations 2021-06-30 18:29:06 +03:00
69889cab4c Merge branch 'develop' into feature/privacy-rooms-page
# Conflicts:
#	packages/asc-web-common/components/PageLayout/index.js
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/helpers/constants.js
#	products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
#	products/ASC.Files/Client/src/store/FilesStore.js
2021-06-30 16:28:37 +03:00
d9eca86efa Web: People: added tReady to file dialogs 2021-06-30 14:11:52 +03:00
2cdcd36020 Web: Commented annoying logs 2021-06-22 13:43:18 +03:00
6118e95028 Merge branch 'develop' into feature/personal 2021-06-17 14:25:09 +03:00
01639a56cc RazorCompileOnBuild:false<
GenerateMvcApplicationPartsAssemblyAttributes:false
2021-06-16 20:08:26 +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
d44f1bee0f Web: fixed loading people/my, fixed Loaders.ProfileView, deleted unnecessary code 2021-06-11 16:57:17 +03:00
Artem Tarasov
1073da9d58 Web: deleted unnecessary code 2021-06-11 14:55:53 +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
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
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
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
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
acd4a3893c Web: added rule to webpack.config for woff, woff2 2021-06-06 23:39:52 +03:00