Timofey
|
47974e378f
|
Merge branch 'develop' into feature/dark-theme
|
2022-01-21 19:31:48 +08:00 |
|
|
|
2029c34f9c
|
analizators/s1121
|
2022-01-21 14:02:17 +03:00 |
|
|
|
cd12b41cc6
|
analizators/s1125
|
2022-01-21 14:01:52 +03:00 |
|
|
|
473259657e
|
analizators/s1118
|
2022-01-21 13:47:56 +03: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 |
|
|
|
ae53ed0d62
|
analizators/s1117
|
2022-01-21 12:27:39 +03:00 |
|
|
|
728c1b896e
|
analizators/s1104
|
2022-01-21 12:19:57 +03: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 |
|
Timofey
|
fb438d12ee
|
Web:Files:Home: add new filter
|
2022-01-20 20:06:54 +08: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 |
|
|
|
5f78b37e25
|
analizators/U2U1000
|
2022-01-20 12:28:48 +03:00 |
|
|
|
2f4d05a847
|
analizators/s2692
|
2022-01-20 11:54:19 +03:00 |
|
|
|
f956ad22fa
|
analizators/s2223
|
2022-01-20 11:53:38 +03:00 |
|
|
|
50a7bd6856
|
analizators/s3265
|
2022-01-20 11:40:21 +03:00 |
|
|
|
3f28dfe78a
|
analizators/s3237
|
2022-01-20 11:36:42 +03:00 |
|
|
|
66643c074b
|
analizators/s2365
|
2022-01-20 10:57:54 +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 |
|
|
|
547b78b72f
|
analizators/2178
|
2022-01-19 16:36:03 +03:00 |
|
|
|
e046f6f8df
|
analizators/s1006
|
2022-01-19 16:14:51 +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 |
|
|
|
85f1660b39
|
analizators/U2U1203
|
2022-01-19 13:46:21 +03:00 |
|
|
|
20b60958a8
|
analizators/U2U1022
|
2022-01-19 13:24:11 +03:00 |
|
|
|
fbb50e676e
|
analizators/U2U1202
|
2022-01-19 12:51:30 +03:00 |
|
|
|
4b211c0b80
|
analizators/U2U1203
|
2022-01-19 12:14:50 +03:00 |
|
|
|
1403afbc16
|
analizators/U2U1209
|
2022-01-19 11:59:14 +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 |
|
|
|
769fc55b95
|
analizators/U2U1210
|
2022-01-19 11:16:58 +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 |
|
|
|
78047d3b93
|
analizators/U2U1210
|
2022-01-18 18:29:46 +03:00 |
|
|
|
84638feaf0
|
analizators/U2U1202
|
2022-01-18 16:54:24 +03:00 |
|
|
|
36c26bc803
|
analizators/U2U1117
|
2022-01-18 15:40:28 +03:00 |
|
|
|
0ee1a35424
|
analizators/U2U1115
|
2022-01-17 11:22:52 +03:00 |
|
Dmitry Kulak
|
8e62da40a3
|
Web: Files: Tiles: Removed unused code
|
2022-01-14 17:46:52 +03:00 |
|
|
|
4bf841581f
|
Analizators/U2U1104
|
2022-01-14 16:12:37 +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 |
|
|
|
9bc8584184
|
analizators/U2U1103
|
2022-01-13 15:53:57 +03:00 |
|
|
|
cacb889ee2
|
analizators/U2U1100
|
2022-01-13 15:04:28 +03:00 |
|
|
|
d1ce4c5ed6
|
analizators/U2U1025
|
2022-01-13 14:30:40 +03:00 |
|
|
|
986d1d49e6
|
refactoring: ICacheNotify<T> map to MemoryCacheNotify by default then RedisConfiguration is null
|
2022-01-13 14:24:14 +03:00 |
|
|
|
4155f911c0
|
analizators/U2U1025
|
2022-01-13 14:19:39 +03:00 |
|
Dmitry Kulak
|
fe75b6fa32
|
Merge branch 'develop' into feature/redesign-tiles
|
2022-01-13 13:59:50 +03:00 |
|
|
|
66cf28ba29
|
analizators/U2U1100
|
2022-01-12 18:42:03 +03:00 |
|
|
|
6961f38593
|
analizators/U2U1023
|
2022-01-12 15:34:58 +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 |
|
|
|
3ff7aeca3b
|
analizators/U2U1015
|
2022-01-12 13:27:06 +03:00 |
|
|
|
efb51c613f
|
refactoring *.proto files according to https://bit.ly/3KcZ0Ef
|
2022-01-11 19:28:48 +03:00 |
|
|
|
50c0596eff
|
analizators/U2U1009
|
2022-01-11 18:37:19 +03:00 |
|
|
|
c85c2e6f26
|
analizators/U2U1007
|
2022-01-11 18:37:10 +03:00 |
|
|
|
d9619e1151
|
analizators/U2U1006
|
2022-01-10 18:13:54 +03:00 |
|
|
|
c43f244282
|
analizators/U2U1003
|
2022-01-10 18:13:30 +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 |
|
|
|
a671732da5
|
analizators/SCS0005
|
2022-01-10 12:24:21 +03:00 |
|
|
|
579e867b2c
|
analizators/s3168
|
2022-01-10 11:18:55 +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 |
|
|
|
50698af649
|
analizators/s3168
|
2021-12-30 15:28:14 +03:00 |
|
|
|
b9ae9b7335
|
analizators/s2583
|
2021-12-30 15:12:44 +03:00 |
|
|
|
6c32e34b40
|
analizators/s1848
|
2021-12-30 15:04:47 +03:00 |
|
|
|
1c29b81a9a
|
analizators/s1848
|
2021-12-30 15:01:20 +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 |
|
|
|
632783b130
|
analizators/s4275
|
2021-12-29 18:12:39 +03:00 |
|
|
|
877095f525
|
analizators/s3923
|
2021-12-29 17:40:19 +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 |
|
|
|
f244266378
|
analizators/s3966
|
2021-12-28 18:50:54 +03:00 |
|
|
|
5e91416c53
|
analizators/s4035
|
2021-12-28 18:44:54 +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 |
|
|
|
895e888ad3
|
analizators/s4144
|
2021-12-28 17:04:52 +03:00 |
|
|
|
6cd3a7bfe1
|
analizators/s4201
|
2021-12-28 17:03:05 +03:00 |
|
|
|
9557ad7abb
|
Web:Common:Store: add array for available themes
|
2021-12-28 21:39:27 +08:00 |
|
|
|
ee79cecf36
|
analizators/s4457
|
2021-12-28 16:19:53 +03:00 |
|
|
|
af1c812cac
|
analizators/s4586
|
2021-12-28 15:03:12 +03:00 |
|
|
|
0a786bbfa3
|
analizators/s4830
|
2021-12-28 15:00:48 +03:00 |
|
|
|
352a8b61ff
|
analizators/s5034
|
2021-12-28 14:54:10 +03: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 |
|
|
|
4f2bade87e
|
Web:Files:DragTooltip: add support dark-theme
|
2021-12-25 01:11:13 +08:00 |
|
|
|
39ec4f3e36
|
Web:Files:Dialogs: add support dark-theme
|
2021-12-25 01:08:23 +08:00 |
|
|
|
5399ed8c82
|
Web:Files:Home: add support dark-theme for section
|
2021-12-24 17:12:31 +08:00 |
|
|
|
99a5f3a29c
|
Web:Files:Badges:Styling favorite badge.
|
2021-12-23 18:49:04 +03:00 |
|
|
|
dcc7986a90
|
map ICacheNotify<> to RedisCache<>
|
2021-12-23 18:27:58 +03:00 |
|
|
|
134000038a
|
Web:Files:Added VersionBadge translation to FilesTableRow component.
|
2021-12-23 18:06:54 +03:00 |
|
|
|
f9f1438df9
|
Web:Files:Badges: Fixed styles badges.
|
2021-12-23 17:59:38 +03:00 |
|
|
|
a0336d310e
|
Web:Files:Added translation VersionBadge to locales for en, ru. Added VersionBadge translation to FilesRowContent component.
|
2021-12-23 17:08:32 +03:00 |
|
|
|
dc7b2675f3
|
Web: Files: Store: Fixed bug with displaying "Save as oform" at Favorite/Recent folders
|
2021-12-23 16:29:21 +03:00 |
|
|
|
6d250efffa
|
add *.dll for support redis + update Grpc.* dll
|
2021-12-23 16:17:31 +03:00 |
|
|
|
57d1d50f57
|
Merge branch 'release/v1.1.0' into feature/translate-1.1.0
|
2021-12-23 14:02:16 +03:00 |
|
|
|
440811e931
|
Web: Added convertLanguage for compatibility
|
2021-12-23 14:01:08 +03:00 |
|
|
|
2e0ca68d43
|
Merge branch 'develop' into feature/redesign-badges
|
2021-12-23 13:22:12 +03:00 |
|
|
|
c899f4db3a
|
Web: People: Fix selectedLanguage == undefined
|
2021-12-23 13:10:35 +03:00 |
|
Dmitry Kulak
|
1f4ce11734
|
Web: Files: Tiles: Loaders redesign
|
2021-12-23 12:32:46 +03:00 |
|
Dmitry Kulak
|
18aa0121f9
|
Web: Files: Tiles: Renaming redesign, fixes
|
2021-12-23 12:32:45 +03:00 |
|
Dmitry Kulak
|
c4c897028c
|
Web: Files: Tiles: Refactoring
|
2021-12-23 12:32:43 +03:00 |
|
Dmitry Kulak
|
22e446db94
|
Web: Files: Tiles: Badges redesign
|
2021-12-23 12:32:41 +03:00 |
|
