Timofey
|
a53ed1a7c5
|
Web: added support theme as props
|
2022-01-25 15:56:51 +08:00 |
|
Dmitry Kulak
|
67a749c7b3
|
Merge branch 'develop' into feature/redesign-tiles
|
2022-01-25 10:14:13 +03:00 |
|
Timofey
|
f98812e233
|
Merge branch 'develop' into feature/dark-theme
|
2022-01-25 15:04:38 +08:00 |
|
|
|
445f03097d
|
Fix content-type header
|
2022-01-24 22:44:18 +03:00 |
|
Dmitry Kulak
|
eb6573bea0
|
Web: Files: Badges: Renamed handleClick to onClick
|
2022-01-24 21:04:46 +03:00 |
|
Timofey
|
72c5c93737
|
Web: add theme support from props
|
2022-01-24 23:27:24 +08:00 |
|
Dmitry Kulak
|
ec47211e1d
|
Merge branch 'develop' into feature/redesign-tiles
|
2022-01-24 17:46:59 +03:00 |
|
Timofey
|
15f0d13068
|
Merge branch 'develop' into feature/dark-theme
|
2022-01-24 22:33:29 +08:00 |
|
Timofey
|
ff370ebe1d
|
Web:Editor: add support dark-theme
|
2022-01-24 22:32:05 +08:00 |
|
Dmitry Kulak
|
8b6936265c
|
Web: Files: Tiles: removed background while renaming
|
2022-01-24 17:17:58 +03:00 |
|
Dmitry Kulak
|
c70e17459b
|
Web: Files: Tiles: Added wrapper for version and "New" badges, refactoring
|
2022-01-24 16:49:27 +03:00 |
|
Timofey
|
d6519064df
|
Web:Files:Section: deleted useless code
|
2022-01-24 16:06:43 +08:00 |
|
Timofey
|
a1f6875006
|
Web:Files:Dialogs: added support dark-theme for third party modal dialog
|
2022-01-24 15:57:21 +08:00 |
|
Dmitry Kulak
|
dc7e3d78d0
|
Web: Files: Tiles: Changed font size for file and folder names
|
2022-01-24 10:54:29 +03:00 |
|
|
|
9ac985c2f2
|
crm: CurrencyProvider: fixed init in constructor
|
2022-01-21 20:32:55 +03:00 |
|
Timofey
|
f831c9344a
|
Web:People:Profile: add support dark-theme for tooltip-link in profile info
|
2022-01-21 23:04:23 +08:00 |
|
Dmitry Kulak
|
83fd179e0a
|
Web: Files: Tiles: Fix after merge
|
2022-01-21 16:51:59 +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 |
|
|
|
4be25479fd
|
used one dbcontext per service (per DAO). fixed error: System.InvalidOperationException: 'Cannot use multiple context instances within a single query execution. Ensure the query uses a single context instance.'
|
2022-01-21 16:45:50 +03:00 |
|
Timofey
|
f5ae02dfc9
|
Merge branch 'develop' into feature/catalog
|
2022-01-21 21:06:40 +08:00 |
|
Timofey
|
47974e378f
|
Merge branch 'develop' into feature/dark-theme
|
2022-01-21 19:31:48 +08:00 |
|
|
|
775f05b32c
|
Merge branch 'develop' into component-tooltips
|
2022-01-21 12:56:08 +03:00 |
|
|
|
32c398c044
|
Web: Tests: Added opportunity to sort translation files by Key with new Configurations -> SORT in VS
|
2022-01-21 12:53:29 +03:00 |
|
Timofey
|
d7c031bc3a
|
Merge branch 'develop' into feature/dark-theme
|
2022-01-21 17:45:41 +08:00 |
|
Timofey
|
b811bbd0c4
|
Merge branch 'develop' into feature/dark-theme
|
2022-01-21 17:39:22 +08:00 |
|
|
|
34441d6335
|
Web: Moved some translations from Files to COMMON for asc-web-components
|
2022-01-21 11:49:16 +03:00 |
|
Timofey
|
b0c7564c2a
|
Web:People:Reassign: update dark-theme
|
2022-01-21 16:44:14 +08:00 |
|
Timofey
|
150735d17d
|
Web:Files:Settings: change theme inject in ConntectedClouds
|
2022-01-21 16:40:41 +08:00 |
|
Timofey
|
4d4d9b0568
|
Web:Files: update dark theme after merge branch 'develop' into feature/dark-theme
|
2022-01-21 16:35:44 +08:00 |
|
|
|
0630a43b58
|
Elastic: fix ping
|
2022-01-21 11:26:25 +03:00 |
|
|
|
5c34a2b770
|
Web: Files: Changed file encoding to UTF8 with BOM
|
2022-01-20 22:05:59 +03:00 |
|
|
|
0f13f686c2
|
Web: Renamed usage of translations key "folder", "file"
|
2022-01-20 22:04:59 +03:00 |
|
|
|
1392659acf
|
Web: Tests: Fix UselessTranslationKeysTest issues: removed useless keys: "TitleCreated", "TitleModified", "TitleUploaded"
|
2022-01-20 18:38:25 +03:00 |
|
|
|
7824786afc
|
Web: Removed useless translation key "SelectFolder"
|
2022-01-20 18:25:12 +03:00 |
|
|
|
525439ff72
|
Web: Renamed translations key switchToThumbnails to SwitchToThumbnails
|
2022-01-20 18:21:01 +03:00 |
|
|
|
b23ac1c5f8
|
Web: Fix badges titles
|
2022-01-20 18:20:13 +03:00 |
|
Dmitry Kulak
|
64e608dba9
|
Web: Files: Tiles: Fixed shadows from badges and quickbuttons for more visibility
|
2022-01-20 17:51:13 +03:00 |
|
|
|
63243003ec
|
Web: Removed duplicate
|
2022-01-20 17:02:15 +03:00 |
|
|
|
9b593d5c79
|
Web: Fix translations issues by tests
|
2022-01-20 16:56:32 +03: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 |
|
Dmitry Kulak
|
2410bb9a5c
|
Web: Files: Tiles: Removed unused code
|
2022-01-20 13:56:33 +03:00 |
|
Dmitry Kulak
|
877373e3a3
|
Web: Files: Tiles: Tiles now change color while checked or active
|
2022-01-20 13:55:58 +03:00 |
|
Dmitry Kulak
|
61d8d33ad2
|
Web: Files: Tiles: Fixed badge padding
|
2022-01-20 10:22:55 +03:00 |
|
Dmitry Kulak
|
9d09963e77
|
Web: Files: removed DocStore from PR
|
2022-01-19 17:55:22 +03:00 |
|
Dmitry Kulak
|
8fa4d6e86d
|
Web: Files: Removed unused code, fixes
|
2022-01-19 17:05:27 +03:00 |
|
Dmitry Kulak
|
efbfb62e2f
|
Web: Files: withLoader: Fixes
|
2022-01-19 15:35:15 +03:00 |
|
Dmitry Kulak
|
1a1d597a82
|
Web: Files: Tiles: Separated clashing styles for rename wrapper
|
2022-01-19 15:31:42 +03:00 |
|
Dmitry Kulak
|
da4b9d0db9
|
Web: Files: Tiles: Fixed option button padding
|
2022-01-19 15:29:17 +03:00 |
|
|
|
c8712954e2
|
Merge branch 'develop' into feature/redesign-tiles
|
2022-01-19 11:47:44 +03:00 |
|
Dmitry Kulak
|
2876ef58ef
|
Web: Files: Tiles: Fixed quick buttons appearance conditions
|
2022-01-19 11:23:46 +03:00 |
|
Dmitry Kulak
|
e21b7a2176
|
Web: Files: Tiles: Refactoring
|
2022-01-19 11:05:59 +03:00 |
|
Dmitry Kulak
|
6cb00cd777
|
Web: Files: Tiles: Added quick buttons, refactoring
|
2022-01-18 19:19:56 +03:00 |
|
Dmitry Kulak
|
8e62da40a3
|
Web: Files: Tiles: Removed unused code
|
2022-01-14 17:46:52 +03:00 |
|
|
|
0796169d76
|
refactoring
|
2022-01-14 10:42:43 +03:00 |
|
|
|
48897308d7
|
refactoring
|
2022-01-13 22:17:56 +03:00 |
|
|
|
1464d54283
|
fixed tests
|
2022-01-13 18:42:58 +03:00 |
|
|
|
6b883bcd60
|
Merge branch 'develop' into feature/support-elasticache
|
2022-01-13 18:16:43 +03:00 |
|
|
|
986d1d49e6
|
refactoring: ICacheNotify<T> map to MemoryCacheNotify by default then RedisConfiguration is null
|
2022-01-13 14:24:14 +03:00 |
|
Dmitry Kulak
|
fe75b6fa32
|
Merge branch 'develop' into feature/redesign-tiles
|
2022-01-13 13:59:50 +03:00 |
|
|
|
5c5aac9244
|
Web:Files:Removed momentJS from DateCell and FilesRowContent components. Combined the getStatusByDate and getTableStatusByDate methods into the getStatusByDate method in the withContent HOC`s. Added parameters for the toLocaleString method in the getStatusByDate method. Replaced the comma from date string inside the getStatusByDate method.
|
2022-01-12 15:33:30 +03:00 |
|
|
|
efb51c613f
|
refactoring *.proto files according to https://bit.ly/3KcZ0Ef
|
2022-01-11 19:28:48 +03:00 |
|
|
|
d3de3a11f2
|
Web:Files:Badges:Styling badges.
|
2022-01-10 18:08:56 +03:00 |
|
|
|
3522dea939
|
Web:Files:Badges:Fix props lineHeightBadge for table view.
|
2022-01-10 16:30:37 +03:00 |
|
|
|
1d83359aa7
|
Web:Files:Badges:Added check for isTablet for tablet badges view. Added changing the font size of badges depending on the view.
|
2022-01-10 15:50:26 +03:00 |
|
|
|
5a193e50f8
|
Web:Files:Badges:Fixed styles badges.Removed inactive lock and favorite badges in mobile view.
|
2022-01-08 13:58:29 +03:00 |
|
|
|
7a47ff8fc9
|
Web:Files:Badges:Styling badges.
|
2022-01-08 00:13:19 +03:00 |
|
|
|
a7da94a8a2
|
Web:Files:Badges:Styling badges in a mobile view.
|
2022-01-07 19:27:49 +03:00 |
|
|
|
6a1a9d2bf3
|
Web:Files:Badges:Disabled display of Share on mobile device when row view.
|
2021-12-30 18:57:07 +03:00 |
|
|
|
5fb4de9537
|
Web:Files:Badges:Added check for isTablet device for row view.
|
2021-12-30 14:29:46 +03:00 |
|
Dmitry Kulak
|
e014ff614e
|
Web: Files: Tiles: Loaders aligned with content, fixes
|
2021-12-30 10:55:16 +03:00 |
|
Dmitry Kulak
|
fd7a5d97f2
|
Web: Files: Tiles: Fixed styles for name renaming
|
2021-12-29 18:45:47 +03:00 |
|
|
|
1645386669
|
Fix after merge
|
2021-12-29 18:30:05 +03:00 |
|
|
|
493a112811
|
Merge branch 'feature/redesign-badges' of github.com:ONLYOFFICE/AppServer into feature/redesign-badges
|
2021-12-29 16:41:09 +03:00 |
|
Dmitry Kulak
|
b5bcf38456
|
Merge remote-tracking branch 'origin/develop' into feature/redesign-tiles
|
2021-12-29 15:48:41 +03:00 |
|
Artem Tarasov
|
3b75038803
|
Merge branch 'develop' into feature/redesign-badges
# Conflicts:
# products/ASC.Files/Client/src/components/Badges.js
# products/ASC.Files/Client/src/components/Icons.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js
# public/images/access.edit.react.svg
|
2021-12-29 15:45:33 +03:00 |
|
|
|
0ad204743f
|
Merge branch 'develop' into feature/dark-theme
|
2021-12-29 20:25:29 +08:00 |
|
|
|
df6a18db6a
|
Merge branch 'develop' into feature/redesign-badges
|
2021-12-29 14:11:44 +03:00 |
|
|
|
9d43cb07ba
|
Files: fix after merge
|
2021-12-28 18:40:42 +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 |
|
|
|
9557ad7abb
|
Web:Common:Store: add array for available themes
|
2021-12-28 21:39:27 +08:00 |
|
|
|
e49d973802
|
Web:Files:EditingWrapperComponent: fix fill and hover fill for ok and cancel buttons
|
2021-12-28 19:38:30 +08:00 |
|
|
|
83f4c0dbef
|
Web:Files:Badges: Refactoring.
|
2021-12-28 14:37:56 +03:00 |
|
|
|
57a7ae2c62
|
Web:Files:Badges:Styling badges.
|
2021-12-28 13:57:31 +03:00 |
|
|
|
420d8e1939
|
Web:Components:Badges:Removed the SharedButton component.
|
2021-12-28 13:29:57 +03:00 |
|
|
|
15c645489f
|
Web:Components:Badges:Moved SharedButton to component QuickButtons. Moved the onClickShare method to HOC withQuickButtons. Removed SharedButton from the FilesTile component. Added quickButtonsComponent and HOC withQuickButtons to FilesTile component.
|
2021-12-28 13:03:10 +03:00 |
|
|
|
190e3eed1e
|
Web:People:Section: add fill for send clock icon in dark-theme
|
2021-12-28 16:43:22 +08:00 |
|
|
|
148acc38c9
|
Web:People:Dialogs: add support dark-theme
|
2021-12-28 15:35:41 +08:00 |
|
|
|
76595827fa
|
Web:People:HOCs: add support dark-theme
|
2021-12-28 15:20:56 +08:00 |
|
|
|
3259cf4db4
|
Web:People:PeopleSelector: add support dark-theme
|
2021-12-28 15:13:37 +08:00 |
|
|
|
12e392f174
|
Web:Files:VersionHistory: add support dark-theme
|
2021-12-28 10:50:01 +08:00 |
|
Dmitry Kulak
|
57c2460c3e
|
Web: Files: Tiles: Redesign, refactoring
|
2021-12-27 18:46:26 +03:00 |
|
|
|
a3e1d16146
|
Merge branch 'develop' into component-tooltips
|
2021-12-27 16:15:17 +03:00 |
|
|
|
8b72068bc9
|
Web:Files:PrivateRoomPage: add support dark-theme
|
2021-12-27 19:02:04 +08:00 |
|
|
|
9a7c4d86ed
|
Web:Files:SharedButton: add support dark-theme
|
2021-12-27 18:52:43 +08:00 |
|
|
|
20e7a51029
|
Web:Files:Icons: add support dark-theme
|
2021-12-27 18:46:19 +08:00 |
|
|
|
e0c84b4c19
|
Web:Files:EditingWrapperComponent: add support dark-theme
|
2021-12-27 18:17:03 +08:00 |
|
|
|
c5f01e1d87
|
Web:Files:Badges: add support dark-theme
|
2021-12-27 17:42:53 +08:00 |
|
|
|
9b98a3200c
|
Web:Files:Panels: add support dark-theme
|
2021-12-27 16:41:27 +08:00 |
|
|
|
ded46585cf
|
Web:Files:EmptyContainer: add support dark-theme
|
2021-12-25 17:04:19 +08:00 |
|
