Dmitry Kulak
|
e014ff614e
|
Web: Files: Tiles: Loaders aligned with content, fixes
|
2021-12-30 10:55:16 +03:00 |
|
Dmitry Kulak
|
b5bcf38456
|
Merge remote-tracking branch 'origin/develop' into feature/redesign-tiles
|
2021-12-29 15:48:41 +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 |
|
Dmitry Kulak
|
57c2460c3e
|
Web: Files: Tiles: Redesign, refactoring
|
2021-12-27 18:46:26 +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 |
|
|
7f39ebd499
|
Web: Files: SelectFileDialog: Fixed loaders according layouts.
|
2021-11-30 10:11:49 +03:00 |
|
|
54a58916ed
|
Web: Common: Filter: fixed multiple api request
|
2021-11-22 16:29:32 +03:00 |
|
|
52626a548e
|
Web: fixed Snackbar styles
|
2021-11-22 15:01:33 +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 |
|
|
a4e21a2319
|
Web: Component: Added modal dialog height property.
|
2021-11-18 15:24:28 +03:00 |
|
|
3a03d65ed9
|
Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.0.1
|
2021-11-11 13:49:08 +03:00 |
|
|
53cb6827b4
|
Fix Bug 53360: Client.Files.Image - Removed the render when opening and closing the file delete dialog.
|
2021-11-11 13:48:47 +03:00 |
|
|
11769e8c9e
|
Fix Bug 53180 - Client: Profile. Error «.../pt/Common.json 404» on pt-BR language.
|
2021-11-10 19:59:03 +03:00 |
|
|
56d16ac2f4
|
Merge pull request #437 from ONLYOFFICE/feature/files-upload
Web: Files: fixed files upload
|
2021-11-08 15:38:45 +03:00 |
|
|
5c5db26dc4
|
Web: Files: removed unused code
|
2021-11-08 14:04:52 +03:00 |
|
|
bf4126cc0e
|
Web: Deleted console.log.
|
2021-11-03 15:25:04 +03:00 |
|
|
da8e34930f
|
Web: Added prop.
|
2021-11-03 11:59:54 +03:00 |
|
|
2d60dbee1b
|
Merge branch 'hotfix/v1.0.1' into bugfix/Bug53416
# Conflicts:
# packages/asc-web-common/components/PageLayout/sub-components/section-body.js
|
2021-11-03 11:58:56 +03:00 |
|
|
72adefec39
|
Web: Deleted useless code after Cherry Pick.
|
2021-11-03 10:35:03 +03:00 |
|
|
706913275c
|
Web: Common: PageLayout: Fixed error "Cannot read properties of null (reading 'focus')".
|
2021-11-03 09:57:56 +03:00 |
|
|
06437454a8
|
Web: Deleted useless code.
|
2021-11-03 09:57:55 +03:00 |
|
|
6fb6f3db60
|
Web: SectionBody: Deleted useless code.
|
2021-11-03 09:57:53 +03:00 |
|
|
6cf7c6d43e
|
Web: Common: PageLayout: Refactoring, deleted useless code.
# Conflicts:
# packages/asc-web-common/components/PageLayout/sub-components/section-body.js
|
2021-11-03 09:57:51 +03:00 |
|
|
76b4251559
|
Web: Files: VersionHistoryPanel: Deleted body scroll? fixed styles.
# Conflicts:
# packages/asc-web-common/components/PageLayout/sub-components/section-body.js
|
2021-11-03 09:57:12 +03:00 |
|
|
44f2a1c17f
|
Web: Common: Fixed styles for body list without scroll.
# Conflicts:
# packages/asc-web-common/components/PageLayout/sub-components/section-body.js
|
2021-11-03 09:54:16 +03:00 |
|
|
7c9e875ff3
|
Merge branch 'hotfix/v1.0.1' into bugfix/Bug53416
|
2021-11-02 18:42:55 +03:00 |
|
|
5759758f71
|
Bug 53416 - Client.Files.Desktop: Fixed scrolls under Ubuntu.
|
2021-11-02 18:41:33 +03:00 |
|
|
e5e5f267c2
|
Web: Common: fixed mediaPlayerClose cursor style
|
2021-11-02 17:51:44 +03:00 |
|
|
20e59a7cbe
|
Web: Common: changed media-viewer icons, fixed media styles
|
2021-11-02 17:51:44 +03:00 |
|
|
8cc08045b7
|
Merge branch 'master' into develop
# Conflicts:
# packages/asc-web-common/components/PageLayout/sub-components/section-header.js
# packages/asc-web-components/combobox/index.js
# packages/asc-web-components/table-container/StyledTableContainer.js
# packages/asc-web-components/table-container/TableGroupMenu.js
# packages/asc-web-components/table-container/TableHeader.js
# products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/store/FilesStore.js
# products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
|
2021-11-01 13:54:40 +03:00 |
|
|
1f5fea8f81
|
Web: Common: fixed mediaPlayerClose cursor style
|
2021-10-28 14:43:20 +03:00 |
|
|
fe65632277
|
Web: Common: changed media-viewer icons, fixed media styles
|
2021-10-28 14:20:06 +03:00 |
|
|
dcb8f108b8
|
Web: Files: fixed Paging re-render
|
2021-10-28 11:30:23 +03:00 |
|
|
68b2108bcb
|
Web: Common: PageLayout: Fixed padding for first row element at desktop view
|
2021-10-26 20:37:28 +03:00 |
|
|
ba68d7b5fd
|
Web: Common: fixed floating button styles when article is visible
|
2021-10-25 12:20:08 +03:00 |
|
|
1e15174d23
|
Web: Files: fixed styles after merge
|
2021-10-22 15:01:43 +03:00 |
|
|
0331356f5d
|
Web: Common: return style.
|
2021-10-22 13:09:58 +03:00 |
|
|
c163576b8b
|
Web: Files: Fixed styles for section header for tablet/mobile view.
|
2021-10-22 13:03:17 +03:00 |
|
|
5bd9c06c1a
|
Merge branch 'develop' into table-group-menu
# Conflicts:
# products/ASC.Files/Client/src/store/FilesStore.js
|
2021-10-22 12:20:20 +03:00 |
|
|
d7547a11a1
|
Web: Fix Failed prop type: Invalid prop animate of value 0 supplied to RectangleLoader
|
2021-10-22 10:17:29 +03:00 |
|
|
94a466ed48
|
Merge branch 'release/1.0.0' into develop
# Conflicts:
# packages/asc-web-components/aside/aside.js
|
2021-10-22 09:02:39 +03:00 |
|
|
81019049d7
|
Merge branch 'develop' into feature/personal-share-dialog
|
2021-10-21 19:14:59 +03:00 |
|
|
c2d0ff17d0
|
Merge branch 'develop' into table-group-menu
|
2021-10-21 15:34:57 +03:00 |
|
Artem Tarasov
|
27eff81dbc
|
Merge branch 'release/1.0.0' into bugfix/tile-view
|
2021-10-21 15:14:58 +03:00 |
|
Artem Tarasov
|
38f742e750
|
Web: Common: PageLayout: fixed position filter section on desktop
|
2021-10-21 15:13:01 +03:00 |
|
|
fce60f4018
|
Web: Common: PageLayout: Fixed error "Cannot read properties of null (reading 'focus')".
|
2021-10-21 13:19:28 +03:00 |
|
|
cc9857c904
|
Web: Deleted useless code.
|
2021-10-21 12:29:25 +03:00 |
|
|
152207d85a
|
Merge branch 'develop' into bugfix/version-history-list
# Conflicts:
# packages/asc-web-common/components/PageLayout/sub-components/section-body.js
# products/ASC.Files/Client/src/pages/VersionHistory/Section/Body/VersionRow.js
|
2021-10-21 12:02:57 +03:00 |
|