Commit Graph

7262 Commits

Author SHA1 Message Date
Timofey
c08b1460bc Web:Files:Home: fix context menu render on tile view 2022-02-03 21:22:31 +08:00
Timofey
223c04a3c7 Merge branch 'feature/dark-theme' into feature/virtual-rooms-1.2 2022-02-03 20:59:26 +08:00
34dab043e0 Merge branch 'develop' into feature/analizators
# Conflicts:
#	common/ASC.Core.Common/ASC.Core.Common.csproj
2022-02-03 12:55:33 +03:00
Timofey
918b138f92 Web:Common:Components: add clear trash button 2022-02-03 16:06:36 +08:00
4661ee96d0 Packages updated 2022-02-02 19:54:23 +03:00
Timofey
7086d0cc50 Web:Common:Navigation: change drop box width on tablet devices 2022-02-02 23:04:41 +08:00
Timofey
512885373d Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-02-02 19:35:42 +08:00
bb28679fdf analizators: bugfix 2022-02-02 14:05:06 +03:00
Timofey
427b10142c Merge branch 'develop' into feature/navigation 2022-02-02 17:31:53 +08:00
Timofey
f6090b4f58 Merge branch 'feature/navigation' into feature/virtual-rooms-1.2 2022-02-01 18:44:49 +08:00
Timofey
2870da6271 Web:Common:Components: fixed top and left position for navigation drop-box 2022-02-01 18:37:44 +08:00
Timofey
46afa9b16c Merge branch 'develop' into feature/navigation 2022-02-01 16:45:30 +08:00
Timofey
750becafb8 Merge branch 'feature/new-context-menu' into feature/virtual-room-1.2 2022-02-01 16:07:27 +08:00
Timofey
bc9dd07400 Merge branch 'develop' into branch feature/new-context-menu 2022-02-01 15:07:01 +08:00
Timofey
cf3d4c71e3 Merge branch 'devlop' into branch feature/catalog 2022-01-31 23:52:52 +08:00
Timofey
140fc8fd1b Web:Files:Components: fixed floating number in secondary progress 2022-01-31 23:47:22 +08:00
Timofey
369801ddb7 Web:Files:Components: add primary and secondary progress in main button mobile view 2022-01-31 21:42:59 +08:00
Timofey
092a89a196 Web:Files:Store: add files count to secondary progress data store 2022-01-31 21:41:54 +08:00
34ff334692 Merge branch 'develop' into feature/analizators 2022-01-31 14:35:16 +03:00
Timofey
21cd73a698 Web: restore code format 2022-01-28 21:44:58 +08:00
Timofey
875c1e897a Web:Files:QuickButton: change color selected button 2022-01-28 20:01:36 +08:00
Timofey
47527c3430 Web:People:ProfileAction: add support dark-theme for link in tooltip 2022-01-28 19:46:46 +08:00
Timofey
f2ac0c721b Merge branch 'feature/dark-theme' of github.com:ONLYOFFICE/AppServer into feature/dark-theme 2022-01-28 18:04:53 +08:00
Timofey
210ebd7ad1 Web:Files: add support dark-theme for select-file-dialog-aside_buttons class 2022-01-28 18:03:33 +08:00
92542a4a27 Merge branch 'feature/dark-theme' of github.com:ONLYOFFICE/AppServer into feature/dark-theme 2022-01-28 13:01:42 +03:00
5db134933b Web: Files: Fixed error when clicked on "change access rights" twice. 2022-01-28 13:01:08 +03:00
Timofey
3c53e73484 Web:Files:SimpleFileInput: add support dark-theme 2022-01-28 17:57:15 +08:00
Timofey
136fe4f41d Web:Files:Store: add files count to secondary progress store 2022-01-28 15:58:23 +08:00
Timofey
15dd9b0642 Merge branch 'develop' into feature/dark-theme 2022-01-27 22:21:06 +08:00
Timofey
5af7f89261 Web:Files: fixed hover and selected color in dark theme for tree folders 2022-01-27 22:19:13 +08:00
Timofey
18ed20569d Web:Editor: wrap editor in theme provider and delete theme as props in components 2022-01-27 21:54:58 +08:00
1908af64f0 cache: return support kafka. refactoring 2022-01-27 15:20:51 +03:00
Timofey
f62a69a957 Web: update DocStore 2022-01-27 19:28:39 +08:00
Timofey
fb1a86eecd Web:Files:QuickButton: fixed color and hover after merge branch 'develop' 2022-01-27 18:25:54 +08:00
Timofey
4b45eaa243 Merge branch 'develop' into feature/dark-theme 2022-01-27 18:10:13 +08:00
Timofey
293de829bd Web:Files:Catalog: add main button mobile on mobile and tablet devices 2022-01-27 17:13:49 +08:00
Dmitry Kulak
23fc1a7b46 Web: Files: Badges: Renamed VersionBadgeWrapper to BadgeWrapper 2022-01-26 15:16:45 +03:00
Dmitry Kulak
b25e0c75b0 Web: Files: Tiles: Added border on hover for ok/cancel buttons while renaming 2022-01-26 14:42:01 +03:00
Dmitry Kulak
926f0c6a2e Web: Files: Changed "shared" icon 2022-01-26 14:09:43 +03:00
Dmitry Kulak
0e6c866ca6 Web: Files: Badges: Extracted common Badge props to object 2022-01-25 14:24:27 +03:00
Dmitry Kulak
a46ea93d32
Merge branch 'develop' into feature/redesign-tiles 2022-01-25 13:37:04 +03:00
Timofey
31a8b00313 Merge branch 'develop' into feature/catalog 2022-01-25 17:35:06 +08:00
Timofey
eb7911054c Web: added support theme as props 2022-01-25 17:13:31 +08:00
Timofey
d4a500beb9 Merge branch 'develop' into feature/dark-theme 2022-01-25 16:35:20 +08:00
7f31d3f19f
Merge pull request #494 from ONLYOFFICE/feature/refactoring-one-dbcontext-in-dao
used one dbcontext per service (per DAO). fixed error: System.Invalid…
2022-01-25 11:14:23 +03:00
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
fce8d26cef analizators/ca1507 2022-01-24 13:49:00 +03:00
fb3a61d0d2 analizators/s3442 2022-01-24 12:57:01 +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
8d0324ee2a analizators/s2326 2022-01-21 16:59:17 +03: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
667697f933 analizators/s2259 2022-01-21 16:46:30 +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
510bd4d731 analizators/s2219 2022-01-21 16:42:02 +03:00
cc53cd53e8 Analizators/s1939 2022-01-21 16:40:08 +03:00
f3d8b8d17a analizators/s1854 2022-01-21 16:36:36 +03:00
fb65d3a09d analizators/1481 2022-01-21 16:15:15 +03:00
3d635a4824 analizators/1643 2022-01-21 16:12:05 +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
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