mushka
|
74becd6437
|
completed submenu
|
2022-02-04 13:21:10 +03:00 |
|
|
3a16fdccfd
|
Merge branch 'hotfix/v1.1.1' into hotfix/campaigns-banner
|
2022-02-03 21:05:07 +03:00 |
|
|
731cbc649b
|
Merge pull request #500 from ONLYOFFICE/feature/socket-io
Feature/socket io
|
2022-02-03 20:58:18 +03:00 |
|
|
655ae73a65
|
Web: Files: Fix refresh last page on delete all items (+ socket refactoring)
|
2022-02-03 14:57:23 +03:00 |
|
Artem Tarasov
|
6562e36a13
|
Merge pull request #502 from ONLYOFFICE/bugfix/fix-display-images-in-media-viewer
Bugfix/fix display images in media viewer
|
2022-02-02 14:55:38 +03:00 |
|
|
bf07a141d8
|
Web:Common:Fix.
|
2022-02-02 14:22:41 +03:00 |
|
|
94b364efcb
|
Merge branch 'hotfix/v1.1.1' into hotfix/campaigns-banner
|
2022-02-01 13:33:27 +05:00 |
|
|
f6a1d10a98
|
Web: Common: added maintenance exist param
|
2022-02-01 13:22:39 +05:00 |
|
|
3be43306b5
|
Web: Components: changed snackbar for new banner
|
2022-02-01 13:22:10 +05:00 |
|
|
e4c9198799
|
Web: Components: added styles
|
2022-02-01 13:20:14 +05:00 |
|
|
d05234bf6c
|
Web: Common: added main-bar styles
|
2022-02-01 13:17:37 +05:00 |
|
|
088e078c1c
|
Web: Common: added top, margin top params, fixed styles
|
2022-02-01 13:17:10 +05:00 |
|
|
dfaa34ac39
|
Web: Common: added main bar
|
2022-02-01 12:59:42 +05:00 |
|
|
a11d24db47
|
Merge branch 'hotfix/v1.1.1' into feature/socket-io
# Conflicts:
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
|
2022-01-31 13:09:11 +03:00 |
|
|
b91348695e
|
Web:Common:Changed props previewFile to isPreviewFile. Changed propTypes to boolean for isPreviewFile. Web:Files:Added onButtonBackHandler function.
|
2022-01-30 21:46:39 +03:00 |
|
|
8add87820c
|
Web:Files:Added isFirstUrl data to localStorage. Changed the condition for changing the url.
|
2022-01-28 16:34:15 +03:00 |
|
|
218990c4fa
|
b:Common: Added props onChangeUrl to the MediaViewer component.
|
2022-01-27 18:48:14 +03:00 |
|
Yaroslavna Gaivoronyuk
|
e068a183d1
|
update README.md
|
2022-01-27 17:29:39 +03:00 |
|
Yaroslavna Gaivoronyuk
|
73c6bcb4f8
|
upd
|
2022-01-27 16:45:02 +03:00 |
|
Yaroslavna Gaivoronyuk
|
bb6c826b74
|
Merge branch 'feature/accessRightSelect' of github.com:ONLYOFFICE/AppServer into feature/accessRightSelect
|
2022-01-27 15:59:32 +03:00 |
|
Yaroslavna Gaivoronyuk
|
ee375307fb
|
change props, upd story
|
2022-01-27 15:58:56 +03:00 |
|
|
45313ba07f
|
Web: Files: Fixed the length of the row separators according to the layout.
|
2022-01-27 13:54:33 +03:00 |
|
|
133bd65938
|
Web: Files: Removed state of begin scrolling.
|
2022-01-27 12:18:59 +03:00 |
|
|
4355430ccd
|
Merge branch 'develop' into feature/accessRightSelect
|
2022-01-27 12:09:53 +03:00 |
|
|
a9bbbbabdc
|
Fixed Bug53161 - Client.Files.Fixed table view header length.
|
2022-01-27 10:35:36 +03:00 |
|
|
4c6d130ea9
|
Web:Files:Added MediaViewer closing handling when the Close button is clicked.
|
2022-01-26 20:56:01 +03:00 |
|
|
4fd451f5a7
|
Web: Common: added checkedMaintenance for banner
|
2022-01-25 20:31:48 +05:00 |
|
|
34dbcab3c4
|
Web: Common: removed div parent
|
2022-01-25 20:30:53 +05:00 |
|
|
e200898978
|
Added isMediaViewerOpen key to localStorage.
|
2022-01-25 18:29:18 +03:00 |
|
|
889e0e31de
|
Web: Common: moved main-bar over section header
|
2022-01-25 20:29:13 +05:00 |
|
|
ef6682ab32
|
Web:Files:Added check for open MediaViewer. Added checkURLchange function to MediaViewer.
|
2022-01-25 18:20:59 +03:00 |
|
|
e810605a4d
|
Web: Socket: Fix proxy ws by web:hub:url (appsettings.json)
|
2022-01-25 12:54:21 +03:00 |
|
Yaroslavna Gaivoronyuk
|
6a7515eec6
|
upd access-right-select
|
2022-01-25 11:17:38 +03:00 |
|
|
b99013e778
|
Web: Components: added close button positioning
(cherry picked from commit 29f051d8932ce27ac9404ea4e24edb54160d2a8e)
|
2022-01-24 18:50:41 +05:00 |
|
|
00a4851ebf
|
Web: Common: deleted getBarHtml function
(cherry picked from commit 990eaaf8a32dca24ef51c39f67458136a689d51a)
|
2022-01-24 18:50:06 +05:00 |
|
|
401b11873f
|
Web: Components: added basic parameters for bar-banner component
(cherry picked from commit e914640449c3502dbece62889399fada55f95617)
|
2022-01-24 18:49:41 +05:00 |
|
|
44925fde24
|
Web: Components: created bar-banner component
|
2022-01-24 18:47:32 +05:00 |
|
|
f1dccd9708
|
Web: Common: created checkBar and getBar function
(cherry picked from commit 954ad6c950f6b1428d5a5f6c0b75cd3e699f4326)
|
2022-01-24 18:46:21 +05:00 |
|
|
88a5b319cd
|
Web: Common: added section bar component
|
2022-01-24 18:44:20 +05:00 |
|
|
b25f339c3e
|
Merge branch 'hotfix/v1.1.1' into feature/socket-io
|
2022-01-24 15:43:04 +03:00 |
|
Dmitry Kulak
|
1e7981be55
|
Web: Components: Badge: Added isHovered and noHover props
|
2022-01-24 14:48:38 +03:00 |
|
|
7f707428f2
|
Web: Files: Added auto-focus when entering a password with an error.
|
2022-01-24 12:09:26 +03:00 |
|
Yaroslavna Gaivoronyuk
|
1057cfa6a0
|
access-right-select, upd link-with-dropdown
|
2022-01-24 11:16:45 +03:00 |
|
|
d0bc7cc223
|
Fix bug 53339: open banner link in new tab
|
2022-01-22 17:30:00 +03:00 |
|
|
57c1084b87
|
Web: Common: refactoring
|
2022-01-22 01:47:37 +03:00 |
|
|
ee2fd6bb0f
|
Web:Files:Added a check for the absence of other pictures in the playlist for moving through the picture via a direct link in MediaViewer.
|
2022-01-21 19:21:29 +03:00 |
|
|
a66964e0b8
|
Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/campaigns-banner
|
2022-01-21 18:46:20 +03:00 |
|
|
f838f5c6da
|
Web: Common: fix methods in firebase config
|
2022-01-21 18:26:34 +03:00 |
|
|
ff5667fe07
|
Web: Common/People: delete useless
|
2022-01-21 18:25:31 +03:00 |
|
Dmitry Kulak
|
b740a4d00a
|
Merge branch 'develop' into feature/redesign-tiles
# Conflicts:
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
# products/ASC.Files/Server/DocStore
|
2022-01-21 16:47:39 +03:00 |
|
|
efe799d712
|
Merge branch 'hotfix/v1.1.1' into feature/convert-password
# Conflicts:
# products/ASC.Files/Client/src/helpers/utils.js
|
2022-01-21 14:44:06 +03:00 |
|
|
34441d6335
|
Web: Moved some translations from Files to COMMON for asc-web-components
|
2022-01-21 11:49:16 +03:00 |
|
|
525439ff72
|
Web: Renamed translations key switchToThumbnails to SwitchToThumbnails
|
2022-01-20 18:21:01 +03:00 |
|
|
99105f5d73
|
Merge branch 'develop' into component-tooltips
# Conflicts:
# packages/asc-web-components/icon-button/index.js
# products/ASC.Files/Client/public/locales/de/Article.json
# products/ASC.Files/Client/public/locales/de/Translations.json
# products/ASC.Files/Client/public/locales/en/Article.json
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/fr/Article.json
# products/ASC.Files/Client/public/locales/fr/Translations.json
# products/ASC.Files/Client/public/locales/it/Article.json
# products/ASC.Files/Client/public/locales/it/Translations.json
# products/ASC.Files/Client/public/locales/pt-BR/Article.json
# products/ASC.Files/Client/public/locales/pt-BR/Translations.json
# products/ASC.Files/Client/public/locales/ro/Article.json
# products/ASC.Files/Client/public/locales/ro/Translations.json
# products/ASC.Files/Client/public/locales/ru/Article.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/public/locales/sk/Article.json
# products/ASC.Files/Client/public/locales/sk/Translations.json
|
2022-01-20 15:45:24 +03:00 |
|
|
6c72436a03
|
Merge branch 'develop' into feature/mobile-main-button
|
2022-01-20 14:25:05 +03:00 |
|
|
d8adf99040
|
Web: Components: ViewSelector: Added default values of width and height for svg container
|
2022-01-20 12:42:32 +03:00 |
|
|
0555b73c5d
|
Web: Common: fix firebase error
|
2022-01-19 16:16:01 +03:00 |
|
|
5dbe35f4d1
|
Web:Common:Сhanged history.pushState method to history.push.
|
2022-01-19 12:27:41 +03:00 |
|
|
2e0d72719e
|
Web: Files: moved db config
|
2022-01-19 12:15:23 +03:00 |
|
Dmitry Kulak
|
5098ea1079
|
Web: Files: Tiles: Loaders: Fixed number of loaders on smartphones
|
2022-01-19 11:34:32 +03:00 |
|
|
5222666d2e
|
Web:Common:Added history.pushState method to display images in MediaViewer.
|
2022-01-18 10:47:00 +03:00 |
|
|
0b84450f7a
|
Web: Components: campaigns-banner: delete useless
|
2022-01-17 22:03:09 +03:00 |
|
|
1a8d88345a
|
Merge branch 'hotfix/v1.1.1' into feature/socket-io
# Conflicts:
# products/ASC.Files/Client/src/store/FilesStore.js
# yarn.lock
|
2022-01-17 19:02:40 +03:00 |
|
|
aa8903b0ef
|
Web: Files: Added copy method to save in 'oform' format.
|
2022-01-17 15:54:14 +03:00 |
|
|
77937390ef
|
Web: Fix crash of Wizard with default en-US language
|
2022-01-14 19:12:58 +03:00 |
|
Dmitry Kulak
|
fe75b6fa32
|
Merge branch 'develop' into feature/redesign-tiles
|
2022-01-13 13:59:50 +03:00 |
|
|
6f90864ed8
|
Merge branch 'hotfix/v1.1.1' into feature/socket-io
|
2022-01-13 10:49:43 +03:00 |
|
|
8b327ceb66
|
Web: Socket.IO: Extended /api/2.0/settings with socketUrl + refactoring of client socket usage
|
2022-01-12 20:13:30 +03:00 |
|
|
0c341f0709
|
Merge branch 'hotfix/v1.1.1' into feature/convert-password
|
2022-01-11 16:14:46 +03:00 |
|
|
3565666fd2
|
Web: Table: fixed default columns size, fixed styles
|
2022-01-11 12:34:54 +03:00 |
|
|
3793c5ae43
|
Web:Components:Tree-Menu:Added props lineHeight for the badge in index.js for the tree-menu component.
|
2022-01-10 16:30:23 +03:00 |
|
|
c7bb1a51d5
|
Fixed Bug 50858 - People. ‘Something went wrong.’ when following the back arrow from a blocked profile card
|
2022-01-10 16:24:21 +03:00 |
|
|
b1c7ef68e7
|
Web:Components:Row:Changed the render to ContentElement.
|
2021-12-30 18:54:41 +03:00 |
|
|
3c23f4d892
|
Merge branch 'hotfix/v1.1.1' into feature/convert-password
# Conflicts:
# products/ASC.Files/Client/src/components/panels/StyledPanels.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/store/UploadDataStore.js
|
2021-12-30 14:34:49 +03:00 |
|
Dmitry Kulak
|
e014ff614e
|
Web: Files: Tiles: Loaders aligned with content, fixes
|
2021-12-30 10:55:16 +03:00 |
|
|
1645386669
|
Fix after merge
|
2021-12-29 18:30:05 +03:00 |
|
Dmitry Kulak
|
b5bcf38456
|
Merge remote-tracking branch 'origin/develop' into feature/redesign-tiles
|
2021-12-29 15:48:41 +03:00 |
|
|
df6a18db6a
|
Merge branch 'develop' into feature/redesign-badges
|
2021-12-29 14:11:44 +03:00 |
|
|
bedfad1ec5
|
Merge branch 'master' into develop
# Conflicts:
# common/ASC.Core.Common/Caching/CachedUserService.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
# products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/store/DialogsStore.js
# products/ASC.Files/Client/src/store/FilesActionsStore.js
# products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
# products/ASC.Files/Core/Core/EF/FilesDbContext.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
# products/ASC.Files/Server/DocStore
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Core/Tfa/TfaManager.cs
|
2021-12-28 18:21:44 +03:00 |
|
|
605e7eba35
|
Fix bad merge febf172875
|
2021-12-28 14:56:00 +03:00 |
|
|
febf172875
|
Merge branch 'master' into hotfix/v1.1.1
# Conflicts:
# lerna.json
# packages/asc-web-common/package.json
# packages/asc-web-components/avatar-editor/index.js
# packages/asc-web-components/avatar-editor/sub-components/avatar-editor-body.js
# packages/asc-web-components/main-button/index.js
# 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/HOCs/withFileActions.js
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/AsideView.js
# products/ASC.Files/Server/DocStore
# products/ASC.Mail/Client/package.json
# products/ASC.People/Client/package.json
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
# products/ASC.Projects/Client/package.json
# web/ASC.Web.Client/package.json
# web/ASC.Web.Editor/package.json
# web/ASC.Web.Editor/src/Editor.jsx
# web/ASC.Web.Login/package.json
|
2021-12-28 13:35:02 +03:00 |
|
Dmitry Kulak
|
57c2460c3e
|
Web: Files: Tiles: Redesign, refactoring
|
2021-12-27 18:46:26 +03:00 |
|
|
50cb570eff
|
Web:Components:Fix the style of the table header.
|
2021-12-24 15:17:33 +03:00 |
|
|
d7faf84a44
|
Web:Files:Badges:Changed the default lineHeight for the Badge component.
|
2021-12-24 12:02:15 +03:00 |
|
|
dc3c7b5e30
|
Fix Bug 54679 - Client.Profile. Failed to execute 'toDataURL' on 'HTMLCanvasElement': Tainted canvases may not be exported
|
2021-12-23 16:48:54 +03:00 |
|
|
440811e931
|
Web: Added convertLanguage for compatibility
|
2021-12-23 14:01:08 +03:00 |
|
gectokot
|
4f334432e5
|
Web: Files: Tiles: Different number of loaders on different screens
|
2021-12-23 12:32:49 +03:00 |
|
Dmitry Kulak
|
1f4ce11734
|
Web: Files: Tiles: Loaders redesign
|
2021-12-23 12:32:46 +03:00 |
|
|
ef853d5d2f
|
Web:Files:Removed the Icons and SimpleRowContent components.
|
2021-12-22 18:50:25 +03:00 |
|
|
b047ae3c0b
|
Web: Common: Added password field to api method.
|
2021-12-22 12:15:56 +03:00 |
|
|
6163f8427b
|
Web:Files:Badges: Added new props lineHeight, textAlign to Badge styles. Added new conditions for resizing badges to the Badges and QuickButtons components. Added new props sectionWidth to HOCs withBadges and withQuickButtons. Styling badges.
|
2021-12-20 15:14:32 +03:00 |
|
|
6d84bd5f04
|
Merge branch 'release/v1.1.0' into feature/translate-1.1.0
|
2021-12-15 17:22:17 +03:00 |
|
|
51103c96ba
|
Fix Bug 54525 - Client.Profile: Remove fake context-menu button
|
2021-12-15 11:56:44 +03:00 |
|
gectokot
|
e9449b5a72
|
Web: Studio: Homepage: Fixed vertical scroll appearing on mobile in landscape mode
|
2021-12-14 14:45:40 +03:00 |
|
|
39f172bd22
|
Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0
|
2021-12-13 17:58:34 +03:00 |
|
|
530d1a18a8
|
Web: Api: Added property for setEncryptionKeys
|
2021-12-13 17:58:25 +03:00 |
|
|
e967b38aa3
|
Fix bug 51320: firebase error
|
2021-12-13 17:03:59 +03:00 |
|
|
9269594b8a
|
Web: DesktopEditors mode: Added more logs
|
2021-12-13 01:32:47 +03:00 |
|
|
2afce477b1
|
Web: Common: Removed useless code.
|
2021-12-10 09:30:11 +03:00 |
|
|
87fe0892a4
|
Web:Files:Badges:Returned the frame on hover badge version.
|
2021-12-08 18:56:15 +03:00 |
|
|
51b7921ed4
|
Web: Edit: Added doc property to api methods for history versions.
# Conflicts:
# packages/asc-web-common/api/files/index.js
|
2021-12-08 16:30:26 +03:00 |
|
|
d5a77379b3
|
Web: Editor: Added api method for restore document version.
|
2021-12-08 16:28:30 +03:00 |
|
|
317750f909
|
Web: Added api methods.
# Conflicts:
# packages/asc-web-common/api/files/index.js
|
2021-12-08 16:28:25 +03:00 |
|
|
ac5edf13cb
|
Web:Files:Badges:Edited badges styles.
|
2021-12-08 15:43:12 +03:00 |
|
|
8360da9806
|
Web:Components:Added rest to IconButton
|
2021-12-07 15:27:42 +03:00 |
|
|
c44f580681
|
Fix issues of UselessModuleTranslationKeysTest
|
2021-12-07 13:04:06 +03:00 |
|
|
4c99d0c8f3
|
Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/campaigns-banner
|
2021-12-07 10:30:44 +03:00 |
|
|
08c0086208
|
Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1
|
2021-12-06 15:18:39 +03:00 |
|
|
28fec434e6
|
Fixed Bug 53161 - Client.Files.Removed the narrowing of the line background when selecting.
|
2021-12-06 15:14:58 +03:00 |
|
|
21fb4fd1b7
|
Web: Moved debug-info changes to separated repository https://github.com/ONLYOFFICE/auto-changelog
|
2021-12-06 15:01:30 +03:00 |
|
|
3a50fca3cc
|
Merge branch 'hotfix/v1.1.1' into bugfix/dropdown-correct-display
|
2021-12-02 18:32:36 +05:00 |
|
|
907877b08a
|
Web: Common: delete filter button title
|
2021-12-02 13:08:33 +05:00 |
|
|
2de54722d6
|
Web: Files: added TitleShowActions and TitleShowFolderActions translations, added row and tile context menu titles
|
2021-12-01 17:17:12 +05:00 |
|
|
27e732e9a3
|
Web: Login: Added usage of new API /authentication.json parameter "session"
|
2021-12-01 10:56:50 +03:00 |
|
|
2b7bc7fc1c
|
Web: Files: added ButtonShareAccess translation, added share and row checkbox tooltip
|
2021-11-30 15:11:59 +05:00 |
|
|
4c977206c9
|
Web: Files: added switchToThumbnails and SwitchViewToCompact translation, added view selector tooltip
|
2021-11-30 14:28:01 +05:00 |
|
|
626ad87077
|
Merge pull request #469 from ONLYOFFICE/feature/make-form
Feature/make form
|
2021-11-30 11:36:23 +03:00 |
|
|
7f39ebd499
|
Web: Files: SelectFileDialog: Fixed loaders according layouts.
|
2021-11-30 10:11:49 +03:00 |
|
|
5bb3602964
|
Web: Common: Api: Fixed copyAs api call params
|
2021-11-30 08:20:55 +03:00 |
|
|
6db5c386e3
|
Web: Files: added group menu title
|
2021-11-29 18:40:00 +05:00 |
|
|
0b9a9b633d
|
Web: Common: Api: Added fileCopyAs action
|
2021-11-29 16:31:40 +03:00 |
|
|
def7e82cc2
|
Web: Files: added TitleSelectFile translation, added group combo box title
|
2021-11-29 17:56:37 +05:00 |
|
|
c9b58cacd8
|
Web: Files: added MainHeaderSelectAll translation, added group menu checkbox title
|
2021-11-29 16:57:14 +05:00 |
|
|
4dac8e9ce6
|
Web: Components: changed expander-down.react.svg, fixed styles
|
2021-11-29 13:11:01 +03:00 |
|
|
99c71148d8
|
Web: Files: fixed SharingPanel styles
|
2021-11-29 12:58:21 +03:00 |
|
|
4586cb45d9
|
Web: Components: fixed CloseButton styles
|
2021-11-29 11:58:54 +03:00 |
|
|
af95e8aacc
|
Web: Components: added border-radius to modal-dialog
|
2021-11-26 17:37:27 +03:00 |
|
|
a046e5ac8d
|
Web: Files: added icon button title prop, added connect tooltip
|
2021-11-25 18:47:09 +05:00 |
|
|
bce51d74b6
|
Fix Bug 53438 - Client.Editor. Added redirect to homepage due to error
|
2021-11-25 16:37:36 +03:00 |
|
|
08746974f4
|
Web: SW: Added SW unregister + refactoring
|
2021-11-25 15:08:18 +03:00 |
|
|
73d3b00c07
|
Web: added missing classNames for autotests
|
2021-11-25 12:11:22 +03:00 |
|
|
465c57b8f6
|
Fixed Bug 54013 - Client.Files.Returned the ability to select elements on the About program page.
|
2021-11-24 11:09:52 +03:00 |
|
|
2f21f2246a
|
Merge branch 'develop' into feature/mobile-main-button
|
2021-11-22 16:39:22 +03:00 |
|
|
54a58916ed
|
Web: Common: Filter: fixed multiple api request
|
2021-11-22 16:29:32 +03:00 |
|
|
16b564a86c
|
Web: Components: fixed empty-screen styles
|
2021-11-22 15:37:30 +03:00 |
|
|
52626a548e
|
Web: fixed Snackbar styles
|
2021-11-22 15:01:33 +03:00 |
|
|
3417cb28f4
|
Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0
|
2021-11-22 11:25:49 +03:00 |
|
|
1004ed5dfb
|
Fixed Bug 53415. Fixed save button
|
2021-11-22 11:20:01 +03:00 |
|
|
b632f3a623
|
Web: Fixed styles according layouts, renaming.
|
2021-11-22 10:15:24 +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 |
|
|
96759f10f1
|
Web: Components: Fixed tests warnings
|
2021-11-20 00:40:25 +03:00 |
|
|
c10944f8fa
|
Web: Components: ContextMenu: Refactoring
|
2021-11-20 00:17:25 +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 |
|
|
50db047ca8
|
Web: Components: MainButton: Reworked MainButton component
|
2021-11-19 17:59:58 +03:00 |
|
|
8ecdc5bdf5
|
Web: Components: ContextMenu: Added property`s for creating menu by component
|
2021-11-19 17:59:10 +03:00 |
|
|
4cd9d042de
|
Web: Files: fixed styles after Cherry picking.
|
2021-11-19 16:58:31 +03:00 |
|
|
4f7f76b07e
|
Web: Files: Fixed styles of modal and aside dialogues.
# Conflicts:
# packages/asc-web-components/modal-dialog/index.js
|
2021-11-19 16:09:13 +03:00 |
|
|
097fc75369
|
Web: Files: Fixed checkbox clickability
|
2021-11-19 14:04:02 +03:00 |
|