Commit Graph

499 Commits

Author SHA1 Message Date
e2f977ce17
Merge branch 'develop' into feature/optimization 2021-09-15 11:47:29 +03:00
03d8d560ba Web: Hide internal login from personal mode 2021-09-14 16:44:39 +03:00
79b778c36d
Merge branch 'develop' into feature/new-campaigns 2021-09-14 11:48:24 +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
8c6de99101 Web: Updated @welldone-software/why-did-you-render, move it to the common devDependencies 2021-09-08 16:52:56 +03:00
b0147cc811 Web: Removed duplicated dependency declaration (fast-deep-equal) 2021-09-08 15:40:38 +03:00
551c623541 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/new-campaigns
# Conflicts:
#	packages/asc-web-components/campaigns-banner/index.js
#	products/ASC.Files/Client/src/components/Article/Body/index.js
2021-09-08 14:36:10 +03:00
fa1d016554 Web: Common: fixed banner translations 2021-09-07 18:34:30 +03:00
019deb54ab Web: Common: fixed article scroll 2021-09-07 16:41:10 +03:00
ef920a2023 Merge branch 'release/1.0.0' into bugfix/mousewheel-opening-files 2021-09-07 12:57:13 +03:00
c46ebd5af9 Web: Common: get campaigns translations from firebase 2021-09-07 12:48:22 +03:00
d51887f642 Web: Common: Fixed Article loaders + added MainButtonLoader 2021-09-07 12:29:55 +03:00
009a801be7 Web: Personal: fixed redirect to login 2021-09-07 11:38:24 +03:00
80f264dd34 Web: Files: fixed filter search 2021-09-06 15:59:41 +03:00
6ee8033097 Web: Common: fixed warning 2021-09-06 12:30:58 +03:00
f32b4f1c9d Web: Files: fixed filter crash 2021-09-03 17:07:07 +03:00
417f5199a2 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-09-02 18:03:49 +03:00
7d69053fc1 Fixed Bug 52088 - Client.Files. Restricted the file selection for the select box 2021-09-02 18:03:42 +03:00
72251a6c11 Fix bug 51320: «FirebaseError: Remote Config: The config fetch request timed out while in an exponential backoff state» 2021-09-02 15:05:36 +03:00
7f08893134 Fix Bug 52311 - Client.Files. Fixed filter block 2021-09-02 13:01:42 +03:00
701e61a6d1 Fix Bug 52188 - Client.Files. Fixed filter reset 2021-08-31 15:01:31 +03:00
c4fb8be12a Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/new-campaigns
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/Body/index.js
2021-08-30 16:54:41 +03:00
ccd7532161 Merge branch 'develop' into release/1.0.0
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/Body/index.js
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
2021-08-27 17:45:52 +03:00
ff7f3926ce Merge branch 'develop' into feature/table-view
# Conflicts:
#	packages/asc-web-common/components/PageLayout/index.js
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
#	public/locales/de/Common.json
#	public/locales/it/Common.json
#	public/locales/lo/Common.json
#	public/locales/pt-BR/Common.json
#	public/locales/ro/Common.json
2021-08-26 16:05:15 +03:00
26c5d2ed90 Web: Common: PageLayout: moved isArticlePinned to settingsStore 2021-08-26 15:07:29 +03:00
ea31c0f258 Web: Files: Fixed article height for tablet view, deleted useless styles. 2021-08-26 15:05:21 +03:00
c66268a9c2 Merge branch 'develop' into release/1.0.0
# Conflicts:
#	products/ASC.Files/Client/public/locales/en/Translations.json
#	products/ASC.Files/Client/public/locales/ru/Translations.json
#	products/ASC.Files/Client/src/helpers/utils.js
2021-08-26 13:49:25 +03:00
1bda036a9f Merge branch 'develop' into bugfix/render-optimization 2021-08-26 10:32:32 +03:00
c81a28f48f Web: Common: fixed onError 2021-08-25 17:54:08 +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
1a43638815 Web: added firebase storage 2021-08-24 21:52:01 +03:00
91199a0de0 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-08-24 15:50:17 +03:00
d223fb6406 Web: Components: Added application block visibility to article for tablet view. 2021-08-24 15:50:12 +03:00
b46a3ae6f0 Web: Common: PrivateRoute: fixed redirect to login 2021-08-24 11:47:00 +03:00
0cfb70d9e2 Error 52089 - Client.Files. Elements of the page are not selected using left mouse button. 2021-08-23 13:50:21 +03:00
c295f1a77c Web: Files: fixed routing to the service folder 2021-08-20 13:23:53 +03:00
0870d65c20 Web: Common: added video loaded error 2021-08-20 12:06:00 +03:00
31bee632e0 Web: Common: fixed MediaViewer 2021-08-19 13:30:42 +03:00
b97e9d1fd7 Web: Common: added utils for load script 2021-08-19 13:30:15 +03:00
3b8cf0a275 Merge branch 'develop' into feature/file-folder-selectors
# Conflicts:
#	products/ASC.Files/Client/public/locales/en/Translations.json
#	products/ASC.Files/Client/public/locales/ru/Translations.json
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/helpers/utils.js
#	web/ASC.Web.Editor/src/Editor.jsx
2021-08-19 10:08:14 +03:00
dd3140129b Fix bug 51929: view tiff format 2021-08-19 05:23:50 +03:00
7cde8b26f1 Web: Common: MediaViewer refactoring 2021-08-19 04:10:32 +03:00
f53d7eb718 Web: Common: fixed article unpin 2021-08-18 17:17:45 +03:00
46a97efb52 Merge branch 'develop' into release/1.0.0
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/Body/ThirdPartyList.js
2021-08-18 16:59:00 +03:00