Timofey
|
d83808142a
|
Web:Common:Loaders: add support dark-theme for tile loader
|
2022-01-21 22:40:29 +08:00 |
|
Timofey
|
47974e378f
|
Merge branch 'develop' into feature/dark-theme
|
2022-01-21 19:31:48 +08:00 |
|
Timofey
|
cfb4818b1e
|
Web:Common:FloationgButton: add props variable
|
2022-01-20 23:46:46 +08:00 |
|
Timofey
|
84aabef8e7
|
Web:Common: update dark theme after merge branch 'develop'
|
2022-01-20 23:45:33 +08:00 |
|
Timofey
|
4598d238e5
|
Web:Components: update dark theme after merge branch 'develop'
|
2022-01-20 23:29:09 +08:00 |
|
Timofey
|
e5f06b932d
|
Merge branch 'develop' into feature/dark-theme
|
2022-01-20 21:18:30 +08: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 |
|
|
|
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 |
|
|
|
25ee05f38a
|
Web:Common:FilterInput: fix fill and stroke color for filter button in dark and base themes
|
2021-12-28 17:58:56 +08: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 |
|
|
|
b45e7a26ae
|
Web:Common:MediaViewer: add support dark-theme
|
2021-12-25 00:43:52 +08:00 |
|
|
|
d7b98e875b
|
Web:Common:Header: add support dark-theme for loader
|
2021-12-24 19:44:37 +08:00 |
|
|
|
6f6ea8eca8
|
Web:Common:FloatingButton: add support dark-theme
|
2021-12-24 19:36:24 +08:00 |
|
|
|
f3821d18f6
|
Web:Common:AdvancedSelector:add support dark-theme
|
2021-12-24 19:25:35 +08:00 |
|
|
|
00865480dd
|
Web:Common:FilterInput: add support dark-theme
|
2021-12-14 17:45:09 +08:00 |
|
|
|
e7854ed5d8
|
Web:Common:PageLayout:Article: add support dark-theme
|
2021-12-14 16:14:36 +08:00 |
|
|
|
907877b08a
|
Web: Common: delete filter button title
|
2021-12-02 13:08:33 +05:00 |
|
|
|
7f39ebd499
|
Web: Files: SelectFileDialog: Fixed loaders according layouts.
|
2021-11-30 10:11:49 +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 |
|
|
|
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 |
|
|
|
b28acbe943
|
Web: Common: added color prop for floating button
|
2021-11-17 17:37:01 +05: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 |
|
|
|
3f532f6765
|
Merge branch 'develop' into feature/mobile-main-button
|
2021-11-02 13:36:34 +05:00 |
|
|
|
886e1baf89
|
Web: Common: added icons in floating button
|
2021-11-02 13:30:33 +05: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 |
|
