Commit Graph

6899 Commits

Author SHA1 Message Date
TatianaLopaeva
9b240a3539 Changed appsettings added window.location.href for 402 2020-09-03 17:01:59 +03:00
TatianaLopaeva
2a56b6dda4 Changed text by figma 2020-09-02 16:52:13 +03:00
TatianaLopaeva
6ee4cbc5b4 Merge branch 'feature/files' into feature/payments-enterprise 2020-09-01 11:05:58 +03:00
TatianaLopaeva
319dbc1158 Added translation and text for trial period 2020-09-01 10:51:19 +03:00
TatianaLopaeva
29d2bfab61 Changed logic of trial 2020-09-01 10:35:15 +03:00
TatianaLopaeva
35a0cf98c0 Added logic of trial at header-container 2020-09-01 10:34:20 +03:00
TatianaLopaeva
991cc488d7 Added information about trial at reducer 2020-09-01 09:11:30 +03:00
5f7265931c Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-08-31 17:45:52 +03:00
29d9f21d05 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	web/ASC.Web.Core/Files/DocumentService.cs
2020-08-31 17:45:57 +03:00
062a3a793f Update yarn.lock files 2020-08-31 17:45:37 +03:00
fa6144919e web: common: bump version 2020-08-31 17:36:05 +03:00
d16652f051 Web: Common: fixed login page for new PageLayout body 2020-08-31 17:35:39 +03:00
36e283fc5c web: common: bump version 2020-08-31 16:34:56 +03:00
a14c7b447c web: components: bump version 2020-08-31 16:34:28 +03:00
f78eb3aada Web: People: fixed empty-screen-container to new article 2020-08-31 16:33:31 +03:00
9ee046bb1e Web: Files: fixed empty-screen-container to new article 2020-08-31 16:32:44 +03:00
946ed771ac Web: Components: fixed empty-screen-container to new article 2020-08-31 16:31:56 +03:00
f5348c3ccd Files: settings. Added settings, forcesave, thirdparty 2020-08-31 15:41:28 +03:00
TatianaLopaeva
e8751d21c0 Added information when support is no longer available 2020-08-31 15:40:42 +03:00
TatianaLopaeva
af9457df7a Changed logic of date 2020-08-31 15:15:33 +03:00
2db018dcf6 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-08-31 13:52:34 +03:00
44aaf5267e Web: Common: fixed section styles 2020-08-31 13:31:39 +03:00
d9f70df70a Update yarn.lock files 2020-08-31 12:42:36 +03:00
1c5402db37 Web: Files: Added Webpack-bundle-analyzer 2020-08-31 12:07:58 +03:00
2b9f263dbc Web: People: Added Webpack-bundle-analyzer 2020-08-31 11:59:35 +03:00
67f2e3feb8 Web: Client: Added Webpack-bundle-analyzer 2020-08-31 11:43:26 +03:00
1fb90663ee Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-08-31 10:04:45 +03:00
927d7619a7 web: common: bump version 2020-08-31 10:04:24 +03:00
1f32e91d54 Web: Files: added widthProp to row 2020-08-31 10:03:48 +03:00
a4a9234328 Web: Common: added react-resize-detector package, fixed styles 2020-08-31 10:03:19 +03:00
b5fcca25e0
Merge pull request #71 from ONLYOFFICE/feature/data-storage-migration
Feature/data storage migration
2020-08-28 19:02:44 +03:00
3da549264e Merge branch 'master' into feature/data-storage-migration 2020-08-28 18:46:20 +03:00
a48f8fb43e Migration: fix start 2020-08-28 18:30:26 +03:00
TatianaLopaeva
93e4f42e19 Rename visible of modal-dialog-container 2020-08-28 18:25:09 +03:00
TatianaLopaeva
611a58b7df Added changed language to end data of license 2020-08-28 18:19:16 +03:00
Artem Tarasov
0e32424313 refactoring 2020-08-28 17:42:01 +03:00
maksim
c07be0324a ASC.Data.Storage.Migration: fix 2020-08-28 14:58:20 +03:00
maksim
aa78badaec ServiceClientListener: fix cache 2020-08-28 14:26:06 +03:00
maksim
e4b2c45ee6 MigrateServiceClient: adding a cache 2020-08-28 13:23:09 +03:00
Artem Tarasov
4b9631597b Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-08-28 12:15:53 +03:00
Ilya Oleshko
ab16aa979d Web: Files: Home : Fixed auto scroll to body on mobile or tablet devices 2020-08-28 12:14:35 +03:00
Ilya Oleshko
e899d9d6bd Web: People: Home : Fixed auto scroll to body on mobile or tablet devices 2020-08-28 12:14:22 +03:00
Artem Tarasov
b859f35e5e implemented access to admin settings by checking the value of the isAdmin property in state.auth.user.isAdmin. Added api methods 2020-08-28 12:13:53 +03:00
TatianaLopaeva
d3dde62de3 Changed max-width for mobile, changed api for UploadLicense, added path into App 2020-08-28 11:46:39 +03:00
maksim
138348f668 MigrateServiceClient: fix 2020-08-28 11:31:46 +03:00
TatianaLopaeva
2022bd4ac1 Merge branch 'feature/files' into feature/payments-enterprise
# Conflicts:
#	web/ASC.Web.Client/src/App.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/admins.js
#	web/ASC.Web.Components/src/components/icons/svg/index.js
2020-08-28 10:57:59 +03:00
TatianaLopaeva
54464c3320 Changed margin-top at header-container 2020-08-28 10:51:22 +03:00
TatianaLopaeva
6816ebc6cb Rename at index and modal-dialog-container 2020-08-28 10:50:38 +03:00
TatianaLopaeva
9bac1c0639 Added headline for payments and some translations 2020-08-28 10:49:18 +03:00
TatianaLopaeva
4fb43397d7 Added translation for payments in StudioLayoute 2020-08-28 10:48:45 +03:00