Commit Graph

686 Commits

Author SHA1 Message Date
c8772bac0f Fix Bug 52089 - Client.Files. Elements of the page are not selected using left mouse button. 2021-09-09 17:29:09 +03:00
2c80148662 Web: Components: Fixed icons location for macOS/iOS. 2021-09-09 13:05:56 +03:00
efd4302538 Web: Components: Fixed toastr icon location 2021-09-09 12:44:23 +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
fabaaef0f9 Web: Updated react-toastify and extended ModuleFederationPlugin shared section 2021-09-08 16:28:10 +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
8e6fa7f5fa Web: Components: added banner img loader 2021-09-08 10:35:36 +03:00
0373be2a18 Fix Bug 52282 - Client.Files. When grabbing the left mouse button, page elements go beyond their boundaries. 2021-09-07 12:08:46 +03:00
ea9b6371a5 Web: Files: Table: added click on column header 2021-09-03 12:53:03 +03:00
1fdb42a53a Fix Error 52282 - Client.Files. When grabbing the left mouse button, page elements go beyond their boundaries. 2021-09-01 15:25:20 +03:00
e4c34e5068 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-08-30 16:24:22 +03:00
6e987786f4 Fix Bug 52089 - Client.Files. Elements of the page are not selected using left mouse button. 2021-08-30 16:24:16 +03:00
9236a83ab8 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-08-30 16:04:45 +03:00
880d73ae22 Fix Bug 52269 - Client. Files. Removed sorting by "Author" for personal 2021-08-30 16:04:35 +03:00
51c2341248 Fix Bug 52089 - Client.Files. Elements of the page are not selected using left mouse button. 2021-08-30 15:59:17 +03:00
e1f320c2f1 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-08-27 17:45:59 +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
2a872fe337 Fix Bug 52089 - Client.Files. Elements of the page are not selected using left mouse button. 2021-08-27 17:10:26 +03:00
45865753a2 Web: Components: Table: fixed onResize error 2021-08-27 14:18:13 +03:00
a4d12a2c75 Web: Files: removed console.log 2021-08-27 14:06:24 +03:00
f740b63fa5 Web: Components: fixed hasAccess 2021-08-26 17:50:27 +03:00
6bb9cb2235 Web: People: fixed user access for module People 2021-08-26 17:47:21 +03:00
833cd9553c Web: Files: fixed FilesTableRow after merge 2021-08-26 16:20:02 +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
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
e5c15cb7a7 Web: Files: Table: fixed drag styles 2021-08-25 16:53:26 +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
248d70cbf9 Web: Components: group-button: Added alt text for component 2021-08-24 16:31:16 +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
36987fb1f3 Web: Remove useless condition, defined display type of panels. 2021-08-19 18:35:04 +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
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
34408c6e41 Web: Components: added style props for snackbar 2021-08-17 21:20:31 +03:00
88d18dd648 Web: Files: fixed row styles 2021-08-17 17:55:11 +03:00
93c2b06f06 Web: Files: removed unused code 2021-08-17 15:38:59 +03:00
6ebffc1784 Web: Components: fixed Link re-render 2021-08-17 15:19:33 +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
36b464a29b Web: Components: delete console.log 2021-08-04 11:57:12 +03:00
3c97f8e736 Web: Table: fixed TableGroupMenu resize 2021-08-02 18:16:15 +03:00
8fca0ae6d1 Web: Components: Table: fixed styles, refactoring 2021-08-02 13:17:34 +03:00
371bba612d Web: Components: fixed IconButton onClick 2021-08-02 12:30:55 +03:00
da6816f04c Web: Components: Table: fixed header crash 2021-08-02 11:50:44 +03:00
86a0f18258 Web: Components: Fixed memory leak after transition from model view to aside view. 2021-08-02 11:21:38 +03:00
432095072b Web: Table: fixed resize 2021-07-30 19:13:45 +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
ead5d1f6a1 Web: Files: SelectorFolder: The component has been simplified and extended (aside view). 2021-07-30 14:18:11 +03:00
e469f6b555 Web: Components: fixed the logic of adding new columns 2021-07-30 13:54:13 +03:00
1648777ffa Web: Components: Table: fixed columns resize 2021-07-30 10:02:30 +03:00
6829a2c854 Web: People: added table view, refactoring 2021-07-29 20:21:26 +03:00
bd2a5070a2 Web: Components: fixed checkbox onChange event 2021-07-29 18:13:57 +03:00
24a550cf57 Web: People: created new HOCs for people, refactoring 2021-07-28 21:06:14 +03:00
eb1049790b Web: Files: fixed table filter 2021-07-28 17:22:50 +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
3edc22c2fb Web: Files: added change of view from table to rows 2021-07-28 16:42:07 +03:00
b1ddf85906 Web: Components: fixed view-selector selection bug 2021-07-28 16:37:34 +03:00
6b08fa8a84 Web: Files: fixed table styles 2021-07-27 16:02:25 +03:00
475d6d638f Web: Files: added column filtering 2021-07-27 15:22:51 +03:00
445c7ae43f Web: Files: added cell type 2021-07-27 13:51:56 +03:00
c834c7615a Web: Components: fixed banner button color 2021-07-27 12:47:55 +03:00
3c7d700a49 Web: Components: added new logic for resizing columns 2021-07-26 17:42:45 +03:00
e17c996111 Web: Components: fixed snackbar button 2021-07-26 12:31:56 +03:00
d86605e2da Web: Files: added drag and drop for table 2021-07-23 18:13:06 +03:00
7f389e200e Web: Files: added dragOptions to TableRow 2021-07-23 16:19:53 +03:00
b02bf63a8e Web: Files: fixed display of share column 2021-07-23 14:17:23 +03:00
89f63d3326 Web: Components: added button decoration 2021-07-23 12:23:00 +03:00
09c9cfe645 Web: Table: added the opportunity to hide columns, fixed styles, refactoring 2021-07-22 16:55:26 +03:00
e7f9bba04c Web: Components: fixed snackbar close 2021-07-21 12:40:52 +03:00
c92d8318f1 Web: Files: fixed header sorting, removed unused code 2021-07-21 12:16:46 +03:00
8c76638669 Web: Components: added insert html in snackbar 2021-07-21 10:52:15 +03:00
b903e58002 Web: Components: rewriting snackbar on class component 2021-07-21 07:15:25 +03:00
044168c6db Web: Components: fixed header styles 2021-07-20 16:01:54 +03:00
d84229886f Web: Components: Table: added header filtering, refactoring 2021-07-20 13:29:39 +03:00
dc8fd150a3 Web: Components: added header align props 2021-07-20 13:28:36 +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
02c39878d4 Web: Components: added text style props 2021-07-20 13:19:56 +03:00
0127a555c8 Web: Components: added show icon props 2021-07-20 13:07:50 +03:00
514aadfc13 Web: Components: fixed color props 2021-07-20 11:27:07 +03:00
a3b20c12dc Web: Components: added color props 2021-07-20 11:07:41 +03:00
f645d6acc0 Web: Components: added background image props 2021-07-20 06:51:29 +03:00
5ed5adbb9b Web: Components: Table: added settings, fixed table group menu header 2021-07-19 14:09:09 +03:00
b957b48c4e Web: Components: Table: fixed header styles 2021-07-16 15:32:46 +03:00
bfa7f75eb2 Web: Files: added translations to TableHeader.js 2021-07-16 13:24:25 +03:00
4cb025b5b2 Web: Files: added selectbox support 2021-07-16 12:36:47 +03:00
a5835615b9 Web: Components: Table: added default header styles 2021-07-16 11:55:59 +03:00
cd8242ee69 Web: Files: added context-menu to files module 2021-07-15 18:10:37 +03:00
2751e0710b Web: Components: added table container styles 2021-07-15 16:56:12 +03:00
d1ec4a262b Web: Components: added TableGroupMenu 2021-07-15 16:55:24 +03:00
568aa61071 Web: Table: refactoring 2021-07-15 10:57:06 +03:00
624b0703c9 Web: Components: fixed color 2021-07-15 09:56:09 +03:00
d7b5f504ed Web: Components: added btnText props 2021-07-15 09:55:21 +03:00
29866d73ac Web: Components: deleted unused 2021-07-14 17:13:16 +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
245928b14e Web: Components: removed unused table files 2021-07-13 11:52:34 +03:00
08a380d5aa Web: Table: changed the logic of work 2021-07-13 11:07:50 +03:00
cc2377aa33 Merge branch 'develop' into feature/table-view 2021-07-12 11:19:59 +03:00
4295ec2ecc Web: Components: Snackbar: Fixed mobile and small tablet margin 2021-07-09 19:21:34 +03:00
3cfc3bd924 Web: Components: Snackbar: Fixed mobile margin 2021-07-09 19:10:34 +03:00
39b7163267 Web: Files: added new table cells, fixed table styles 2021-07-09 13:39:09 +03:00
64f455eb59 Web: init table view 2021-07-09 11:59:20 +03:00
57b485906c Web: Components: fixed banner margin 2021-07-02 18:08:04 +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
749728d085 Web: Components: fixed banner width 2021-07-02 13:21:54 +03:00
c940aae128 Web: refactoring translation loaders 2021-07-02 12:25:36 +03:00
6fa5368336 Web: Components: fixed banner sub-header line height 2021-07-01 15:18:02 +03:00
bca3f0f3d8 Web: Components: fixed banner width for tablet 2021-07-01 14:36:48 +03:00
79c7a461d7 Web: Components: fixed banner width 2021-07-01 13:46:18 +03:00
a7d56b56f2 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/CampaignsBanner 2021-07-01 13:12:18 +03:00
a489e73245 Web: Components: fixed banner styles 2021-07-01 12:23:20 +03:00
e2adbff10f Web: Components: fixed banner styles 2021-07-01 11:52:56 +03:00
a4929bbdd4 Web: Components: fixed banner style 2021-07-01 11:23:39 +03:00
fe1a787d1b Web: Components: disabled hover button in banner 2021-07-01 10:51:47 +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
348a0577e7 Web: Components: fixed banner 2021-07-01 00:50:15 +03:00
0d3f441fd5 Web: Components: added body link for banner 2021-07-01 00:28:58 +03:00
6fe51a936e Web: Components: added campaigns banner test 2021-06-30 18:35:25 +03:00
1edb2662f1 Web: Components: added campaigns banner storybook 2021-06-30 18:31:44 +03:00
be88eae6bf Web: Components: added campaigns banner 2021-06-30 18:10:16 +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
Artem Tarasov
51e17e5510 Web: Files: fixed reset selection when open aside 2021-06-30 12:55:10 +03:00
Artem Tarasov
4da80d3f0c Web: Files: deleted unnecessary code 2021-06-30 10:50:06 +03:00
d163e09a1c Web: Components: added isLoading prop to modal-dialog 2021-06-30 10:23:49 +03:00
Artem Tarasov
8d1be25dbc Web: Component: ViewSelector: fixed styled 2021-06-29 22:02:12 +03:00
Artem Tarasov
3385d367d4 Web: Files: refactoring 2021-06-29 15:48:17 +03:00
Artem Tarasov
d73bb73dab Web: Components: rewrited component SwitchButton to ViewSelector 2021-06-29 15:27:46 +03:00
b0f64ca924 Merge branch 'develop' into feature/personal 2021-06-29 14:50:51 +03:00
Artem Tarasov
d98954d921 Merge branch 'develop' into feature/thumbnails 2021-06-25 15:41:12 +03:00
9462cd7bdd Web: Storybook: Update package.json 2021-06-25 14:19: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
a55544454a Web: Common: added support scroll to selectbox, fixed styles 2021-06-18 17:17:59 +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
b7ce849e32 Web: Components: Theme: Fixed line height for ComboBox component 2021-06-18 09:57:02 +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
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
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
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
Vladislav Makhov
87c8da2355 web:components: change config 2021-06-10 18:06:25 +03:00
Vladislav Makhov
98d9881ef1 web: components: add snackbar 2021-06-10 17:20:09 +03:00
93c2f7fb07 Web: Component: added tooltipColor for help button 2021-06-09 04:02:58 +03:00
6fcddbcefa Web: Components: added color for tooltip 2021-06-09 04:02:28 +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
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
Artem Tarasov
fbab4041c9 Merge branch 'develop' into feature/thumbnails
# Conflicts:
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FilesTileContainer.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FilesTileContent.js
#	products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
#	products/ASC.Files/Server/DocStore
2021-06-02 15:07:40 +03:00
60a7e84f60 Web: ProfileAction : Added locale usage for DateInput 2021-06-02 12:04:26 +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
72527ccded Merge branch 'master' into develop
# Conflicts:
#	lerna.json
#	package.json
#	packages/asc-web-common/package.json
#	packages/asc-web-components/package.json
#	products/ASC.CRM/Client/package.json
#	products/ASC.Calendar/Client/package.json
#	products/ASC.Files/Client/package.json
#	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-05-29 21:57:42 +03:00
d585c0a785 Web: Bumped version to 0.1.10 2021-05-29 21:26:13 +03:00
Artem Tarasov
e7a7aed6ec Merge branch 'develop' into feature/thumbnails
# Conflicts:
#	packages/asc-web-common/components/PageLayout/index.js
#	products/ASC.Files/Client/src/Files.jsx
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FilesTileContent.js
#	products/ASC.Files/Client/src/pages/Home/index.js
#	products/ASC.Files/Client/src/store/index.js
2021-05-28 15:30:39 +03:00
792430a0c6 Web: Components: fixed combobox clickability 2021-05-27 14:50:23 +03:00
3ad8b7e1dc Web: Components: fixed row checkbox clickability 2021-05-27 13:27:08 +03:00
757e90ee7a Web: Components: fixed help-button iconName path 2021-05-26 17:16:32 +03:00
7e19a25b0c Web: fixed text styles 2021-05-24 14:30:11 +03:00
Alexey Kostenko
fbbec464d7 Web: Components: Updated ToggleButton (Added animation - framer-motion, and isLoading prop) 2021-05-20 19:11:44 +03:00
16d6db9054 Web: Files: fixed context-menu drag 2021-05-20 12:54:16 +03:00
Artem Tarasov
5996b3f74f Merge branch 'develop' into bugfix/fixed-styles 2021-05-20 01:00:36 +03:00
Artem Tarasov
80a09fdb31 Web: Client: NavMenu: fixed position version-box when change orientation or window size 2021-05-20 00:57:11 +03:00
Alexey Kostenko
f25eb00494 Merge branch 'develop' into feature/access-rights-admins 2021-05-19 18:05:19 +03:00
d5ff576188 Web: Files: Store: Added mark read action, added remove from list and mark read icons 2021-05-19 13:54:45 +03:00
6c51f15d28 Web: Components: fixed toggle-button styles 2021-05-18 17:58:45 +03:00
Artem Tarasov
d43493e787 Merge branch 'develop' into bugfix/fixed-styles 2021-05-16 00:50:21 +03:00
Artem Tarasov
31105f4eb8 Web: Components: TreeMenu: fixed badge hitting the name of an item in menu wit a large number of new notifications 2021-05-16 00:50:09 +03:00
Alexey Kostenko
1d036e33d6 Merge branch 'develop' into feature/access-rights-admins 2021-05-14 13:13:34 +03:00
0d98b05210 Web: Files: fixed icons clickability 2021-05-13 16:57:10 +03:00
Artem Tarasov
940dc60684 Web: Components: fix style of IconButton in PasswordInput Components 2021-05-13 00:00:55 +03:00
Alexey Kostenko
f9c2eaefa6 Web: Components: Added prop - onClick anywhere in the row, except the checkbox and context menu 2021-05-11 14:54:30 +03:00
Artem Tarasov
58a41faa4a Merge branch 'develop' into feature/thumbnails
# Conflicts:
#	products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
#	yarn.lock
2021-05-11 10:30:19 +03:00
57a4b8a9b8 Upgrade lodash to version 4.17.21 (lodash vulnerability issue) 2021-05-07 21:12:25 +03:00
3ae370deed Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into develop 2021-05-07 18:54:42 +03:00
6c3244a3e9 Web: Added opportunity to deploy all static clients to build/deploy directory (yarn build && yarn deploy) 2021-05-07 18:54:25 +03:00
95c9c9d1a3 Merge branch 'develop' into feature/portal-modal-dialog 2021-05-06 16:30:31 +03:00
b7af18f636 v0.1.9 2021-05-06 14:57:01 +03:00
c50c65a1c5 Web: Components: moved ModalDialog to Portal 2021-05-06 12:49:53 +03:00
3365d1a1dc Web: Client: added showCopyLink prop to password-input component, fixed displaying "copy email and password" link 2021-05-05 15:48:19 +03:00
14719ed698 Web: Components: fixed checkbox icons style 2021-04-27 14:31:05 +03:00
Artem Tarasov
5d2264d483 Merge branch 'develop' into feature/thumbnails
# Conflicts:
#	products/ASC.Files/Client/src/components/EditingWrapperComponent.js
#	products/ASC.Files/Client/src/components/FileItem.js
#	products/ASC.Files/Client/src/components/FilesContainer.js
#	products/ASC.Files/Client/src/components/FilesContent.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/EditingWrapperComponent.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/SimpleFilesRow.js
#	products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
#	products/ASC.Files/Client/src/components/sub-components/Badges.js
#	products/ASC.Files/Client/src/components/sub-components/EditingWrapperComponent.js
#	products/ASC.Files/Client/src/components/sub-components/Icons.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/FilesRowContainer.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleRowContent.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/BadgesFileTile.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FilesTileContainer.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/SimpleTileContent.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/TileContainer.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/TileContent.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
2021-04-27 13:40:38 +03:00
f3610ce7f6 Web: Common: Fix openEdit query param 2021-04-26 19:02:16 +03:00
cad6ee216c Web: Components: Badge: Fixed event propagation for Badge component 2021-04-26 10:25:45 +03:00
7c9e35d004 Web: Components: ContextMenuButton: Fixed out of event call for new menu item 2021-04-26 09:45:57 +03:00
d2588270cf Merge branch 'master' into develop 2021-04-23 20:16:42 +03:00
8159ae7b69 Web: Components: Row: Added new context-menu usage inside row 2021-04-23 17:58:06 +03:00
02bcb50e67 Web: Files: Fix ConnectedClouds context-options work 2021-04-23 15:02:57 +03:00
Alexey Kostenko
2d6083c972 Web: Components: Fixed warnings 2021-04-22 16:10:26 +03:00
Alexey Kostenko
8519fe4d60 Web: Components: SocialButton style fix 2021-04-22 14:54:06 +03:00
Alexey Kostenko
691e7d5498 Merge branch 'develop' into feature/oauth2.0 2021-04-21 15:04:26 +03:00
TatianaLopaeva
0f3eb1350b Merge branch 'develop' into feature/team-template
# Conflicts:
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
2021-04-20 12:05:19 +03:00
3734027f4f Web: Files: fixed newItem styles 2021-04-19 14:16:42 +03:00
9b6e4ace8b Web: Files: fixed badge for tree menu 2021-04-19 14:08:40 +03:00
Alexey Kostenko
d9860256ec Web: Common/Components: FacebookButton style fix 2021-04-19 09:49:47 +03:00
7062c713ad Merge branch 'bugfix/v0.1.6' of https://github.com/ONLYOFFICE/AppServer into bugfix/v0.1.6 2021-04-16 16:05:01 +03:00
a289256846 Web: Files: added ConflictResolveDialog, refactoring files operations 2021-04-16 16:04:50 +03:00
TatianaLopaeva
d4da2a8cbb Web: Fixed width of input for horizontal orientation. 2021-04-16 14:38:17 +03:00
Alexey Kostenko
96ec652313 Merge branch 'develop' into feature/oauth2.0 2021-04-16 14:25:37 +03:00
TatianaLopaeva
297e4f42e9 Merge branch 'develop' into feature/team-template 2021-04-16 09:25:43 +03:00
Artem Tarasov
54b96e8aa0 Merge branch 'develop' into feature/thumbnails
# Conflicts:
#	packages/asc-web-common/components/PageLayout/sub-components/SelectedFrame.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesContent.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/FilesRowContainer.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/SimpleFilesRow.js
2021-04-15 15:05:15 +03:00
13d083f01c Web: GroupMenu: Fix wrong items title displaying 2021-04-15 10:54:12 +03:00
Artem Tarasov
74a5bf33dc Web: Files: fix drag, deleted console.log 2021-04-14 12:41:08 +03:00
Artem Tarasov
4be1db4c9a Web: Files: added calling the context menu when right-clicking on a tile 2021-04-14 00:09:51 +03:00
TatianaLopaeva
39064cf4e2 Web: Settings: Added cancel and save button. 2021-04-13 22:51:43 +03:00
4b5c73b3e7 Web: fixed input user-select 2021-04-13 17:05:23 +03:00
a321619c98 Web: fixed input select 2021-04-13 15:18:33 +03:00
c324404767 Web: fixed firefox frame 2021-04-13 14:07:44 +03:00
Alexey Kostenko
e99f66267f Style fix 2021-04-13 13:15:30 +03:00
5936640ce2 Web: fixed selection 2021-04-13 12:43:17 +03:00
Alexey Kostenko
571b412d27 Web: Client/Components: Fixed facebook button styles/icon, fixed translations 2021-04-13 11:17:39 +03:00
Alexey Kostenko
544a24d0f1 Web: Client/Components: Style fix and added translations 2021-04-13 09:45:52 +03:00
Alexey Kostenko
e187db767f Web: Login: Updated field with buttons for login 2021-04-09 16:00:41 +03:00
Alexey Kostenko
b8354a98bf Web: Components: Added FacebookButton component 2021-04-09 15:55:54 +03:00
Artem Tarasov
f8b36757ae Merge branch 'develop' into feature/thumbnails
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesContent.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/SimpleFilesRow.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
#	products/ASC.Files/Client/src/store/index.js
2021-04-09 11:51:39 +03:00
Alexey Kostenko
ec6c1df3cf Merge branch 'develop' into feature/oauth2.0 2021-04-08 11:59:08 +03:00
Artem Tarasov
3ee7541e54 Web: Components/People: fixed translation in PasswordInput 2021-04-07 14:41:46 +03:00
Artem Tarasov
6eb9f8eeaa Web: Components: fixed size of sharing icon in the context menu 2021-04-06 18:51:11 +03:00
424efc1e72 Web: Files: fixed treeFolders drag 2021-04-06 15:47:04 +03:00
Ilya Oleshko
b228e20cdb Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0 2021-04-05 18:10:35 +03:00
Ilya Oleshko
f6d8238602 Web: Files: Fixed empty elements inside context menu, added missing actions for deleted items 2021-04-05 18:10:26 +03:00
TatianaLopaeva
a75b57060d Web: components: Fixed styles of icons. 2021-04-05 17:49:22 +03:00
Ilya Oleshko
018f3fad33 Web: Files: Added data-api for new ContextMenu 2021-04-05 16:44:55 +03:00
Artem Tarasov
43491f42a9 Merge branch 'develop' into feature/thumbnails
# Conflicts:
#	products/ASC.Files/Client/src/Files.jsx
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesContent.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/FilesRowContainer.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/SimpleFilesRow.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/store/InitFilesStore.js
2021-04-05 10:54:27 +03:00
Ilya Oleshko
3c4cd300a3 Web: Components: ContextMenuButton: Added to boolean for isMobile 2021-04-02 19:33:17 +03:00
Ilya Oleshko
3ae0a4703f Web: Components: Row: Removed unused test 2021-04-02 18:05:26 +03:00
Ilya Oleshko
5733a4d9ab Web: Components: ContextMenu: Added hiding disabled items inside ContextMenu component 2021-04-02 17:54:52 +03:00
Ilya Oleshko
6c0918409f Web: Components: Row: Fixed multi-open context menu on row 2021-04-02 17:31:36 +03:00
Artem Tarasov
43b9301e90 Merge branch 'develop' into feature/thumbnails
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/SimpleFilesRow.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTile/FilesTileContainer.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
2021-04-01 18:19:09 +03:00
Ilya Oleshko
04b8500a78 Web: Components: Apply ContextMenu at Row 2021-04-01 13:22:37 +03:00
Ilya Oleshko
4a66eda956 Merge branch 'develop' into feature/contextmenu-refactoring 2021-03-31 15:21:16 +03:00
Ilya Oleshko
81c18fcd49 Merge branch 'develop' into feature/contextmenu-refactoring 2021-03-31 13:52:08 +03:00
Ilya Oleshko
d75e0e7e1d Web: Components: Fixed usage webkit-touch-callout at TextInput component only for desktop 2021-03-31 12:39:31 +03:00
Ilya Oleshko
b979b3324f Web: Components: Added stopping webkit-touch-callout at GroupButtonsMenu component 2021-03-31 10:44:04 +03:00
Ilya Oleshko
d12a3460db Web: Components: Added stopping webkit-touch-callout at TextInput component 2021-03-31 10:43:41 +03:00
Alexey Kostenko
0f5e5cce3f Web: Components/People/Login: Fixed warning ("React does not recognize prop") 2021-03-30 11:37:21 +03:00
Ilya Oleshko
9412f574ec Web: Components: ContextMenu added base styling 2021-03-30 10:42:10 +03:00
Alexey Kostenko
1546bacaf9 Web: Components: fixed socialButton event 2021-03-26 17:16:34 +03:00
Ilya Oleshko
53c0e36967 Web: Components: Reworked context-menu component 2021-03-26 16:03:51 +03:00
Ilya Oleshko
eef2e8f385 Web: Components: Added Portal component 2021-03-26 16:03:19 +03:00
Ilya Oleshko
10b27e532d Web: Components: Utils: Added DOM helpers 2021-03-26 16:02:44 +03:00
Ilya Oleshko
f7b31231d0 Web: Components: Utils: Added object to JSX converter 2021-03-26 16:02:05 +03:00
Ilya Oleshko
983e689bbe Web: Components: Utils: Added class name combiner 2021-03-26 16:01:22 +03:00
Alexey Kostenko
6fadc94b71 Web: Components/People: Fixed social-button styles 2021-03-25 18:06:48 +03:00
1955e4f141 Web: Files: fixed drag styles, added drag tooltip 2021-03-25 15:29:34 +03:00