Commit Graph

14066 Commits

Author SHA1 Message Date
a4d12a2c75 Web: Files: removed console.log 2021-08-27 14:06:24 +03:00
19290bf8cb Web: Editor: Added translation for documents type. 2021-08-27 13:46:03 +03:00
71e2fad599 Fix Bug 51981 - Fixed reset sorting 2021-08-27 13:33:05 +03:00
7fba408991 Web: Editor: Added option "Compare files" for editor. 2021-08-27 13:25:23 +03:00
500deafd58 Web: Files: fixed moveToAction clearPrimaryProgressData 2021-08-27 11:52:29 +03:00
4f30eb9a2a Web: removed duplicate translations from Common.json 2021-08-27 11:09:19 +03:00
957877899a Fix bug 51871: convertation process 2021-08-26 17:57:27 +03:00
f740b63fa5 Web: Components: fixed hasAccess 2021-08-26 17:50:27 +03:00
6bb9cb2235 Web: People: fixed user access for module People 2021-08-26 17:47:21 +03:00
833cd9553c Web: Files: fixed FilesTableRow after merge 2021-08-26 16:20:02 +03:00
ff7f3926ce Merge branch 'develop' into feature/table-view
# Conflicts:
#	packages/asc-web-common/components/PageLayout/index.js
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
#	public/locales/de/Common.json
#	public/locales/it/Common.json
#	public/locales/lo/Common.json
#	public/locales/pt-BR/Common.json
#	public/locales/ro/Common.json
2021-08-26 16:05:15 +03:00
bb7cec933e
Merge pull request #327 from ONLYOFFICE/bugfix/render-optimization
Bugfix/render optimization
2021-08-26 15:43:06 +03:00
26c5d2ed90 Web: Common: PageLayout: moved isArticlePinned to settingsStore 2021-08-26 15:07:29 +03:00
ea31c0f258 Web: Files: Fixed article height for tablet view, deleted useless styles. 2021-08-26 15:05:21 +03:00
c66268a9c2 Merge branch 'develop' into release/1.0.0
# Conflicts:
#	products/ASC.Files/Client/public/locales/en/Translations.json
#	products/ASC.Files/Client/public/locales/ru/Translations.json
#	products/ASC.Files/Client/src/helpers/utils.js
2021-08-26 13:49:25 +03:00
8407efccaf Merge branch 'release/1.0.0' into bugfix/mousewheel-opening-files 2021-08-26 14:10:52 +05:00
3786b02e7b Web: Files: fixed loading folder tree, api request 2021-08-26 14:10:15 +05:00
1bda036a9f Merge branch 'develop' into bugfix/render-optimization 2021-08-26 10:32:32 +03:00
e20f2dbf21
Merge pull request #328 from ONLYOFFICE/feature/file-folder-selectors
Feature/file folder selectors
2021-08-26 10:15:39 +03:00
30afd1eca0
Merge branch 'develop' into feature/file-folder-selectors 2021-08-26 09:51:21 +03:00
14e8c59b17 Merge branch 'develop' into release/1.0.0 2021-08-25 21:17:41 +03:00
c37fd46e6f fix remove photo 2021-08-25 21:17:06 +03:00
040afb10fd Merge branch 'develop' into feature/file-folder-selectors 2021-08-25 19:11:14 +03:00
c81a28f48f Web: Common: fixed onError 2021-08-25 17:54:08 +03:00
05c08762ea Web: Files: fixed loopTreeFolders error 2021-08-25 17:21:18 +03:00
e5c15cb7a7 Web: Files: Table: fixed drag styles 2021-08-25 16:53:26 +03:00
8727b504b7 Merge branch 'develop' into feature/table-view
# Conflicts:
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FileTile.js
2021-08-25 16:48:07 +03:00
72aef4ed6e Web: Files: Tile: fixed checkedProps 2021-08-25 14:47:57 +03:00
c977941cb2 Web: Client: Files: Fixed group buttons visible conditions. Added alt text for delete button at favorites folder 2021-08-24 16:33:00 +03:00
248d70cbf9 Web: Components: group-button: Added alt text for component 2021-08-24 16:31:16 +03:00
91199a0de0 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-08-24 15:50:17 +03:00
d223fb6406 Web: Components: Added application block visibility to article for tablet view. 2021-08-24 15:50:12 +03:00
37efed6fe3
Merge pull request #331 from ONLYOFFICE/bugfix/fix-text-in-trash-folder
Web: Files: Fixed bug 52081 and 51984, fixed delete dialog in trash f…
2021-08-24 14:45:55 +03:00
0981bfa63b Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-08-24 11:47:12 +03:00
b46a3ae6f0 Web: Common: PrivateRoute: fixed redirect to login 2021-08-24 11:47:00 +03:00
f1edba5f71 Web: files: Fixes third-party list icons. (tablet view) 2021-08-24 11:12:53 +03:00
b89986b4bb Merge branch 'release/1.0.0' into bugfix/mousewheel-opening-files 2021-08-24 12:27:21 +05:00
8785eb215d Web: Files: delete log 2021-08-24 12:26:43 +05:00
9a69d30cac Merge branch 'release/1.0.0' into bugfix/fix-text-in-trash-folder 2021-08-24 12:20:20 +05:00
ac7166adc6 Web: Files: delete log 2021-08-24 12:19:53 +05:00
20e5efec70 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-08-23 18:20:44 +03:00
a8f2f7348a Web: Files: Editor: fixed successAuth 2021-08-23 18:20:36 +03:00
24ad85e200 Web: Files: Fixed bug 52081 and 51984, fixed delete dialog in trash folder, fixed the "share" button in the group selector 2021-08-23 19:57:58 +05:00
3fb9cc1f24 Files: fixed uploaders 2021-08-23 15:55:42 +03:00
a0f5c4231f fixed run via vs 2021-08-23 15:55:19 +03:00
1e0d553b33 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-08-23 14:00:24 +03:00
68e0da72d7 Web: Added no selection of logo. 2021-08-23 13:56:35 +03:00
0cfb70d9e2 Error 52089 - Client.Files. Elements of the page are not selected using left mouse button. 2021-08-23 13:50:21 +03:00
e0d9ceb9e4 Merge branch 'release/1.0.0' into bugfix/mousewheel-opening-files 2021-08-23 14:50:24 +05:00
cc2e2764d2 Merge branch 'release/1.0.0' into bugfix/mousewheel-opening-files 2021-08-23 14:47:02 +05:00