Commit Graph

6998 Commits

Author SHA1 Message Date
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
TatianaLopaeva
8a465e838d Refactoring 2020-09-10 09:08:23 +03:00
TatianaLopaeva
305bb8ac7b Refactoring 2020-09-10 09:05:55 +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
b357a52f7f Merge branch 'feature/payments-enterprise' of github.com:ONLYOFFICE/AppServer into feature/payments-enterprise 2020-09-07 18:42:46 +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
3729d92a5a web: common: bump version 2020-09-07 18:35:03 +03:00
1dff214c06 Web: Common: Remove error routing on 500 error 2020-09-07 18:34:47 +03:00
Artem Tarasov
797dd6c249 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-07 18:27:39 +03:00
Artem Tarasov
6d68dfd0c6 added redirect from / to homepage(settings in state.auth.settings.homepage) 2020-09-07 18:26:44 +03:00
886c7d6464 Merge branch 'master' into feature/files 2020-09-07 18:16:33 +03:00
98c20197fd web: components: bump version 2020-09-07 18:12:13 +03:00
58d2db1d97 Web: Components: fixed text-input disable color 2020-09-07 18:10:40 +03:00
9899880bff web: common: bump version 2020-09-07 17:32:02 +03:00
d9783ecf26 Web: Common: fixed sort-combobox styles, added isMobile prop 2020-09-07 17:31:36 +03:00
96df0ab8ca Api: added payment settings 2020-09-07 16:53:39 +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
c7cb291668 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-09-07 13:55:24 +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
71fee5aab4 Added id for FileInput 2020-09-06 13:04:33 +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
52104fafd6 Merge branch 'feature/files' into feature/payments-enterprise
# Conflicts:
#	web/ASC.Web.Common/src/api/client.js
2020-09-04 21:36:25 +03:00
a2f050590b Update yarn.lock files 2020-09-04 21:04:05 +03:00
cf53c32ff4 web: common: bump version 2020-09-04 20:54:50 +03:00
31f19a0f96 Web: Client: Refactoring of initial requests calling 2020-09-04 20:37:53 +03:00
49f5166517 Web: Files: Added route to Error520 2020-09-04 20:35:49 +03:00
fb53f4f1f1 Web: People: Added route to Error520 2020-09-04 20:35:21 +03:00
de41a366f6 Web: Client: Fixed layout in Wizard and removed useless constant 2020-09-04 20:34:00 +03:00
8907f8b315 Web: Common: API client: Added support of 402 and +500 statuses 2020-09-04 20:32:34 +03:00
ac8fa40c01 Web: Common: Added body text to Error520 2020-09-04 20:30:34 +03:00
0432158a0f Web: Files: fixed files page crash 2020-09-04 19:10:24 +03:00
22b7b8ff52 web: common: bump version 2020-09-04 15:57:06 +03:00
4fd7cffa63 Web: Common: fixed sort button 2020-09-04 15:56:49 +03:00
66009ff013 Jenkins: fix 2020-09-04 14:44:58 +03:00
Ilya Oleshko
728b00ab93 web: common: bump version 2020-09-04 13:56:49 +03:00
Ilya Oleshko
4794084ef1 Web: Common: FilterInput : Fix default height for items 2020-09-04 13:56:37 +03:00
f9e1c7bc02 Merge branch 'feature/files' into feature/payments-enterprise 2020-09-04 12:25:57 +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
f4329a6ef9 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-04 11:36:41 +03:00
Artem Tarasov
a017814a62 fixed wizard render 2020-09-04 11:36:16 +03:00
f3581e1d35 Configure: Restored initial settings 2020-09-04 10:40:06 +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
e6f9e88bb8 new jenkins server 2020-09-03 18:49:43 +03:00