Commit Graph

697 Commits

Author SHA1 Message Date
TatianaLopaeva
b1b07fc5de Changed logic of getSettingsPayment 2020-09-18 10:22:35 +03:00
TatianaLopaeva
fbb0787eff Added AcceptLicense 2020-09-17 17:07:32 +03:00
TatianaLopaeva
a858a3a846 Merge branch 'feature/files' into feature/payments-enterprise
# Conflicts:
#	web/ASC.Web.Components/src/components/icons/svg/index.js
2020-09-17 11:25:51 +03:00
a4cb368513 Update yarn.lock files 2020-09-16 18:39:06 +03:00
TatianaLopaeva
8ecc93a30c Changed logic of upload license 2020-09-16 10:33:06 +03:00
3b691247b2 Update yarn.lock files 2020-09-15 23:29:13 +03:00
986e53608d Update yarn.lock files 2020-09-15 22:55:11 +03:00
2bad04c058 Update yarn.lock files 2020-09-15 22:42:42 +03:00
TatianaLopaeva
3eeb24a5b5 Merge branch 'feature/files' into feature/payments-enterprise
# Conflicts:
#	web/ASC.Web.Common/src/components/StudioLayout/StudioLayout.js
#	web/ASC.Web.Components/src/components/icons/svg/index.js
2020-09-15 17:52:45 +03:00
TatianaLopaeva
d8abe20133 Refactoring 2020-09-15 17:23:57 +03:00
TatianaLopaeva
ce32451441 Changed reducer and actions: added setLicenseUpload and resetUploadedLicense 2020-09-15 14:16:12 +03:00
TatianaLopaeva
ed85445dcc Changed format 2020-09-15 11:10:19 +03:00
TatianaLopaeva
7da745b96c Refactoring actions and reducer 2020-09-15 11:01:54 +03:00
Alexey Kostenko
72ac3e9b15 Web: Client/Components: Fix dropDown styles on wizard 2020-09-15 09:02:24 +03:00
TatianaLopaeva
1f887f4b5b Refactoring 2020-09-14 12:31:56 +03:00
65fbf2247e Update yarn.lock files 2020-09-11 22:51:28 +03:00
99a6fd523e Web: Client: Moved organizationName into authReducer 2020-09-11 18:03:40 +03:00
TatianaLopaeva
18147c3248 Added color for text when support is not available 2020-09-11 08:31:44 +03:00
TatianaLopaeva
e4034a8724 Added information when support is not available by layout, changed logic for data comparison 2020-09-10 17:17:23 +03:00
TatianaLopaeva
3968d09123 Refactoring styles for header-container 2020-09-10 16:24:11 +03:00
TatianaLopaeva
c4cdfe3191 Deleted nav-thumb-horizontal 2020-09-10 15:54:02 +03:00
TatianaLopaeva
fae1522c01 Refactoring styles for advantages-container 2020-09-10 15:04:13 +03:00
TatianaLopaeva
2b24c97d9e Refactoring styles of advantages-container 2020-09-10 14:57:29 +03:00
7433eea815 Web: Clients: SW: Added code for updating SW lifecycle to update the app after user triggered refresh 2020-09-10 13:19:06 +03:00
TatianaLopaeva
8a465e838d Refactoring 2020-09-10 09:08:23 +03:00
TatianaLopaeva
305bb8ac7b Refactoring 2020-09-10 09:05:55 +03:00
323823981a Update yarn.lock files 2020-09-09 22:25:31 +03:00
b3b6fd0938 Web: Components: Re-written ModalDialog component with SLOT pattern 2020-09-09 21:49:25 +03:00
TatianaLopaeva
dc4199a6c8 Changed componentDidMount and componentDidUpdate at index, changed reducer and actions 2020-09-09 17:06:42 +03:00
TatianaLopaeva
957c7cd741 Changed style for header-container 2020-09-09 11:22:44 +03:00
TatianaLopaeva
46e9124f81 Added api methods for payments 2020-09-08 15:39:45 +03:00
72ebd235ec Merge branch 'feature/files' into feature/payments-enterprise 2020-09-07 18:42:57 +03:00
9778b258d7 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-07 18:41:51 +03:00
efbebc05b5 Update yarn.lock files 2020-09-07 18:41:42 +03:00
Artem Tarasov
6d68dfd0c6 added redirect from / to homepage(settings in state.auth.settings.homepage) 2020-09-07 18:26:44 +03:00
TatianaLopaeva
e802727b1b Changed style for buttons 2020-09-07 14:46:58 +03:00
TatianaLopaeva
ca16bff3d0 Deleted text about Created Portals 2020-09-07 14:34:51 +03:00
TatianaLopaeva
5be50ebef9 Merge branch 'feature/files' into feature/payments-enterprise
# Conflicts:
#	web/ASC.Web.Common/src/api/client.js
2020-09-06 13:10:24 +03:00
TatianaLopaeva
23666db461 Changed style for buttons, added logic for loading file when clicking a file, hidden FileInput 2020-09-06 12:49:37 +03:00
a2f050590b Update yarn.lock files 2020-09-04 21:04:05 +03:00
31f19a0f96 Web: Client: Refactoring of initial requests calling 2020-09-04 20:37:53 +03:00
de41a366f6 Web: Client: Fixed layout in Wizard and removed useless constant 2020-09-04 20:34:00 +03:00
TatianaLopaeva
eb8b6fce38 Changed the license upload notification: Added toastr and Deleted modal-dialog-container, Changed text of notification 2020-09-04 12:05:55 +03:00
Artem Tarasov
a017814a62 fixed wizard render 2020-09-04 11:36:16 +03:00
4686122183 Merge branch 'feature/files' into feature/payments-enterprise 2020-09-04 10:15:48 +03:00
TatianaLopaeva
c104ed287c Delete debugger 2020-09-04 08:41:47 +03:00
TatianaLopaeva
9b240a3539 Changed appsettings added window.location.href for 402 2020-09-03 17:01:59 +03:00
4ed48f06b4 Web: Client: Added forceBackend in createI18N 2020-09-02 18:02:42 +03:00
3c11d95772 Web: Settings: Fixed crash on language undefined 2020-09-02 18:02:15 +03:00
TatianaLopaeva
2a56b6dda4 Changed text by figma 2020-09-02 16:52:13 +03:00