Commit Graph

744 Commits

Author SHA1 Message Date
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
3f81f68b29 Web: Components: fixed people group selector, fixed checkbox table settings style for drop down portals 2021-10-05 18:11:18 +05:00
19c8ee34c0 Web: Components: added drop down work in two modes 2021-10-05 16:54:45 +05:00
3262e9f767 Merge branch 'release/1.0.0' into bugfix/fixed-styles-selcted-row 2021-10-05 13:01:43 +03:00
d0229aa17f
Merge pull request #370 from ONLYOFFICE/bugfix/fix-operations-notifications
Bugfix/fix operations notifications
2021-10-05 12:32:39 +03:00
5d3d8f4d45 Web: Changed opportunity to show/hide DebugInfo to appsettings.json param "debug-info:enabled" and 'api/2.0/settings.json' 2021-10-05 11:13:38 +03:00
9ce696e624 Web: Studio: Init Debug Info
+ Added About version from package.json
+ Fix DocumentServer version
2021-10-04 17:08:03 +03:00
96980d00b8 Web: Components: changed article panel width 2021-10-04 15:08:56 +03:00
822aba4713 Web: Files: fixed download action 2021-10-03 14:47:28 +03:00
Artem Tarasov
f497e28241 Web: Common: PageLayout/Headline: fixed styles of header section, filter section 2021-10-01 16:51:28 +03:00
Artem Tarasov
9c5f4524a7 Common: PageLayout: Article: deleted devider' 2021-10-01 15:30:11 +03:00
Artem Tarasov
4a6738f898 Web: Common/Components/Files: deleted unnecessary code, refactoring 2021-10-01 11:05:03 +03:00
Artem Tarasov
8382581ff1 Merge branch 'release/1.0.0' into bugfix/fixed-styles-selcted-row 2021-09-30 10:59:20 +03:00
Artem Tarasov
e64a7f07de Web: Common/Components/Files: fixed styles when selecting row 2021-09-30 10:55:26 +03:00
e46d383196 Fix bug 52840: hide delete button in preview mode 2021-09-29 17:05:42 +03:00
e4fa7cf5fd Fix Bug 52834 - Docs. Desktop: regDesktop not calling when isEncryption equals false (personal mode issue) 2021-09-29 15:02:54 +03:00
b2676b4df8 Web: Common: Api: Removed debugger 2021-09-28 12:33:39 +03:00
9bd9bc3e33 Web: Common: Api: Changed request method from POST to GET (mobile app issue) 2021-09-28 12:32:09 +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
590db7bb67
Merge pull request #347 from ONLYOFFICE/feature/third
Feature/third
2021-09-27 12:35:07 +03:00
Artem Tarasov
ae64556bb0 web: common/people/login: renamed providers to lowercase (client) 2021-09-27 09:55:44 +03:00
25a58de730 Web: SW: Update workbox 2021-09-24 21:17:50 +03:00
6ada582cc5 Web: service-worker updates optimization 2021-09-24 20:10:54 +03:00
50becafef7 Fixed Bug 52642 - Android.Docs.Mobile. Fixed orientation change for mobile Firefox 2021-09-24 15:07:44 +03:00
cf5a7c8ff2 Bug 52726 - Client.Files.Image: Fix After removing the image from the viewer, the following media file is displayed on the page. 2021-09-23 17:05:04 +03:00
8ad5ac73c6 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-09-22 13:52:09 +03:00
a7597a42e2 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-09-21 14:01:12 +03:00
d702b47502 Fixed Bug 52642 - Android.Docs.Mobile. Fixed orientation change for mobile Firefox 2021-09-21 14:01:06 +03:00
11935dc196 Web: Common: delete useless 2021-09-21 14:00:59 +03:00
6691e523a8 Fix bug 52626, 52622: Media Viewer crash 2021-09-21 13:48:13 +03:00
15e7cf9bfd Merge branch 'release/1.0.0' into bugfix/dropdown-correct-display 2021-09-16 12:28:20 +05:00
b88a6f5ddf Merge branch 'release/1.0.0' of https://github.com/ONLYOFFICE/AppServer into release/1.0.0 2021-09-15 15:56:28 +03:00
3c77982f4a Fix Bug 51819 Web: Editor. Fixed openEdit 2021-09-15 14:52:36 +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
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
11dfddb031 Merge branch 'release/1.0.0' into bugfix/dropdown-correct-display 2021-09-14 18:33:01 +05:00
fe2cf74350 Web: Common: fix headline font size 2021-09-14 13:46:15 +03:00
52dfeaa6e7 Web: Disabled body selection for macOS (for touchpad). 2021-09-14 12:28:13 +03:00
79b778c36d
Merge branch 'develop' into feature/new-campaigns 2021-09-14 11:48:24 +03:00
e6e49559a9 Merge branch 'release/1.0.0' into bugfix/dropdown-correct-display 2021-09-13 14:59:06 +05:00
1fe11360a8 Web: Components: added portals to drop-down 2021-09-13 14:56:02 +05: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
74011d7328 Fixed Bug 52443 - Client.Files. Fixed downloadAs action 2021-09-13 11:09:59 +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
b70a9cd115 Web: Common: Fixed response for response type "text". 2021-09-10 11:52:06 +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
da606cb574 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-09-08 16:24:28 +03:00
899507000f Web: fixed login route 2021-09-08 16:24:20 +03:00
1501c1d91e FIx Bug 52243 Client.Editor. There is no prompt message indicating that the file was saved successfully when using Save Copy As. 2021-09-08 15:46:52 +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
b7df3903dd Web: Files: fixed the hiding of the article 2021-08-18 15:52:27 +03:00
b4d6beb1ae Web: Common: fixed main-snackbar style 2021-08-17 17:54:42 +03:00
48c6d35a20 Web: AuthStore: Removed useless code 2021-08-17 16:32:19 +03:00
e8991a612b Fix bug Bug 51927: MediaViewer updateHammer TypeError 2021-08-17 01:00:07 +03:00
e634b5c72f Web: Editor: Fixed converting file when open in new tab. 2021-08-16 13:17:49 +03:00
9715719994 Merge branch 'develop' into bugfix/canShare 2021-08-16 11:07:30 +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
e60815b15d Web: Refactoring and API calls optimization 2021-08-13 20:32:50 +03:00
996b438a6b Web: Api: Added opportunity to skipLogout on 401 error 2021-08-13 19:24:48 +03:00
c7efd52424 Web: Common: simplified condition 2021-08-13 16:54:05 +03:00
6e9ceea8c0 Web: Editor: Added link for insert image and mail merge. 2021-08-13 14:50:24 +03:00
9a5034386b Fix bug 51930: wrong order media 2021-08-13 07:21:10 +03:00
f3b06cf04f Web: Common: fixed video play 2021-08-13 06:45:00 +03:00
17eaf17b7d Web: Common: Add check if store is initialized. 2021-08-12 14:41:12 +03:00
0250e1c898 Web: service-worker: Force wb.messageSkipWaiting() after reload page 2021-08-11 22:04:22 +03:00
63426dcaf3 Web: Update workbox to v6.2.3 2021-08-11 20:38:39 +03:00
3f56790c85 Fix bug 51365: update avatar in header 2021-08-11 10:18:10 +03:00
26641ad77c Fix bug 51692: autoplay next file 2021-08-11 00:21:34 +03:00
d84918b6e5 Fix bug 51861: esc closed MediaViewer 2021-08-10 16:49:17 +03:00
65b7b75e26 Fix bug 51693: keyboard navigation 2021-08-10 16:12:51 +03:00
6b1447bb72 Web: Common: fixed video autoplay 2021-08-05 12:38:38 +03:00
85817fc25f Web: Common: fixed close button size 2021-08-04 17:50:50 +03:00
fccd79c997 Web: Common: added space button action 2021-08-04 12:50:44 +03:00
48f92c6ad2 Web: Common: added action on press delete 2021-08-04 12:43:31 +03:00
edc522d317 Web: Common: start video by click 2021-08-04 12:35:24 +03:00
Artem Tarasov
deeb497a9e Web: Common: AuthStore: at logout added a condition for going to the login page if personal is true 2021-08-03 11:03:19 +03:00
452cfd2b5a Web: Common: fixed getFoldersTree foldersCount 2021-07-30 18:12:10 +03:00
0457bd714a Web: Common: disabled media autoplay 2021-07-30 12:03:38 +03:00
6829a2c854 Web: People: added table view, refactoring 2021-07-29 20:21:26 +03:00
b13e71fcae Web: Files: fixed table filter 2021-07-28 17:45:09 +03:00
75e7ca893f Merge branch 'develop' into feature/file-folder-selectors
# Conflicts:
#	products/ASC.Files/Client/webpack.config.js
#	web/ASC.Web.Editor/src/Editor.jsx
2021-07-28 17:19:05 +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
90b706c750 Web: Common: fixed firebase init 2021-07-27 18:04:42 +03:00
93d1cb0f38 Fix Bug 51344 "downloadable font: kern: Too large subtable..." on FF 2021-07-27 15:56:19 +03:00
475d6d638f Web: Files: added column filtering 2021-07-27 15:22:51 +03:00
050ce4ce8d Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-07-27 14:00:39 +03:00
107476c544 Web: Common: fixed minimumFetchIntervalMillis 2021-07-27 12:32:18 +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
30b41aac42 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-07-26 12:37:01 +03:00
d86605e2da Web: Files: added drag and drop for table 2021-07-23 18:13:06 +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
01cbae520d Web: Common: fixed translations 2021-07-22 15:09:42 +03:00
34247e4a25 Web: Common: added translation in new version snackbar 2021-07-22 14:24:09 +03:00
ed5d2f5ba0 Web: Common: disabled workbox logs 2021-07-22 14:23:42 +03:00
fa500d094f Merge branch 'develop' into release/1.0.0 2021-07-22 11:12:37 +03:00
e703927239 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-07-21 18:30:33 +03:00
13f8f5ef7d Fix sw.js creation 2021-07-21 18:28:56 +03:00
ee453f8111 Web: Common: fixed main-bar style 2021-07-21 12:51:03 +03:00
c92d8318f1 Web: Files: fixed header sorting, removed unused code 2021-07-21 12:16:46 +03:00
6924b34e84 Web: Common: show new version snackbar 2021-07-21 07:23:56 +03:00
f7ce0e210b Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
# Conflicts:
#	packages/asc-web-common/utils/sw-helper.js
2021-07-21 07:20:51 +03:00
4e920bfe3c Web: Common: disabled snackbar 2021-07-21 07:19:08 +03:00
95c99a0ac9 Web: Common: added snackbar container style 2021-07-21 07:17:58 +03:00
653066af0c Merge branch 'develop' into release/1.0.0
# Conflicts:
#	config/nginx/onlyoffice.conf
2021-07-20 18:21:00 +03:00
829edbbda5 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-07-20 13:22:44 +03:00
eab97bbfed Web: init new single sw.js creation 2021-07-20 12:32:27 +03:00
5ed5adbb9b Web: Components: Table: added settings, fixed table group menu header 2021-07-19 14:09:09 +03:00
dc323f255f Enabled registerSW 2021-07-15 15:16:07 +03:00
57a1e23eba Disable registerSW for fix issues with CDN 2021-07-15 11:57:07 +03:00
e81c3df0be Added displaying version from appsettings.json (api/2.0/settings.json) 2021-07-14 17:31:06 +03:00
728b6d359d Web: Components: replaced snackbar 2021-07-14 17:12:13 +03:00
1ebc588a93 Web: Bumped version to 1.0.0 2021-07-14 13:26:36 +03:00
a3592ca94d Web: Common: added snackbar 2021-07-13 14:36:27 +03:00
cb8d225707 Merge branch 'develop' into feature/file-folder-selectors
# Conflicts:
#	products/ASC.Files/Client/src/store/index.js
2021-07-12 13:08:40 +03:00
b4c4625f3f Moved getting firebase config to API method /api/2.0/settings.json 2021-07-09 18:28:08 +03:00
0297620036 Fix SnackBar usage 2021-07-09 17:25:20 +03:00
3556497de6 Merge branch 'develop' into feature/personal 2021-07-08 14:38:26 +03:00
84fa1f8eb3 Web: Common: fixed height 2021-07-08 13:59:48 +03:00
08d3e9df5e Web: Files: Optimization: deleted getFiles function. 2021-07-08 13:25:24 +03:00
523fb66248 Web: Common: fixed buttons height 2021-07-07 13:20:16 +03:00
2e2f121d26 Web: Common: disabled hover 2021-07-07 12:47:01 +03:00
c5b409a571 Merge branch 'develop' into feature/file-folder-selectors 2021-07-07 11:41:45 +03:00
04173a1426 Web: Common: fixed 2021-07-07 11:05:18 +03:00
a9ed86fee7 Web: Common: open selector on button 2021-07-06 17:37:07 +03:00
db7ea5c88f Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into bugfix/v1.0.0
# Conflicts:
#	products/ASC.Files/Client/src/pages/Home/index.js
2021-07-06 11:38:02 +03:00
77b5a5a440 Web: Common: fixed load translate rules for campaigns 2021-07-05 20:47:49 +03:00
a325507b0e WEb: SelectFileFolder: Added custom types of files. 2021-07-02 18:35:38 +03:00
b3fd47a216 Merge branch 'feature/CampaignsBanner' of github.com:ONLYOFFICE/AppServer into feature/personal
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/Body/index.js
2021-07-02 16:42:05 +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
da924cc3b3 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/CampaignsBanner
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/Body/index.js
2021-07-02 16:12:06 +03:00
81f93c3640 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/CampaignsBanner 2021-07-02 13:22:40 +03:00
c940aae128 Web: refactoring translation loaders 2021-07-02 12:25:36 +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
5ef780d40d Web: Common: Added api methods. 2021-07-01 15:46:36 +03:00
426fce6140 Web: Common: Added api method. 2021-07-01 13:18:43 +03:00
a7d56b56f2 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/CampaignsBanner 2021-07-01 13:12:18 +03:00
19c9f88d6a Web: Common: added locales path 2021-07-01 10:40:37 +03:00
bcf7ceb568 Merge branch 'develop' into feature/translations-loaders
# Conflicts:
#	packages/asc-web-common/components/Loaders/index.js
2021-07-01 09:13:17 +03:00
c93a4eda8e Merge branch 'develop' into feature/privacy-rooms-page
# Conflicts:
#	products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
2021-06-30 17:20:54 +03:00
Artem Tarasov
ef25c07ddc Web: Common: FilterInput: fixed transfer viewSettings 2021-06-30 17:05:11 +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
1083fd8416 Merge branch 'develop' into feature/personal
# Conflicts:
#	products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
#	products/ASC.Files/Client/src/store/FilesStore.js
2021-06-30 16:09:53 +03:00
dae7215376 Web: Common: fixed article max width 2021-06-30 13:57:48 +03:00
567d3b46ed Web: Common: fixed button height on mobile 2021-06-30 13:49:33 +03:00
0a82baea4c WebL Common: fixed article max width 2021-06-30 13:38:53 +03:00
2576784207 Web: Common: added borderRadius prop 2021-06-30 12:57:05 +03:00
2a013c9c5c Web: Common: refactoring tree menu loader 2021-06-30 12:54:10 +03:00
Artem Tarasov
4da80d3f0c Web: Files: deleted unnecessary code 2021-06-30 10:50:06 +03:00
1a3cfcbf27 Web: Common: added new loaders 2021-06-30 10:22:01 +03:00
f327f42bf8 Web: Common: added filed encrypted to startUploadSession function 2021-06-29 17:54:24 +03:00
Artem Tarasov
4613940d15 Wb: Common: FileteInput: fixed display ViewSelector on mobile 2021-06-29 16:54:30 +03:00
Artem Tarasov
3385d367d4 Web: Files: refactoring 2021-06-29 15:48:17 +03:00
Artem Tarasov
0cae3990cc Web: Files: added usage ViewSelector 2021-06-29 15:32:48 +03:00
Artem Tarasov
879aaf1ffd Web: Common: Loaders: fixed description for Loaders.Tile, Loaders.Tiles 2021-06-28 11:42:38 +03:00
Artem Tarasov
ff5a165638 Web: Files: Thumbnails: fixed position of TileCOntainer, fixed readme ThileLoader 2021-06-28 11:25:23 +03:00
a1dec7cd2d Web: Common: disabled sort by button 2021-06-28 08:14:40 +03:00
Artem Tarasov
547e4a1a26 Web: Common: Filter: fixed select view 2021-06-25 16:38:57 +03:00
Artem Tarasov
52cd157d8d Web: Common: FilterInpt: deleted unnecessary code 2021-06-25 15:56:44 +03:00
Artem Tarasov
50556cb428 Web: Thumbnails: deleted unnecessary code, refactoring 2021-06-25 14:30:14 +03:00
Artem Tarasov
b65c717fd5 Web: Common: Loaders: fixed TilesLoader for Chrome 2021-06-24 19:34:47 +03:00
c8184e9dc0 Web: Files: fixed privacy bugs 2021-06-23 15:39:43 +03:00
Artem Tarasov
01fb0a6621 Web: Files: Thumbnails: deleted unnecessary code 2021-06-23 15:34:30 +03:00
Artem Tarasov
f894d4593f Web: Common: Loaders: fixed TilesLoader 2021-06-23 15:00:49 +03:00
Artem Tarasov
1430dace28 Web: fix after merdge 2021-06-23 00:00:42 +03:00
Artem Tarasov
2d9c33a8c6 Merge branch 'develop' into feature/thumbnails
# Conflicts:
#	packages/asc-web-common/components/PageLayout/index.js
2021-06-22 23:46:35 +03:00
282738cb13 Merge branch 'develop' into feature/personal 2021-06-22 18:44:12 +03:00
8963df11c3 Merge branch 'feature/personal' of https://github.com/ONLYOFFICE/AppServer into feature/personal 2021-06-22 13:41:22 +03:00
b1662e7ac6 Web: Init maintenance displaying 2021-06-22 13:41:11 +03:00
e27cee4535 Web: Common: fixed selection 2021-06-22 09:56:48 +03:00
Artem Tarasov
a81ba032fa Web: Files: Thumbnails: removed ThumbnailsStore, createThumbnails func moved to FilesStore, applied createThumbnails func 2021-06-19 09:48:30 +03:00
a55544454a Web: Common: added support scroll to selectbox, fixed styles 2021-06-18 17:17:59 +03:00
0005169b2b Web: Common: fixed dragCondition 2021-06-18 14:10:20 +03:00
7905b07c0c Web: Files: added dragCondition to Selecto 2021-06-18 13:53:32 +03:00
Artem Tarasov
83549b62cd Merge branch 'develop' into feature/thumbnails
# Conflicts:
#	packages/asc-web-common/api/files/index.js
#	products/ASC.Files/Client/src/pages/Home/index.js
2021-06-18 12:02:10 +03:00
Artem Tarasov
5034495b28 Web: Files: Thumbnails: added ThumbnailsStore, api for create thumbs 2021-06-18 01:13:49 +03:00
249af955d1 Web: Files: added onSelect function for selectbox 2021-06-17 18:46:22 +03:00
df70473ce5 Merge branch 'develop' into feature/changing-selectbox-library 2021-06-17 17:19:17 +03:00
b088c925d6 Merge branch 'develop' into feature/personal
# Conflicts:
#	products/ASC.Files/Client/src/components/dialogs/ConnectDialog/index.js
#	products/ASC.Files/Client/src/pages/Home/index.js
#	products/ASC.Files/Client/src/store/FilesStore.js
2021-06-17 15:47:33 +03:00
Artem Tarasov
a8fe50142c Web: Tree: fixed position of scrollbar on tablet 2021-06-17 15:01:35 +03:00
741de9f2f7 Web: Files: added react-selecto library 2021-06-17 14:36:45 +03:00
0aa2eb3e85 Web: Files: removed react-selectable-fast library 2021-06-17 14:27:41 +03:00
d07273cee8 Web: Files: fixed display of tree menu, added new api for tree menu 2021-06-15 14:15:48 +03:00
Artem Tarasov
f8e28e5952 Merge branch 'develop' into feature/thumbnails
# Conflicts:
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
2021-06-15 14:06:29 +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
ee4760e899 Merge branch 'develop' into feature/thumbnails
# Conflicts:
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
2021-06-11 18:30:44 +03:00
5db2e8a868 Merge branch 'develop' into feature/restore-files-convertation 2021-06-11 17:50:28 +03:00
52214ade4b Web: Common: Slowed down TopLoaderService show 2021-06-11 17:29:29 +03:00
Artem Tarasov
d44f1bee0f Web: fixed loading people/my, fixed Loaders.ProfileView, deleted unnecessary code 2021-06-11 16:57:17 +03:00
e074c0cf93 Web: Files: changed color of conversion 2021-06-11 16:56:43 +03:00
ef59a2ac47 Web: Files: added hideConfirmConvert setting 2021-06-11 15:49:32 +03:00
e0d076a7bc Merge branch 'develop' into feature/restore-files-convertation 2021-06-11 15:17:35 +03:00
Artem Tarasov
f181a491fb Merge branch 'develop' into bugfix/fixed-styles 2021-06-11 14:56:52 +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
59bab6a085 Web: Files: fixed conversion progress 2021-06-09 13:28:22 +03:00
b7ce4a35e7 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/access-rights-admins
# Conflicts:
#	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/security/sub-components/admins.js
#	web/ASC.Web.Client/src/components/pages/Settings/index.js
2021-06-09 00:23:12 +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
Artem Tarasov
c25fa589a9 Web: People: deleted fonts with ext .woff, added hash to font name 2021-06-08 15:26:56 +03:00
41ef020616 Web: Common: added backupCodes in tfa store 2021-06-08 14:19:36 +03:00
4d9c26545e Web: Files: added conversion progress 2021-06-07 16:20:18 +03:00
Artem Tarasov
7db667108b Web: added font-family Opne-Sans to /public, added import fonts to custom.scss 2021-06-06 23:35:56 +03:00
5754a9b753 Merge branch 'feature/personal' of github.com:ONLYOFFICE/AppServer into feature/personal 2021-06-04 14:43:10 +03:00
d01ef10cc5 Web: NavMenu/PageLayout: Was done:
- fixed loaders: two rectangle loader combined into one
- fixed loaders at index.html: two rectangle loader combined into one
- hide NavItem component
- hide click on Headline component
- fixed article padding style for desktop
- added new logo.
2021-06-04 14:42:21 +03:00