Commit Graph

907 Commits

Author SHA1 Message Date
Artem Tarasov
afedcc603c Web: Client: wizard: deleted unused props 2020-10-01 11:06:48 +03:00
TatianaLopaeva
b33328218a Update yarn.lock files 2020-10-01 09:37:25 +03:00
ccd1aef9f8 Web: Re-written NavMenu with selectors and reselect 2020-10-01 01:25:08 +03:00
Artem Tarasov
17d999f538 refactoring 2020-10-01 00:44:49 +03:00
Artem Tarasov
14f0d0f2be update yarn.lock 2020-09-30 15:00:27 +03:00
Artem Tarasov
bfdfcbb4b5 Web: Client: Wizard: added password hash 2020-09-30 14:22:14 +03:00
Artem Tarasov
c68b6d6b7f update yarn.lock 2020-09-30 10:53:51 +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
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
TatianaLopaeva
a09953ff73 Refactoring and added Trans from "react-i18next" 2020-09-28 16:03:43 +03:00
Artem Tarasov
5426089bdb Web: Client: refactoring translate Wizard 2020-09-28 13:09:34 +03:00
TatianaLopaeva
8139997ada Refactoring headerContainer 2020-09-28 12:07:18 +03:00
TatianaLopaeva
26efa35a32 Refactoring translation 2020-09-28 11:35:53 +03:00
TatianaLopaeva
e51c65d0b7 Refactoring to variables condition 2020-09-28 10:19:08 +03:00
a6180afa35 Web: Normalize routing + refactoring 2020-09-25 19:14:50 +03:00
TatianaLopaeva
3357a2c687 Refactoring reducer 2020-09-25 16:38:36 +03:00
TatianaLopaeva
c9a8fcbd13 Re-write to variables condition 2020-09-25 10:39:22 +03:00
TatianaLopaeva
06b6386489 Simplify action type 2020-09-24 15:24:58 +03:00
TatianaLopaeva
555f9b0812 Refactoring and deleted className 2020-09-24 14:30:19 +03:00
TatianaLopaeva
5d01d660a5 Return lock.png 2020-09-24 13:05:17 +03:00
TatianaLopaeva
59716a184b Deleted png images 2020-09-24 12:14:56 +03:00
TatianaLopaeva
6021ea4a76 Deleted png images 2020-09-24 12:01:08 +03:00
885eb4a691 Web: Clients: Added #temp-content markup on load and opportunity to hide it + router refactoring 2020-09-23 18:42:47 +03:00
TatianaLopaeva
e5cf2db796 Refactoring toast 2020-09-23 17:45:02 +03:00
TatianaLopaeva
e515be4271 Refactoring styles, actions and reducer 2020-09-23 16:58:02 +03:00
TatianaLopaeva
60cc7c1706 Added setDocumentTitle 2020-09-23 15:41:12 +03:00
TatianaLopaeva
1849e3712d Merge branch 'feature/files' into feature/payments-enterprise 2020-09-23 15:25:23 +03:00
TatianaLopaeva
1a0881d58a Refactoring styles 2020-09-23 14:44:27 +03:00
TatianaLopaeva
ee148a0b23 Refactoring styles 2020-09-23 11:08:41 +03:00
TatianaLopaeva
27774c97bd Refactoring styles for headerContainer and buttonContainer (added grid for desktop) 2020-09-22 17:08:18 +03:00
TatianaLopaeva
41930dcb38 Changed min-width for containers 2020-09-22 15:36:29 +03:00
TatianaLopaeva
f9ca91fe51 Refactoring styles 2020-09-22 14:56:52 +03:00
TatianaLopaeva
2ae3926d1b Added inserts line breaks when words are exceeding the width of the container, to avoid overflow. 2020-09-22 11:43:08 +03:00
TatianaLopaeva
87ee165027 Refactoring styles 2020-09-22 10:31:33 +03:00
TatianaLopaeva
a6b602851b Added changeDocumentTitle 2020-09-21 15:15:38 +03:00
TatianaLopaeva
ca420104fc Merge branch 'feature/files' into feature/payments-enterprise
# Conflicts:
#	web/ASC.Web.Client/src/App.js
#	web/ASC.Web.Common/src/components/StudioLayout/StudioLayout.js
2020-09-21 14:54:05 +03:00
Artem Tarasov
1bf4a243fd Web: Client: refactoring: added utils.js, replaced changeDocumentTitle() with setDocumentTitle() 2020-09-21 14:53:24 +03:00
TatianaLopaeva
24c93d2026 Added useTranslation to containers 2020-09-21 14:39:06 +03:00
TatianaLopaeva
13a9e3e73b Changed styles and Added flexible length for tablet and mobile 2020-09-21 10:17:20 +03:00
7b4441676e Update yarn.lock files 2020-09-19 18:35:17 +03:00
0f00799480 Web: Client: Fixed redirect to defaultPage 2020-09-19 18:24:48 +03:00
TatianaLopaeva
2d684556b6 Refactoring 2020-09-18 18:15:12 +03:00
TatianaLopaeva
833b2c8860 Refactoring 2020-09-18 17:36:56 +03:00
TatianaLopaeva
0945cf05f3 Refactoring 2020-09-18 17:33:33 +03:00
4a09b4b5f2 Web: fixed body scroll 2020-09-18 17:06:35 +03:00
TatianaLopaeva
81583aca4f Changed logic for standaloneMod and refactoring header-container 2020-09-18 14:46:54 +03:00
TatianaLopaeva
564b250438 Changed margin of header-container 2020-09-18 13:23:35 +03:00
TatianaLopaeva
f4e876ccb5 Refactoring styles of advantages-container, button-container, contact-container 2020-09-18 12:25:49 +03:00
TatianaLopaeva
57d8da2600 Changed translation (ru) 2020-09-18 12:22:57 +03:00
Artem Tarasov
f3b8e4880c Web: Files: refactoring - changing document.title with changeTitleDocument() 2020-09-18 11:18:48 +03:00
TatianaLopaeva
332b267157 Refactoring header-container 2020-09-18 10:24:48 +03:00
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
2f4a3141d5 Web: People: Speeded up loading first page + refactoring 2020-09-17 11:28:23 +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
c16659c322 Web: Client: Removed useless markup 2020-09-17 10:21:15 +03:00
fdf4e7564b Web: Client: Speeded up loading first page + refactoring 2020-09-17 10:18:44 +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
Vladislav Makhov
d5d086761e Refactoring 2020-09-09 12:42:45 +03:00
TatianaLopaeva
957c7cd741 Changed style for header-container 2020-09-09 11:22:44 +03:00
Vladislav Makhov
1ff8b7b3a1 Refactoring 2020-09-09 10:32:51 +03:00
Vladislav Makhov
657901777f Refactoring 2020-09-09 09:00:27 +03:00
Vladislav Makhov
86438647b8 Format PropTypes 2020-09-08 16:07:07 +03:00
Vladislav Makhov
66a0d9f60d PropTypes 2020-09-08 15:54:20 +03:00
TatianaLopaeva
46e9124f81 Added api methods for payments 2020-09-08 15:39:45 +03:00
Vladislav Makhov
8a9af72f1e Fix url address 2020-09-08 14:06:43 +03:00
Vladislav Makhov
24a2df3b16 Fix tree settings for t.p.s. 2020-09-08 13:38:25 +03:00
Vladislav Makhov
d864984596 Refactoring 2020-09-08 13:08:56 +03:00
Vladislav Makhov
806e48bd6d Fix translation 2020-09-08 12:09:17 +03:00
Vladislav Makhov
653d60d897 Format styles 2020-09-08 10:57:26 +03:00
Vladislav Makhov
eccc420fd1 Format styles 2020-09-08 10:30:09 +03:00
Vladislav Makhov
31f28acf88 Fix logos 2020-09-08 10:21:49 +03:00
Vladislav Makhov
9934a6b06e Refactoring 2020-09-08 09:10:55 +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
Vladislav Makhov
167e346575 Merge branch 'feature/files' into feature/third-party-settings 2020-09-07 15:34:08 +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
Vladislav Makhov
93c366d04e Refactoring 2020-09-06 12:15:51 +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
Vladislav Makhov
f5062b3fdf Fix naming 2020-09-04 14:41:03 +03:00
Vladislav Makhov
b545b7ffa7 Add possibility to update consumer props values 2020-09-04 14:39:05 +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
Vladislav Makhov
ae1d9f242a Fix outer description 2020-09-03 18:24:19 +03:00
Vladislav Makhov
3000bf00bf Merge branch 'feature/third-party-settings' of github.com:ONLYOFFICE/AppServer into feature/third-party-settings 2020-09-03 18:10:00 +03:00
Vladislav Makhov
d9e99cec2b Format style 2020-09-03 18:09:50 +03:00
94fe24b3bd Merge branch 'feature/files' into feature/third-party-settings
# Conflicts:
#	web/ASC.Web.Client/src/components/pages/Settings/index.js
2020-09-03 17:43:44 +03:00
TatianaLopaeva
9b240a3539 Changed appsettings added window.location.href for 402 2020-09-03 17:01:59 +03:00
Vladislav Makhov
f7aeb419a1 Add Integration Icon 2020-09-03 12:28:32 +03:00
Vladislav Makhov
164163482c Add icons 2020-09-03 12:22:50 +03:00
Vladislav Makhov
f3de49a6dc Format styles 2020-09-03 10:43:46 +03:00
Vladislav Makhov
09b7501241 Refactoring 2020-09-02 18:22:52 +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
Vladislav Makhov
a27beb5d81 Delete unused code 2020-09-02 15:47:53 +03:00
Vladislav Makhov
80431f4fc6 Redo styles 2020-09-02 15:17:08 +03:00
Vladislav Makhov
5b40301e44 Add translation 2020-09-02 14:44:56 +03:00
dc0940cca0 Web: Settings: Fixed TypeError: Cannot read property 'label' of undefined 2020-09-02 13:01:24 +03:00
Vladislav Makhov
c53b3dbd3e Refactoring 2020-09-02 12:50:08 +03:00
0eb3b2b4d3 Update yarn.lock files 2020-09-02 12:30:53 +03:00
da50146545 Web: Clients: Added useEffect for changeLanguage call if functional components (issue: Warning: Cannot update a component https://fb.me/setstate-in-render) 2020-09-02 12:19:21 +03:00
0152274029 Web: Clients: Fixed workbox.expiration.Plugin is not a constructor 2020-09-01 18:34:06 +03:00
00c6ce5e9b Web: Clients: Added api-cache in service-worker for base info for 30 Minutes 2020-09-01 18:11:20 +03:00
bd6c0d0338 Web: Clients: Fixed windows is not defined 2020-09-01 18:09:39 +03:00
bc8613c4f6 Web: Clients: Uncommented self.skipWaiting() on install service-worker 2020-09-01 17:53:24 +03:00
Vladislav Makhov
d596a6938e Add several translations 2020-09-01 16:18:49 +03:00
Vladislav Makhov
deea50f763 Refactoring 2020-09-01 15:30:21 +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
Vladislav Makhov
e58bd5b5b2 Refactoring 2020-09-01 10:02:16 +03:00
TatianaLopaeva
991cc488d7 Added information about trial at reducer 2020-09-01 09:11:30 +03:00