Commit Graph

5435 Commits

Author SHA1 Message Date
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
Vladislav Makhov
a92dec4449 Add register visibility 2020-07-23 09:50:42 +03:00
Artem Tarasov
037bed591f styles fix 2020-07-22 18:47:37 +03:00
Vladislav Makhov
ee21cb1a8b Merge branch 'feature/new-login-page' of github.com:ONLYOFFICE/AppServer into feature/new-login-page 2020-07-22 17:00:45 +03:00
Vladislav Makhov
d192f50953 Merge branch 'master' into feature/new-login-page
# Conflicts:
#	web/ASC.Web.Components/src/components/input-block/index.js
#	web/ASC.Web.Components/src/components/password-input/index.js
2020-07-22 15:51:48 +03:00
Artem Tarasov
109b39153b added link for generate pass 2020-07-22 15:14:50 +03:00
Artem Tarasov
96b07eaf81 layout fix 2020-07-22 14:48:19 +03:00
820117cb04 Api: added SaveMailDomainSettings, EnableAdminMessageSettings 2020-07-22 14:03:38 +03:00
Vladislav Makhov
967757b348 Fix styles 2020-07-22 13:47:56 +03:00
Artem Tarasov
8c5688387b web: components: bump version 2020-07-22 13:24:15 +03:00
Artem Tarasov
11fb04e75d added tests 2020-07-22 13:23:28 +03:00
Artem Tarasov
1a0de3fe01 update readme 2020-07-22 13:16:50 +03:00
Artem Tarasov
65c7381eba layout fix 2020-07-22 11:34:31 +03:00
Artem Tarasov
d42cffb0ce added prop to show TextTooltip 2020-07-22 11:26:42 +03:00
Artem Tarasov
ab2ee3f26f added prop to hide Tooltip 2020-07-22 10:10:21 +03:00
Artem Tarasov
626fcda87d added prop to hide newPasswordButton 2020-07-22 09:20:20 +03:00
Artem Tarasov
9414fad3d1 fix 2020-07-22 08:52:59 +03:00
Artem Tarasov
5e3b3228d6 web: components: bump version 2020-07-21 17:30:21 +03:00
Artem Tarasov
41daa4e157 Merge branch 'master' into feature/input-file 2020-07-21 17:29:58 +03:00
Artem Tarasov
b0585d4ec0 fix layout 2020-07-21 17:00:12 +03:00
Artem Tarasov
baaa29172d fix bug 2020-07-21 16:30:22 +03:00
Artem Tarasov
923c1bf0fa Merge branch 'master' into feature/Wizard
# Conflicts:
#	web/ASC.Web.Components/src/components/password-input/index.js
2020-07-21 15:14:10 +03:00
Artem Tarasov
ee86ce8140 added settings pass 2020-07-21 15:10:09 +03:00
d085530b8d web: components: bump version 2020-07-21 15:02:46 +03:00
d4bf98d932 Web: Components: Added large size to propTypes 2020-07-21 15:02:32 +03:00
Artem Tarasov
3865909d9a fixed margin settings 2020-07-21 14:44:17 +03:00
Artem Tarasov
55c19bbd43 fixed Button 2020-07-21 14:01:54 +03:00
Artem Tarasov
098fa8dd3a fixed EmailInput 2020-07-21 13:55:54 +03:00
Artem Tarasov
d1561a1954 delete translation for tooltip pasword input 2020-07-21 13:50:14 +03:00
Artem Tarasov
228edd119d fixe PasswordInput 2020-07-21 13:49:16 +03:00
Artem Tarasov
1a8aacebdc Merge branch 'master' into feature/Wizard
# Conflicts:
#	common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
#	common/ASC.Resource.Manager/Startup.cs
#	web/ASC.Web.Components/src/components/password-input/index.js
2020-07-21 13:13:47 +03:00
Vladislav Makhov
a4d1481faf tabIndex fix 2020-07-20 17:41:17 +03:00
Vladislav Makhov
19355a9a58 Fix autofocus 2020-07-20 17:23:47 +03:00
Alexey
cb0a734a78 Web: Components: Updated tree-menu in settings section 2020-07-20 16:22:52 +03:00
Vladislav Makhov
bda1b1c6a8 Fix console errors 2020-07-20 16:07:36 +03:00
Vladislav Makhov
36fc8875fb Fix console errors 2020-07-20 16:01:59 +03:00
Vladislav Makhov
6b39d62e0b Delete unused code 2020-07-20 16:01:11 +03:00
Vladislav Makhov
16b12e210a Fix console errors 2020-07-20 15:39:46 +03:00
Vladislav Makhov
dabba4514e Fix styles 2020-07-20 15:39:33 +03:00
Artem Tarasov
2051989917 web: components: bump version 2020-07-20 14:12:45 +03:00
Artem Tarasov
9bef9d112d removed unsed class 2020-07-20 13:57:33 +03:00
Artem Tarasov
a7b23fd127 fix icon color and cursor 2020-07-20 13:55:14 +03:00
Artem Tarasov
b39f0a7a0b Merge branch 'master' of github.com:ONLYOFFICE/AppServer into feature/input-file 2020-07-20 12:06:40 +03:00
Vladislav Makhov
df3f01a18c Merge branch 'master' into feature/new-login-page 2020-07-20 11:54:06 +03:00
Vladislav Makhov
cb635607e6 web: components: bump version 2020-07-20 10:39:41 +03:00
Vladislav Makhov
f0d8c8e6ce Update README.md 2020-07-20 10:37:35 +03:00
Vladislav Makhov
02794bacc9 Add body padding prop 2020-07-20 10:37:23 +03:00
Artem Tarasov
e6fe415043 added in email-input.stories.js value large for prop size 2020-07-20 10:22:14 +03:00
Artem Tarasov
5901f9956e fix render 2020-07-20 10:21:20 +03:00
Vladislav Makhov
12bc78f3a9 Fix console error 2020-07-20 10:17:21 +03:00
Vladislav Makhov
30631f0ce5 Fix validate 2020-07-18 08:37:25 +03:00
Vladislav Makhov
e769ff55c2 Fix styles 2020-07-18 08:35:28 +03:00
be81ca291d Update yarn.lock files + bump versions 2020-07-17 18:03:08 +03:00
d094546147 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Client/yarn.lock
#	products/ASC.Files/Core/ASC.Files.Core/Core/FileStorageService.cs
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/yarn.lock
2020-07-17 17:48:50 +03:00
ea318c3b05 Merge branch 'master' into feature/new-login-page 2020-07-17 17:44:28 +03:00
ec20c66c5d Update yarn.lock files 2020-07-17 17:43:39 +03:00
c4f3ef8003 Fixed ReferenceError: babelHelpers is not defined (Changed package version to fixed) 2020-07-17 17:43:24 +03:00
Artem Tarasov
305edd419c isDisabled fix 2020-07-17 15:58:28 +03:00
Artem Tarasov
e524adc21a added tests 2020-07-17 15:28:58 +03:00
Artem Tarasov
aae292ca41 added PropTypes 2020-07-17 15:16:14 +03:00
Artem Tarasov
121a00f330 added readme 2020-07-17 14:33:59 +03:00
562abfcdc9 DI: refactoring 2020-07-17 13:52:28 +03:00
Artem Tarasov
8ab56cbb18 Merge branch 'master' into feature/input-file 2020-07-17 12:49:25 +03:00
Artem Tarasov
397b12973f added text-overflow 2020-07-17 12:16:53 +03:00
Artem Tarasov
d782575f42 fix onInput 2020-07-17 11:49:54 +03:00
Artem Tarasov
1232398789 added input accept props 2020-07-17 11:34:52 +03:00
Artem Tarasov
1919277107 added onInputFile handler 2020-07-17 11:31:23 +03:00
Vladislav Makhov
787b3c2a80 Merge branch 'master' into feature/new-login-page
# Conflicts:
#	web/ASC.Web.Components/src/components/password-input/index.js
#	web/ASC.Web.Components/src/components/password-input/password-input.stories.js
2020-07-17 10:34:33 +03:00
Artem Tarasov
3d6e2c667f fixed hover style 2020-07-17 10:15:58 +03:00
Artem Tarasov
496457c427 warning, error, active, hover style 2020-07-16 23:32:18 +03:00
Artem Tarasov
7be7073908 added styles for border 2020-07-16 17:40:45 +03:00
Artem Tarasov
8e817c7c91 Merge branch 'master' into feature/input-file 2020-07-16 16:42:50 +03:00
Artem Tarasov
b599d5f163 added styles for property size 2020-07-16 16:38:34 +03:00
679e77a3ea Update yarn.lock files 2020-07-16 16:09:09 +03:00
Vladislav Makhov
20fcb5dab7 Merge branch 'master' into feature/field-container-label-view 2020-07-16 16:07:48 +03:00
098e872a38 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Client/yarn.lock
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Common/yarn.lock
#	web/ASC.Web.Components/package.json
#	web/ASC.Web.Components/yarn.lock
2020-07-16 15:58:43 +03:00
42b0275f5c web: components: bump version 2020-07-16 15:54:52 +03:00
f0b50f7185 web: common: bump version 2020-07-16 15:54:24 +03:00
ec8c6a5ddb Fixed security vulnerability in lodash 2020-07-16 15:54:04 +03:00
Vladislav Makhov
95f96d9a7c web: components: bump version 2020-07-16 15:44:46 +03:00
Vladislav Makhov
01867762f0 Update README.md 2020-07-16 15:44:28 +03:00
Vladislav Makhov
587058c4c1 Add visibility of field label section 2020-07-16 15:44:15 +03:00
78b10ab893 Update yarn.lock files 2020-07-16 14:55:40 +03:00
0e351b88d7 web: components: bump version 2020-07-16 14:41:56 +03:00
8d0d5fd908 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Core/ASC.Files.Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/ASC.Files.Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/ASC.Files.Core/Core/FileStorageService.cs
#	web/ASC.Web.Components/package.json
2020-07-16 14:41:32 +03:00
Vladislav Makhov
85dcdb5689 Merge branch 'master' into feature/password-input-simple-view 2020-07-16 14:32:11 +03:00
Vladislav Makhov
8a907a0df7 Fix hover color 2020-07-16 14:27:42 +03:00
Artem Tarasov
045688390b Merge branch 'master' into feature/input-file 2020-07-16 13:09:37 +03:00
Artem Tarasov
4fb3b16fd2 add scale 2020-07-16 13:08:09 +03:00
Artem Tarasov
e42d5d2c3f icon position fix 2020-07-16 12:37:22 +03:00
Artem Tarasov
b5c066c957 fixed Loader size and position 2020-07-16 12:31:18 +03:00
Artem Tarasov
5a5ebe651e fixed Loader in Button and propTypes 2020-07-16 12:10:50 +03:00
Vladislav Makhov
d258a640c0 web: components: bump version 2020-07-16 11:59:31 +03:00
Vladislav Makhov
fd6d90a797 Fix styles 2020-07-16 11:59:17 +03:00
Vladislav Makhov
423f148cfb Update icon pic 2020-07-16 11:58:58 +03:00
Artem Tarasov
eb97b2f212 created Component FileInput 2020-07-16 11:42:10 +03:00
Alexey
b4304d8526 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-07-16 11:33:17 +03:00
Vladislav Makhov
2ffb65eec8 Fix icon 2020-07-16 10:53:12 +03:00
Vladislav Makhov
545a5d0431 Update README.md 2020-07-16 10:38:13 +03:00
Vladislav Makhov
2a4df5fd55 Add simple view option 2020-07-16 10:30:30 +03:00
576e8a6de0 Files: revert 2020-07-16 00:49:25 +03:00
f18f14fa34 DocumentService: fix 2020-07-16 00:36:48 +03:00
cb1bf99393 Files: fix 2020-07-16 00:25:19 +03:00
f03ab16127 Converter: fix 2020-07-16 00:08:28 +03:00
d99f6ff0a5 Files: additional logging 2020-07-15 23:39:43 +03:00
Artem Tarasov
cdf487bc74 Merge branch 'master' into feature/Button-large 2020-07-15 22:17:48 +03:00
Artem Tarasov
e2b9789e6f added test for large prop 2020-07-15 19:14:00 +03:00
Alexey
3fd30e7a83 web: common: bump version 2020-07-15 19:06:14 +03:00
Alexey
965b2e97d3 Web: Common: Tile view temporarily hidden 2020-07-15 19:05:40 +03:00
Artem Tarasov
c6b81a3aac added description property size="large" in readme 2020-07-15 19:00:36 +03:00
Artem Tarasov
550da8cbe7 fix padding 2020-07-15 18:49:12 +03:00
9ee887d270 DocumentService log error 2020-07-15 18:06:35 +03:00
Artem Tarasov
3004890d98 fixed paddings 2020-07-15 17:58:33 +03:00
9d0df35a17 DocumentService log error 2020-07-15 17:58:12 +03:00
414e17ac1f DocumentService log error 2020-07-15 17:40:58 +03:00
Artem Tarasov
4b942c6964 added min-width 2020-07-15 17:34:01 +03:00
Vladislav Makhov
e5bdfe32d7 Merge branch 'master' into feature/text-input-large 2020-07-15 17:24:33 +03:00
Artem Tarasov
db7669eccd added button size large in all.button.stories.js 2020-07-15 17:20:11 +03:00
Artem Tarasov
4ee0cee88d added large button size 2020-07-15 17:17:37 +03:00
Vladislav Makhov
5393bec4af web: components: bump version 2020-07-15 17:17:18 +03:00
Vladislav Makhov
1c0db2edfd Update README.md 2020-07-15 17:09:29 +03:00
Vladislav Makhov
eac05e5750 Add large prop 2020-07-15 17:07:58 +03:00
a54be3b64c Merge branch 'master' into feature/files 2020-07-15 16:57:14 +03:00
Vladislav Makhov
a7b0968252 Add social buttons mock 2020-07-15 16:18:09 +03:00
Alexey
dd000d197d Web: Common: Removed viewSelector from people module 2020-07-15 16:12:10 +03:00
e10ac2ccfa BaseStartup: refactoring 2020-07-15 15:33:44 +03:00
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
baa71247d8 Merge branch 'master' into feature/general-startup 2020-07-15 13:06:32 +03:00
533935906f Resource: fix 2020-07-15 12:55:31 +03:00
Artem Tarasov
6d2deca3c6 layout fix 2020-07-15 11:47:21 +03:00
Vladislav Makhov
55a0c01183 Fix styles 2020-07-15 10:12:49 +03:00
Alexey
b573555024 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-07-15 08:00:04 +03:00
Alexey
62ed90e9a0 web: common: bump version 2020-07-15 07:59:56 +03:00
Alexey
e886437d83 Web: Files: Fix tile styles 2020-07-15 07:30:59 +03:00
Artem Tarasov
84ca1146a0 layout fix 2020-07-14 17:46:00 +03:00
Vladislav Makhov
5af854226a Fix styles 2020-07-14 13:40:56 +03:00
Vladislav Makhov
806f64abae Fix styles and responsive layout 2020-07-14 12:55:09 +03:00
Vladislav Makhov
505e98b1a1 Add textAlign prop (left as default) 2020-07-14 12:54:11 +03:00
88e932a0a7 Merge branch 'master' into feature/files 2020-07-13 16:46:42 +03:00
Vladislav Makhov
3b8c2f0e69 Fix responsive layout for start login page
Move header logo to a separate component
2020-07-13 16:20:02 +03:00
Alexey
41f59c9130 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-07-13 16:00:51 +03:00
Alexey
e5b71cff4f Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/store/files/actions.js
2020-07-13 16:00:32 +03:00
Ilya Oleshko
c9eb590f1e web: common: bump version 2020-07-13 15:56:36 +03:00
Ilya Oleshko
2d8b694374 Web: Common: Fixed order of returning filter props, add new 2020-07-13 15:56:24 +03:00
Alexey
8612f32ae5 web: common: bump version 2020-07-13 15:54:43 +03:00
Alexey
665915804e Web: Common: Fixed mobile view selector 2020-07-13 15:53:29 +03:00
Vladislav Makhov
001c8c2620 Fix responsive layout for textarea 2020-07-13 14:16:36 +03:00
Vladislav Makhov
7dd8308069 Fix height scale 2020-07-13 14:15:44 +03:00
Vladislav Makhov
c085d3c00d Fix styles 2020-07-13 12:28:13 +03:00
Alexey
3ca42459a1 Web: Files: Separated the logic of the Filter and ViewSelector 2020-07-13 12:10:40 +03:00
589eaa17f1 web: components: bump version 2020-07-12 20:48:49 +03:00
4efe98ff9e Revert "Fix Re-rendered because of props changes: props.onClick"
This reverts commit 7c8f84ab8b.
2020-07-12 20:48:15 +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
Artem Tarasov
491a3d32da added routing after completed Wizard 2020-07-10 18:08:22 +03:00
Vladislav Makhov
52dde654b8 Fix validate 2020-07-10 15:15:38 +03:00
Vladislav Makhov
22029e6468 Fix styles 2020-07-10 15:13:08 +03:00
58a9fc188c web: components: bump version 2020-07-10 14:39:52 +03:00
6f316242cb Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-07-10 14:38:44 +03:00
Ilya Oleshko
87a892ee73 web: components: bump version 2020-07-10 14:39:59 +03:00
Ilya Oleshko
62bdbf68a3 Web: Components: Fixed ContextMenuButton, removed bindings and added event property for onClick 2020-07-10 14:39:49 +03:00
Vladislav Makhov
900755fb37 Rename translate parameter 2020-07-10 14:21:28 +03:00
7c8f84ab8b Fix Re-rendered because of props changes: props.onClick 2020-07-10 14:15:30 +03:00
Vladislav Makhov
4e37091d9b Add email field validation 2020-07-10 14:02:44 +03:00
Vladislav Makhov
b3d2db8d10 Add error messages 2020-07-10 13:48:54 +03:00
Artem Tarasov
f8e9cfc5f0 added onKeyPressHandler 2020-07-10 13:10:54 +03:00
Vladislav Makhov
b508ca2cd4 Render fixes 2020-07-10 13:02:44 +03:00
Vladislav Makhov
229b63e04d Fix button view in aside modal 2020-07-10 13:00:59 +03:00
Artem Tarasov
486dbe1fb5 layout fix 2020-07-10 11:26:16 +03:00
Vladislav Makhov
81f6a041c7 return 100% width 2020-07-10 10:46:22 +03:00
Alexey
e07cfee5a9 web: components: bump version 2020-07-10 10:37:53 +03:00
Alexey
132242b06a Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-07-10 08:54:01 +03:00
954551873f web: common: bump version 2020-07-09 22:27:27 +03:00
d0f66c66e7 Web: Files: Implemented CompleteVersion 2020-07-09 22:26:43 +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
Artem Tarasov
8cacf241d5 fix 2020-07-09 11:42:28 +03:00
Vladislav Makhov
d8a97b0457 Add translation for placeholder 2020-07-09 11:30:13 +03:00
5988855b61 Fix License 2020-07-08 18:30:23 +03:00
Vladislav Makhov
73e189583e Fix validate 2020-07-08 18:28:04 +03:00
Vladislav Makhov
142f4c10fa Update README.md 2020-07-08 18:27:50 +03:00
Artem Tarasov
6c01f7392f added method setPortalOwner 2020-07-08 18:15:50 +03:00
Vladislav Makhov
2013cf61da Add hasError prop 2020-07-08 16:57:34 +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
Alexey
6435d8759b Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
2020-07-08 13:02:01 +03:00
Vladislav Makhov
8c4f94098a Add fields validate 2020-07-08 12:47:05 +03:00
Alexey
1a99461091 Web: Files: Added file view as tiles 2020-07-08 12:26:25 +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
Vladislav Makhov
d6ae6ae2c0 Fix password tooltip
Add translations
2020-07-08 09:41:26 +03:00
Vladislav Makhov
ae7bb806df Add adaptive styles, remove unused code 2020-07-08 09:11:51 +03:00
SuhorukovAnton
9d069de30a general-startup: transform GeneralStartup to BaseStartup 2020-07-07 23:00:39 +03:00
6b97af6df3 web: common: bump version 2020-07-07 17:56:02 +03:00
a18212da87 Web: Files: added files convert to row, fixed api 2020-07-07 17:55:01 +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
Vladislav Makhov
200b027092 Add translation, fix styles 2020-07-07 14:17:26 +03:00
SuhorukovAnton
a43c14dcb3 Merge branch 'master' into feature/api-defaultvalue 2020-07-07 12:38:35 +03:00
Vladislav Makhov
3016af962c Add input handlers 2020-07-07 12:27:01 +03:00
Vladislav Makhov
67cc4f5abc Add props validation 2020-07-07 10:43:47 +03:00
Vladislav Makhov
d113f17b2b Add pointer cursor, fix "onRecoverClick" callback event. 2020-07-07 10:42:31 +03:00
b4ac3f3113 web: common: bump version 2020-07-07 10:35:59 +03:00
925654c3f6 Web: Common: added convert api 2020-07-07 10:27:04 +03:00
Alexey
e7b4727b77 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-07-07 07:45:32 +03:00
Alexey
50ed35c9e5 Web: Files: Added folder view as tiles 2020-07-07 07:45:22 +03:00
Vladislav Makhov
44c9c728c3 Fix title styles 2020-07-06 19:19:55 +03:00
Vladislav Makhov
bc2f1fa670 add mock on send recover 2020-07-06 18:08:47 +03:00
Artem Tarasov
1a730f0750 fix redirect to /wizard 2020-07-06 18:08:34 +03:00
Vladislav Makhov
13a1218dd9 fix z-index 2020-07-06 16:12:19 +03:00
Vladislav Makhov
209262b622 Add "Register", fix styles 2020-07-06 16:06:37 +03:00
Vladislav Makhov
63dc366083 Remove unused component from import 2020-07-06 16:04: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
Artem Tarasov
83fc1b18c6 added Loader in Wizard page 2020-07-06 12:57:43 +03:00
Artem Tarasov
e1ce565504 added condition loading Wizard in PrivateRoute 2020-07-06 11:00:56 +03:00
SuhorukovAnton
00558dd95f general-startup: fix 2020-07-06 10:56:17 +03:00
0e02ee4ec3 web: components: bump version 2020-07-06 10:29:08 +03:00
d3dc618ad9 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-07-06 10:28:44 +03:00
02c40ad657 Web: Files: moved dragging prop to redux, added onDrop function to TreeFolders 2020-07-06 10:28:31 +03:00
51a993b2ea Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json
#	products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json
#	web/ASC.Web.Components/package.json
2020-07-05 14:35:14 +03:00
SuhorukovAnton
71d90ebfa2 general-startup: fix 2020-07-03 18:57:59 +03:00
Vladislav Makhov
f170ce525d Add translation for recover access 2020-07-03 16:28:20 +03:00
SuhorukovAnton
2f5491f1ba general-startup: first version 2020-07-03 14:47:27 +03:00
Artem Tarasov
6f456eaa4e cleanup 2020-07-03 12:20:07 +03:00
b534cb1d1f web: components: bump version 2020-07-03 11:43:06 +03:00
023b5169b8 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-07-03 11:42:09 +03:00
903d474194 Web: Components: fixed progressBar value 2020-07-03 11:41:38 +03:00
Vladislav Makhov
2e00b4533f Add console.log 2020-07-03 11:40:12 +03:00
Vladislav Makhov
aa4a8e4699 Add "recover access" functionality 2020-07-03 10:30:38 +03:00
SuhorukovAnton
6647217371 api-defaultvalue: fix 2020-07-02 23:51:18 +03:00
NikolayRechkin
f9fd3d5122 web: common: bump version 2020-07-02 17:18:03 +03:00
NikolayRechkin
379974e8f2 web: common: added a double tap event 2020-07-02 17:17:23 +03:00
da9423bfdc Wizard: api 2020-07-02 17:11:59 +03:00
Artem Tarasov
be462db7d9 Fixed styles, add fakeToken in auth/reducer, added redirect to Wizard in PrivateRoute 2020-07-02 16:56:00 +03:00
Vladislav Makhov
4f27d908f3 Redesign styles 2020-07-02 11:44:17 +03:00
NikolayRechkin
d4eac18a74 web: common: bump version 2020-07-02 11:03:21 +03:00
NikolayRechkin
478e03530b Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files 2020-07-02 11:03:03 +03:00
NikolayRechkin
1a32e11f2c web: Common: added a touch events 2020-07-02 11:02:50 +03:00
Artem Tarasov
94ee712c0e fixed warning 2020-06-30 17:29:54 +03:00
SuhorukovAnton
0ec331db76 api-defaultvalue: fix 2020-06-30 16:56:38 +03:00
cf3ee949da web: common: bump version 2020-06-30 15:03:28 +03:00
0025f3b858 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-06-30 15:00:57 +03:00
5c3ff62d2e Web: Files: added badge click event 2020-06-30 15:00:44 +03:00
Artem Tarasov
7326d54e96 added file upload 2020-06-30 14:43:24 +03:00
Vladislav Makhov
6015a1d101 update prop validation 2020-06-30 14:37:43 +03:00
Artem Tarasov
3286df2572 added Redux 2020-06-30 14:35:16 +03:00
Vladislav Makhov
f7799d3bdb Revert "Hide burger menu on Login Page"
This reverts commit fdd2df9265.
2020-06-30 14:35:13 +03:00
Vladislav Makhov
fdd2df9265 Hide burger menu on Login Page 2020-06-30 13:18:26 +03:00
Ilya Oleshko
6c07204658 web: common: bump version 2020-06-30 12:26:21 +03:00
Ilya Oleshko
00d9c26640 Web: Common: Fixed itemId check for filter change view 2020-06-30 12:26:14 +03:00
Ilya Oleshko
f883297700 web: common: bump version 2020-06-30 11:43:48 +03:00
Ilya Oleshko
c2a9189d4e Web: Files: Home: Filter: Added viewSettings to SortComboBox for mobile devices 2020-06-30 11:43:40 +03:00
Vladislav Makhov
5d9b713859 Add possibility to hide password generation button 2020-06-30 10:31:12 +03:00
Vladislav Makhov
bea394c230 Fix margin top 2020-06-30 09:48:06 +03:00
Alexey
8cb95b4a64 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-06-30 09:41:04 +03:00
Alexey
a3dd53878e Web: Files/Common: added ViewSelector component 2020-06-30 09:40:09 +03:00
Vladislav Makhov
8742342873 Remove cancel button from modal 2020-06-30 08:13:12 +03:00
Vladislav Makhov
199d266f18 Fix header style in modal window 2020-06-30 08:12:21 +03:00
Vladislav Makhov
582f6b1110 Fix font style 2020-06-30 08:01:54 +03:00
Vladislav Makhov
1ea6db8538 Update password field using PasswordInput component 2020-06-30 07:28:04 +03:00
Vladislav Makhov
97fa7010ea Set scale prop at the "sign in" button 2020-06-30 06:48:14 +03:00
Vladislav Makhov
a93ee38107 Rename remember text 2020-06-30 06:45:30 +03:00
Vladislav Makhov
fb386a8783 Change "forgot password" styles 2020-06-30 06:44:08 +03:00
Vladislav Makhov
8eaf1f02b7 Make greetingTitle black 2020-06-30 06:39:14 +03:00
Vladislav Makhov
df996552c3 Make Header component is available on login page 2020-06-30 06:26:31 +03:00
Artem Tarasov
80a6811f4f fixed export Box Component 2020-06-29 18:09:27 +03:00
Artem Tarasov
ed48224a7d added Redux Wizard 2020-06-29 18:07:05 +03:00
6c2352d4e5 Merge branch 'master' into feature/files 2020-06-29 17:54:33 +03:00
b035a6347e Notify: fix 2020-06-29 17:49:15 +03:00
Vladislav Makhov
05263bf36e Remove logo from FormContainer 2020-06-29 17:12:32 +03:00
c6975459cb Merge branch 'master' into feature/files 2020-06-29 16:54:44 +03:00
feedc8a1b0 Core: fix 2020-06-29 16:53:55 +03:00
6d05a77b60 Merge branch 'master' into feature/files 2020-06-29 12:40:47 +03:00
eb6be17333 Backup: removed notify reference 2020-06-29 12:32:43 +03:00
Artem Tarasov
14ddcfac38 Added translation 2020-06-29 11:34:32 +03:00
87f85fdefe Merge branch 'master' into feature/files 2020-06-29 09:53:07 +03:00
57454bae0c References updated 2020-06-28 16:55:21 +03:00
461fc55f22
Merge pull request #45 from ONLYOFFICE/feature/backup
Feature/backup
2020-06-28 16:23:36 +03:00
155e0b2c9b Backup: fix 2020-06-28 14:46:16 +03:00
Artem Tarasov
efd6e652da deleted sub-components 2020-06-26 17:57:08 +03:00
Artem Tarasov
d911f80342 Added GroupButton for TimeZones and Languages 2020-06-26 17:47:09 +03:00
2d1d09096c web: common: bump version 2020-06-26 17:41:11 +03:00
6bf6a774ef Web: Common: fix hammer off error 2020-06-26 17:40:24 +03:00
Artem Tarasov
03a355be7f added input file 2020-06-26 17:10:32 +03:00
1626d179ee web: common: bump version 2020-06-26 15:59:13 +03:00
6e37032e21 web: components: bump version 2020-06-26 15:58:43 +03:00
792f8ff7a8 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-06-26 15:55:54 +03:00
0c9fa66e36 Web: Common: added new api methods 2020-06-26 15:52:46 +03:00
6d40997d09 Web: Components: removed badge from tree-menu, fixed tree styles 2020-06-26 15:51:47 +03:00
Artem Tarasov
f412dcea1d added Modal Window 2020-06-26 13:57:05 +03:00
Artem Tarasov
07e306c6db added alternative display if owner exists 2020-06-26 11:44:32 +03:00
eafafef8df Thumb: fix 2020-06-26 11:02:21 +03:00
817d0d1bb1 Thumb: fix 2020-06-26 11:01:37 +03:00
cfdc6d495e Merge branch 'master' into feature/files 2020-06-26 09:46:04 +03:00
29a0e752bb Merge branch 'master' into feature/backup
# Conflicts:
#	ASC.Web.sln
#	web/ASC.Web.Api/Controllers/PortalController.cs
2020-06-25 19:21:42 +03:00
1798e7bb7b web: components: bump version 2020-06-25 18:14:06 +03:00
e2a80c0e0c Web: Components: Passed event to onClick handler 2020-06-25 18:11:34 +03:00
Artem Tarasov
9cfa89c076 Added layout for mobile devices 2020-06-25 17:47:55 +03:00
23945aeb24 Api: backup removed 2020-06-25 16:25:03 +03:00
b01b3d85f8 Backup: fix 2020-06-25 16:10:28 +03:00
d53b11967a Merge branch 'master' into feature/backup 2020-06-25 15:37:53 +03:00
1871959768 fix 2020-06-25 15:17:22 +03:00
2fe2c2167b Merge branch 'master' into feature/thumbnails
# Conflicts:
#	ASC.Web.sln
2020-06-25 15:01:38 +03:00
d14313c6c1 References updated 2020-06-25 14:38:34 +03:00
Artem Tarasov
31361df8ed Wizard page design fix 2020-06-25 12:33:10 +03:00
NikolayRechkin
b7e40eefdd update yarn.lock files 2020-06-25 11:01:47 +03:00
NikolayRechkin
9046c068fa web: common: bump version 2020-06-25 10:53:25 +03:00
NikolayRechkin
1337df1101 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files 2020-06-25 10:51:05 +03:00
NikolayRechkin
06fc4e9e33 web: common: MediaViewer. added a touch swipe events 2020-06-25 10:50:24 +03:00
d30a6a2186 web: components: bump version 2020-06-24 14:07:39 +03:00
3c619cfb40 Web: Components: fixed TreeFolders styles 2020-06-24 14:06:07 +03:00
SuhorukovAnton
e21d99e361 Thumbnails: fix 2020-06-23 14:19:12 +03:00
SuhorukovAnton
cce4d5fa7a Thumbnails: delete unnecessary 2020-06-23 14:14:13 +03:00
SuhorukovAnton
4e839c9b11 Backup: transfer to ASC.Data.Backup 2020-06-23 13:48:36 +03:00
Ilya Oleshko
dacde04f39 Merge branch 'master' into feature/files 2020-06-23 08:23:07 +03:00
f43816738b Files: fix 2020-06-22 21:58:16 +03:00
a0dcf31041 web: components: bump version 2020-06-22 15:21:56 +03:00
2d232ffcb7 Web: Common: added onMouseDown event to DragAndDrop 2020-06-22 15:21:13 +03:00
NikolayRechkin
1d719ec3cb web: common: bump version 2020-06-22 09:53:54 +03:00
SuhorukovAnton
6f4bd59c6d Thumbnails: refactoring 2020-06-21 14:45:31 +03:00
Artem Tarasov
36f11ff673 Created page Wizard 2020-06-19 16:47:41 +03:00
10bcd867cc Web: Common: Api: Added getFileVersion 2020-06-18 17:45:35 +03:00
c672728b43 Web: Components: Export Box component 2020-06-18 17:45:01 +03:00
76e7ba73c4 web: components: bump version 2020-06-18 10:43:22 +03:00
2d627baa71 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-06-18 10:42:05 +03:00
d07e8e2322 Web: Components: added new styles to tree-node 2020-06-18 10:08:36 +03:00
6121a2c580 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-06-17 17:20:39 +03:00
39a5a75998 UI version page: init 2020-06-17 17:20:32 +03:00
571d41ac78 web: common: bump version 2020-06-17 17:16:05 +03:00
572fa4c3a5 Web: Files: fixed selector value, added new fields in folders 2020-06-17 17:15:15 +03:00
SuhorukovAnton
103de233e9 Thumbnails: fix 2020-06-17 14:00:28 +03:00
f5ac2aa70f web: common: bump version 2020-06-17 11:41:17 +03:00
3a28b9b1ae Web: Files: fixed row mouse click 2020-06-17 11:40:20 +03:00
SuhorukovAnton
5fbe80d32a Thumbnails: first version 2020-06-16 14:55:46 +03:00
9267ffe9b1 web: common: bump version 2020-06-16 11:49:44 +03:00
22a7df50b7 Web: Common: added DnD styles 2020-06-16 11:49:22 +03:00
38c40eec05 Merge branch 'master' into feature/backup 2020-06-15 18:40:26 +03:00
9276bfd384 Backup: fix 2020-06-15 18:33:53 +03:00
ceeff0b0c0 web: common: bump version 2020-06-15 15:41:34 +03:00
5357ac0c4f Web: Files: fixed files selection 2020-06-15 15:39:44 +03:00
a4645f72ef web: common: bump version 2020-06-15 13:49:37 +03:00
2b9dbcbe81 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-06-15 13:48:39 +03:00
7f0498f299 Web: Common: changed the logic of Drag And Drop 2020-06-15 13:46:42 +03:00
Ilya Oleshko
b6dd65f1c7 Merge branch 'master' into feature/files 2020-06-15 09:22:52 +03:00
Ilya Oleshko
e2cef60f0f web: components: bump version 2020-06-11 15:55:13 +03:00
Ilya Oleshko
9ab3b7557b web: common: bump version 2020-06-11 15:55:03 +03:00
Ilya Oleshko
a1f3b4bde0 Web: Removed faker package, updated yarn lock and fixed stories 2020-06-11 15:54:53 +03:00
7ee4237af4 Update storybook packages (Fix ReDoS vulnerability in websocket-extensions) 2020-06-11 15:13:43 +03:00
31bbd13805 web: common: bump version 2020-06-11 10:19:57 +03:00
10b03928b8 Web: Common: fixed viewScrollTop undefined value 2020-06-11 10:16:14 +03:00
7c96f27214 web: common: bump version 2020-06-11 09:56:35 +03:00
0ab8c4d872 Web: Common: fixed select items with scroll 2020-06-11 09:54:33 +03:00
SuhorukovAnton
ab6588d99b Backup: bagfix and refactoring 2020-06-10 15:35:10 +03:00
4058cd2a74 web: common: bump version 2020-06-10 12:10:09 +03:00
5e182db30c Web: Common: fixed SelectedFrame error with empty filter 2020-06-10 12:09:02 +03:00
3c66bbb607 Merge branch 'master' into feature/backup 2020-06-09 10:48:07 +03:00
bdcd5eac1a web: common: bump version 2020-06-09 10:04:27 +03:00
b1ee7dbc03 Web: Common: added SelectedFrame.js, fixed DragAndDrop styles 2020-06-09 10:02:13 +03:00
144877ab38 Update yarn.lock files 2020-06-08 12:00:05 +03:00
Ilya Oleshko
0d2666dcab web: common: bump version 2020-06-05 15:08:51 +03:00
Ilya Oleshko
dce000f004 Web: Common: Fixed FolderType enum 2020-06-05 15:08:32 +03:00
Ilya Oleshko
be6b6eb3ad Merge branch 'master' into feature/files 2020-06-05 14:25:54 +03:00
635ff124fb Json: fixed enum 2020-06-05 14:05:42 +03:00
f59be0f44b Merge branch 'master' into feature/backup 2020-06-04 17:12:34 +03:00
004dcc2d4d Merge branch 'master' into feature/files 2020-06-04 16:48:03 +03:00
b569245076 rever logger 2020-06-04 16:47:27 +03:00
d7386049dc Merge branch 'master' into feature/files 2020-06-04 16:27:06 +03:00
b55cc7c697 Startup: added command line 2020-06-04 16:26:31 +03:00
ae0fb62add Merge branch 'master' into feature/files 2020-06-04 16:05:12 +03:00
794486f335 Notify: temp log 2020-06-04 16:04:17 +03:00
5d818c0afa web: common: bump version 2020-06-04 15:54:46 +03:00
64ae28db3d Web: Common: refactoring DragAndDrop component, added new props 2020-06-04 15:49:40 +03:00
c65ab449bd Web: Common: added isDropZone prop to page-layout 2020-06-04 15:46:01 +03:00
4ea72a0e65 Merge branch 'master' into feature/backup
# Conflicts:
#	ASC.Web.sln
2020-06-04 14:39:40 +03:00
SuhorukovAnton
26f2107590 Backup: refactoring 2020-06-04 13:47:22 +03:00
Ilya Oleshko
99e641bb2f Merge branch 'master' into feature/files 2020-06-03 18:53:04 +03:00
a14049e88f Settings: fixed GetSupportedCultures 2020-06-03 18:51:01 +03:00
NikolayRechkin
4ead7ad5da web: common: bump version 2020-06-03 15:33:59 +03:00
NikolayRechkin
c4f856fac8 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files 2020-06-03 15:33:42 +03:00
NikolayRechkin
87ba3a069a web: common: MediaViewer. fixed the image size 2020-06-03 15:33:05 +03:00
e27d33f880 web: common: bump version 2020-06-03 15:04:00 +03:00
462c513aa8 Web: Common: added withScroll prop to PageLayout 2020-06-03 15:03:33 +03:00
SuhorukovAnton
89368aed8b Backup: refactoring 2020-06-03 12:15:05 +03:00
a1778b5cdf Packages updated 2020-06-01 14:36:23 +03:00
NikolayRechkin
e62de10128 web: common: bump version 2020-06-01 12:17:34 +03:00
NikolayRechkin
d8e804df2e web: common: MediaViewer. Fixed a scroll buttons style 2020-06-01 12:17:00 +03:00
d60f5e73b0 web: common: bump version 2020-05-29 09:31:45 +03:00
1613c1a06e Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-05-29 09:31:06 +03:00
cb98c4ccbb Web: Common: added dropzone to PageLayout, added DragAndDrop export 2020-05-29 09:25:28 +03:00
NikolayRechkin
9cf8585a11 web: common: bump version 2020-05-29 00:07:09 +03:00
NikolayRechkin
a633e0f6aa Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files 2020-05-29 00:05:56 +03:00
NikolayRechkin
ec914dfc04 web: common: MediaViewer. fixed a image-viewer for safari 2020-05-29 00:05:37 +03:00
c367922d9c Web: Common: added DragAndDrop component 2020-05-28 17:18:50 +03:00
SuhorukovAnton
9655101d2b Backup: add DIHelper's methods and fix startup 2020-05-28 16:28:51 +03:00
4ac1fd815a web: common: bump version 2020-05-28 10:01:50 +03:00
fa634b7e53 Web: Common: fixed FolderType enum 2020-05-28 10:00:35 +03:00
5edf43ebb2 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-05-28 09:36:11 +03:00
0a48d2b179 Merge branch 'master' into feature/files 2020-05-28 09:20:58 +03:00
NikolayRechkin
8e6df7371f web: common: bump version 2020-05-28 09:07:12 +03:00
NikolayRechkin
3226154cb3 web: common: fixed styles 2020-05-28 09:06:18 +03:00
e7ecaefa3c Added JsonStringEnumConverter 2020-05-27 16:19:58 +03:00
NikolayRechkin
a1f55209a9 web: common: bump version 2020-05-26 15:07:26 +03:00
NikolayRechkin
b4499b54a5 web: common: MediaViewer. Fixed a playlist position 2020-05-26 15:06:59 +03:00
Ilya Oleshko
5cba165a0e web: common: bump version 2020-05-26 12:54:29 +03:00
Ilya Oleshko
fc12479c03 web: components: bump version 2020-05-26 12:54:19 +03:00
Ilya Oleshko
fb8cccc6ea Web: Common: Removed fake api 2020-05-26 12:53:34 +03:00
Ilya Oleshko
0b24a1d671 Web: Components: Removed faker 2020-05-26 12:52:31 +03:00
NikolayRechkin
9e3997eaf2 web: common: bump version 2020-05-25 17:59:23 +03:00
NikolayRechkin
f64fedfb88 web: common: MediaViewer. deleted unused code 2020-05-25 17:58:39 +03:00
NikolayRechkin
d401368e52 web: common: bump version 2020-05-25 16:23:27 +03:00
NikolayRechkin
0cbb5e55ea Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files 2020-05-25 16:23:00 +03:00
NikolayRechkin
22ce7c7381 web: common: fixed playlist change 2020-05-25 16:21:14 +03:00
48411e4c9d Merge branch 'master' into feature/files 2020-05-22 14:01:04 +03:00
22ae4383b6 UrlShortener: fix 2020-05-22 13:58:12 +03:00
4299f91ab5 Merge branch 'master' into feature/files 2020-05-22 12:54:19 +03:00
1700ba1965 UrlShortener: config 2020-05-22 12:41:14 +03:00
NikolayRechkin
64811dbd39 update yarn.lock files 2020-05-21 15:35:28 +03:00
NikolayRechkin
d6792ba727 web: common: bump version 2020-05-21 10:10:39 +03:00
NikolayRechkin
e8a0bbcd73 Merge branch 'feature/files' into feature/media-viewer 2020-05-21 10:10:08 +03:00
NikolayRechkin
51b504827b web: common: bump version 2020-05-21 10:05:16 +03:00
NikolayRechkin
4e4b37fe13 web: common: MediaViewer. Fixes for pull request 2020-05-20 13:40:41 +03:00
6cd1cf9541 web: common: bump version 2020-05-20 10:56:04 +03:00
5207769230 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-05-20 10:55:34 +03:00
3b8805ab88 Web: Common: added copy and move API 2020-05-20 10:55:26 +03:00
0705756719 Merge branch 'master' into feature/files 2020-05-19 23:13:51 +03:00
NikolayRechkin
ea02ee9313 Merge branch 'feature/files' into feature/media-viewer 2020-05-19 00:30:31 +03:00
NikolayRechkin
70456dc651 web: common: bump version 2020-05-19 00:15:18 +03:00
NikolayRechkin
20cf39f908 web: common: MediaViewer. Refactoring 2020-05-19 00:12:48 +03:00
ecd66902a0 Merge branch 'master' into feature/system-json 2020-05-18 14:16:03 +03:00
4b89f35538 Web: Files: fixed sharing panel selected options 2020-05-18 11:34:07 +03:00
1842076658 Merge branch 'master' into feature/files 2020-05-18 10:51:37 +03:00
550b0dd20e Sln: packages updated 2020-05-18 10:27:22 +03:00
8a32228bc8 web: common: bump version 2020-05-18 09:25:17 +03:00
NikolayRechkin
1fe2c562bc web: common: MediaViewer. refactoring 2020-05-17 20:00:45 +03:00
NikolayRechkin
52f687bd65 Merge branch 'feature/files' into feature/media-viewer 2020-05-17 19:16:38 +03:00
47c79d57f0 Optimization 2020-05-17 16:08:20 +03:00
6e31e618ef Web: Files: fixed download as 2020-05-15 21:25:31 +03:00
8c11f5364c Web: Files: added download files upload with progress 2020-05-15 21:02:56 +03:00
f97e690773 Web: Files: added sharing api 2020-05-15 18:47:35 +03:00
91d287a2d5 Merge branch 'master' into feature/system-json
# Conflicts:
#	common/ASC.Core.Common/Caching/CachedUserService.cs
2020-05-14 17:14:59 +03:00
de55454c84 Merge branch 'master' into feature/files 2020-05-14 17:08:59 +03:00
1d245236ef Merge branch 'master' into feature/files-index 2020-05-14 12:19:34 +03:00
NikolayRechkin
6bfad7069d web: common: MediaViewer. fixed a file deletion 2020-05-14 11:47:57 +03:00
NikolayRechkin
22a0046f1f web: files: MediaViewer. file deletion 2020-05-13 16:20:23 +03:00
NikolayRechkin
7c2c986e60 web: common: fixed progress for touch devices 2020-05-13 11:01:55 +03:00
NikolayRechkin
c9108fe3da web: common: MediaViewer. Fixed a styles 2020-05-13 10:18:28 +03:00
NikolayRechkin
ca23997dc3 web: common: MediaViewer. fixed a styles 2020-05-12 17:05:22 +03:00
NikolayRechkin
c0fc5cc21d web: common: MediaViewer. Changed a playlist 2020-05-10 13:43:54 +03:00
NikolayRechkin
2b7cf5386a web: common: MediaViewer. Conversion 2020-05-09 21:11:54 +03:00
Ilya Oleshko
11cde4c7e7 web: components: bump version 2020-05-08 16:25:47 +03:00
Ilya Oleshko
45ed12eb2a Web: Components: Added indeterminate property for Checkbox inside Row 2020-05-08 16:25:38 +03:00
38af94ec11 web: components: bump version 2020-05-08 15:43:54 +03:00
7cbbf41340 Web: Components: fixed onClick action for link-with-dropdown, updated README.md file 2020-05-08 15:41:01 +03:00
NikolayRechkin
fda955966d Merge branch 'feature/files' into feature/media-viewer 2020-05-08 10:27:58 +03:00
NikolayRechkin
2aacf2ab36 web: common: MediaViewer. fix 2020-05-08 10:18:50 +03:00
65ad687d02 web: components: bump version 2020-05-08 09:16:18 +03:00
b22f40c7ef Web: Components: fixed progress-bar styles for Firefox 2020-05-08 09:13:02 +03:00
f547df107e Merge branch 'master' into feature/files 2020-05-07 14:40:51 +03:00
7bf739fe09 Optimization 2020-05-07 14:02:29 +03:00
3a747ef8e4 Merge branch 'master' into feature/system-json
# Conflicts:
#	common/ASC.Api.Core/Core/ApiContext.cs
#	common/ASC.Api.Core/Core/ApiDateTime.cs
#	common/ASC.Api.Core/Model/EmployeeWraper.cs
#	common/ASC.Api.Core/Model/EmployeeWraperFull.cs
#	common/ASC.Core.Common/Caching/CachedUserService.cs
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	products/ASC.People/Server/Models/GroupWrapperFull.cs
#	products/ASC.People/Server/Startup.cs
#	web/ASC.Web.Api/Models/BuildVersion.cs
2020-05-07 10:28:20 +03:00
NikolayRechkin
1bd0dd0a73 web: common: MediaViewer. Fix 2020-05-06 18:02:44 +03:00
NikolayRechkin
e4cea2ff4f web: common: MediaViewer. added a current file id 2020-05-06 16:36:17 +03:00
NikolayRechkin
278487054c web: common: bump version 2020-05-06 12:53:36 +03:00
NikolayRechkin
3afb210225 Merge branch 'feature/files' into feature/media-viewer 2020-05-05 18:53:33 +03:00
NikolayRechkin
7aa1af45e8 web: common: MediaViewer. created a README 2020-05-05 18:50:24 +03:00
NikolayRechkin
dc2ea73955 web: common: MediaViewer. Changed a story 2020-05-05 16:23:29 +03:00
NikolayRechkin
ea9907ce41 web: common: MediaViewer. video viewer 2020-05-05 16:15:33 +03:00
NikolayRechkin
717d76b273 web: common: MediaViewer. Fixed a image viewer 2020-05-05 16:02:21 +03:00
NikolayRechkin
cab53265dd web: common: MediaViewer. New icons 2020-05-05 12:22:58 +03:00
NikolayRechkin
41d08c3d26 web: components: bump version 2020-05-05 12:04:58 +03:00
NikolayRechkin
9f52ba9520 web: components: new icons 2020-05-05 12:04:49 +03:00
NikolayRechkin
bbc8faf617 web: components: bump version 2020-05-02 19:40:09 +03:00
NikolayRechkin
df22a59814 web: components: fix icons 2020-05-02 19:39:46 +03:00
NikolayRechkin
9578065435 web: components: bump version 2020-05-01 12:00:33 +03:00
NikolayRechkin
e3fd2bb587 web: components: new icons 2020-05-01 12:00:16 +03:00
NikolayRechkin
f8218bf17f web: common: MediaViewer. stop playing invisible video/audio 2020-04-30 11:37:16 +03:00
NikolayRechkin
62fee1ecfe web: common: MediaViewer. refactoring video viewer 2020-04-30 11:20:30 +03:00
NikolayRechkin
4e11abf2a2 web: common: MediaViewer. refactoring 2020-04-30 10:35:02 +03:00
37b126e5cd Files: search 2020-04-29 17:11:31 +03:00
NikolayRechkin
4ec2c14ed4 web: common: MediaViewer. Button handlers. Component property descriptions 2020-04-29 17:11:01 +03:00
02d0a0b7ec web: common: bump version 2020-04-28 17:43:44 +03:00
30bc96584c Web: Common: fixed display progress-bar 2020-04-28 17:41:34 +03:00
92dca843f0 web: common: bump version 2020-04-28 11:59:46 +03:00
5722074692 web: components: bump version 2020-04-28 11:59:32 +03:00
ea4f050ede Web: Common: removed unused props from the pageLayout 2020-04-28 11:58:09 +03:00
ce513e5a50 Web: Components: reworked the progress-bar logic 2020-04-28 11:56:48 +03:00
NikolayRechkin
59a3f9c665 web: common: MediaViewer. Refactoring 2020-04-25 21:03:13 +03:00
NikolayRechkin
c1121ba621 web: common: MediaViewer. adaptive viewer size 2020-04-25 19:49:00 +03:00
NikolayRechkin
e826dac989 web: components: MediaViewer. Refactoring 2020-04-24 21:53:30 +03:00
NikolayRechkin
714f37294b web: common: MediaViewer. added audio support 2020-04-24 15:28:17 +03:00
Ilya Oleshko
72980c6bdd web: common: bump version 2020-04-24 11:30:26 +03:00
Ilya Oleshko
7569b50083 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-04-24 10:17:14 +03:00
Ilya Oleshko
a06fc5a656 Web: Common: Api: Added openEdit for files api 2020-04-24 10:15:07 +03:00
NikolayRechkin
7c8e567879 web: common: first version of MediaViewer 2020-04-24 00:44:47 +03:00
NikolayRechkin
c9e4d23394 Merge remote-tracking branch 'remotes/origin/feature/files' into feature/media-viewer 2020-04-23 13:58:02 +03:00
2330693b7d web: common: bump version 2020-04-23 13:08:41 +03:00
44f84c8056 Files: Service. first version 2020-04-23 12:38:50 +03:00
NikolayRechkin
f8749e437a web: common: bump version 2020-04-23 12:37:56 +03:00
7b76d26e29 web: common: bump version 2020-04-23 12:04:55 +03:00
fa68bedd98 Web: Files: added upload files 2020-04-23 11:55:45 +03:00
NikolayRechkin
324b1c4ceb web: common: MediaViewer. added common styles 2020-04-22 20:44:09 +03:00
NikolayRechkin
bb94d506c0 web: common: fix video viewer 2020-04-21 13:49:23 +03:00
b55ef3aa37 Merge branch 'master' into feature/files 2020-04-20 11:19:17 +03:00
NikolayRechkin
921bde3d9e web: common: first version of the video viewer 2020-04-20 09:32:27 +03:00
NikolayRechkin
1b918fca81 web: common: init video viewer 2020-04-19 23:09:12 +03:00
NikolayRechkin
1820a6a828 web: common: init MediaViewer 2020-04-19 23:06:17 +03:00
c5ff09ac09 Added DI for Voip 2020-04-17 17:07:44 +03:00
Ilya Oleshko
8c349b0ee2 Merge branch 'master' into feature/files 2020-04-16 16:10:55 +03:00
1b0784e3cf Files: updated JWT 2020-04-16 16:07:30 +03:00
c788c6f223 Merge branch 'master' into feature/files 2020-04-16 09:45:03 +03:00
1dbdb1aedd Files: configuration 2020-04-15 18:39:59 +03:00
Ilya Oleshko
a87a4b187f Merge branch 'master' into feature/files 2020-04-15 14:32:29 +03:00
a1e1cd17be FileHandler: fix 2020-04-15 13:46:24 +03:00
c7e1cf7b95 web: components: bump version 2020-04-14 13:34:27 +03:00
fc77267633 Web: Components: added subtitle to empty screen container 2020-04-14 13:27:42 +03:00
Ilya Oleshko
c57af32d0d web: components: bump version 2020-04-13 15:56:57 +03:00
Ilya Oleshko
d986751205 Web: Components: Changed DropDown dynamic container from FixedSizeList to VariableSizeList. 2020-04-13 15:56:47 +03:00
e5d4709463 web: common: bump version 2020-04-07 11:13:17 +03:00
000505b656 Web: Common: added share access rights enum 2020-04-07 11:10:32 +03:00
da42fb0f42 web: common: bump version 2020-04-07 10:31:33 +03:00
df7718c6a3 Web: Common: added sharing api 2020-04-07 10:17:57 +03:00
Ilya Oleshko
f0916c4782 Merge branch 'master' into feature/files 2020-04-02 17:48:36 +03:00
df549c6e6a web: common: bump version 2020-04-02 12:16:05 +03:00
8b95f6af27 Web: Files: moved shareData to redux, added new api requests, refactoring 2020-04-02 12:15:35 +03:00
e199ff703a Web: Common: removed unused styles from AdvancedSelector 2020-03-31 13:50:28 +03:00
e9e6032914 web: common: bump version 2020-03-30 14:35:43 +03:00
b71743cabe Web: Common: removed ComboBox from advansedSelector, added embeddedComponent 2020-03-30 14:31:50 +03:00
Ilya Oleshko
c833bbbca6 web: components: bump version 2020-03-30 10:23:44 +03:00
Ilya Oleshko
9eca35fa60 Web: Components: Added contextButtonSpacerWidth property for Row component, fixed readme 2020-03-30 10:23:26 +03:00
8141654772 web: components: bump version 2020-03-28 13:21:38 +03:00
841c2b9c28 web: common: bump version 2020-03-28 13:20:50 +03:00
f701a1b000 Web: Common: added new propTypes to AdvancedSelector 2020-03-28 13:20:27 +03:00
7cdbe7c079 Web: Common: added ability to display combobox in footer of advanced selector, added new props to PeopleSelector and GroupSelector 2020-03-28 13:10:32 +03:00
d9b043496a Web: Components: added key icon, added class name to combo-button 2020-03-28 13:04:12 +03:00
Ilya Oleshko
3a5ce4971f web: components: bump version 2020-03-26 17:13:37 +03:00
Ilya Oleshko
f825b3b108 web: common: bump version 2020-03-26 17:13:25 +03:00
Ilya Oleshko
80acbc1061 Web: Common: Added application of columnCount parameter inside FilterInput component 2020-03-26 17:11:58 +03:00
Ilya Oleshko
17d2a678d1 Web: Components: Added columnCount property for DropDown component 2020-03-26 17:10:14 +03:00
63bf49d256 Web: Files: added DeleteDialog dialog, added removeFiles api request 2020-03-24 14:36:47 +03:00
Daniil Senkiv
a0b3345fc6 web: common: bump version 2020-03-23 13:47:59 +03:00
Daniil Senkiv
cf5946dece Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files 2020-03-23 13:47:40 +03:00
Daniil Senkiv
c38f4022de web.files: MainButton: fix selector 2020-03-23 13:47:28 +03:00
51c83460cd Web: Files: added TreeFolders update after rename or delete action 2020-03-23 13:42:37 +03:00
Daniil Senkiv
8ff996e72d web: common: bump version 2020-03-20 16:01:14 +03:00
Daniil Senkiv
46bc8fdeb7 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files 2020-03-20 15:59:34 +03:00
Daniil Senkiv
7a2ae47eb0 Web.Files/Common: Filter: add folder param instead of hash param 2020-03-20 15:59:06 +03:00
805713f2a0 web: common: bump version 2020-03-20 15:15:21 +03:00
04f28c2a71 Web: Files: replaced rootFolders to treeFolders 2020-03-20 14:59:07 +03:00
Ilya Oleshko
8c2bfb53f1 web: components: bump version 2020-03-20 13:37:26 +03:00
Ilya Oleshko
dff6d378c5 Web: Components: RowContent: Fixed ignoring onClick 2020-03-20 12:00:56 +03:00
Daniil Senkiv
71e5e3c73c Web.Client: fix 09474e8be9 2020-03-20 11:15:27 +03:00
978cf0e34e Merge branch 'master' into feature/files-refactoring
# Conflicts:
#	products/ASC.Files/Server/Controllers/FilesController.cs
#	products/ASC.Files/Server/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Server/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Server/Services/WCFService/FileOperations/FileOperation.cs
2020-03-19 16:07:16 +03:00
b25eb5b914 web: common: bump version 2020-03-19 15:26:31 +03:00
eadec341c6 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-03-19 15:25:40 +03:00