Commit Graph

463 Commits

Author SHA1 Message Date
098e872a38 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Client/yarn.lock
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Common/yarn.lock
#	web/ASC.Web.Components/package.json
#	web/ASC.Web.Components/yarn.lock
2020-07-16 15:58:43 +03:00
ec8c6a5ddb Fixed security vulnerability in lodash 2020-07-16 15:54:04 +03:00
78b10ab893 Update yarn.lock files 2020-07-16 14:55:40 +03:00
Ilya Oleshko
b6dd65f1c7 Merge branch 'master' into feature/files 2020-06-15 09:22:52 +03:00
Ilya Oleshko
a1f3b4bde0 Web: Removed faker package, updated yarn lock and fixed stories 2020-06-11 15:54:53 +03:00
7ee4237af4 Update storybook packages (Fix ReDoS vulnerability in websocket-extensions) 2020-06-11 15:13:43 +03:00
144877ab38 Update yarn.lock files 2020-06-08 12:00:05 +03:00
NikolayRechkin
64811dbd39 update yarn.lock files 2020-05-21 15:35:28 +03:00
Daniil Senkiv
71e5e3c73c Web.Client: fix 09474e8be9 2020-03-20 11:15:27 +03:00
15c5114a10 Update yarn.lock files 2020-03-18 13:08:58 +03:00
Daniil Senkiv
730ca469a1 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json
#	products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json
#	products/ASC.Files/Client/src/store/files/actions.js
#	products/ASC.Files/Client/src/store/files/reducers.js
#	products/ASC.Files/Client/src/store/files/selectors.js
2020-03-17 09:07:39 +03:00
Ilya Oleshko
8b1568701f Web.Client: Settings: Fixed admin`s row width 2020-03-16 12:19:32 +03:00
0bcfec5a19 Update yarn.lock files 2020-03-16 11:20:25 +03:00
eb21f8a957 Update yarn.lock files 2020-03-16 10:37:55 +03:00
dependabot[bot]
2f8f43a03a
Bump acorn from 5.7.3 to 5.7.4 in /web/ASC.Web.Client
Bumps [acorn](https://github.com/acornjs/acorn) from 5.7.3 to 5.7.4.
- [Release notes](https://github.com/acornjs/acorn/releases)
- [Commits](https://github.com/acornjs/acorn/compare/5.7.3...5.7.4)

Signed-off-by: dependabot[bot] <support@github.com>
2020-03-16 07:22:50 +00:00
e4af4d168f Update yarn.lock files 2020-02-26 10:23:38 +03:00
2ccd226940 web: clients: Fixed CRA proxy bug; 2020-02-26 10:02:37 +03:00
f3731820cb Web: Client: change title of pages, added new translations 2020-02-18 13:15:02 +03:00
0eb0048596 Web: Client: change title of pages 2020-02-17 16:50:42 +03:00
35ee20c957 Web: Client: added logo icons 2020-02-14 16:05:32 +03:00
Ilya Oleshko
e99d1acc3c Web: Common: Layout: Added use of icons from module 2020-02-12 16:18:23 +03:00
NikolayRechkin
396ef70d49 web: client: small fix a loader 2020-02-06 16:13:05 +03:00
Daniil Senkiv
fff197c90c Web.Client: i18n config: debug only in development mode 2020-02-05 15:45:12 +03:00
Daniil Senkiv
77f88297ed Web.Client: removed useless changeLanguage function 2020-02-05 10:57:49 +03:00
Daniil Senkiv
ea3ab6c723 Web.Client: Settings: hidden whiteLabel page 2020-02-03 17:40:48 +03:00
Daniil Senkiv
99e9aee6df Web.Client: Settings: AccessRights: passed groupsCaption prop to AdvancedSelectors from redux 2020-02-03 17:22:22 +03:00
Daniil Senkiv
f9b390e8e7 Web.Client: Settings: added request for new customNames if user without user language changed portal language 2020-02-03 17:01:15 +03:00
Daniil Senkiv
a4d2b2ecff Web.Client: Settings: Customization: added handling error for restore greeting title 2020-02-03 16:45:12 +03:00
Daniil Senkiv
93a844e5dd Web.Client: Customization: fixed working with translations 2020-02-03 16:36:15 +03:00
3d1e4cc5f5 Web: Client: fixed accessRight admins page 2020-02-03 16:01:03 +03:00
cebb0122db web: Client: Fixed logout redirect on sing out click (issue: unknown 't' function) 2020-02-03 11:38:53 +03:00
f6ac92ad3d web: Client: Removed useless variable 2020-02-03 11:37:27 +03:00
f0cec97c3e web: common: Added ErrorBoundary component with componentDidCatch and new Error520Container show 2020-02-03 11:36:25 +03:00
f3e670e393 web: Common: Extended PeopleSelector component with Me option 2020-02-02 17:33:44 +03:00
Daniil Senkiv
33a841715b Web.Client: Settings: Common: fixed changing language 2020-01-31 15:48:41 +03:00
Daniil Senkiv
13929cabf3 Web.Client: Settings: Customization: replaced i18n method 2020-01-29 13:21:01 +03:00
Daniil Senkiv
f78f0cd374 i18n.reloadResources: fixed for reducing reloading translations 2020-01-29 13:15:46 +03:00
Daniil Senkiv
2f953e4de9 Merge branch 'master' into feature/translations 2020-01-28 17:13:00 +03:00
Daniil Senkiv
756df5b71b Web.Client: Settings: customization: fixed style 2020-01-28 16:10:58 +03:00
Daniil Senkiv
3d82ffcdcd Web.Client: Settings: removed useless container for header 2020-01-28 14:50:23 +03:00
Daniil Senkiv
60ceba9699 web.Client: fixed translation keys 2020-01-28 10:01:25 +03:00
Daniil Senkiv
96c7143192 Merge branch 'master' into feature/translations 2020-01-27 14:49:26 +03:00
effad5439c web: Added dummy Documents product 2020-01-27 14:07:02 +03:00
Daniil Senkiv
8713184d56 Web.Client: removed useless i18n config 2020-01-26 15:05:26 +03:00
Daniil Senkiv
ec2a58e5d5 Web.Client: Home: added ru translation 2020-01-26 15:02:53 +03:00
Daniil Senkiv
d0eebbe6fd Web.Client: Settings: access rights: added translations 2020-01-26 14:47:15 +03:00
Daniil Senkiv
9d82e657ed Merge branch 'master' into feature/translations
# Conflicts:
#	web/ASC.Web.Common/src/components/PageLayout/index.js
#	web/ASC.Web.Common/src/constants/index.js
2020-01-26 14:12:37 +03:00
Daniil Senkiv
2e7b7ff9e8 Web.Client/Common: fixed problem with working if user without user language changed portal language 2020-01-24 21:46:25 +03:00
ec7299aabf web: Common: Added ComingSoon page 2020-01-24 17:48:36 +03:00
f776054b35 ASC.Web.Client: Settings: AccessRights: hid modules tab 2020-01-24 15:50:02 +03:00