|
|
129160c35e
|
Web: Common: fixed filter styles
|
2020-08-14 17:06:08 +03:00 |
|
|
|
7bd1e7abe1
|
Web: Files: added version api
|
2020-08-14 13:02:23 +03:00 |
|
|
|
0626d82fa8
|
Web: Files: added unblock/check-in api
|
2020-08-13 14:42:29 +03:00 |
|
Ilya Oleshko
|
37fe1cab21
|
Merge branch 'master' into feature/files
|
2020-08-12 18:05:29 +03:00 |
|
Artem Tarasov
|
c6d1198ae0
|
deleted console.log, simple condition
|
2020-08-12 16:38:34 +03:00 |
|
Alexey
|
73d1cf269b
|
Web: Common: Added keyboard events to MediaViewer
|
2020-08-12 16:11:30 +03:00 |
|
Artem Tarasov
|
1503bc105b
|
fix link
|
2020-08-12 11:54:08 +03:00 |
|
|
|
181c1e52f4
|
Web: Files: added version history api
|
2020-08-12 11:08:04 +03:00 |
|
|
|
408de4246f
|
Web: Common: fixed files selection
|
2020-08-11 17:49:20 +03:00 |
|
|
|
5f32a94db0
|
Web: Common: fixed file selection
|
2020-08-11 17:36:22 +03:00 |
|
Ilya Oleshko
|
fdbdf6a8b6
|
Web: Common: PageLayout: Fixed selection on draging
|
2020-08-11 15:53:39 +03:00 |
|
Ilya Oleshko
|
211b20499f
|
Web: Common: Login: Fixed Login container
|
2020-08-11 15:40:34 +03:00 |
|
Ilya Oleshko
|
3de0e34389
|
Web: Common: PageLayout: Fixed StudioLayout container
|
2020-08-11 15:39:17 +03:00 |
|
Ilya Oleshko
|
47889d384f
|
Web: Common: PageLayout: Fixed PrivateRoute container
|
2020-08-11 15:37:34 +03:00 |
|
Ilya Oleshko
|
89bfd913e6
|
Web: Common: PageLayout: Fixed ExternalRedirect container
|
2020-08-11 15:36:36 +03:00 |
|
Ilya Oleshko
|
66adcdcefe
|
Web: Common: PageLayout: Fixed PageLayout sub components to class components
|
2020-08-11 15:35:24 +03:00 |
|
Ilya Oleshko
|
d02afe646a
|
Web: Common: PageLayout: Fixed PageLayout for children logic
|
2020-08-11 15:34:00 +03:00 |
|
Ilya Oleshko
|
fdb4f43028
|
Web: Common: PageLayout: Removed function (new) layout
|
2020-08-11 15:31:45 +03:00 |
|
Ilya Oleshko
|
4684c6ec84
|
Web: Common: PageLayout: Added SectionBodyContent container
|
2020-08-11 15:30:14 +03:00 |
|
Ilya Oleshko
|
a2dface5ac
|
Web: Common: Filter: Moved function initialization out of render
|
2020-08-11 11:11:48 +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 |
|
Artem Tarasov
|
bdeedbbb42
|
added seLicense()
|
2020-08-03 22:36:13 +03:00 |
|
Artem Tarasov
|
555eac84b8
|
add method getIsRequiredLicense
|
2020-08-03 22:04:49 +03:00 |
|
Artem Tarasov
|
afc8803ff4
|
added timezone transfer
|
2020-08-03 16:14:05 +03:00 |
|
Artem Tarasov
|
90cda6ef62
|
fixed redirect to /login
|
2020-08-03 10:57:58 +03:00 |
|
|
|
72ae1f5e9b
|
Merge branch 'master' into feature/Wizard
# Conflicts:
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Common/src/api/settings/index.js
|
2020-07-31 16:49:54 +03:00 |
|
Ilya Oleshko
|
fa8a0b92d8
|
Merge branch 'master' into feature/files
|
2020-07-31 15:05:58 +03:00 |
|
Artem Tarasov
|
d8f25319a1
|
fixed redirect drom login page
|
2020-07-31 14:31:46 +03:00 |
|
Vladislav Makhov
|
1f93279d13
|
Code format
|
2020-07-31 13:23:53 +03:00 |
|
Artem Tarasov
|
2e42c813b8
|
fixed actions
|
2020-07-30 13:50:13 +03:00 |
|
Vladislav Makhov
|
175b0f7bda
|
fix styles
|
2020-07-30 13:25:40 +03:00 |
|
|
|
5cd4a1aaa8
|
Web: Common: fixed SelectedFrame select target
|
2020-07-30 11:55:36 +03:00 |
|
Vladislav Makhov
|
13a4bae881
|
Fix toastr
|
2020-07-29 17:13:40 +03:00 |
|
Artem Tarasov
|
e949ff75ba
|
added Layout
|
2020-07-29 13:05:23 +03:00 |
|
Artem Tarasov
|
4c9a7dadfd
|
Merge branch 'master' into feature/Wizard
# Conflicts:
# web/ASC.Web.Common/src/api/settings/index.js
|
2020-07-29 11:52:18 +03:00 |
|
|
|
0231e60cc7
|
Merge branch 'master' into feature/files
# Conflicts:
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/src/components/icons/svg/index.js
# web/ASC.Web.Components/src/index.js
|
2020-07-28 17:34:46 +03:00 |
|
Vladislav Makhov
|
c54129bf33
|
Recover: fix translation
|
2020-07-28 13:25:09 +03:00 |
|
Vladislav Makhov
|
8d41d2dbc2
|
Register: add translations
|
2020-07-28 11:07:34 +03:00 |
|
Vladislav Makhov
|
5ef9d20f64
|
Register: add working with api
|
2020-07-28 11:07:12 +03:00 |
|
Vladislav Makhov
|
1f1a6891b2
|
Style fixes
|
2020-07-28 10:29:55 +03:00 |
|
Vladislav Makhov
|
ddf497bac4
|
Merge differences from master after header fix
|
2020-07-28 10:24:53 +03:00 |
|
Vladislav Makhov
|
39150efb4f
|
Merge branch 'master' into feature/new-login-page
# Conflicts:
# web/ASC.Web.Common/src/components/Layout/i18n.js
# web/ASC.Web.Common/src/components/Layout/index.js
# web/ASC.Web.Common/src/components/Layout/locales/en/translation.json
# web/ASC.Web.Common/src/components/Layout/locales/ru/translation.json
|
2020-07-27 17:28:28 +03:00 |
|
Vladislav Makhov
|
cfdf71157f
|
Fix
|
2020-07-27 16:41:15 +03:00 |
|
Vladislav Makhov
|
86170f2923
|
Fix styles
|
2020-07-27 16:36:02 +03:00 |
|
Vladislav Makhov
|
3fdfb6211d
|
Fix translation
|
2020-07-27 15:51:04 +03:00 |
|
Vladislav Makhov
|
1b6d1b24c1
|
Add api post data
|
2020-07-27 14:37:21 +03:00 |
|
Vladislav Makhov
|
64e0a940e1
|
PropTypes
|
2020-07-24 16:20:35 +03:00 |
|
