Commit Graph

4102 Commits

Author SHA1 Message Date
cc9e0e1374 Merge branch 'master' into feature/scope
# Conflicts:
#	web/ASC.Web.Core/Notify/NotifyConfiguration.cs
2020-09-09 18:18:34 +03:00
f464e031b8 Notify: fix 2020-09-08 11:42:13 +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
f48574a809 Merge branch 'master' into feature/scope 2020-09-04 11:26:03 +03:00
82dd4a8828 Settings: fix timeZones for unix 2020-09-03 18:30:14 +03:00
0f4877b541 AuthService: selectel instruction fix 2020-09-03 12:12:03 +03:00
4fc7427aed AuthService: added description 2020-09-03 11:43:13 +03:00
SuhorukovAnton
90f1c4fa3d Merge branch 'master' into feature/scope 2020-08-31 11:29:44 +03:00
SuhorukovAnton
132a6b05ae scope: add deconstructs 2020-08-31 11:18:07 +03:00
maksim
95299daaf9 ASC.Data.Storage.Migration: adding listener and extension 2020-08-27 17:06:03 +03:00
maksim
8282f3f658 fix 2020-08-27 17:01:37 +03:00
13cef58770 Settings: auth. Translate 2020-08-26 19:13:41 +03:00
952e0f40c7 Settings: authservice api 2020-08-26 17:34:21 +03:00
SuhorukovAnton
055e787d63 scope: fix 2020-08-24 21:41:06 +03:00
SuhorukovAnton
c96620554d Merge branch 'master' into feature/scope 2020-08-24 17:09:42 +03:00
maksim
eb58c24d2e LaunchSettings: fix 2020-08-24 10:45:51 +03:00
maksim
eecf23f214 ASC.Data.Storage.Migration: bugfix 2020-08-24 09:52:17 +03:00
maksim
280604e41d ASC.Data.Storage.Migration: adding protocol buffers and event listening 2020-08-21 11:05:27 +03:00
4501d3229a Nuget: replaced thirdparty 2020-08-20 17:50:08 +03:00
SuhorukovAnton
faec4269db Merge branch 'master' into feature/scope 2020-08-16 12:23:20 +03:00
f00a964c32 Merge branch 'master' into feature/private
# Conflicts:
#	common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
2020-08-14 17:19:36 +03:00
Artem Tarasov
1bd341fc33 fix translate 2020-08-12 17:17:14 +03:00
Artem Tarasov
c6d1198ae0 deleted console.log, simple condition 2020-08-12 16:38:34 +03:00
Artem Tarasov
4499d82de9 decomposition 2020-08-12 16:32:42 +03:00
Artem Tarasov
c301178a16 fixed translate 2020-08-12 16:32:17 +03:00
Artem Tarasov
171ae1b147 web: common: bump version 2020-08-12 14:57:41 +03:00
Artem Tarasov
00fcc549e5 web: components: bump version 2020-08-12 14:57:24 +03:00
Artem Tarasov
f110b2a49a deleted Toast, added ModalDialog 2020-08-12 14:18:40 +03:00
Artem Tarasov
e3119d4610 fixed fontWeight link for License 2020-08-12 13:30:24 +03:00
Artem Tarasov
034d60707d fixed link 2020-08-12 13:08:24 +03:00
SuhorukovAnton
df8b6fd8b0 private: firtst version 2020-08-12 12:58:08 +03:00
Artem Tarasov
a19d7ec4cf fixed modal dialog 2020-08-12 12:00:47 +03:00
Artem Tarasov
1503bc105b fix link 2020-08-12 11:54:08 +03:00
bcda6bf69f Api: refresh license 2020-08-11 11:52:39 +03:00
Artem Tarasov
325d497cc0 fixed accept file 2020-08-10 18:40:46 +03:00
Artem Tarasov
d463a4ab25 fixed bugs upload incorrect file license after upload current 2020-08-10 18:25:04 +03:00
Artem Tarasov
70f3098fb2 fixed modal message and accept files 2020-08-10 18:06:20 +03:00
Artem Tarasov
d338f546e0 Added message about successful upload 2020-08-10 13:29:32 +03:00
Artem Tarasov
ef9b4d52e9 added input highlighting 2020-08-10 11:22:49 +03:00
Artem Tarasov
56bd4e8411 fixed upload license 2020-08-10 10:27:58 +03:00
Artem Tarasov
b8d42d53ed fixed language 2020-08-07 22:02:55 +03:00
Ilya Oleshko
0bae66814f Fix: Fixed file upload from form 2020-08-07 17:32:55 +03:00
Artem Tarasov
e6dea2c648 input-file fixed upload same file 2020-08-07 16:57:16 +03:00
Artem Tarasov
3b8796ca93 refactoring 2020-08-07 13:39:53 +03:00
Artem Tarasov
3838c5ae39 fix 2020-08-06 09:44:52 +03:00
Artem Tarasov
c4ba6adee2 fixed an error related to requesting the state.wizard.wizardCompleted key in PublicRoute. Fixed translation and layout 2020-08-06 00:01:41 +03:00
Artem Tarasov
5c8efbd7c5 upload license 2020-08-05 15:27:28 +03:00
Artem Tarasov
8257c957cb fix upload license 2020-08-04 16:39:05 +03:00
Artem Tarasov
5ccc0fc21c upload fix 2020-08-04 11:48:43 +03:00