|
|
7f095f03d1
|
Merge branch 'master' into feature/Wizard
# Conflicts:
# common/ASC.Resource.Manager/Startup.cs
# config/kafka.json
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.Designer.cs
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.de.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.es.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.fr.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.it.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.ru.resx
# web/ASC.Web.Core/TariffSettings.cs
|
2020-07-15 15:23:28 +03:00 |
|
Artem Tarasov
|
2469126f7a
|
hidden input license file
|
2020-07-15 14:26:49 +03:00 |
|
Artem Tarasov
|
7e3ba192b1
|
fixed file name in input type=file
|
2020-07-15 14:01:29 +03:00 |
|
|
|
533935906f
|
Resource: fix
|
2020-07-15 12:55:31 +03:00 |
|
Artem Tarasov
|
765a209de5
|
Merge branch 'feature/Wizard' of github.com:ONLYOFFICE/AppServer into feature/Wizard
|
2020-07-15 11:54:58 +03:00 |
|
Artem Tarasov
|
6d2deca3c6
|
layout fix
|
2020-07-15 11:47:21 +03:00 |
|
|
|
4e5c187851
|
EF: DateTime? hack
|
2020-07-15 11:38:00 +03:00 |
|
|
|
f8b026a7b9
|
Merge branch 'feature/Wizard' of github.com:ONLYOFFICE/AppServer into feature/Wizard
|
2020-07-15 00:05:26 +03:00 |
|
Artem Tarasov
|
84ca1146a0
|
layout fix
|
2020-07-14 17:46:00 +03:00 |
|
|
|
3d7e1f114c
|
Merge pull request #46 from ONLYOFFICE/feature/api-defaultvalue
Feature/api defaultvalue
|
2020-07-13 16:41:31 +03:00 |
|
|
|
a347f4e4f3
|
fix
|
2020-07-13 16:18:31 +03:00 |
|
|
|
a822f9b349
|
Files: fix
|
2020-07-13 15:57:39 +03:00 |
|
|
|
dfd8bbfdb8
|
Merge branch 'master' into feature/api-defaultvalue
|
2020-07-13 15:28:11 +03:00 |
|
|
|
cd3240a7f6
|
Removed LimitedConcurrencyLevelTaskScheduler
|
2020-07-13 14:11:36 +03:00 |
|
|
|
54fde4a5a4
|
Merge branch 'feature/Wizard' of github.com:ONLYOFFICE/AppServer into feature/Wizard
|
2020-07-13 12:15:22 +03:00 |
|
Artem Tarasov
|
80a5e224e8
|
added PropTypes and deleted console.log
|
2020-07-12 12:34:42 +03:00 |
|
Artem Tarasov
|
0e2da28101
|
added getPortalSettings after wizard completed
|
2020-07-10 19:00:21 +03:00 |
|
|
|
064160a1ea
|
Files: onedrive
|
2020-07-10 18:37:02 +03:00 |
|
Artem Tarasov
|
491a3d32da
|
added routing after completed Wizard
|
2020-07-10 18:08:22 +03:00 |
|
|
|
56df9a98ef
|
Files: resources
|
2020-07-10 14:57:42 +03:00 |
|
|
|
732307a217
|
ResManager: fix
|
2020-07-10 14:57:04 +03:00 |
|
SuhorukovAnton
|
2925ff25b4
|
api-defaultvalue: add System.Text.Json
|
2020-07-10 13:35:24 +03:00 |
|
Artem Tarasov
|
f8e9cfc5f0
|
added onKeyPressHandler
|
2020-07-10 13:10:54 +03:00 |
|
Artem Tarasov
|
486dbe1fb5
|
layout fix
|
2020-07-10 11:26:16 +03:00 |
|
SuhorukovAnton
|
f8e42cbd08
|
api-defaultvalue: add JsonPropertyNames
|
2020-07-09 22:06:08 +03:00 |
|
SuhorukovAnton
|
28e70e91f6
|
api-defaultvalue: add JsonPropertyNames
|
2020-07-09 18:37:36 +03:00 |
|
Artem Tarasov
|
92fdf4c41d
|
added Toast
|
2020-07-09 17:57:53 +03:00 |
|
Artem Tarasov
|
5d1043af13
|
added Loader
|
2020-07-09 15:11:08 +03:00 |
|
Artem Tarasov
|
11be0a1ef3
|
added in PasswordInput NewPasswordButtonVisible from /new-login-page
|
2020-07-09 14:12:53 +03:00 |
|
Artem Tarasov
|
27ddc44211
|
added truncate label timezone
|
2020-07-09 12:47:07 +03:00 |
|
|
|
71c267939d
|
Files: fix names and Serializers
|
2020-07-09 12:02:44 +03:00 |
|
Artem Tarasov
|
8cacf241d5
|
fix
|
2020-07-09 11:42:28 +03:00 |
|
|
|
feba6bb1c0
|
ApiSystem: System.Text.Json
|
2020-07-09 11:08:42 +03:00 |
|
|
|
5988855b61
|
Fix License
|
2020-07-08 18:30:23 +03:00 |
|
Artem Tarasov
|
6c01f7392f
|
added method setPortalOwner
|
2020-07-08 18:15:50 +03:00 |
|
Artem Tarasov
|
6dd5c338fe
|
fix translation and layout
|
2020-07-08 15:34:29 +03:00 |
|
SuhorukovAnton
|
8b5ab8c9a4
|
api-defaultvalue: delete DataContracts
|
2020-07-08 13:10:09 +03:00 |
|
Artem Tarasov
|
86be9d522b
|
render optimization
|
2020-07-08 13:04:23 +03:00 |
|
Artem Tarasov
|
b3fe0f3fbc
|
added .DS_Store in .gitignore
|
2020-07-08 11:44:06 +03:00 |
|
Artem Tarasov
|
07089f2fc7
|
added api methods
|
2020-07-08 11:29:44 +03:00 |
|
|
|
74b9676819
|
Docker: added thumbnail, backup, notify
|
2020-07-07 19:26:55 +03:00 |
|
|
|
54c7c25a8a
|
Setting: added GetMachineName
|
2020-07-07 16:33:47 +03:00 |
|
Artem Tarasov
|
621d04db58
|
added select language
|
2020-07-07 16:24:57 +03:00 |
|
Artem Tarasov
|
779eb155b5
|
added action getPortalCultures, fix routing
|
2020-07-07 14:50:31 +03:00 |
|
SuhorukovAnton
|
88cad55450
|
api-defaultvalue: delete DataMembers
|
2020-07-07 12:59:12 +03:00 |
|
SuhorukovAnton
|
a43c14dcb3
|
Merge branch 'master' into feature/api-defaultvalue
|
2020-07-07 12:38:35 +03:00 |
|
Artem Tarasov
|
1a730f0750
|
fix redirect to /wizard
|
2020-07-06 18:08:34 +03:00 |
|
Artem Tarasov
|
7cccd43f22
|
fix
|
2020-07-06 15:14:20 +03:00 |
|
Artem Tarasov
|
c0e5626c1f
|
deleted unnecessary func and action in Wizard
|
2020-07-06 14:26:47 +03:00 |
|
Artem Tarasov
|
75b591ff1e
|
added tooltip and translation Password
|
2020-07-06 13:38:25 +03:00 |
|
