|
|
a2ea415cd6
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-09-08 09:57:25 +03:00 |
|
|
|
64dd0e2bd6
|
Web: Components: fixed empty-screen-container
|
2020-09-08 09:57:04 +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 |
|
SuhorukovAnton
|
80198032a4
|
scope: refactoring
|
2020-09-07 15:01:15 +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 |
|
|
|
6d567c4360
|
Merge branch 'master' into feature/scope
|
2020-09-04 14:45:50 +03:00 |
|
|
|
66009ff013
|
Jenkins: fix
|
2020-09-04 14:44:58 +03:00 |
|
|
|
020ccfd7d4
|
Scope: fix
|
2020-09-04 14:33:44 +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 |
|
|
|
8e3e73c746
|
Scope: fix
|
2020-09-04 13:10:19 +03:00 |
|
|
|
f9e1c7bc02
|
Merge branch 'feature/files' into feature/payments-enterprise
|
2020-09-04 12:25:57 +03:00 |
|
|
|
dc98b02d4f
|
fix
|
2020-09-04 12:20:12 +03:00 |
|
|
|
897f3c910e
|
Sln: removed *_Ubuntu configuration
|
2020-09-04 12:06:30 +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 |
|
|
|
f48574a809
|
Merge branch 'master' into feature/scope
|
2020-09-04 11:26:03 +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 |
|
