Commit Graph

7992 Commits

Author SHA1 Message Date
Artem Tarasov
235193fb6b web: common: bump version 2020-09-30 11:45:47 +03:00
Artem Tarasov
b7cda3333e Web: Common: added function createHashPassword 2020-09-30 11:43:19 +03:00
Artem Tarasov
c68b6d6b7f update yarn.lock 2020-09-30 10:53:51 +03:00
Artem Tarasov
5b5018a214 web: common: bump version 2020-09-30 10:44:06 +03:00
Diana
9e32aaca03 migration process 2020-09-29 20:17:06 +03:00
Diana
0d74f8d6a2 fix 2020-09-29 20:13:09 +03:00
Diana
7888c8d501 added schema for mysql and npgsql 2020-09-29 20:12:07 +03:00
Diana
bea6857429 fix models for npgsql 2020-09-29 20:09:39 +03:00
4ac2767afb Web: Files: removed useless actions, fixed clearProgressData 2020-09-29 18:24:49 +03:00
b56df84bce Settings: added password settings 2020-09-29 18:08:54 +03:00
4b302d1634 Web: People: Replaced RequestLoader to showLoader/hideLoader function calls 2020-09-29 17:43:13 +03:00
f96e5cee1a Web: Files: Replaced RequestLoader to showLoader/hideLoader function calls 2020-09-29 17:40:42 +03:00
Alexey Kostenko
c8374e3fa8 Web: People: Added a template for the avatar editor page 2020-09-29 16:46:27 +03:00
SuhorukovAnton
31cc18f568 fix-messages: IDE1006 2020-09-29 15:27:28 +03:00
SuhorukovAnton
9d5a9dd769 fix-messages: IDE1005 2020-09-29 14:58:00 +03:00
SuhorukovAnton
4e1bc262b9 fix-messages: IDE0075 2020-09-29 14:53:02 +03:00
SuhorukovAnton
9b6ccc19f0 fix-messages: IDE0074 2020-09-29 14:51:34 +03:00
80853762b1 Web: Files: Fixed mapDispatchToProps 2020-09-29 14:47:29 +03:00
86207e27fc Web: Applied prettier styled and removed debugger 2020-09-29 14:46:28 +03:00
SuhorukovAnton
a055c71610 fix-messages: IDE0070 2020-09-29 14:32:30 +03:00
981e7646ca Web: Files: Fixed opening DocEditor 2020-09-29 14:21:37 +03:00
SuhorukovAnton
151d8e162a fix-messages: IDE0063 2020-09-29 13:34:12 +03:00
SuhorukovAnton
1da0de1200 fix-messages: IDE0065 2020-09-29 13:28:03 +03:00
SuhorukovAnton
754ac38e3e fix-messages: IDE0074 2020-09-29 12:18:16 +03:00
SuhorukovAnton
135a845eaf fix-messages: IDE0063 2020-09-29 12:16:07 +03:00
SuhorukovAnton
6df7f14901 fix-messages: IDE0056 2020-09-29 12:06:08 +03:00
SuhorukovAnton
b7cc10c13a fix-messages: IDE0054 2020-09-29 12:03:37 +03:00
SuhorukovAnton
2d34d70a4e fix-messages: IDE0051 and IDE0052 2020-09-29 11:57:37 +03:00
ad4b28d1f2 Merge branch 'feature/files' into feature/loading-acceleration
# Conflicts:
#	products/ASC.Files/Client/public/index.html
#	products/ASC.Files/Client/src/App.js
#	products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
#	products/ASC.Files/Client/src/components/Article/Body/index.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
#	products/ASC.Files/Client/src/components/pages/Home/index.js
#	products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.People/Client/src/components/pages/Home/Section/Header/index.js
#	products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
#	web/ASC.Web.Client/src/App.js
#	web/ASC.Web.Common/src/components/index.js
2020-09-29 11:48:36 +03:00
de03714d3d Nginx: X-Frame-Options 2020-09-29 10:31:27 +03:00
ee4348c705
Merge pull request #82 from ONLYOFFICE/feature/payments-enterprise
Feature/payments enterprise
2020-09-29 09:38:00 +03:00
TatianaLopaeva
09f8b3df6b Deleted unnecessary variable 2020-09-29 09:18:43 +03:00
TatianaLopaeva
ea2f5ec097 Merge branch 'feature/files' into feature/payments-enterprise 2020-09-29 09:06:16 +03:00
TatianaLopaeva
463bdc0ec8 Refactoring buttonContainer and index 2020-09-29 09:05:02 +03:00
Alexey Kostenko
d7ce84f7a2 web: components: bump version 2020-09-29 08:14:43 +03:00
Alexey Kostenko
d29e743a2b Web: Components: Changed animation of toast notifications, fixed styles for mobile devices 2020-09-29 08:14:29 +03:00
SuhorukovAnton
d866eccade fix-messages: IDE0044 2020-09-28 18:42:03 +03:00
SuhorukovAnton
29ec562a78 fix-messages: IDE0038 2020-09-28 18:21:29 +03:00
Ilya Oleshko
ac9262f4c9 Web: Files : Fixed editor url, always last 2020-09-28 17:46:27 +03:00
SuhorukovAnton
de64bcca88 fix-messages: IDE0020 2020-09-28 17:45:05 +03:00
SuhorukovAnton
1d7f54ca22 fix-messages: IDE0019 2020-09-28 17:39:13 +03:00
SuhorukovAnton
1545138152 fix-messages: IDE0034 2020-09-28 17:34:28 +03:00
SuhorukovAnton
bde6f8ab49 fix-messages: IDE0031 2020-09-28 17:33:41 +03:00
SuhorukovAnton
e3e12c7fb0 fix-messages: IDE0030 2020-09-28 17:31:07 +03:00
SuhorukovAnton
bc98087599 fix-messages: IDE0018 2020-09-28 17:25:40 +03:00
Ilya Oleshko
9933b768d0 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-28 17:23:32 +03:00
Ilya Oleshko
e4764828f3 Web: Files: Editor : Fixed frame height for tablet 2020-09-28 17:23:11 +03:00
SuhorukovAnton
ba07caf1c8 fix-messages: IDE0017 2020-09-28 17:22:46 +03:00
SuhorukovAnton
3b0a86a536 fix-messages: IDE0016 2020-09-28 16:48:27 +03:00
TatianaLopaeva
fbc9e7a354 Merge branch 'feature/files' into feature/payments-enterprise 2020-09-28 16:22:49 +03:00