Commit Graph

3066 Commits

Author SHA1 Message Date
18044095de Web: Editor: Fixed missing icon. 2021-08-03 12:09:56 +03:00
93f51a19e2 Web: Editor: Added possibility to save in folder where access is not denied. 2021-08-03 12:04:18 +03:00
3c97f8e736 Web: Table: fixed TableGroupMenu resize 2021-08-02 18:16:15 +03:00
8fca0ae6d1 Web: Components: Table: fixed styles, refactoring 2021-08-02 13:17:34 +03:00
4a977d711b Web: Files: Deleted useless styles. 2021-08-02 11:40:18 +03:00
f8673baeb9 Web: Files: removed unused translations 2021-08-02 11:36:14 +03:00
fa9d2f3f77 Web: Files: fixed header menu 2021-08-02 11:34:35 +03:00
c6c437b00d Web: Files: Fixed styles. 2021-07-30 19:59:00 +03:00
ba37ea8be6 Web: Editor: SelectFolder: Added header, refactoring, fixed height (aside view). 2021-07-30 19:23:23 +03:00
eff32de5f3 Web: Components: Table: fixed TableGroupMenu 2021-07-30 18:04:05 +03:00
fdefba1514 Web: Editor/Files: SelectFile: Added editor folders tree for select file component. 2021-07-30 17:50:02 +03:00
5639f4dfaf Web: Files: SelectFile: Refactoring. 2021-07-30 17:36:46 +03:00
b8a983451b WEb: Files: SelectFolder: Added possibility to close when click on backdrop. 2021-07-30 17:20:18 +03:00
8b41c21f51 Web: Files: SelectFolder: Refactoring. 2021-07-30 17:16:51 +03:00
b85b2dfa52 Web: Editor/Files: SelectFile: Refactoring, the component has been extended. 2021-07-30 16:26:26 +03:00
57b1382a87 Web: fixed article panel resize 2021-07-30 16:08:54 +03:00
562e1f203b Web: Components: Table: added min column width 2021-07-30 14:51:40 +03:00
ead5d1f6a1 Web: Files: SelectorFolder: The component has been simplified and extended (aside view). 2021-07-30 14:18:11 +03:00
1eb0e87950 Web: Files: fixed delete folder message on personal 2021-07-30 11:50:36 +03:00
6829a2c854 Web: People: added table view, refactoring 2021-07-29 20:21:26 +03:00
9df80ececa Web: Files: SelectFolder: Added errors handlers. 2021-07-29 19:54:34 +03:00
a0b812c53d Web: Editor: Refactoring. 2021-07-29 19:18:03 +03:00
d35e3608ba Web: Files: fixed default viewAs 2021-07-29 18:15:56 +03:00
bd2a5070a2 Web: Components: fixed checkbox onChange event 2021-07-29 18:13:57 +03:00
a7ba985ea0 Web: Files/Editor: Added tree folder for editor. 2021-07-29 15:52:30 +03:00
dba5275eb2 Web: Editor/Files: Component expansion for modal view, refactoring. 2021-07-29 14:35:27 +03:00
8707bfc46b Web: Files: Added request to the SaveAs method. 2021-07-29 14:05:31 +03:00
9697677ce4 Web: Editor: Added SaveAs method for selector folder component, extension select folder dialog. 2021-07-29 14:04:30 +03:00
acfde9e2b0 Web: Files: fixed files selection, fixed loader 2021-07-28 21:07:23 +03:00
b6258b4ff1 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into release/1.0.0
# Conflicts:
#	products/ASC.Files/Client/src/HOCs/withLoader.js
2021-07-28 20:15:09 +03:00
b13e71fcae Web: Files: fixed table filter 2021-07-28 17:45:09 +03:00
eb1049790b Web: Files: fixed table filter 2021-07-28 17:22:50 +03:00
75e7ca893f Merge branch 'develop' into feature/file-folder-selectors
# Conflicts:
#	products/ASC.Files/Client/webpack.config.js
#	web/ASC.Web.Editor/src/Editor.jsx
2021-07-28 17:19:05 +03:00
2abbd580c2 Merge branch 'develop' into feature/table-view
# Conflicts:
#	public/locales/en/Common.json
#	public/locales/ru/Common.json
2021-07-28 16:53:23 +03:00
3edc22c2fb Web: Files: added change of view from table to rows 2021-07-28 16:42:07 +03:00
c4163231a2 Web: Files: moved links in constant 2021-07-28 14:20:15 +03:00
18fb288ad3 Web: Files: fixed loader hoc 2021-07-28 14:13:22 +03:00
f99090ec9b Web: Files: Remove Comments. 2021-07-28 12:33:09 +03:00
48d94b4a2d Merge branch 'develop' into feature/editor-extention 2021-07-28 11:53:36 +03:00
3be8ab673c Web: Editor: Fixed not displaying data of Sharing Panel. 2021-07-28 11:15:55 +03:00
441102ad79 Web: Files: fixed table styles 2021-07-27 16:21:36 +03:00
6b08fa8a84 Web: Files: fixed table styles 2021-07-27 16:02:25 +03:00
eddb323ff6 Web: Editor/Files: Added create new file option. 2021-07-27 15:47:08 +03:00
475d6d638f Web: Files: added column filtering 2021-07-27 15:22:51 +03:00
050ce4ce8d Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-07-27 14:00:39 +03:00
ee35713b89 Web: Files: added download app list 2021-07-27 13:59:59 +03:00
43c079e15e Web: Files: added translations 2021-07-27 13:58:23 +03:00
445c7ae43f Web: Files: added cell type 2021-07-27 13:51:56 +03:00
d8c8d267c9 Web: Files: added an avatar to the author's cell 2021-07-27 09:57:00 +03:00
4874d783fc Web: Files: fixed date cell 2021-07-26 18:58:42 +03:00
e2d3f3195d Merge branch 'develop' into release/1.0.0 2021-07-26 15:40:05 +03:00
fcd46cfe3c Web: Files: Deleted preview and edit options for not supported formats. 2021-07-26 14:19:30 +03:00
538d65c724 Web: Remove query hash from remoteEntry.js 2021-07-26 14:02:10 +03:00
be2322a1ca Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-07-26 12:58:51 +03:00
30b41aac42 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-07-26 12:37:01 +03:00
a57f018def Web: Files: Added icon for fb2 format. 2021-07-26 11:59:08 +03:00
d86605e2da Web: Files: added drag and drop for table 2021-07-23 18:13:06 +03:00
0f27a6c673 Merge branch 'develop' into release/1.0.0 2021-07-23 17:34:43 +03:00
675fb8de21 Web: Fix caching remoteEntry.js 2021-07-23 17:20:42 +03:00
7f389e200e Web: Files: added dragOptions to TableRow 2021-07-23 16:19:53 +03:00
b02bf63a8e Web: Files: fixed display of share column 2021-07-23 14:17:23 +03:00
9b47aa8d4a Merge branch 'develop' into feature/table-view 2021-07-22 16:56:48 +03:00
09c9cfe645 Web: Table: added the opportunity to hide columns, fixed styles, refactoring 2021-07-22 16:55:26 +03:00
fa500d094f Merge branch 'develop' into release/1.0.0 2021-07-22 11:12:37 +03:00
e703927239 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-07-21 18:30:33 +03:00
13f8f5ef7d Fix sw.js creation 2021-07-21 18:28:56 +03:00
c92d8318f1 Web: Files: fixed header sorting, removed unused code 2021-07-21 12:16:46 +03:00
f7ce0e210b Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
# Conflicts:
#	packages/asc-web-common/utils/sw-helper.js
2021-07-21 07:20:51 +03:00
653066af0c Merge branch 'develop' into release/1.0.0
# Conflicts:
#	config/nginx/onlyoffice.conf
2021-07-20 18:21:00 +03:00
64ff924721 Web: Files: fixed the content of the created column 2021-07-20 18:08:46 +03:00
b586154b1d Web: Files: fixed EditingWrapperComponent styles 2021-07-20 16:13:55 +03:00
d8e90c7dac Web: Files: added creation, renaming of files to table view 2021-07-20 16:03:06 +03:00
d84229886f Web: Components: Table: added header filtering, refactoring 2021-07-20 13:29:39 +03:00
829edbbda5 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-07-20 13:22:44 +03:00
eab97bbfed Web: init new single sw.js creation 2021-07-20 12:32:27 +03:00
4d389cab91 Web: Files: fixed SimpleFilesRow click 2021-07-19 14:37:54 +03:00
5ed5adbb9b Web: Components: Table: added settings, fixed table group menu header 2021-07-19 14:09:09 +03:00
bfa7f75eb2 Web: Files: added translations to TableHeader.js 2021-07-16 13:24:25 +03:00
4cb025b5b2 Web: Files: added selectbox support 2021-07-16 12:36:47 +03:00
cd8242ee69 Web: Files: added context-menu to files module 2021-07-15 18:10:37 +03:00
f00f07ce1e Web: Files: added TableGroupMenu to files module 2021-07-15 17:00:47 +03:00
e81ef462f6 Web: Files: moved getting header menus item to the store, changed the header display logic 2021-07-15 17:00:15 +03:00
9f3d12dacb Web: Files: added table-view to files module 2021-07-15 13:45:04 +03:00
568aa61071 Web: Table: refactoring 2021-07-15 10:57:06 +03:00
e9af9374ca Web: Files: hidden annoying loader on first load 2021-07-14 17:37:30 +03:00
1ebc588a93 Web: Bumped version to 1.0.0 2021-07-14 13:26:36 +03:00
20234a0f31 Web: Files: lowercase banner image 2021-07-13 12:58:24 +03:00
3dddd9abce Web: Table: changed the logic of work 2021-07-13 11:12:22 +03:00
08a380d5aa Web: Table: changed the logic of work 2021-07-13 11:07:50 +03:00
cb8d225707 Merge branch 'develop' into feature/file-folder-selectors
# Conflicts:
#	products/ASC.Files/Client/src/store/index.js
2021-07-12 13:08:40 +03:00
cc2377aa33 Merge branch 'develop' into feature/table-view 2021-07-12 11:19:59 +03:00
fccdd5f97a Web: Files: fixed translations 2021-07-09 18:49:57 +03:00
1bfeef948f Web: Files: SelectFolderInput: Added missing props. 2021-07-09 17:23:29 +03:00
ee544dcde5 Merge branch 'feature/personal' of github.com:ONLYOFFICE/AppServer into feature/personal 2021-07-09 17:02:01 +03:00
d14655900c Web: Files: fixed 2021-07-09 17:01:48 +03:00
dde99b792a Web: Files: Applied prettier style fix 2021-07-09 16:13:50 +03:00
f08bd76e74 Merge branch 'feature/file-folder-selectors' of github.com:ONLYOFFICE/AppServer into feature/file-folder-selectors 2021-07-09 14:54:51 +03:00
a491b1879a Web: Files: SelectFileDialog: Added possibility to pass children. 2021-07-09 14:53:41 +03:00
39b7163267 Web: Files: added new table cells, fixed table styles 2021-07-09 13:39:09 +03:00
1a06bd6a83 Web: Files: hid inLoad log 2021-07-09 12:00:05 +03:00
64f455eb59 Web: init table view 2021-07-09 11:59:20 +03:00
dc94e29af7 Web: Files: expose SelectFolderDialog 2021-07-09 10:48:09 +03:00
80947ef342 Web: Files: get auth store 2021-07-09 10:47:36 +03:00
a8f49a74d1 Merge branch 'feature/file-folder-selectors' of github.com:ONLYOFFICE/AppServer into feature/file-folder-selectors 2021-07-09 09:54:22 +03:00
e2d80ff306 Web: Files: Added default value. 2021-07-08 23:18:43 +03:00
90450a79aa Web:Files: Deleted useless code & Refactoring. 2021-07-08 23:08:16 +03:00
458153f68f Web: Files: Rename Files. 2021-07-08 22:52:10 +03:00
044c1155b1 WEb: Files: SelectFolderInput/SelectFileInput: Rename classes. 2021-07-08 22:31:50 +03:00
71e511c714 Merge branch 'feature/file-folder-selectors' of github.com:ONLYOFFICE/AppServer into feature/file-folder-selectors 2021-07-08 17:17:16 +03:00
fcea13a983 Web: Files: SelectFileInput: Deleted useless parameters. 2021-07-08 17:01:36 +03:00
9906380a96 Web: Files: Return folder icon to the files module. 2021-07-08 16:22:32 +03:00
6e041aa594 Merge branch 'feature/file-folder-selectors' of github.com:ONLYOFFICE/AppServer into feature/file-folder-selectors 2021-07-08 15:40:09 +03:00
966e6656cf Web: Files: Deleted useless code. 2021-07-08 15:35:03 +03:00
2763650de8 Merge branch 'feature/file-folder-selectors' of github.com:ONLYOFFICE/AppServer into feature/file-folder-selectors 2021-07-08 15:31:17 +03:00
4f27876b54 Web: Files: Fixed styles. 2021-07-08 15:30:40 +03:00
b7aae0c1c2 WEb: Files: Deleted useless console.log. 2021-07-08 15:13:59 +03:00
713af18dfe Merge branch 'feature/file-folder-selectors' of github.com:ONLYOFFICE/AppServer into feature/file-folder-selectors 2021-07-08 15:13:45 +03:00
a2460959c9 Web: Files: Deleted useless request (optimization). 2021-07-08 15:09:42 +03:00
515cf80e45 Web: Files: fixed typo 2021-07-08 14:41:15 +03:00
3556497de6 Merge branch 'develop' into feature/personal 2021-07-08 14:38:26 +03:00
79962c867b Merge branch 'feature/file-folder-selectors' of github.com:ONLYOFFICE/AppServer into feature/file-folder-selectors 2021-07-08 14:22:58 +03:00
48ea45fa3b Web: Files: get auth store 2021-07-08 14:22:30 +03:00
b0604da79b Web: Files: expose SelectFileDialog 2021-07-08 14:13:20 +03:00
57bba777dc Web: Files: Removed icons (32, 64, 96 sizes) to the root folder. 2021-07-08 14:08:44 +03:00
d141e6cb5b Web: Files: Refactoring & deleted useless code. 2021-07-08 13:51:14 +03:00
08d3e9df5e Web: Files: Optimization: deleted getFiles function. 2021-07-08 13:25:24 +03:00
b7190218c3 Web: Files: Refactoring & optimization. 2021-07-08 12:55:10 +03:00
3d8213db8b Web: Files: Deleted useless code. 2021-07-07 18:03:07 +03:00
7f42b5bdfd Web: Files: Fixed translations, added common translation. 2021-07-07 17:56:10 +03:00
b1029b7e9e Web: Files: Fixed icon path, deleted icon from files module. 2021-07-07 17:33:12 +03:00
037c7cd256 Web:Files: Added translations for empty list. 2021-07-07 17:26:24 +03:00
4829db5490 Web: Files: Return translations. 2021-07-07 17:05:00 +03:00
ce2741acd6 Web:Files: Added loader for aside panel. 2021-07-07 12:00:46 +03:00
783fbb2774 Web: Files: Deleted useless code. 2021-07-07 11:45:11 +03:00
c5b409a571 Merge branch 'develop' into feature/file-folder-selectors 2021-07-07 11:41:45 +03:00
ecd9fd26ce Web: Files: SelectFileDialog: Refactoring. 2021-07-07 11:33:29 +03:00
3c9fa72225 Web: Files: Changed styles. 2021-07-07 11:20:50 +03:00
1110a578aa WEb: Files: SelectFileDialog: Refactoring. 2021-07-07 10:29:58 +03:00
d05115a597 Web: Files: SelectFileDoalog: Component optimization for aside view. 2021-07-07 10:27:18 +03:00
7fef814e1b Web: Files: Component optimization & refactoring. 2021-07-07 10:12:02 +03:00
aa5b65617e Web: Files: Added store for selected file. 2021-07-07 09:59:01 +03:00
6b99ee4fc1 WEb:Files:SelectFolderInput/SelectFolderDialog: Added saving selected folder between other views. 2021-07-06 17:33:46 +03:00
fed1ece277 Web: Files: fixed display of share menu 2021-07-06 17:07:56 +03:00
376f9c6af1 Web: Files:SelectFileDialog: Fixed no re-render for aside view. 2021-07-06 16:27:50 +03:00
fcf3c2b0cb Web: Files: SelectFolderDialog: added automatic parameter setting when passed id. 2021-07-06 16:10:34 +03:00
271590b47e Web: Files: SelectFileDialog: Added possibility to pass folder id and expand the folder tree. 2021-07-06 16:03:21 +03:00
22a66e287c Web: Files: SelectFolderDailog: Removed convertPathParts function to the static. 2021-07-06 16:01:36 +03:00
899f9d9699 Web: Files: SelectFolderInput/SelectFolderDialog: Added the ability to pass id to input, added full path if id was passed. Refactoring. 2021-07-06 14:14:38 +03:00
99f23471f0 WEb: Files: SelectFolderDialog: Added the ability to pass the folder id and expand the folder tree to it. 2021-07-06 13:05:15 +03:00
db7ea5c88f Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into bugfix/v1.0.0
# Conflicts:
#	products/ASC.Files/Client/src/pages/Home/index.js
2021-07-06 11:38:02 +03:00
3c3fe37cb2 Web:Files: Fixed styles for empty container. 2021-07-05 18:33:44 +03:00
1eab1bdf31 Web: Files: SelectFolderDialog: Fixed. 2021-07-05 18:25:48 +03:00
a6fdfb7a2b Web: Files: Fixed tree folder body for Ipad. 2021-07-05 18:19:09 +03:00
49db5f5348 Web: Files: fixed campaigns logic 2021-07-05 18:00:15 +03:00
a3818bf6b7 Web: Files: SelectFileDialog: Disabled save button if file was not selected. 2021-07-05 17:55:06 +03:00
33ce11eab8 Web: Files: Removed inputs for select dile and folder to the component. 2021-07-05 17:48:21 +03:00
951e2fbeaf Web: Files: Removed tree body component. 2021-07-05 16:10:51 +03:00
2413daa175 Web: Files: get campaigns from firebase 2021-07-05 15:51:56 +03:00
21bb4e619a Web: Files: SelectFileDialog: Refactoring. 2021-07-05 13:30:56 +03:00
50ea66c6f5 Web: SelectFileDialog: Refactoring. 2021-07-05 13:26:04 +03:00
7a0dfdc1ec Web: Files: SelectFileDialog: Added saving function. 2021-07-05 13:18:53 +03:00
e822857eb5 Web: Files: Added radio/checkbox, added selecting file and save button. 2021-07-05 12:54:12 +03:00
e47ecb1767 Web: Files: Close dialog, when display type was changes. 2021-07-05 10:37:38 +03:00
b10bbcfc9d Web: Files: SelectFileDialog: Added base selected folder for select file component for aside view. 2021-07-05 10:25:38 +03:00
6a6fa35ab8 Web: Files: Added styles for input. 2021-07-05 09:50:12 +03:00
ffb1e32c23 Web: Files: SelectFileDialog: Added empty container to the files list. 2021-07-02 20:53:41 +03:00
577a720691 WEb:Files: Removed translations for empty header container from files to root. 2021-07-02 20:52:48 +03:00
56768292e0 Web: Files: SelectFileDialog/SelectFileInput: Added loader text. 2021-07-02 20:00:19 +03:00
27963e6ace WEb: Added prop types and refactoring. 2021-07-02 19:40:15 +03:00
719fb969c1 Web: Files: SelectFileDialog: Deleted useless code. 2021-07-02 18:46:47 +03:00
a325507b0e WEb: SelectFileFolder: Added custom types of files. 2021-07-02 18:35:38 +03:00
8811bf1d1f Web: Files: fixed ThirdPartyList width 2021-07-02 18:02:56 +03:00
71608b1a1b Web: Files: show banner only for personal 2021-07-02 16:42:43 +03:00
b3fd47a216 Merge branch 'feature/CampaignsBanner' of github.com:ONLYOFFICE/AppServer into feature/personal
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/Body/index.js
2021-07-02 16:42:05 +03:00
dfaaf254e4 Web: Files: consecutive ads 2021-07-02 16:39:10 +03:00
a31dc583c1 Merge branch 'develop' into feature/personal
# Conflicts:
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
#	products/ASC.Files/Client/src/pages/Settings/index.js
2021-07-02 16:26:45 +03:00
87c556ec85 Web: Files: Deleted icons 24px size. 2021-07-02 16:16:52 +03:00
dd94145f3b WEb: Files: Fixed styles. 2021-07-02 16:12:38 +03:00
da924cc3b3 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/CampaignsBanner
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/Body/index.js
2021-07-02 16:12:06 +03:00
658b7052c3 Web: Client: About: Removed useless component 2021-07-02 15:42:04 +03:00
77606f11c1 Web: Files: Removed icons 24 size to the root folder. 2021-07-02 15:36:58 +03:00
Artem Tarasov
88ca0fb0af Web: Files: fixed selection 2021-07-02 14:54:12 +03:00
45920f7535 Web: fixed MainButton loader 2021-07-02 14:05:38 +03:00
5e97c7d287 WEb: Files: SelectFolderDialog: Added based selected folder. 2021-07-02 13:51:05 +03:00
aa93554785 Web: Files: Fixed not showing files, when latest folder was empty. 2021-07-02 13:50:35 +03:00
4f9e03212f Web: Files: added filter cleaning 2021-07-02 13:44:58 +03:00
81f93c3640 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/CampaignsBanner 2021-07-02 13:22:40 +03:00
c940aae128 Web: refactoring translation loaders 2021-07-02 12:25:36 +03:00
ae9a3b7886 Web: Settings: SelectFolder/SelectFolderInput: Added aside and modal view. 2021-07-02 11:27:28 +03:00
94b6783ddc Web: Files: Removed scrollbar to the FolderTreeBody, added height content custom parameters. 2021-07-02 10:25:42 +03:00
b68b9763f0 Web: Files: SelectDolderDialog: Added scrollbar to the modal view dialog. 2021-07-01 21:03:21 +03:00
0d4159a907 Web: Files: Removed icon to common folder. 2021-07-01 19:18:24 +03:00
c9665cf692 Web: Files: SelectFileDialog/SelectFileInput: Added custom header. 2021-07-01 18:47:55 +03:00
996e1d6086 Web: Files: Added border to the SelectFileDialog. 2021-07-01 18:35:17 +03:00
c65771b3a8 Web: Files: SelectFileDialog/SelectFileInput: Added latest selected folder. 2021-07-01 17:43:44 +03:00
513ec04e33 Merge branch 'develop' into feature/translations-loaders
# Conflicts:
#	products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	products/ASC.People/Client/src/components/Article/MainButton/index.js
#	products/ASC.People/Client/src/pages/Home/Section/Header/index.js
2021-07-01 16:47:34 +03:00
c63287a1cd Web: Files: SelectFileInput: Refactoring. 2021-07-01 15:58:36 +03:00
cfe2ad8a14 Web: Files: Added translations. 2021-07-01 15:58:04 +03:00
13acc5f511 Web: Files: added banner store 2021-07-01 15:53:28 +03:00
9754b50178 Web: Files: Added styles. 2021-07-01 15:45:05 +03:00
574fb26838 Web: Settings: Fixed imports. 2021-07-01 15:40:41 +03:00
28451417dd Web :Files: SelectFileInput: Added styles to separate file. 2021-07-01 15:34:34 +03:00
b4fef17807 Web: Files: Added SelectFileInput. 2021-07-01 15:32:12 +03:00
568aeb86af Web: Files: Added SelectFileDialog component. 2021-07-01 15:31:41 +03:00
ee35648212 Web: Files: FolderTreeBody: Fixed styles. 2021-07-01 15:23:06 +03:00
57276f308c Web: Files: SelectFolderDialog: Deleted useless code. 2021-07-01 15:13:23 +03:00
34f536b1e5 Web: Files: SelectFolderDialog: Added last selected folder. 2021-07-01 15:12:50 +03:00
8776c45895 Web: Files: fixed ThirdPartyList width 2021-07-01 14:37:09 +03:00
bed81a48d9 Web: Files: Added "certain folder" parameter. 2021-07-01 13:55:20 +03:00
3b4477e548 Web: Files: Added parameter "without provider" to the tree folders. 2021-07-01 13:50:13 +03:00
57550164ed Web: Files: fixed banner visibility 2021-07-01 13:46:44 +03:00
15a268f83b Web: Settings: Removed icons to common folder. 2021-07-01 13:38:24 +03:00
50d9d9113f Web: Files: fixed files selection 2021-07-01 13:15:10 +03:00
e08630f740 Web: Files: Added StyledPanels. 2021-07-01 13:14:52 +03:00
a7d56b56f2 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/CampaignsBanner 2021-07-01 13:12:18 +03:00
5a07094755 Web: Files: added banner loader 2021-07-01 13:10:45 +03:00
3fa967fd39 Web: Files: Added styles to separate file. 2021-07-01 13:03:16 +03:00
e12db8fe11 Web: Files: Added SelectFolderInput component. 2021-07-01 12:59:43 +03:00
ac59a0d3bb Web: Files: SelectFileDialog: Renamed parameters. 2021-07-01 12:54:47 +03:00
2771ff504d Web: Files: Added SelectFolderDialog and FolderTreeBody, and translations for them. 2021-07-01 12:50:28 +03:00
7b3f411605 Web: Files: fixed scroll 2021-07-01 12:50:01 +03:00
cfeeb6c17b Web: Files: fixed privacy icons styles 2021-07-01 12:35:06 +03:00
f0c971dd02 Web: Files: added campaigns banner 2021-07-01 11:26:52 +03:00
bcf7ceb568 Merge branch 'develop' into feature/translations-loaders
# Conflicts:
#	packages/asc-web-common/components/Loaders/index.js
2021-07-01 09:13:17 +03:00
Artem Tarasov
e7e0f55403 Web: Files: deleted unnecessary code 2021-06-30 17:06:57 +03:00
69889cab4c Merge branch 'develop' into feature/privacy-rooms-page
# Conflicts:
#	packages/asc-web-common/components/PageLayout/index.js
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/helpers/constants.js
#	products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
#	products/ASC.Files/Client/src/store/FilesStore.js
2021-06-30 16:28:37 +03:00
1083fd8416 Merge branch 'develop' into feature/personal
# Conflicts:
#	products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
#	products/ASC.Files/Client/src/store/FilesStore.js
2021-06-30 16:09:53 +03:00
Artem Tarasov
0f19f240d1 Web: Files: fixed reset selection 2021-06-30 15:02:29 +03:00
f905d72caa Web: Files: fixed article max width 2021-06-30 13:58:00 +03:00
f915deeaf0 Web: Files: added translation loaders to the file module 2021-06-30 12:55:52 +03:00
Artem Tarasov
51e17e5510 Web: Files: fixed reset selection when open aside 2021-06-30 12:55:10 +03:00
41f7a87ad1 Web: Files: added tReady to file panels 2021-06-30 10:29:48 +03:00
fff65d1ee9 Web: Files: added tReady to file dialogs 2021-06-30 10:28:13 +03:00
67f3782a41 Web: Files: fixed dragging 2021-06-29 18:57:55 +03:00
f327f42bf8 Web: Common: added filed encrypted to startUploadSession function 2021-06-29 17:54:24 +03:00
Artem Tarasov
9de3ebe20b Web: Files: deleted unnecessary code 2021-06-29 17:00:52 +03:00
Artem Tarasov
3385d367d4 Web: Files: refactoring 2021-06-29 15:48:17 +03:00
Artem Tarasov
0cae3990cc Web: Files: added usage ViewSelector 2021-06-29 15:32:48 +03:00
9870859fe1 Web: Files: fixed dragging 2021-06-29 13:36:04 +03:00
73cdaad3fb Web: Files: added hiding group file menu 2021-06-29 13:13:05 +03:00
6590529260 Web: Files: removed margin for privacy folder 2021-06-29 12:32:59 +03:00
78595cf513 Web: Files: fixed PrivateRoomSupport translation 2021-06-29 12:27:46 +03:00
Artem Tarasov
4d7fe086b5 Web: Files: fixed reset seletion 2021-06-28 14:38:17 +03:00
2cd83d0897 Web: Files: refactoring private rooms page 2021-06-28 14:36:38 +03:00
Artem Tarasov
42f30be69c Web: Files: fixed display of the canWebEditIcon if the file is already open 2021-06-28 14:29:06 +03:00
Artem Tarasov
4e7480c481 Web: Files: Thumbnails: fixed the display of the thumbnail if the resource could not be loaded 2021-06-28 14:21:52 +03:00
1b685a7b5e Web: Files: fixed PrivacyDescriptionConnect translations 2021-06-28 13:37:38 +03:00
3f26df9d49 Web: Files: fixed FileCreated translation 2021-06-28 13:09:24 +03:00
Artem Tarasov
01df3101e0 Web: Files: Thumbnails: added alt attr for thumbnail image 2021-06-28 12:39:06 +03:00
Artem Tarasov
ff5a165638 Web: Files: Thumbnails: fixed position of TileCOntainer, fixed readme ThileLoader 2021-06-28 11:25:23 +03:00
d2bb6daf3d Web: Files: fixed empty screen for privacy folder 2021-06-28 10:45:36 +03:00
Artem Tarasov
5f984327dd Web: Files" THumbnails: fixed double opening docEditor, when click on svg 2021-06-28 10:27:41 +03:00
Artem Tarasov
c5ec80c802 Web: Files: Thumbnails: fixed highlight tile when clickin on context button for chrome and android 2021-06-28 10:01:57 +03:00
Artem Tarasov
4c1b5bcad6 Web: Files: Thumbnails: fixed the reset of the page scroll position when clicking on the checkbox 2021-06-27 21:39:59 +03:00
9c79e2803c Web: Files: added a page loader for the private rooms page 2021-06-27 10:34:57 +03:00
2d0807fa17 Web: Files: hidden privacy folder data for mobile devices 2021-06-27 09:35:15 +03:00
99f9d27fd0 Web: Files: added checkProtocol helper, fixed toast 2021-06-27 09:31:07 +03:00
Artem Tarasov
52bf73df20 Web: Files: Thumbnails: fixed canConvert badge 2021-06-25 16:41:15 +03:00
Artem Tarasov
2691e9c724 Web: Files: hoc: fixed opening floder or file when double click on renaming/creation item 2021-06-25 16:40:29 +03:00
Artem Tarasov
930cd48583 Web: Files: Thumbnails: fixed double opening docEditor when click on thumbnail 2021-06-25 15:39:36 +03:00
Artem Tarasov
50556cb428 Web: Thumbnails: deleted unnecessary code, refactoring 2021-06-25 14:30:14 +03:00
3217c2acb1 Web: Files: fixed PrivateRoomsPage route 2021-06-25 09:45:43 +03:00
Artem Tarasov
af77facf99 Web: Files: Thumbnails: deleted unnecessary code 2021-06-24 19:53:48 +03:00
Artem Tarasov
ac288d3027 Web: Files: Thumbnails: refactoring styles 2021-06-24 19:48:26 +03:00
Artem Tarasov
2c1a39bcdb Web: Files: Thumbnails: refactoring 2021-06-24 19:46:46 +03:00
bf67b5c296 Web: Files: added PrivateRoomsPage 2021-06-24 16:23:14 +03:00
Artem Tarasov
8310bff1b7 Web: Files: THumbnails: fixed unable to choose file selection 2021-06-24 15:35:50 +03:00
d32c68b617 Web: Files: fixed context menu options for private rooms, fixed access rights for sharing 2021-06-24 12:06:03 +03:00
Artem Tarasov
0403801270 Web: Files: Thumbnails: added validation for thumbnailStatus, fixed styles 2021-06-24 11:33:21 +03:00
Artem Tarasov
fdae8372ef Web: Files: Thumbnails: fixed drag style, deleted console.log 2021-06-24 01:52:47 +03:00
Artem Tarasov
81c6a04b0d Web: Files: Thumbnails: fixed file action 2021-06-24 01:00:51 +03:00
Artem Tarasov
aac415adbb Web: Files: Thumbnails: fixed size of badges 2021-06-24 00:42:50 +03:00
Artem Tarasov
d017052e9b Web: Files: Thumbnails: added usage thumbnailStatus 2021-06-24 00:29:53 +03:00
ce15c26c50 Web: Files: added display of privacy room files 2021-06-23 17:02:06 +03:00
Artem Tarasov
1f753cfd6e Web: Files: Thumbnails: added reset selection when clicking on an empty area of the page, fixed the area when clicking on which the file opens 2021-06-23 16:57:42 +03:00
c8184e9dc0 Web: Files: fixed privacy bugs 2021-06-23 15:39:43 +03:00
Artem Tarasov
01fb0a6621 Web: Files: Thumbnails: deleted unnecessary code 2021-06-23 15:34:30 +03:00
Artem Tarasov
f894d4593f Web: Common: Loaders: fixed TilesLoader 2021-06-23 15:00:49 +03:00
Artem Tarasov
d5ebaa6247 Web: Files: Thumbnails: fixed files style 2021-06-23 14:29:12 +03:00
Artem Tarasov
771ff447b0 Web: Files: Thumbnails: fixed folder style 2021-06-23 14:20:29 +03:00
Artem Tarasov
ed92a79f29 Web: Files: Thumbnails: fixed styles, refactoring 2021-06-23 11:11:35 +03:00
Artem Tarasov
fe1a1e7e5c Web: Files: THumbnails: fixed view of EditingWrapperComponent for new folder 2021-06-23 02:21:27 +03:00
Artem Tarasov
1430dace28 Web: fix after merdge 2021-06-23 00:00:42 +03:00
Artem Tarasov
2d9c33a8c6 Merge branch 'develop' into feature/thumbnails
# Conflicts:
#	packages/asc-web-common/components/PageLayout/index.js
2021-06-22 23:46:35 +03:00
282738cb13 Merge branch 'develop' into feature/personal 2021-06-22 18:44:12 +03:00
Artem Tarasov
28614d8f39 Web: Files: THumbnails: fixed opened folder when click on context menu 2021-06-22 15:14:02 +03:00
2cdcd36020 Web: Commented annoying logs 2021-06-22 13:43:18 +03:00
Artem Tarasov
2b2fddf857 Web: Files: Thumbnails: fixed double opening context menu 2021-06-22 12:51:44 +03:00
43fe4995f4 Web: Files: fixed SharingPanel translations 2021-06-22 10:29:29 +03:00
Artem Tarasov
baf5cfa069 Web: Files: Thumbnails: fixed context menu 2021-06-19 10:12:39 +03:00
Artem Tarasov
bb8f09a725 Web: Files: Thumbnails: fix call createThumbnails 2021-06-19 10:04:08 +03:00
Artem Tarasov
a81ba032fa Web: Files: Thumbnails: removed ThumbnailsStore, createThumbnails func moved to FilesStore, applied createThumbnails func 2021-06-19 09:48:30 +03:00
Artem Tarasov
83549b62cd Merge branch 'develop' into feature/thumbnails
# Conflicts:
#	packages/asc-web-common/api/files/index.js
#	products/ASC.Files/Client/src/pages/Home/index.js
2021-06-18 12:02:10 +03:00
443da941be Web: Files: fixed select for thirdparty folders 2021-06-18 11:00:31 +03:00
Artem Tarasov
d2f77fb06a Web: Files: Thumbnails: fixed styles tile, refactoring, added thumbnailUrl 2021-06-18 02:02:30 +03:00
Artem Tarasov
5034495b28 Web: Files: Thumbnails: added ThumbnailsStore, api for create thumbs 2021-06-18 01:13:49 +03:00
249af955d1 Web: Files: added onSelect function for selectbox 2021-06-17 18:46:22 +03:00
df70473ce5 Merge branch 'develop' into feature/changing-selectbox-library 2021-06-17 17:19:17 +03:00
b088c925d6 Merge branch 'develop' into feature/personal
# Conflicts:
#	products/ASC.Files/Client/src/components/dialogs/ConnectDialog/index.js
#	products/ASC.Files/Client/src/pages/Home/index.js
#	products/ASC.Files/Client/src/store/FilesStore.js
2021-06-17 15:47:33 +03:00
0aa2eb3e85 Web: Files: removed react-selectable-fast library 2021-06-17 14:27:41 +03:00
a3298a49ac Web: Files: fixed createTreeFolders 2021-06-17 12:04:01 +03:00
1250201319 Web: Files: fixed upload progress 2021-06-16 14:31:13 +03:00
7d0a1d340d Web: Files: fixed files render, removed log 2021-06-16 13:47:15 +03:00
b738bbc268 Web: Files: fixed files render 2021-06-16 13:38:18 +03:00
7d59d8f3a6 Web: Files: fixed deleteThirdParty 2021-06-15 18:59:07 +03:00
456a82a3fc Web: Files: fixed tree menu update 2021-06-15 17:23:07 +03:00
ad52d25d28 Web: Files: added tree menu update after folder deletion 2021-06-15 16:12:15 +03:00
c09a637758 Web: Files: changed the logic of opening the folder tree 2021-06-15 14:59:51 +03:00
d07273cee8 Web: Files: fixed display of tree menu, added new api for tree menu 2021-06-15 14:15:48 +03:00
Artem Tarasov
f8e28e5952 Merge branch 'develop' into feature/thumbnails
# Conflicts:
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
2021-06-15 14:06:29 +03:00
65378cc089 Merge branch 'develop' into feature/personal
# Conflicts:
#	products/ASC.CRM/Client/public/index.html
#	products/ASC.Calendar/Client/public/index.html
#	products/ASC.Files/Client/public/index.html
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
#	products/ASC.Files/Client/src/pages/Home/index.js
#	products/ASC.Mail/Client/public/index.html
#	products/ASC.People/Client/public/index.html
#	products/ASC.People/Client/src/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
#	products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
#	products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
#	products/ASC.Projects/Client/public/index.html
2021-06-15 11:49:39 +03:00
Artem Tarasov
ee4760e899 Merge branch 'develop' into feature/thumbnails
# Conflicts:
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
2021-06-11 18:30:44 +03:00
4a154db396 Web: removed useless translations 2021-06-11 18:07:51 +03:00
5db2e8a868 Merge branch 'develop' into feature/restore-files-convertation 2021-06-11 17:50:28 +03:00
68f880254e Web: Files: added dialog for converting to context actions 2021-06-11 17:20:38 +03:00
e074c0cf93 Web: Files: changed color of conversion 2021-06-11 16:56:43 +03:00
ef59a2ac47 Web: Files: added hideConfirmConvert setting 2021-06-11 15:49:32 +03:00
864ef2ff64 Web: Files: changed the logic of opening the folder tree 2021-06-11 12:50:33 +03:00
a9e55b49ec Web: Files: hid the display of folders for the recycle bin 2021-06-11 12:04:23 +03:00
64b6c973b1 Web: Files: fixed conversion 2021-06-10 20:18:30 +03:00
9bb8e9bd1d Web: Files: fixed getConversationPercent 2021-06-10 17:33:50 +03:00
7501e91ae3 Web: Client: Files: Fixed share option for not edited items 2021-06-10 14:19:26 +03:00
a47b94bd7f Web: Files: removed useless uploadStatus, fixed upload bugs 2021-06-09 17:52:28 +03:00
fdc71ec359 Merge branch 'feature/restore-files-convertation' of github.com:ONLYOFFICE/AppServer into feature/restore-files-convertation 2021-06-09 15:02:44 +03:00
29733f0ace Wen: Files: fixed upload panel style 2021-06-09 15:02:24 +03:00
59bab6a085 Web: Files: fixed conversion progress 2021-06-09 13:28:22 +03:00
d5989124f3 Web: Files: fixed conversion progress 2021-06-08 19:09:00 +03:00
Artem Tarasov
c25fa589a9 Web: People: deleted fonts with ext .woff, added hash to font name 2021-06-08 15:26:56 +03:00
83d4bfd7a3 Web: Files: added conversion for uploaded files 2021-06-08 14:24:47 +03:00
b8f7cb1b61 Web: Client: fixed sharing panel in editor 2021-06-07 18:21:02 +03:00
31423ddbc6 Web: Files: fixed upload panel visibility 2021-06-07 18:05:02 +03:00
4d9c26545e Web: Files: added conversion progress 2021-06-07 16:20:18 +03:00
2d56421dd2 Web: Files: fixed mobx warnings 2021-06-07 13:52:01 +03:00
9a6f281a50 Web: Files: fixed conversion of files, added conversion loaders 2021-06-07 12:44:59 +03:00
Artem Tarasov
fac8dafe1e Web: Files: fixed width of unselected node in settings tree 2021-06-07 00:21:40 +03:00
Artem Tarasov
acd4a3893c Web: added rule to webpack.config for woff, woff2 2021-06-06 23:39:52 +03:00
5754a9b753 Merge branch 'feature/personal' of github.com:ONLYOFFICE/AppServer into feature/personal 2021-06-04 14:43:10 +03:00
d01ef10cc5 Web: NavMenu/PageLayout: Was done:
- fixed loaders: two rectangle loader combined into one
- fixed loaders at index.html: two rectangle loader combined into one
- hide NavItem component
- hide click on Headline component
- fixed article padding style for desktop
- added new logo.
2021-06-04 14:42:21 +03:00
914b975ada Web: Files: Store: Fixed files and folders actions for "personal" setting 2021-06-04 11:28:44 +03:00
Vladislav Makhov
da8503612e web: files: private room: fix upload dialog 2021-06-04 11:23:00 +03:00
209f3b174c Web: Files: added tReady to ConvertDialog 2021-06-03 17:29:06 +03:00
531233a9a8 Web: Files: added new translations, fixed conversion 2021-06-03 15:56:14 +03:00
Vladislav Makhov
a071470ff2 Merge branch 'feature/personal' of github.com:ONLYOFFICE/AppServer into feature/personal 2021-06-03 14:30:10 +03:00
Vladislav Makhov
e209f2c4b1 web: files: hide tp settings in personal 2021-06-03 14:29:54 +03:00
Vladislav Makhov
6f5c5d2524 web: files: move files setting fetching to store 2021-06-03 14:29:30 +03:00
62b57fa313 Web: Files: refactoring UploadDataStore 2021-06-03 14:23:25 +03:00
cefc4c417a Web: Files: hide share button in upload panel 2021-06-03 12:53:08 +03:00
a7edb118ac Web: Files: added conversion for upload action 2021-06-03 12:50:01 +03:00
e62d8c7ec9 Web: Files: sharing dialog for personal 2021-06-03 12:46:36 +03:00
Vladislav Makhov
bdaeb27fd1 web: files: filter options for personal 2021-06-03 11:01:19 +03:00
Vladislav Makhov
dbb6562b88 web: files: rename isPersonal to personal according to settings api key 2021-06-03 10:34:53 +03:00
Vladislav Makhov
30bb8e7e02 web: files: Can connect a third-party service only in My Documents, if personal mode 2021-06-03 08:22:42 +03:00
581df1cdcf Web: Files: added update after converting the file 2021-06-02 18:41:15 +03:00
Vladislav Makhov
e260207954 web: files: fix translate loading when open direct link 2021-06-02 17:14:53 +03:00
ce77c270de Web: Files: added conversion progress for file 2021-06-02 16:56:27 +03:00
5e8751d9f1 Web: Files: added convert file icon, refactoring convert dialog 2021-06-02 16:03:46 +03:00
Artem Tarasov
d960ae6220 Merge branch 'develop' into bugfix/fixed-styles
# Conflicts:
#	web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
2021-06-02 15:09:03 +03:00
Artem Tarasov
fbab4041c9 Merge branch 'develop' into feature/thumbnails
# Conflicts:
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FilesTileContainer.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FilesTileContent.js
#	products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
#	products/ASC.Files/Server/DocStore
2021-06-02 15:07:40 +03:00
4d44ccad12 Merge branch 'develop' into feature/restore-files-convertation
# Conflicts:
#	products/ASC.Files/Client/src/store/UploadDataStore.js
2021-06-02 14:28:42 +03:00
62ac315c8d Web: i18n: Replaced i18т config load: from "languageOnly" to "all" and added new utils function loadLanguagePath() + Refactoring 2021-06-02 13:55:11 +03:00
929adc773a Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations 2021-06-02 10:59:15 +03:00
908310041f Web: Added new translation for toasts ("EncryptingFile", "EncryptionKeysReload", "EncryptionFilePreparing") 2021-06-02 10:59:07 +03:00
ad12ac19c3 Web: Files: removed useless toast translations 2021-06-02 10:46:17 +03:00
Artem Tarasov
a38195d506 Merge branch 'develop' into bugfix/fixed-styles
# Conflicts:
#	products/ASC.CRM/Client/src/custom.scss
#	products/ASC.Calendar/Client/src/custom.scss
#	products/ASC.Files/Server/DocStore
#	products/ASC.Mail/Client/src/custom.scss
#	products/ASC.People/Client/src/custom.scss
#	products/ASC.Projects/Client/src/custom.scss
#	web/ASC.Web.Client/src/custom.scss
#	web/ASC.Web.Login/src/custom.scss
2021-06-02 10:23:08 +03:00
23e1083be7 Web: Removed empty translations keys 2021-06-01 13:49:37 +03:00
de98856728 Web: Tests: Added new 'sk' translations; 2021-06-01 11:21:39 +03:00
8e532bc8b9 Web: Tests: Added new 'ro' translations; 2021-06-01 11:20:14 +03:00
3d62da4422 Web: Tests: Added new 'pt-BR' translations; 2021-06-01 11:19:13 +03:00
c5a5072aa7 Web: Tests: Added new 'lo' translations; 2021-06-01 11:17:19 +03:00
8eb62d8079 Web: Tests: Added new 'it' translations; 2021-06-01 11:15:24 +03:00
a0fc465678 Web: Tests: Added new 'fr' translations; 2021-06-01 11:13:50 +03:00
e3b5ac774a Web: Tests: Added new 'de' translations; 2021-06-01 10:56:47 +03:00
7beccd192b Web: Added not found keys in 'de' language translation files (fix NotTranslatedKeysTest issue) 2021-05-31 20:33:12 +03:00
061b4e46e7 Web: Added not found 'de' language translation files (fix NotAllLanguageTranslatedTest issue) 2021-05-31 19:11:58 +03:00
e2b9561d7b Web: Rewritten all json translation files with sorting of properties alphabetically 2021-05-31 18:34:15 +03:00
f78742ac39 Web: Fix UselessModuleTranslationKeysTest issues 2021-05-31 17:35:25 +03:00
6b56b539c5 Web: Update EN language 2021-05-31 17:10:34 +03:00
0551bf6b98 Web: Files: moved convert dialog to store 2021-05-31 15:44:44 +03:00
74064fc76d Merge branch 'develop' into feature/translations 2021-05-29 21:59:02 +03:00
72527ccded Merge branch 'master' into develop
# Conflicts:
#	lerna.json
#	package.json
#	packages/asc-web-common/package.json
#	packages/asc-web-components/package.json
#	products/ASC.CRM/Client/package.json
#	products/ASC.Calendar/Client/package.json
#	products/ASC.Files/Client/package.json
#	products/ASC.Mail/Client/package.json
#	products/ASC.People/Client/package.json
#	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-05-29 21:57:42 +03:00
d585c0a785 Web: Bumped version to 0.1.10 2021-05-29 21:26:13 +03:00
Artem Tarasov
a9a972dcaa Web: Files: Thumbnails: fix after merge 2021-05-28 15:32:35 +03:00
Artem Tarasov
e7a7aed6ec Merge branch 'develop' into feature/thumbnails
# Conflicts:
#	packages/asc-web-common/components/PageLayout/index.js
#	products/ASC.Files/Client/src/Files.jsx
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FilesTileContent.js
#	products/ASC.Files/Client/src/pages/Home/index.js
#	products/ASC.Files/Client/src/store/index.js
2021-05-28 15:30:39 +03:00
12bcf816b5 Web: Client: added new translations keys 2021-05-28 12:09:10 +03:00
3252372a77 Web: Files: fixed rename folder action 2021-05-27 16:16:30 +03:00
2cf57ece75 Web: Files: fixed files filter 2021-05-27 14:49:40 +03:00
Artem Tarasov
102f26ed3c Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
# Conflicts:
#	public/locales/de/Common.json
#	public/locales/en/Common.json
#	public/locales/ru/Common.json
2021-05-27 11:58:53 +03:00
Artem Tarasov
46d80f7b34 Web: moved translation keys "ByFirstNameSorting", "ByLastNameSorting" to "static/locales/{lng}/Common.json" 2021-05-27 11:57:20 +03:00
00957a65ad Web: moved translation keys "LblSelect", "EditUserDialogTitle", "Version" 2021-05-27 11:51:32 +03:00
30cf4f8cde Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations 2021-05-27 11:14:31 +03:00
25ac98e272 Merge branch 'develop' into feature/translations
# Conflicts:
#	products/ASC.Files/Client/public/locales/en/DeleteDialog.json
#	products/ASC.Files/Client/public/locales/en/Home.json
#	products/ASC.Files/Client/public/locales/ru/DeleteDialog.json
#	products/ASC.Files/Client/public/locales/ru/Home.json
2021-05-27 11:13:41 +03:00
178767a2b5 Web: Files: fixed translations 2021-05-27 11:03:12 +03:00
fe18e7e55c Web: moved translation key "LblSelect" 2021-05-26 17:53:36 +03:00
151ffc7b26 Web: moved translation key "Active" 2021-05-26 17:46:09 +03:00
e437c7a035 Web: moved translationKeys "Size", "View", "Review" 2021-05-26 17:37:03 +03:00
364fc6bbeb Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations 2021-05-26 16:40:10 +03:00
541b14c8fe Web: moved translationKeys "DisableUserButton", "NotFoundLanguage" 2021-05-26 16:40:02 +03:00
Artem Tarasov
be2825c3cc Web: fixed syntax in OperationsPanel.json 2021-05-26 16:34:49 +03:00
Artem Tarasov
55bbd5d28d Web: moved translation key "Restore" 2021-05-26 16:32:33 +03:00
2c5b95e352 Web: moved translationKeys "ProjectsProduct", "InviteLinkTitle", MoveConfirmationMessage" 2021-05-26 16:06:40 +03:00