Commit Graph

2352 Commits

Author SHA1 Message Date
Diana
4ddd2cebec delete dataannotations 2021-02-20 22:02:12 +03:00
7e32c26241 Files: fixed tests 2021-02-19 14:52:29 +03:00
Ilya Oleshko
cb72f2241b Web: Added product version badge 2021-02-18 15:55:26 +03:00
Ilya Oleshko
d204c9b6de Merge branch 'develop' into feature/not-implemented-page 2021-02-16 13:22:34 +03:00
Ilya Oleshko
f2f2fbc07c Merge branch 'develop' into feature/not-implemented-page 2021-02-15 10:58:34 +03:00
Artem Tarasov
1ddc2c951a Merge branch 'develop' into feature/empty-group
# Conflicts:
#	web/ASC.Web.Common/package.json
2021-02-12 13:10:41 +03:00
c6b9ef48af Files: fix GetRecalculateFilesCountUpdate 2021-02-10 15:44:07 +03:00
Viktor Fomin
accdc264b8 Web: Files: fixed property 2021-02-08 14:49:53 +03:00
Artem Tarasov
3b6ffef2a8 Merge branch 'develop' into feature/empty-group 2021-02-05 17:26:38 +03:00
Viktor Fomin
da33e26515 Web: Files: deleted console.log 2021-02-05 16:19:48 +03:00
Viktor Fomin
7188cda442 Web: Files: fixed favorite 2021-02-05 15:43:55 +03:00
Viktor Fomin
f921bdc9d0 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into bugfix/layout-fix 2021-02-05 15:35:42 +03:00
c66837ab0d Files: fix status 2021-02-05 15:34:12 +03:00
Viktor Fomin
2de83fa0ae Web: Files: fixed icons 2021-02-04 20:16:56 +03:00
Viktor Fomin
efd5b28cea Web: Files: fixed spaces 2021-02-04 13:33:00 +03:00
Viktor Fomin
2a38633702 Web: Files: truncate filename in version history 2021-02-04 13:08:22 +03:00
Artem Tarasov
3ccf6fe42d Merge branch 'develop' into feature/empty-group 2021-02-04 11:08:18 +03:00
Ilya Oleshko
3a01516131 Merge branch 'develop' into feature/not-implemented-page 2021-02-03 21:14:58 +03:00
Alexey Kostenko
c250dc2034 Web: Component: Removed duplicate icon 2021-02-03 16:15:47 +03:00
Alexey Kostenko
3262f62c89 Merge branch 'develop' into feature/access-rights-fix 2021-02-03 16:06:52 +03:00
Alexey Kostenko
5a343565f4 Web: Files: SharingPanel: ComboBox button style fix 2021-02-03 16:03:23 +03:00
Alexey Kostenko
da2216c005 Web: Files: Changed internal link icon 2021-02-03 14:39:32 +03:00
Alexey Kostenko
bfcbf8fbdd Merge branch 'develop' into feature/row-content-icon-fix 2021-02-03 10:45:00 +03:00
Artem Tarasov
a23348732f Merge branch 'develop' into feature/empty-group 2021-02-02 20:31:09 +03:00
Alexey Kostenko
2cadd58cf5 Web: Files: Do not show the pencil icon in Row, if user can't to edit the a document 2021-02-02 18:13:27 +03:00
Artem Tarasov
b2aac3838c Web: People/Files/Common: Filter: fixed default value for Search 2021-02-02 16:35:06 +03:00
Viktor Fomin
05d1359e39 Web: Files: added translate 2021-02-02 15:40:04 +03:00
Viktor Fomin
793a28715c Web: Files: added translate 2021-02-02 15:38:26 +03:00
Viktor Fomin
4774a35c40 Web: Files: added translate 2021-02-02 15:34:29 +03:00
Viktor Fomin
19a5526af4 Web: Files: added success message translate 2021-02-02 00:40:09 +03:00
Viktor Fomin
7dfa50a23e Web: Files: delete files without notification 2021-02-02 00:36:18 +03:00
Alexey Kostenko
6bd41fa586 Web: Files: Fixed date, time and username in version history 2021-02-01 14:34:43 +03:00
Ilya Oleshko
8910ab5d65 Merge branch 'develop' into feature/not-implemented-page 2021-02-01 10:42:18 +03:00
Viktor Fomin
753fbb8a58
Merge branch 'develop' into bugfix/remove-google-sharing 2021-01-29 17:02:48 +03:00
Viktor Fomin
cb2d37f107 Web: Files: removed google plus share 2021-01-29 16:47:21 +03:00
Viktor Fomin
1dbf7098bb Web: Files: fixed file status 2021-01-29 15:40:35 +03:00
Ilya Oleshko
8226d9185c Merge branch 'develop' into feature/not-implemented-page 2021-01-29 12:38:22 +03:00
b0e8b9c6af Bump version to v0.0.10 2021-01-29 11:13:27 +03:00
a9b16585ea Files: fix delete 2021-01-29 10:17:56 +03:00
TatianaLopaeva
8adfa96cbb Web: Files: Deleted useless console.log. 2021-01-28 16:20:03 +03:00
TatianaLopaeva
a22e262310 Update yarn lock files 2021-01-28 16:18:22 +03:00
TatianaLopaeva
993611097b Merge branch 'develop' into feature/fix-hide/show-header 2021-01-28 10:50:29 +03:00
TatianaLopaeva
24ee58f0f6 Web: Files/People: Fixed height of context menu for desktop. 2021-01-28 10:45:44 +03:00
0246a30e84 Files: fix creation text file 2021-01-27 21:11:47 +03:00
TatianaLopaeva
77ce035d15 Web: Files/People: Fixed context menu for desktop. 2021-01-27 20:01:52 +03:00
666a390f13 Merge branch 'feature/fix-hide/show-header' of https://github.com/ONLYOFFICE/AppServer into feature/fix-hide/show-header 2021-01-27 19:28:45 +03:00
680622218e Web: Components: fixed double opening of context menu for desktops 2021-01-27 19:28:34 +03:00
7cf1252b1e Web: Files: fixed field isFolder to selection 2021-01-27 19:26:14 +03:00
Artem Tarasov
93e6777b27 Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/index.js
#	web/ASC.Web.Common/src/components/PageLayout/index.js
#	web/ASC.Web.Components/package.json
2021-01-27 18:03:12 +03:00
Vladislav Makhov
72a5b5c2b9 Merge branch 'feature/upload-panel' of github.com:ONLYOFFICE/AppServer into feature/upload-panel 2021-01-27 17:29:09 +03:00