Commit Graph

4997 Commits

Author SHA1 Message Date
TatianaLopaeva
d3dde62de3 Changed max-width for mobile, changed api for UploadLicense, added path into App 2020-08-28 11:46:39 +03:00
TatianaLopaeva
2022bd4ac1 Merge branch 'feature/files' into feature/payments-enterprise
# Conflicts:
#	web/ASC.Web.Client/src/App.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/admins.js
#	web/ASC.Web.Components/src/components/icons/svg/index.js
2020-08-28 10:57:59 +03:00
TatianaLopaeva
54464c3320 Changed margin-top at header-container 2020-08-28 10:51:22 +03:00
TatianaLopaeva
6816ebc6cb Rename at index and modal-dialog-container 2020-08-28 10:50:38 +03:00
TatianaLopaeva
9bac1c0639 Added headline for payments and some translations 2020-08-28 10:49:18 +03:00
TatianaLopaeva
4fb43397d7 Added translation for payments in StudioLayoute 2020-08-28 10:48:45 +03:00
TatianaLopaeva
ca776849a1 Rename and changed store for payments 2020-08-28 10:47:38 +03:00
TatianaLopaeva
8bea385182 Added a link and icon for payments in StudioLayout 2020-08-28 10:46:37 +03:00
TatianaLopaeva
da91e178d4 Added a link to payments and icon to sidebar 2020-08-28 10:45:56 +03:00
TatianaLopaeva
a65e06f847 Delete commit at index.js 2020-08-28 10:44:03 +03:00
TatianaLopaeva
35d35af498 Added translation and style for modal-dailog-container 2020-08-28 10:43:27 +03:00
TatianaLopaeva
ca90e4b6c2 Update index.js as a class, button-container and added modal-dialog container 2020-08-28 10:41:48 +03:00
TatianaLopaeva
5561348cdf Rename click events 2020-08-28 10:41:00 +03:00
TatianaLopaeva
0e9e39387f Update files with files upload, input was hidden, some changed in reducer 2020-08-28 10:39:49 +03:00
TatianaLopaeva
58054d1d91 Added setLiscense, some translations and changed action for payments 2020-08-28 10:39:12 +03:00
TatianaLopaeva
07f9344496 Changed styles by figma 2020-08-28 10:37:49 +03:00
TatianaLopaeva
3a756ed4e9 Added division into Enterprise and SaaS, added reducer for payments 2020-08-28 10:36:26 +03:00
TatianaLopaeva
792f2368ce Changed images and rename them 2020-08-28 10:33:59 +03:00
TatianaLopaeva
745f3ed131 Added adaptation for mobile 2020-08-28 10:32:25 +03:00
TatianaLopaeva
251c222c24 Update files with containers and added adaptation for tablet 2020-08-28 10:28:23 +03:00
TatianaLopaeva
9fff932736 Changed App and images from png into svg, added action and reducer for payments 2020-08-28 10:26:39 +03:00
TatianaLopaeva
47e0b43485 Added state and propTypes 2020-08-28 09:48:44 +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
Artem Tarasov
00337a45ed web: common: bump version 2020-08-27 13:36:21 +03:00
Artem Tarasov
20cefbf1e4 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-08-27 13:35:29 +03:00
Artem Tarasov
2b36634f96 added Error403 2020-08-27 13:33:06 +03:00
5633d2467b Merge branch 'master' into feature/files 2020-08-27 10:42:47 +03:00
Artem Tarasov
84d4446b23 added api methods for settings, refactoring 2020-08-27 10:38:46 +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
65149259a9 web: components: bump version 2020-08-26 13:14:58 +03:00
0178acb2f0 Web: Components: fixed drag-and-drop styles 2020-08-26 13:14:36 +03:00
0c518770d9 web: common: bump version 2020-08-26 11:35:50 +03:00
0996222642 web: components: bump version 2020-08-26 11:35:38 +03:00
82af63f80d Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-08-26 11:35:19 +03:00
60bf8d02f1 Web: Components: added react-dropzone library to drag-and-drop component 2020-08-26 11:34:01 +03:00
28dc9efd16 Web: Common: moved DragAndDrop component 2020-08-26 11:30:46 +03:00
b91d86340c web: common: bump version 2020-08-25 16:28:35 +03:00
667b3f0032 web: common: Fixed Cannot update a component from inside the function body of a different component (issue: call of i18n.changeLanguage without useEffect) 2020-08-25 16:28:14 +03:00
9f3413841e web: common: bump version 2020-08-25 14:09:32 +03:00
366821d868 Web: Common: fixed filter 2020-08-25 14:03:49 +03:00
Ilya Oleshko
46425cd159 web: common: bump version 2020-08-25 13:07:38 +03:00
Ilya Oleshko
a003d65f66 Web: People: FilterBlock : Fixed showItem condition for simple selector 2020-08-25 13:07:22 +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
ded117d37a web: components: bump version 2020-08-24 11:21:57 +03:00
232da628f8 Web: Components: fixed tree styles, fixed main button styles 2020-08-24 11:20:40 +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
e9b0775605 web: common: bump version 2020-08-21 17:38:38 +03:00
42927df84d Web: Common: fixed selector selected group 2020-08-21 17:38:11 +03:00
b372705c3f web: components: bump version 2020-08-21 16:20:15 +03:00
f29fad894f web: common: bump version 2020-08-21 16:20:01 +03:00
fd587b7f6b Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-08-21 16:19:52 +03:00
7982449828 Web: Components: fixed the display of the context-menu-button 2020-08-21 16:19:09 +03:00
76d48fabdd Web: Common: fixed the display and closing of the filter 2020-08-21 16:18:17 +03:00
maksim
280604e41d ASC.Data.Storage.Migration: adding protocol buffers and event listening 2020-08-21 11:05:27 +03:00
fd5a9a74f0 Merge branch 'master' into feature/files 2020-08-20 17:51:14 +03:00
4501d3229a Nuget: replaced thirdparty 2020-08-20 17:50:08 +03:00
c480404b22 web: components: bump version 2020-08-20 17:42:09 +03:00
28b6f56aee web: common: bump version 2020-08-20 17:41:50 +03:00
603a8bbbc5 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-08-20 17:40:52 +03:00
2c17848368 Web: Components: fixed context menu displayType state 2020-08-20 17:40:35 +03:00
d58cdc3cc5 Web: Common: fixed selector styles 2020-08-20 17:39:57 +03:00
49f77646a5 web: common: bump version 2020-08-20 12:46:31 +03:00
9620f56594 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-08-20 12:46:06 +03:00
14abe9c3f4 Web: Common: fixed profile menu 2020-08-20 12:45:59 +03:00
22a2cd3e4b Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-08-20 12:43:27 +03:00
15ba6828c5 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
2020-08-20 12:43:12 +03:00
d5942241e8 Web: Clients: Parallelized initial API queries 2020-08-20 12:17:36 +03:00
05bc905831 Web: Clients: Fixed regex to transltaion.json files for serviceWorker 2020-08-19 21:18:23 +03:00
27f52a2dc2 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-08-19 20:00:57 +03:00
8d11e1b0c8 Web: Clients: Changed interaction with serviceWorker 2020-08-19 20:00:41 +03:00
b7b7cfeeb7 web: components: bump version 2020-08-19 17:45:26 +03:00
0f1ecd1ae2 Web: Components: update ContextMenuButton styles 2020-08-19 17:45:06 +03:00
Ilya Oleshko
c34ecd5ecb web: components: bump version 2020-08-19 15:38:52 +03:00
Ilya Oleshko
53da5042f8 Web: Components: GroupButtonsMenu : Added orientationchange event listener 2020-08-19 15:38:46 +03:00
eb19b4ee38 web: common: bump version 2020-08-19 14:58:46 +03:00
d7b5444385 Web: Common: fixed selector styles 2020-08-19 14:58:23 +03:00
140c79ad16 web: common: bump version 2020-08-19 10:39:21 +03:00
257949735f web: components: bump version 2020-08-19 10:39:08 +03:00
9b491cf1d8 Web: Common: added aside panel to context-menu-button 2020-08-19 10:37:52 +03:00
8617da3c50 Web: Components: added aside panel to context-menu-button 2020-08-19 10:36:27 +03:00
49ead142d0 web: common: bump version 2020-08-18 17:05:11 +03:00
2b37363939 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-08-18 17:04:01 +03:00
32f335ba50 Web: Common: added new styles 2020-08-18 17:02:20 +03:00
Ilya Oleshko
a23c6c3163 web: components: bump version 2020-08-18 14:46:08 +03:00
Ilya Oleshko
fc0fbec33e Web: Components: GroupButtonsMenu : Fix tests 2020-08-18 14:46:00 +03:00
TatianaLopaeva
19ba763a44 added onClick 2020-08-18 14:11:34 +03:00
Ilya Oleshko
9703c2bec4 web: components: bump version 2020-08-18 13:20:17 +03:00
Ilya Oleshko
2a5db42e40 Web: Components: GroupButtonsMenu : Fix update menu with uncommon size 2020-08-18 13:20:06 +03:00
TatianaLopaeva
e359ed7e79 update props 2020-08-18 10:55:36 +03:00
6fc134f16b web: common: bump version 2020-08-18 10:48:34 +03:00
ef34adb788 Web: Common: fixed Selector 2020-08-18 10:47:33 +03:00
TatianaLopaeva
684667d5de en support 2020-08-18 10:32:06 +03:00
TatianaLopaeva
b1f31c5bae en support 2020-08-18 10:31:22 +03:00
TatianaLopaeva
fecb7383dd added styled for desktop 2020-08-18 08:49:35 +03:00
59f54e0cd5 web: common: bump version 2020-08-17 16:49:58 +03:00
ca0ba3a828 web: components: bump version 2020-08-17 16:49:44 +03:00
9fb1a37af3 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-08-17 16:49:05 +03:00
eb9592abd5 Web: Common: fixed selector styles, fixed filter styles 2020-08-17 16:45:14 +03:00
8dba11ac56 Web: Components: fixed scroll styles, fixed separator styles 2020-08-17 16:43:47 +03:00
5d5083f40b web: common: bump version 2020-08-17 15:38:59 +03:00
d7920176e0 Web: Common: i18nBaseSettings: restored interpolation.format + turned on useSuspense 2020-08-17 15:38:53 +03:00
df96f4cd0a web: common: bump version 2020-08-17 15:37:30 +03:00
08e27857d8 web: common: bump version 2020-08-17 14:44:08 +03:00
c16c9b280a Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-08-17 14:19:19 +03:00
5542e211df Web Client: refactoring 2020-08-17 13:16:04 +03:00
Tatiana Lopaeva
271bfc1eb8 added payments 2020-08-17 12:20:24 +03:00
a1c4a8a9f5 Web Client: refactoring 2020-08-17 10:54:42 +03:00
SuhorukovAnton
faec4269db Merge branch 'master' into feature/scope 2020-08-16 12:23:20 +03:00
fb44538e69 web: common: bump version 2020-08-14 22:35:30 +03:00
105ac1a577 Web Common: simplified configuration of i18n 2020-08-14 22:32:21 +03:00
c398eb8229 Web Client: simplified configuration of i18n (+ removed useless requests) 2020-08-14 22:14:42 +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
91e3db56cb web: common: bump version 2020-08-14 17:08:08 +03:00
a5bde0148c web: components: bump version 2020-08-14 17:07:50 +03:00
129160c35e Web: Common: fixed filter styles 2020-08-14 17:06:08 +03:00
487ea08bb5 Web: Components: fixed badge styles, added isFill prop to context-menu-button 2020-08-14 17:05:47 +03:00
34696bfc37 web: common: bump version 2020-08-14 13:02:56 +03:00
7bd1e7abe1 Web: Files: added version api 2020-08-14 13:02:23 +03:00
Alexey
7199e3f7ba web: components: bump version 2020-08-14 09:35:13 +03:00
Alexey
9084bbb692 Web: Components: Added keyboard handling to SaveCancelButtons component 2020-08-14 09:35:07 +03:00
Alexey
8987b29192 Web: Components: Style fix 2020-08-14 09:21:35 +03:00
Alexey
a9627fd9ef Web: Components: Added test and storybook to SaveCancelButtons component 2020-08-14 09:05:07 +03:00
Alexey
a0e989d82b web: components: bump version 2020-08-14 08:29:23 +03:00
Alexey
fada82ae41 Web: Components: Fix rotate in avatar editor 2020-08-14 08:29:15 +03:00
59b5c5f951
Merge pull request #64 from ONLYOFFICE/feature/customization
Feature/customization
2020-08-13 18:42:59 +03:00
18e3ff6bc6 web: common: bump version 2020-08-13 14:42:57 +03:00
0626d82fa8 Web: Files: added unblock/check-in api 2020-08-13 14:42:29 +03:00
Alexey
58e73a9ffb Web: Client: Settings: Refactoring 2020-08-13 14:21:59 +03:00
Alexey
cc0c852ae1 Web: Client: Settings: code formatting 2020-08-13 12:01:45 +03:00
Alexey
6d1a78922d Web: Client: Settings: Refactoring 2020-08-13 11:11:03 +03:00
4891311488 Merge branch 'feature/files' into feature/customization
# Conflicts:
#	web/ASC.Web.Components/src/components/icons/svg/index.js
2020-08-13 10:15:11 +03:00
5795c6f324 Merge branch 'feature/files' into feature/customization
# Conflicts:
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Components/src/index.js
2020-08-13 10:07:14 +03:00
3c32cf3f9f web: components: bump version 2020-08-13 09:59:44 +03:00
b60dad90b8 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-08-13 09:59:13 +03:00
f0d2d42e97 Web: Components: added new icons 2020-08-13 09:57:21 +03:00
Ilya Oleshko
6f7ff8cee9 web: components: bump version 2020-08-12 18:23:46 +03:00
Ilya Oleshko
b005ae7c50 Web: Components: Fix missing import 2020-08-12 18:22:22 +03:00
Ilya Oleshko
37fe1cab21 Merge branch 'master' into feature/files 2020-08-12 18:05:29 +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
Alexey
512de9658e web: common: bump version 2020-08-12 16:11:37 +03:00
Alexey
73d1cf269b Web: Common: Added keyboard events to MediaViewer 2020-08-12 16:11:30 +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
Alexey
a8c0973d42 Merge branch 'feature/files' into feature/customization 2020-08-12 11:57:32 +03:00
Artem Tarasov
1503bc105b fix link 2020-08-12 11:54:08 +03:00
Alexey
b3ebf23c7b Web: Client: revert customization refactoring 2020-08-12 11:52:46 +03:00
57cd398457 web: common: bump version 2020-08-12 11:08:42 +03:00
181c1e52f4 Web: Files: added version history api 2020-08-12 11:08:04 +03:00
Alexey
63fbf522c9 web: components: bump version 2020-08-12 09:04:08 +03:00
Alexey
f252c91966 Web: Components: Moved avatar rotation button 2020-08-12 09:03:56 +03:00
d529fcd69c web: common: bump version 2020-08-11 17:49:46 +03:00
408de4246f Web: Common: fixed files selection 2020-08-11 17:49:20 +03:00
5c67e42a74 web: common: bump version 2020-08-11 17:36:59 +03:00
5f32a94db0 Web: Common: fixed file selection 2020-08-11 17:36:22 +03:00
Ilya Oleshko
7e8fb518ce web: common: bump version 2020-08-11 16:00:25 +03:00
Ilya Oleshko
fdbdf6a8b6 Web: Common: PageLayout: Fixed selection on draging 2020-08-11 15:53:39 +03:00
Ilya Oleshko
09e67be27e Web: Client: About: Fixed page wrapper 2020-08-11 15:47:31 +03:00
Ilya Oleshko
8709e83f9a Web: Client: Confirm: Fixed sub pages containers 2020-08-11 15:46:50 +03:00
Ilya Oleshko
4800942452 Web: Client: Home: Fixed page container 2020-08-11 15:45:15 +03:00
Ilya Oleshko
ee0a040fb7 Web: Client: Settings: Fixed customization page container 2020-08-11 15:44:28 +03:00
Ilya Oleshko
f2f85f0ddc Web: Client: Settings: Fixed Layout container 2020-08-11 15:43:12 +03:00
Ilya Oleshko
7bd5ff0b4f Web: Client: Fixed ConfirmRoute wrapper 2020-08-11 15:41:45 +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
bcda6bf69f Api: refresh license 2020-08-11 11:52:39 +03:00
Ilya Oleshko
8a2de16b91 web: common: bump version 2020-08-11 11:23:08 +03:00
Ilya Oleshko
a2dface5ac Web: Common: Filter: Moved function initialization out of render 2020-08-11 11:11:48 +03:00
Ilya Oleshko
dd73e1ca7f web: components: bump version 2020-08-11 11:05:21 +03:00
Ilya Oleshko
0a17c876a6 Web: Components: Fixed test warning for ProgressBar 2020-08-11 11:04:08 +03:00
Ilya Oleshko
38b781f5fc Web: Components: Moved fix for GroupButtonsMenu, now click action used data-api, fixed test 2020-08-11 11:03:29 +03:00
Ilya Oleshko
a5fdb4a5a9 Web: Components: Moved fix for GroupButton, now click action used data-api, fixed test 2020-08-11 11:03:09 +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
Alexey
9ea9da4af5 web: components: bump version 2020-08-10 13:06:38 +03:00
Alexey
4a7933cab6 Merge branch 'feature/files' into feature/customization 2020-08-10 12:59:53 +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
9362a05d57 web: components: bump version 2020-08-06 14:48:27 +03:00
866df98ca9 Web: Components: fixed button warning 2020-08-06 14:47:16 +03:00
Alexey
d514d8399b Web: Client: Settings: Added translate keys, refactoring 2020-08-06 10:50:04 +03:00
Alexey
2a0641decb Web: Components: Added SaveCancelButtons component 2020-08-06 10:00:41 +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
Alexey
5a93916314 Web: Client: Settings: Refactoring 2020-08-05 18:08:49 +03:00
Artem Tarasov
5c8efbd7c5 upload license 2020-08-05 15:27:28 +03:00
a8576da190 web: components: bump version 2020-08-05 15:19:53 +03:00
Alexey
2dd3f6e3fa Web: Client: Settings: Fixed save custom title 2020-08-05 15:19:51 +03:00
2805c4e31c Web: Components: added tabIndex to scroll 2020-08-05 15:19:07 +03:00
Alexey
dba555e2b7 Web: Client: Settings: Updated customization and custom-titles pages, small actions fix 2020-08-04 17:53:32 +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
Alexey
5148c7d54e Web: Client: Settings: Added SaveSettingsButtons component to custom-tiles page 2020-08-04 10:46:36 +03:00
58a0b5dd7a Settings: remove check password settings 2020-08-04 10:32:40 +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
1dd404187b Settings: fix 2020-08-03 18:34:53 +03:00
178bf82c28 Settings: fix 2020-08-03 17:06:37 +03:00
39b984debd Settings: added license/required and license upload 2020-08-03 16:42:59 +03:00
Artem Tarasov
afc8803ff4 added timezone transfer 2020-08-03 16:14:05 +03:00
f6d71ad1f6 Wizard: Complete. Timezone 2020-08-03 15:01:02 +03:00
a6b11e84c5 Settings: Added create timezones 2020-08-03 14:22:22 +03:00
Artem Tarasov
588c043046 Merge branch 'feature/Wizard' of github.com:ONLYOFFICE/AppServer into feature/Wizard 2020-08-03 11:06:18 +03:00
Artem Tarasov
90cda6ef62 fixed redirect to /login 2020-08-03 10:57:58 +03:00
0a8bf7f830 Merge branch 'feature/Wizard' of github.com:ONLYOFFICE/AppServer into feature/Wizard 2020-08-02 21:04:27 +03:00
4b6c0a0261 Merge branch 'master' into feature/Wizard 2020-08-02 21:03:56 +03:00
Alexey
c5a99950d5 Web: Client: Settings: Fixed save button event 2020-08-02 11:03:08 +03:00
Alexey
547e95f8e9 Web: Client: Settings: Show a reminder only after re-visiting the page with unsaved changes 2020-08-02 10:36:15 +03:00
Alexey
d588567ac6 Web: Client: Settings: SaveSettingsButtons mobile style fix 2020-08-02 09:38:59 +03:00
Alexey
1d1740e7e4 Web: Client: Settings: Added a handler for the cancel button 2020-08-02 07:54:44 +03:00
Artem Tarasov
f988fa5573 refactoring layout 2020-08-01 19:10:21 +03:00
Artem Tarasov
d13383f507 refactoring styles 2020-08-01 02:00:40 +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
Artem Tarasov
652371a42c fixed layout 2020-07-31 16:02:59 +03:00
Artem Tarasov
f95d788516 fixed modal 2020-07-31 15:20:12 +03:00
Ilya Oleshko
b11f0b4700 web: common: bump version 2020-07-31 15:11:09 +03:00
Ilya Oleshko
df44923e5a web: components: bump version 2020-07-31 15:10:53 +03:00
Ilya Oleshko
fa8a0b92d8 Merge branch 'master' into feature/files 2020-07-31 15:05:58 +03:00
Artem Tarasov
b40a6d91bc added ErrorContainer if wizard not init 2020-07-31 15:05:28 +03:00
Artem Tarasov
d8f25319a1 fixed redirect drom login page 2020-07-31 14:31:46 +03:00
Vladislav Makhov
6463e30762 Merge branch 'feature/new-login-page' of github.com:ONLYOFFICE/AppServer into feature/new-login-page 2020-07-31 13:24:08 +03:00
Vladislav Makhov
1f93279d13 Code format 2020-07-31 13:23:53 +03:00
07649e2dac web: components: bump version 2020-07-31 12:15:19 +03:00
8ce8aed45d Web: Files: fixed items select 2020-07-31 12:14:44 +03:00
Alexey
c014cdff3b Merge branch 'feature/customization' of github.com:ONLYOFFICE/AppServer into feature/customization 2020-07-31 11:35:29 +03:00
Alexey
f497aa5ba2 Web: Client: Settings: Added saveSettingButtons component, added system for saving temporary settings without applying 2020-07-31 11:35:14 +03:00
5da656e41d web: components: bump version 2020-07-31 11:31:30 +03:00
08ba989ab5 Web: Components: fixed row warning 2020-07-31 11:30:55 +03:00
ffed684c3b web: components: bump version 2020-07-31 11:15:25 +03:00
2c83d4a6f1 Web: Components: added support for right-clicking on a row and click a context-menu-button 2020-07-31 11:08:33 +03:00
SuhorukovAnton
73fff2e63c Merge branch 'master' into feature/scope 2020-07-30 16:39:52 +03:00
SuhorukovAnton
f89c3eefe6 scope: refactoring 2020-07-30 16:33:54 +03:00
Artem Tarasov
a1d2c2c4f0 Merge branch 'master' into feature/Wizard 2020-07-30 16:04:11 +03:00
Ilya Oleshko
d575bc610d Merge branch 'master' into feature/new-login-page 2020-07-30 16:03:02 +03:00
Artem Tarasov
0cb324682a web: components: bump version 2020-07-30 14:17:51 +03:00
Artem Tarasov
3674d56373 added display setting for texttooltip 2020-07-30 14:16:44 +03:00
Artem Tarasov
84773e6c13 Merge branch 'master' into feature/input-password-wizard 2020-07-30 13:51:51 +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
Artem Tarasov
d09b512126 web: components: bump version 2020-07-30 13:08:28 +03:00
Artem Tarasov
2a049f8d78 before merge 2020-07-30 13:07:05 +03:00
6fabf36bbf web: common: bump version 2020-07-30 11:56:20 +03:00
5cd4a1aaa8 Web: Common: fixed SelectedFrame select target 2020-07-30 11:55:36 +03:00
e1a16e54c9 web: components: bump version 2020-07-30 11:10:46 +03:00
ceaead8ee6 Web: Components: added new class names to row 2020-07-30 11:09:50 +03:00
Artem Tarasov
70b95179f0 refactoring 2020-07-29 23:27:56 +03:00
Vladislav Makhov
3728ab1018 Login checkbox: fix console error 2020-07-29 21:32:50 +03:00
Artem Tarasov
0bafcc7b1d refactoring 2020-07-29 19:01:57 +03:00
Artem Tarasov
baf77c3979 fix styles, refactoring 2020-07-29 18:16:16 +03:00
Vladislav Makhov
871b03a4cf Recover modal: fix console errors 2020-07-29 17:44:42 +03:00
Vladislav Makhov
13a4bae881 Fix toastr 2020-07-29 17:13:40 +03:00
Artem Tarasov
f09a959e84 fix 2020-07-29 14:01:29 +03:00
Artem Tarasov
232351af6c fix 2020-07-29 14:00:59 +03:00
Artem Tarasov
2bdac8f586 fix 2020-07-29 13:50:59 +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
Artem Tarasov
53e8550621 fixed style, added props minWidth 2020-07-29 11:32:57 +03:00
Artem Tarasov
8015f5bf90 web: components: bump version 2020-07-29 09:59:58 +03:00
Artem Tarasov
c4ce07bec7 fix layout 2020-07-29 09:59:39 +03:00
Artem Tarasov
c14d2a47dc Merge branch 'master' into feature/input-password-wizard
# Conflicts:
#	web/ASC.Web.Components/package.json
2020-07-29 09:39:01 +03:00
Alexey
dffe73d470 Merge branch 'feature/files' into feature/customization 2020-07-29 08:54:00 +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
2371953954 Settings: fix greetingsettings 2020-07-28 14:41:51 +03:00
Vladislav Makhov
4aed1a7a09 Merge branch 'feature/new-login-page' of github.com:ONLYOFFICE/AppServer into feature/new-login-page 2020-07-28 13:32:36 +03:00
Vladislav Makhov
c54129bf33 Recover: fix translation 2020-07-28 13:25:09 +03:00
c325cb139d Settings: added authproviders and login.ashx 2020-07-28 11:13:49 +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
Alexey
e7d3b6000b Web: Client: Settings: Fix mobile styles on customization page 2020-07-28 10:17:32 +03:00
Alexey
7982194f5a Web: Client: Settings: Fix language-and-time-zone and customization pages, refactoring 2020-07-27 18:13:01 +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
Alexey
3ec06cab83 Web: Client: Settings: Fix custom-tiles page, refactoring 2020-07-27 17:24:41 +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
Alexey
27055fb58a Web: Client: Settings: Refactoring customization page 2020-07-27 14:39:28 +03:00
Vladislav Makhov
1b6d1b24c1 Add api post data 2020-07-27 14:37:21 +03:00
Alexey
c2ad40995e Web: Client: Settings: Added custom-titles page, updated customization page 2020-07-27 09:38:02 +03:00
f9dc19526c Added sendjoininvite, sendadmmail 2020-07-24 17:01:20 +03:00
Vladislav Makhov
64e0a940e1 PropTypes 2020-07-24 16:20:35 +03:00
Vladislav Makhov
c07f4cf713 Set mock 2020-07-24 16:04:54 +03:00
Vladislav Makhov
7a3ff1c401 Fix validate 2020-07-24 15:50:54 +03:00
Vladislav Makhov
5315eb3bfc Fix styles 2020-07-24 15:47:08 +03:00
Vladislav Makhov
362f1cca02 Fix render 2020-07-24 15:35:24 +03:00
Vladislav Makhov
b3abfa05cc Add recover access 2020-07-24 15:31:23 +03:00
Artem Tarasov
aca4ce9c32 added checking, refacktoring 2020-07-24 15:30:11 +03:00
Vladislav Makhov
68f3139c46 Add translations 2020-07-24 15:12:31 +03:00
Vladislav Makhov
05ade13438 Add UnionIcon 2020-07-24 15:02:34 +03:00
Vladislav Makhov
01341cf4ba web: components: bump version 2020-07-24 15:02:15 +03:00
Vladislav Makhov
749702248d Refactor 2020-07-24 14:49:01 +03:00
Vladislav Makhov
53cb292fa9 Fix styles 2020-07-24 14:48:54 +03:00
Vladislav Makhov
e751296adb Unauth header init 2020-07-24 14:21:13 +03:00
Vladislav Makhov
20b67c8261 Fix Box export 2020-07-24 14:18:03 +03:00
Vladislav Makhov
aa1f8959ab web: components: bump version 2020-07-24 14:17:37 +03:00
3d449d4863 web: components: bump version 2020-07-24 13:53:03 +03:00
779c81037f Web: Components: hid the drop-down in the progress bar 2020-07-24 13:51:10 +03:00
Artem Tarasov
f6d0e5aab7 fix style 2020-07-24 12:14:41 +03:00
8683983ae0 web: common: bump version 2020-07-24 10:37:03 +03:00
226dfc79df Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-07-24 10:35:05 +03:00
f8345f18ce Web: Common: fixed SelectedFrame, added scrolling, fixed selection in tile display 2020-07-24 10:34:53 +03:00
Artem Tarasov
cbda5efd21 refactoring styles of settings-box 2020-07-24 09:39:11 +03:00
Artem Tarasov
64d488a550 Merge branch 'master' into feature/Wizard 2020-07-24 08:49:38 +03:00
Artem Tarasov
fb61263fde web: components: bump version 2020-07-23 19:12:42 +03:00
Artem Tarasov
499451892e Merge branch 'master' into feature/input-password-wizard 2020-07-23 19:05:56 +03:00
Alexey
b35af29ec8 Web: Client: Settings: Updated section header, refactoring 2020-07-23 18:56:57 +03:00
Artem Tarasov
cfd0cf7bb6 fix tests 2020-07-23 18:45:00 +03:00
Artem Tarasov
da546fbb86 web: components: bump version 2020-07-23 16:43:51 +03:00
Artem Tarasov
08f5b5e0f8 fixed outline, fixed error when file upload refused, export fix 2020-07-23 16:42:49 +03:00
Alexey
e067346d2c Web: Client: Settings: Routing, updated tree 2020-07-23 16:37:18 +03:00
Vladislav Makhov
14867e5af2 Fix view 2020-07-23 16:35:04 +03:00
Artem Tarasov
5bf6f7de50 added onInputFileHandler 2020-07-23 16:26:32 +03:00
Vladislav Makhov
54117509ff Fix styles 2020-07-23 16:07:35 +03:00
Vladislav Makhov
2d5c92b628 Move props to a separate file 2020-07-23 15:54:55 +03:00
Artem Tarasov
8fd658ced9 added FileInput 2020-07-23 15:52:20 +03:00
Vladislav Makhov
c146edbc3a Refactoring 2020-07-23 15:39:19 +03:00
Vladislav Makhov
7d3d79eb5d Fix styles 2020-07-23 15:37:35 +03:00
Vladislav Makhov
3adb650e12 Add translations 2020-07-23 15:22:24 +03:00
Vladislav Makhov
ae59b91a85 Add register modal dialog 2020-07-23 15:22:09 +03:00
Vladislav Makhov
0c905a3e7a Rename modal-dialog.js to forgot-password-modal-dialog.js 2020-07-23 15:20:59 +03:00
Artem Tarasov
92a09334a4 Merge branch 'master' into feature/Wizard 2020-07-23 13:42:21 +03:00
Artem Tarasov
ad65f3eb1b web: components: bump version 2020-07-23 13:39:15 +03:00
Artem Tarasov
64083849ff Merge branch 'master' into feature/input-password-wizard 2020-07-23 13:38:52 +03:00
Artem Tarasov
a0b99cc097 refactoring 2020-07-23 12:35:42 +03:00
Artem Tarasov
6a3922accc added functionality to change email 2020-07-23 11:16:55 +03:00
Artem Tarasov
dcee7b97b8 layout fix, added new view 2020-07-23 11:03:30 +03:00