Commit Graph

7703 Commits

Author SHA1 Message Date
0a3d7a0dc4 Fixed Bug 55056 - Client.Files. Added reset selections. 2022-01-25 15:56:24 +03:00
6d17e0a37d Web: Files: Added opportunity to react on move/delete file on socket.io 2022-01-25 15:45:01 +03:00
Dmitry Kulak
0e6c866ca6 Web: Files: Badges: Extracted common Badge props to object 2022-01-25 14:24:27 +03:00
b03ac6d58f Fixed Bug 55062 - Client.Files. Renamed operation panel button. 2022-01-25 14:16:17 +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
509332fb23 Web: restored classNames for autotest after merge 2022-01-25 12:31:18 +03:00
Vashchuk Nikita
3e03f820bb async IDataStore 2022-01-25 12:29:11 +03:00
Timofey
eb7911054c Web: added support theme as props 2022-01-25 17:13:31 +08:00
403704c9c1 Web: Files: Socket: Added new data parameter for "s:modify-folder" 2022-01-25 12:03:15 +03: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
eb75b0b32a Web: Files: Added opportunity to react on modify-folder with socket 2022-01-24 20:43:24 +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
cfb5705f60 edit Convert (fr, es, it, ro) 2022-01-24 16:45:11 +03:00
7bc5511cf7 Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-01-24 16:19:01 +03:00
0cc9ce3f19 Web: Files: Deleted useless translation. 2022-01-24 16:18:25 +03:00
c29abf9119 Fixed Bug 54870 - Client.Files.Clouds.Drag’n’drop. Fixed 'itemOperationToFolder is not defined' error 2022-01-24 15:58:44 +03:00
b25f339c3e Merge branch 'hotfix/v1.1.1' into feature/socket-io 2022-01-24 15:43:04 +03:00
e6f92c3142
Merge pull request #493 from ONLYOFFICE/feature/convert-password
Feature/convert password
2022-01-24 15:03:55 +03:00
e865ee0c46 Fixed Bug 55056 - Client.Files. Removed the possibility of simultaneous operations with files. 2022-01-24 14:17:14 +03:00
83e7b1193b Web: Files: Fixed translation. 2022-01-24 14:03:29 +03:00
fce8d26cef analizators/ca1507 2022-01-24 13:49:00 +03:00
226dd96d0c Web: Files: Fixed translation. 2022-01-24 13:15:46 +03:00
d865a9602b Web: Files: Fixed floating button deletion if the floating button was displayed with a warning and the user tried to convert this file again. 2022-01-24 13:01:27 +03:00
fb3a61d0d2 analizators/s3442 2022-01-24 12:57:01 +03:00
7f707428f2 Web: Files: Added auto-focus when entering a password with an error. 2022-01-24 12:09:26 +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
a36b5642e2 Web: Files: Added KeyDown support in the convert dialog with password. 2022-01-24 10:20:53 +03:00
9137620740 Web: Files: Added KeyDown support in the upload panel, added auto-focused property to the input. 2022-01-24 10:06:08 +03:00
9ac985c2f2 crm: CurrencyProvider: fixed init in constructor 2022-01-21 20:32:55 +03:00
ee2fd6bb0f Web:Files:Added a check for the absence of other pictures in the playlist for moving through the picture via a direct link in MediaViewer. 2022-01-21 19:21:29 +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
2abdb3fc21 Web: Files: Fixed button color, the button is disabled if the user has not entered a character. 2022-01-21 16:52:40 +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
292f00e225 WEb: files: Moved api copy method. 2022-01-21 15:50:59 +03:00
88a6f82297 Web: Files: Deleted useless code. 2022-01-21 15:21:43 +03:00
efe799d712 Merge branch 'hotfix/v1.1.1' into feature/convert-password
# Conflicts:
#	products/ASC.Files/Client/src/helpers/utils.js
2022-01-21 14:44:06 +03:00
8de8ffbb86 Web: Files: Deleted useless code. 2022-01-21 14:40:13 +03:00
Timofey
47974e378f Merge branch 'develop' into feature/dark-theme 2022-01-21 19:31:48 +08:00
e3497f0ad1 Web: Files: Added header translation. 2022-01-21 14:14:17 +03: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
e1d07c5699 Web: Files: Added English translation. 2022-01-21 13:45:52 +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
97624451a8 Web: Files: Fixed Regular expression. 2022-01-21 11:24:54 +03:00
f7779b3056 Web: Files: refactoring. 2022-01-21 10:51:01 +03:00
720ca53c70 Web: Files: Added password error handler to HOCs. 2022-01-21 10:49:52 +03:00
1e5877faef Web: Files: Added row loader when creation file or folder. 2022-01-21 10:38:34 +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
d4b28b7de3 Fixed Bug 53524 - VersionHistory: User's display name with diacritics invalid 2022-01-20 11:43:16 +03:00
50a7bd6856 analizators/s3265 2022-01-20 11:40:21 +03:00
3f28dfe78a analizators/s3237 2022-01-20 11:36:42 +03:00
4cbb25048f Web: Files: Added password error handler. 2022-01-20 11:09:40 +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
68f2952975 Web: Files: Added loader for button. 2022-01-19 17:09:08 +03:00
3ac17188cb Fixed Bug 54083 - Client.Files. Fixed file selection reset 2022-01-19 17:07:33 +03:00
Dmitry Kulak
8fa4d6e86d Web: Files: Removed unused code, fixes 2022-01-19 17:05:27 +03:00
c3687bc804 Web: Files: Added warning about creating a file with an error. 2022-01-19 17:04:58 +03:00
384a3b1129 Web: files: Added dialog description. 2022-01-19 16:56:40 +03:00
547b78b72f analizators/2178 2022-01-19 16:36:03 +03:00
e046f6f8df analizators/s1006 2022-01-19 16:14:51 +03:00
fd5b61dce1 Web: Files: Added warning about successful file creation. 2022-01-19 15:56:37 +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
53eee989e6 Web: Files: Added warning toastr about file protecting. 2022-01-19 15:28:53 +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
fde1f1c015 Web:Files:Сhanged history.pushState method to history.push. 2022-01-19 12:27:17 +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
832b422007 Web: Files: Added logic for entering a password when creating a form template from a text file. 2022-01-19 10:24:07 +03:00
Vashchuk Nikita
5b9668c14f ILinkDao, fix 2022-01-18 19:50:31 +03:00
Dmitry Kulak
6cb00cd777 Web: Files: Tiles: Added quick buttons, refactoring 2022-01-18 19:19:56 +03:00
0a90636703 Web: Files: When confirming the creation of a file, the buttons were removed. Added password entry process. 2022-01-18 18:35:13 +03:00
78047d3b93 analizators/U2U1210 2022-01-18 18:29:46 +03:00
aea69a3077 Fixed Bug 54884 - Client.Files. Removed the possibility of simultaneous operations with files. 2022-01-18 18:08:27 +03:00
84638feaf0 analizators/U2U1202 2022-01-18 16:54:24 +03:00
36c26bc803 analizators/U2U1117 2022-01-18 15:40:28 +03:00
1271bae470 Web: Files: Added copy api method to create form template, added closing editors tab. 2022-01-18 12:22:55 +03:00
28bbc72ad5 Web:Files:Added history.pushState method to display images in HOC withFileActions. 2022-01-18 10:46:02 +03:00
1a8d88345a Merge branch 'hotfix/v1.1.1' into feature/socket-io
# Conflicts:
#	products/ASC.Files/Client/src/store/FilesStore.js
#	yarn.lock
2022-01-17 19:02:40 +03:00
474f754dd9 Merge branch 'hotfix/v1.1.1' of https://github.com/ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-01-17 17:20:35 +03:00
9e49ae6a75 Web: Files: Refactoring, removed bug with memory leak. 2022-01-17 16:21:10 +03:00
87fa4afcd3 Web: Files: Refactoring. 2022-01-17 15:57:37 +03:00
aa8903b0ef Web: Files: Added copy method to save in 'oform' format. 2022-01-17 15:54:14 +03:00
a853d511e5 Web: Files: Added new prop. 2022-01-17 15:50:42 +03:00
753e8c48bd Fixed Bug 54881 - Client.Files. Disabled "Move to Trash" button when no item is selected 2022-01-17 15:35:20 +03:00
83c952bf7e Web: Files: removed recent request for private folder 2022-01-17 11:40:35 +03:00
0ee1a35424 analizators/U2U1115 2022-01-17 11:22:52 +03:00
77937390ef Web: Fix crash of Wizard with default en-US language 2022-01-14 19:12:58 +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
a66272af1a Elastic: fix ping 2022-01-14 15:20:44 +03:00
783bdd27f0 WEb: Files: Change the password dialog due to modification of the password imitation component. 2022-01-14 14:36:14 +03:00
e6647c835f Web: Files: Simplification of the password imitating component. 2022-01-14 12:17:59 +03:00
6e2a990c58 Fixed Bug 54484 - People. Added redirect to people list after deleting user profile 2022-01-14 11:20:15 +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
bed51de56e Web: Files: Refactoring. 2022-01-13 16:21:08 +03:00
9bc8584184 analizators/U2U1103 2022-01-13 15:53:57 +03:00
4cec0e7828 Fixed Bug 54870 - Client.Files.Clouds.Drag’n’drop. Fixed drag'n'drop movement third-party storage folders. 2022-01-13 15:37:19 +03:00
9a236cabf5 Web: Files: Added possibility to change width of password input. 2022-01-13 15:36:40 +03:00
23c8a8358e Web: Files: Added password dialog. 2022-01-13 15:35:56 +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
6fd00f52c5 Merge branch 'hotfix/v1.1.1' into feature/convert-password
# Conflicts:
#	products/ASC.Files/Client/src/store/UploadDataStore.js
2022-01-13 13:14:03 +03:00
e6f89afb6d Web: Files: Transferring actions to a row file. 2022-01-13 12:53:30 +03:00
1681507100 Fixed Bug 54580 - Docs. Private Rooms. Unable to load form file '.oform' 2022-01-13 12:13:48 +03:00
94a4ddb146 Web: files: Fixed import. 2022-01-13 11:40:46 +03:00
d8ee3de51a Web: Files: Moving a component to a separate folder. 2022-01-13 11:37:24 +03:00
52c48a810c Web: files: Added error toastr. 2022-01-13 11:18:41 +03:00
6f90864ed8 Merge branch 'hotfix/v1.1.1' into feature/socket-io 2022-01-13 10:49:43 +03:00
dbb80ac38b Web: Files: Added new translation. 2022-01-13 10:13:54 +03:00
3a0684d24b Web: Files: Fixed translations for languages. 2022-01-13 10:03:53 +03:00
549c381ca1 Web: Files: Fixed translations for Italian language. 2022-01-13 09:59:50 +03:00
baeadfd93a Web: Files: fixed fr translations. 2022-01-13 09:56:52 +03:00
7e74cf8c91 Web: Files: fixed translations. 2022-01-13 09:55:05 +03:00
253ae7aa19 Web: Files: Renaming of translations keys. 2022-01-13 09:40:26 +03:00
c81fe84da2 Web: Files: Fixed translations. 2022-01-13 09:28:17 +03:00
Vashchuk Nikita
f75a56f594 Merge branch 'feature/async' of github.com:ONLYOFFICE/AppServer into feature/async 2022-01-12 22:09:32 +03:00
Vashchuk Nikita
c74da79ba2 Merge branch 'develop' into feature/async
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
#	products/ASC.Files/Core/Services/DocumentService/Configuration.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	products/ASC.Files/Core/Utils/FileUploader.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
2022-01-12 22:07:21 +03:00
8b327ceb66 Web: Socket.IO: Extended /api/2.0/settings with socketUrl + refactoring of client socket usage 2022-01-12 20:13:30 +03:00
66cf28ba29 analizators/U2U1100 2022-01-12 18:42:03 +03:00
a91d767c66 Merge branch 'hotfix/v1.1.1' into bugfix/conversion-dialog-in-sorted-folders 2022-01-12 17:26:48 +03:00
Vashchuk Nikita
c778bb6db3 fix 2022-01-12 17:13:56 +03:00
332fc5866a Web: Files: Hide the file destination when checkbox is not set. 2022-01-12 17:09:21 +03:00
ee71dbb2cd Web: updated icons of modules 2022-01-12 15:51:36 +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
d2fb921a7c Web:Files: Refactoring. 2022-01-11 18:59:35 +03:00
1941ceee28 Web: Files: Added toast for success conversion. 2022-01-11 18:48:09 +03:00
6ba659ac04 Web: Files: Added translations. 2022-01-11 18:43:43 +03:00
50c0596eff analizators/U2U1009 2022-01-11 18:37:19 +03:00
c85c2e6f26 analizators/U2U1007 2022-01-11 18:37:10 +03:00
5fcf5cc1cc Files: copyas method now has "Password" param 2022-01-11 18:27:06 +03:00
8b9ea275de Web: Files: Renaming. 2022-01-11 17:08:42 +03:00
a87a1a22b5 Web: Files: Added information about file destination. 2022-01-11 17:05:36 +03:00
Vashchuk Nikita
e6f3c19b6e added async to ISecurityDao 2022-01-11 16:15:18 +03:00
0c341f0709 Merge branch 'hotfix/v1.1.1' into feature/convert-password 2022-01-11 16:14:46 +03:00
15f15da4a0 Web: files: Added translations. 2022-01-11 15:46:53 +03:00
0246f10380 Web: People: fixed mobx warning 2022-01-11 12:35:53 +03:00
3565666fd2 Web: Table: fixed default columns size, fixed styles 2022-01-11 12:34:54 +03:00
ac157df98d Web: Files: The converted file does not appear in the sorted folders. 2022-01-11 11:17:06 +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
3df4bc8c67 Web: People: added badges for people table 2022-01-10 17:28:22 +03:00
3522dea939 Web:Files:Badges:Fix props lineHeightBadge for table view. 2022-01-10 16:30:37 +03:00
901d48b4f0 Web: People: fixed the user position cell 2022-01-10 15:56:38 +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
6cbd02b71c Merge branch 'hotfix/v1.1.1' into feature/socket-io
# Conflicts:
#	products/ASC.Files/Client/webpack.config.js
#	products/ASC.Files/Server/DocStore
#	yarn.lock
2022-01-10 11:06:32 +03:00
efffe7feb3 Fixed Bug 54482 - People. User profile is not removed from the context menu 2022-01-10 10:55:29 +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
5c97e7ed63 Web: Socket.IO: Changed logger settings 2021-12-30 15:55:00 +03:00
f8035967b5 Web: Socket: Changed room settings 2021-12-30 15:54:23 +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
3c23f4d892 Merge branch 'hotfix/v1.1.1' into feature/convert-password
# Conflicts:
#	products/ASC.Files/Client/src/components/panels/StyledPanels.js
#	products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
#	products/ASC.Files/Client/src/store/UploadDataStore.js
2021-12-30 14:34:49 +03:00
5fb4de9537 Web:Files:Badges:Added check for isTablet device for row view. 2021-12-30 14:29:46 +03:00
f2134c7600 Web: Files: Fixed last page operations after merge. 2021-12-30 12:55:49 +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
ddead9c17f WEb: Files: Refactoring. 2021-12-29 17:28:32 +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
c9e7503e35 Web: Files: Changed password input logic. 2021-12-29 16:00:03 +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
5630e0b6bf Files: fix 2021-12-28 20:21:22 +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
98f12cc15f DocStore: resolve conflict (febf172875) 2021-12-28 18:20:59 +03:00
Vashchuk Nikita
0876c22f6f spreading async in Files 2021-12-28 18:15:29 +03:00
895e888ad3 analizators/s4144 2021-12-28 17:04:52 +03:00
6cd3a7bfe1 analizators/s4201 2021-12-28 17:03:05 +03:00
4c5ba66857 Web: People: fixed table cell styles 2021-12-28 16:47:57 +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
a6a5140fec Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1 2021-12-28 16:04:51 +03:00
f282d23a59 Web: Files: fixed NewFilesPanel styles 2021-12-28 16:04:40 +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
febf172875 Merge branch 'master' into hotfix/v1.1.1
# Conflicts:
#	lerna.json
#	packages/asc-web-common/package.json
#	packages/asc-web-components/avatar-editor/index.js
#	packages/asc-web-components/avatar-editor/sub-components/avatar-editor-body.js
#	packages/asc-web-components/main-button/index.js
#	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/src/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFileDialog/AsideView.js
#	products/ASC.Files/Server/DocStore
#	products/ASC.Mail/Client/package.json
#	products/ASC.People/Client/package.json
#	products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
#	products/ASC.Projects/Client/package.json
#	web/ASC.Web.Client/package.json
#	web/ASC.Web.Editor/package.json
#	web/ASC.Web.Editor/src/Editor.jsx
#	web/ASC.Web.Login/package.json
2021-12-28 13:35:02 +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
3b42a6e0db Web: files: deleted useless code. 2021-12-28 11:41:10 +03:00
5e0747e8b5 Web: Files: Added folder for sub components. 2021-12-28 11:35:41 +03:00
3dd22c418c Web: Files: Refactoring. 2021-12-28 11:24:54 +03: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
fdf6f0a2d2 Web: Files: Added translations. 2021-12-28 08:57:56 +03:00
12e392f174 Web:Files:VersionHistory: add support dark-theme 2021-12-28 10:50:01 +08:00
Vashchuk Nikita
6e4eff9ce3 added async to FileSecurity 2021-12-27 20:52:40 +03:00
Vashchuk Nikita
46a3630aa8 Merge branch 'feature/async' of github.com:ONLYOFFICE/AppServer into feature/async
# Conflicts:
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Security/FileSecurity.cs
#	products/ASC.Files/Core/Model/FolderContentWrapper.cs
2021-12-27 20:41:10 +03:00
c5c4705c64 Web: Files: Renaming. 2021-12-27 19:18:15 +03:00
e7aff4a118 Web: Files: Added simulate password for convert file. 2021-12-27 19:12:55 +03:00
Dmitry Kulak
57c2460c3e Web: Files: Tiles: Redesign, refactoring 2021-12-27 18:46:26 +03:00
829fba71a8 Fixed Bug 51806 - Client.Files. Fixed error after clicking on the lock icon 2021-12-27 16:24:54 +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
657961c334 Web: Socket: Implemented "stop editing" + refactoring 2021-12-24 20:58:38 +03: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
d25076eb02 Web: Files: fixed VersionHistoryStore error 2021-12-24 16:13:31 +03:00
Vashchuk Nikita
9a86fe1062 async IFileSecurity 2021-12-24 14:46:27 +03:00
7946cdfb21 Files: optimization 2021-12-24 13:43:19 +03: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
79b7fee7e5 Web: Files: Fixed style. 2021-12-23 17:51:30 +03:00
c02624c907 WEb: Files: Refactoring. 2021-12-23 17:48:20 +03:00
0484bd547c Web: Files: Fixed file name according layouts. 2021-12-23 17:45:14 +03:00
3423696d23 Web: Files: Fixed translation. 2021-12-23 17:42:06 +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
4c72f35766 Web: Files: Fixed styles for iOS. 2021-12-23 16:12:41 +03:00
331bc95fa9 Web: Files: Redesign of upload panel. 2021-12-23 14:53:32 +03:00
Vashchuk Nikita
c85bd19cf7 removed sync methods from Dao 2021-12-23 14:46:21 +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
Dmitry Kulak
37fb1b2081 Web: Files: Tiles: Removed file extension from file title 2021-12-23 12:32:40 +03:00
Dmitry Kulak
9d06c87dde Web: Files: Tiles: File tiles and layout redesign 2021-12-23 12:32:40 +03:00
Dmitry Kulak
23afa67e31 Web: Files: Tiles: Folder tile redesign, made file icons bigger 2021-12-23 12:32:38 +03:00
757bee9f28 Web: Files: Renaming. 2021-12-23 12:19:39 +03:00
604354f494 Web: Files: Changed title for actions. 2021-12-23 12:17:39 +03:00
919092e6c6 Merge branch 'feature/translate-1.1.0' of https://github.com/ONLYOFFICE/AppServer into feature/translate-1.1.0 2021-12-23 11:28:50 +03:00
3c26c6cdfd edit az, vi, uk 2021-12-23 11:24:00 +03:00
cd56b02c8e Merge branch 'feature/translate-1.1.0' of https://github.com/ONLYOFFICE/AppServer into feature/translate-1.1.0 2021-12-22 19:10:45 +03:00
e28744d69a Web:Tests: fix culture change before test start 2021-12-23 00:09:49 +08:00
ef853d5d2f Web:Files:Removed the Icons and SimpleRowContent components. 2021-12-22 18:50:25 +03:00
5b816aa5f1 Web:Files:Article:add support dark-theme for body 2021-12-22 23:40:13 +08:00
48aa091786 Merge branch 'feature/translate-1.1.0' of https://github.com/ONLYOFFICE/AppServer into feature/translate-1.1.0 2021-12-22 18:12:12 +03:00
86e965d779 Web: Fix translations 2021-12-22 18:12:04 +03:00
fce3c57e8f Web:Files:Badges: Changed the conditions for displaying badges version. Changed style badge version New. 2021-12-22 16:20:23 +03:00
858e5084c0 WEb: Files: Refactoring. 2021-12-22 16:07:26 +03:00
55cb04d4ad Web: Files: Added adaptive layout. 2021-12-22 15:37:13 +03:00
53c3775d15 Web:Files:Changed default column display for table view. Changed badges column key from Share to QuickButtons. 2021-12-22 15:20:47 +03:00
bda5f4638b Web:Components:Avatar: update dark theme 2021-12-22 20:18:24 +08:00
35cac885f3 Web: Files: UploadPanel: Added error handler for password input. 2021-12-22 13:59:19 +03:00
b63d7d02f4 Web:Tests: close process when tests done 2021-12-22 18:45:53 +08:00
332aec8c28 Web: Files: Added translations. 2021-12-22 13:41:34 +03:00
76d423aa31 Web: files: Fixed styles. 2021-12-22 13:22:25 +03:00
c9f1765575 Web: Files: Added the ability to enter a password and convert. 2021-12-22 12:22:23 +03:00
5a6147bd36 Web: Files: Added logic for converting with password. 2021-12-22 12:21:03 +03:00
6ae2438395 Web: Files: UploadPanel: Added hide input prop. 2021-12-22 12:17:47 +03:00
868332bb83 Web:Tests: add ability to ignore different cultures 2021-12-22 16:46:45 +08:00
1bc044699f Web:Files:Badges:Сhanging the displayed content in TableRow. 2021-12-21 21:31:31 +03:00
561dbb3a65 Web:Files:Badges: Fixed styles badges for desktop view. 2021-12-21 20:52:24 +03:00
e1cf46f16f Web:Files:Badges: Added HOC withQuickButtons and quickButtonsComponent props to TableRow component. Styling badges for desktop view. 2021-12-21 20:35:02 +03:00
dba445fbb2 Fixed Bug 53171 - Client.Files.Editor. Removed restore revision option if the file is open for editing. 2021-12-21 17:23:23 +03:00
47681bb6f1 Merge branch 'hotfix/v1.1.1' into feature/convert-password 2021-12-21 14:48:05 +03:00