|
0ad204743f
|
Merge branch 'develop' into feature/dark-theme
|
2021-12-29 20:25:29 +08: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 |
|
|
ee839e8169
|
Web:Common:PageLayout: change background-color and fill for section toggler button in dark-theme
|
2021-12-28 16:52:37 +08:00 |
|
|
d46679e9bb
|
Web:Common:PageLayout: add support dark-theme for section
|
2021-12-25 00:50:45 +08:00 |
|
|
e7854ed5d8
|
Web:Common:PageLayout:Article: add support dark-theme
|
2021-12-14 16:14:36 +08:00 |
|
|
52626a548e
|
Web: fixed Snackbar styles
|
2021-11-22 15:01:33 +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 |
|
|
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 |
|
|
5759758f71
|
Bug 53416 - Client.Files.Desktop: Fixed scrolls under Ubuntu.
|
2021-11-02 18:41:33 +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 |
|
|
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 |
|
|
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 |
|
|
c2d0ff17d0
|
Merge branch 'develop' into table-group-menu
|
2021-10-21 15:34:57 +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 |
|
|
2f8804653a
|
Web: SectionBody: Deleted useless code.
|
2021-10-21 11:11:14 +03:00 |
|
Artem Tarasov
|
23b30f5d8d
|
Web: Common: PageLayout: table style fix
|
2021-10-20 15:52:02 +03:00 |
|
|
5a3b7fdc6c
|
Web: Common: PageLayout: Refactoring, deleted useless code.
|
2021-10-19 13:58:55 +03:00 |
|
|
b82dc5bf91
|
Web: Files: VersionHistoryPanel: Deleted body scroll? fixed styles.
|
2021-10-19 13:41:52 +03:00 |
|
|
30dc2623ba
|
Web: Common: Fixed styles for body list without scroll.
|
2021-10-19 12:18:07 +03:00 |
|
|
67179fd267
|
Merge branch 'release/1.0.0' into table-group-menu
|
2021-10-18 10:53:09 +03:00 |
|
|
10a12dfec0
|
Web: Fix max-size of ArticleMainButton (too long button issue)
|
2021-10-15 21:22:34 +03:00 |
|
|
d635b33cac
|
Web: Common: fixed select-box boundContainer
|
2021-10-14 15:05:07 +03:00 |
|
|
e36697c9df
|
Web: Files: TableGroupMenu moved to header
|
2021-10-13 16:04:49 +03:00 |
|
|
749e89cbb3
|
Web: Components: fixed group-button-menu styles
|
2021-10-07 17:44:37 +03:00 |
|
|
19232a92e9
|
Web: Common: fixed header styles
|
2021-10-07 16:27:43 +03:00 |
|
|
593ac7abc5
|
Web: Common: fixed section-header styles for mobile devices
|
2021-10-07 10:47:25 +03:00 |
|
|
36c25c8278
|
Web: fixed media query
|
2021-10-06 15:44:39 +03:00 |
|
|
cb5c70e071
|
Web: fixed header styles
|
2021-10-06 15:28:29 +03:00 |
|
|
f87b71f2e5
|
Web: Files: fixed header icons, fixed styles
|
2021-10-06 15:02:56 +03:00 |
|