Commit Graph

4780 Commits

Author SHA1 Message Date
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
c1782f774a Web: Files: added Empty TrashDialog with translations 2020-03-19 15:25:11 +03:00
Daniil Senkiv
102f838a6a Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files 2020-03-19 15:17:14 +03:00
Ilya Oleshko
5d8a94324e web: common: bump version 2020-03-19 15:07:24 +03:00
Ilya Oleshko
8269dc8560 Web: Common: Api: Files: Added getFoldersTree request 2020-03-19 15:07:05 +03:00
Daniil Senkiv
25d796b309 web: components: bump version 2020-03-19 15:06:04 +03:00
Daniil Senkiv
09474e8be9 People.Client: replace FilterInput from asc-web-components to asc-web-common, delete asc-web-components FilterInput 2020-03-19 15:05:57 +03:00
Daniil Senkiv
bdac987529 web: common: bump version 2020-03-19 14:52:16 +03:00
Daniil Senkiv
e9243547e2 Web.Common: Filter: fix work with selectors 2020-03-19 14:52:02 +03:00
Daniil Senkiv
df76148505 web: common: bump version 2020-03-19 13:49:25 +03:00
Daniil Senkiv
9d0cef81dd Web.Common: fix folderTree 2020-03-19 13:49:16 +03:00
Daniil Senkiv
9b8f2f69a6 web: common: bump version 2020-03-19 11:40:58 +03:00
Daniil Senkiv
4b20b8578c Web.Files: Filter: apply withSubfolders param correctly 2020-03-19 11:40:42 +03:00
Daniil Senkiv
c1bbf62609 Web.Files: get info about author of file before showing interface with fix 2020-03-19 09:15:58 +03:00
Daniil Senkiv
339f8cfcfb web: common: bump version 2020-03-18 15:11:07 +03:00
Daniil Senkiv
0faa3a74ed Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files 2020-03-18 15:10:14 +03:00
Daniil Senkiv
dacbf30366 Web.Files: get info about author of file before showing interface 2020-03-18 15:09:56 +03:00
7314c218eb web: common: bump version 2020-03-18 13:09:26 +03:00
62374a5fda web: components: bump version 2020-03-18 13:09:17 +03:00
15c5114a10 Update yarn.lock files 2020-03-18 13:08:58 +03:00
Ilya Oleshko
2d70a7fbcc web: common: bump version 2020-03-18 11:42:38 +03:00
Ilya Oleshko
cb9a587f7a Web: Common: Constants: Added FileAction constant 2020-03-18 11:39:43 +03:00
Daniil Senkiv
730ca469a1 Merge branch 'feature/files' of https://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/components/pages/Home/locales/en/translation.json
#	products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json
#	products/ASC.Files/Client/src/store/files/actions.js
#	products/ASC.Files/Client/src/store/files/reducers.js
#	products/ASC.Files/Client/src/store/files/selectors.js
2020-03-17 09:07:39 +03:00
be472d5f24 web: components: bump version 2020-03-16 13:30:15 +03:00
ea33270edb Web: Components: fixed tree menu 2020-03-16 13:29:45 +03:00
Ilya Oleshko
87f208b033 web: components: bump version 2020-03-16 12:22:00 +03:00
Ilya Oleshko
8b1568701f Web.Client: Settings: Fixed admin`s row width 2020-03-16 12:19:32 +03:00
Ilya Oleshko
5028b1ce52 Web: Components: RowContent: Fixed default width 2020-03-16 12:18:35 +03:00
0bcfec5a19 Update yarn.lock files 2020-03-16 11:20:25 +03:00
52a9ff98d0 Merge branch 'master' into feature/files
# Conflicts:
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Components/package.json
#	web/ASC.Web.Components/yarn.lock
2020-03-16 11:02:13 +03:00
d694819eda web: common: bump version 2020-03-16 10:49:47 +03:00
0ed02f88a0 web: components: bump version 2020-03-16 10:49:34 +03:00
eb21f8a957 Update yarn.lock files 2020-03-16 10:37:55 +03:00
c6d13463ab Merge branch 'master' of github.com:ONLYOFFICE/AppServer 2020-03-16 10:25:18 +03:00
dependabot[bot]
2f8f43a03a
Bump acorn from 5.7.3 to 5.7.4 in /web/ASC.Web.Client
Bumps [acorn](https://github.com/acornjs/acorn) from 5.7.3 to 5.7.4.
- [Release notes](https://github.com/acornjs/acorn/releases)
- [Commits](https://github.com/acornjs/acorn/compare/5.7.3...5.7.4)

Signed-off-by: dependabot[bot] <support@github.com>
2020-03-16 07:22:50 +00:00
4c09c402f4 web: components: bump version 2020-03-16 09:49:29 +03:00
638e5e9657 Web: Components: downgraded version rc-tree 2020-03-16 09:49:12 +03:00
dependabot[bot]
e4e7cce565
Bump acorn from 5.7.3 to 5.7.4 in /web/ASC.Web.Components
Bumps [acorn](https://github.com/acornjs/acorn) from 5.7.3 to 5.7.4.
- [Release notes](https://github.com/acornjs/acorn/releases)
- [Commits](https://github.com/acornjs/acorn/compare/5.7.3...5.7.4)

Signed-off-by: dependabot[bot] <support@github.com>
2020-03-14 00:55:11 +00:00
8119d2884e web: components: bump version 2020-03-13 18:29:12 +03:00
7b346ed102 Web: Components: updated rc-tree package 2020-03-13 18:27:58 +03:00
Daniil Senkiv
d920cc30f7 web: common: bump version 2020-03-13 18:11:48 +03:00
Daniil Senkiv
17aebb0ba0 Web.Files/Common: filter on real data 2020-03-13 18:11:15 +03:00
Ilya Oleshko
3ec713c32d web: common: bump version 2020-03-13 12:08:41 +03:00
Ilya Oleshko
cb5836af98 Web: Common: FilterInput: Removed useless prop from sorting ComboBox 2020-03-13 12:08:28 +03:00
Daniil Senkiv
0fcee867a3 web: common: bump version 2020-03-13 10:55:47 +03:00
Daniil Senkiv
2d9840e78b Web.Files/Common: Filter: add withSubFolders param 2020-03-13 10:55:25 +03:00
Daniil Senkiv
d7f55ea7a6 web: common: bump version 2020-03-13 09:31:07 +03:00
Daniil Senkiv
114e31fb37 Web.Common: FilterInput: fix styles 2020-03-13 09:30:54 +03:00
Daniil Senkiv
d65b09f003 web: common: bump version 2020-03-12 16:22:59 +03:00
Daniil Senkiv
ae6f0a6ef9 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files 2020-03-12 15:57:43 +03:00
Daniil Senkiv
2597cbfdb4 Web.Common: FilterInput: added selectors 2020-03-12 15:57:23 +03:00
025f177d9a web: common: bump version 2020-03-11 17:20:56 +03:00
5bab7b0259 web: components: bump version 2020-03-11 17:20:45 +03:00
1ff9356ea7 Web: Common: added progress-bar to PageLayout 2020-03-11 17:18:47 +03:00
8ecc223156 Web: Components: fixed progress-bar rerender 2020-03-11 17:18:12 +03:00
153052a9a0 web: components: bump version 2020-03-11 16:14:45 +03:00
b08e9f83c4 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-03-11 16:14:18 +03:00
7941f4ff05 Web: Components: added progress-bar component 2020-03-11 16:12:04 +03:00
Ilya Oleshko
ba0f5e6fca web: common: bump version 2020-03-11 14:16:06 +03:00
Ilya Oleshko
594c1a776b Web: Common: Api: Files: Added file creating API requests 2020-03-11 14:15:44 +03:00
Ilya Oleshko
0b8c870e19 web: common: bump version 2020-03-11 13:53:59 +03:00
Ilya Oleshko
4e45f96b7a Web: Common: Api: Files: Fixed request payload 2020-03-11 13:53:49 +03:00
Ilya Oleshko
e984a620ea web: common: bump version 2020-03-10 15:42:08 +03:00
Ilya Oleshko
53e77b7981 Web: Common: Api: Files: Fixed property name for creating folder 2020-03-10 15:41:47 +03:00
12b7d47a25 web: common: bump version 2020-03-10 09:22:19 +03:00
1d072fec22 Web: Common: added share api 2020-03-10 09:22:02 +03:00
3f4ad15b46 Files: fropbox 2020-03-06 16:17:17 +03:00
Ilya Oleshko
40a023b94e Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-03-06 14:30:25 +03:00
Ilya Oleshko
578b10170b web: common: bump version 2020-03-06 14:30:13 +03:00
NikolayRechkin
57559d08cc web: components: bump version 2020-03-06 14:28:38 +03:00
NikolayRechkin
2f6497d37c web: components: fix tree menu 2020-03-06 14:28:18 +03:00
Ilya Oleshko
67efe1074c Web: Common: Api: Files: Added deleteFolder and deleteFile 2020-03-06 14:27:51 +03:00
f3cb58d0aa web: components: bump version 2020-03-06 13:17:59 +03:00
013a35da04 Web: Components: added ref support to tree-menu component 2020-03-06 13:14:04 +03:00
Daniil Senkiv
6353a8318b Web.Common: copy FilterInput component from web.components 2020-03-05 17:02:47 +03:00
Ilya Oleshko
7a06630e34 web: common: bump version 2020-03-05 09:18:08 +03:00
Ilya Oleshko
da17495699 Web: Common: Api: Files: Fixed api data 2020-03-05 09:15:27 +03:00
a7069aa19d web: common: bump version 2020-03-04 16:23:14 +03:00
22e2729cc5 Web: Files: fixed merge 2020-03-04 16:22:56 +03:00
ed9c15864a web: common: bump version 2020-03-04 15:47:54 +03:00
fcd9da1dc5 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
# Conflicts:
#	web/ASC.Web.Common/src/api/files/filter.js
2020-03-04 15:47:31 +03:00
bcbe88caab Web: Common: added treeFolders field to filter 2020-03-04 15:40:02 +03:00
Daniil Senkiv
253752fbfc web: common: bump version 2020-03-04 14:49:13 +03:00
Daniil Senkiv
ffff9d38b8 Web.Common/Files: FilesFilter: add authorType 2020-03-04 14:49:01 +03:00
67521344e0 web: components: bump version 2020-03-04 13:22:12 +03:00
10998c67e5 Web: Components: added loadData prop to tree-menu 2020-03-04 13:21:52 +03:00
7ef15cb51d web: components: bump version 2020-03-04 09:17:35 +03:00
cdaf42ad6b Web: Components: fixed tree-menu tests 2020-03-04 09:11:17 +03:00
e109a7d043 web: components: bump version 2020-03-04 08:55:15 +03:00
ba13637a97 Merge branch 'master' of github.com:ONLYOFFICE/AppServer 2020-03-03 09:37:46 +03:00
Daniil Senkiv
b23b820d60 web: common: bump version 2020-03-03 09:30:42 +03:00
Daniil Senkiv
5442438698 Web.Files: Filter: add first version of FilesFilter 2020-03-03 09:30:27 +03:00
Ilya Oleshko
b89bc4723c web: common: bump version 2020-03-02 17:09:08 +03:00
Ilya Oleshko
b044b545d0 Web: Common: Api: Files: Added getFileInfo, getFolderPath, createTextFileInCommon, getFileInfo, updateFile, createFolder and renameFolder api requests 2020-03-02 17:08:53 +03:00
Ilya Oleshko
034f426a4d web: common: bump version 2020-03-02 13:48:24 +03:00
Ilya Oleshko
52bf9ac9e0 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-03-02 13:48:09 +03:00
Ilya Oleshko
97fa98857e Web: Common: Api: Files: Added getFolder by folder id 2020-03-02 13:47:51 +03:00
7fc33a282b Web: Common: added getSharedFolderList fake api 2020-03-02 12:30:47 +03:00
Ilya Oleshko
948d43a05d web: common: bump version 2020-03-02 11:25:30 +03:00
Ilya Oleshko
f80ab0b473 Web: Common: Api: Files: Disabled fakeApi for trash folder 2020-03-02 11:25:26 +03:00
Ilya Oleshko
336561c86f web: common: bump version 2020-03-02 11:17:58 +03:00
Ilya Oleshko
2a9c57d06e Web: Common: Api: Files: Added createTextFile and createTextFileInMy 2020-03-02 11:17:32 +03:00
df6d25f4a9 Web: Components: renamed onBadgeClick function updated README.md file 2020-03-02 09:47:58 +03:00
Ilya Oleshko
6a14d0978f web: common: bump version 2020-02-28 17:26:24 +03:00
Ilya Oleshko
e543f00b17 web: common: bump version 2020-02-28 17:21:26 +03:00
Ilya Oleshko
49845fbb6c Web: Common: Api: Files: Added getCommonFolderList and getProjectsFolderList 2020-02-28 17:21:15 +03:00
Ilya Oleshko
3f2baee4cb web: common: bump version 2020-02-28 16:08:14 +03:00
Ilya Oleshko
e35df76d90 Files.Client: Home: Fixed fake folderApi. Added @my and @trash api. 2020-02-28 16:08:03 +03:00
Ilya Oleshko
c691ef3e7d web: common: bump version 2020-02-28 13:33:33 +03:00
Ilya Oleshko
22650be927 Files.Client: Home: Added Row and fakeApi 2020-02-28 13:33:13 +03:00
77e9967714 Web: Components: added Badge to tree-menu 2020-02-27 17:33:17 +03:00
Daniil Senkiv
91d7e28b25 Files.Client: Article: add MainButton elems 2020-02-27 16:21:20 +03:00
9a1a118f79 Merge branch 'master' into feature/elastic 2020-02-27 11:24:14 +03:00
97ae3914c5 web: common: bump version 2020-02-26 16:32:24 +03:00
68395a16aa web: components: bump version 2020-02-26 16:32:14 +03:00
d5a4dbc5be Merge branch 'master' of github.com:ONLYOFFICE/AppServer 2020-02-26 16:32:10 +03:00
b526b61bdd Update yarn.lock files 2020-02-26 13:01:04 +03:00
e57e8ff935 web: files: Replaced fake product 2020-02-26 11:06:44 +03:00
1bc8f58df4 Merge branch 'master' into feature/user-actions-changes 2020-02-26 10:55:17 +03:00
ac5017da99 Merge branch 'master' into feature/elastic
# Conflicts:
#	build/build.bat
#	build/rebuild.bat
2020-02-26 10:46:37 +03:00
e4af4d168f Update yarn.lock files 2020-02-26 10:23:38 +03:00
2ccd226940 web: clients: Fixed CRA proxy bug; 2020-02-26 10:02:37 +03:00
b5bc446cc3 Merge branch 'master' into feature/user-actions-changes 2020-02-25 13:16:02 +03:00
44ec45ebb6 Merge branch 'master' into feature/elastic
# Conflicts:
#	common/ASC.Common/Security/Cryptography/InstanceCrypto.cs
#	common/ASC.Core.Common/Billing/TariffService.cs
#	common/ASC.Core.Common/Caching/CachedQuotaService.cs
#	common/ASC.Core.Common/Caching/CachedTenantService.cs
#	common/ASC.Core.Common/Caching/CachedUserService.cs
#	common/ASC.Core.Common/Context/Impl/AuthManager.cs
#	common/ASC.Core.Common/Context/Impl/CoreConfiguration.cs
#	common/ASC.Core.Common/Context/Impl/TenantManager.cs
#	common/ASC.Core.Common/Context/SecurityContext.cs
#	common/ASC.Core.Common/Data/DbSettingsManager.cs
#	common/ASC.Core.Common/Tenants/TenantUtil.cs
#	common/ASC.Data.Reassigns/QueueWorker.cs
#	common/ASC.IPSecurity/IPSecurity.cs
#	common/services/ASC.Studio.Notify/Program.cs
#	products/ASC.People/Server/Startup.cs
#	web/ASC.Web.Core/CookiesManager.cs
#	web/ASC.Web.Core/Tfa/TfaManager.cs
2020-02-25 11:24:45 +03:00
9db8b26985 Replaced NewtonsoftJson with System.Text.Json 2020-02-21 16:19:32 +03:00
Daniil Senkiv
1ae795a86b web: common: bump version 2020-02-21 14:14:13 +03:00
Daniil Senkiv
b724548e98 web.common: fix working web.client, if api people not available 2020-02-21 14:13:45 +03:00
Daniil Senkiv
a1d249be68 web.common: fix problem with handling idle modules 2020-02-21 14:11:33 +03:00
bc6e1d5e9e updated dependecies 2020-02-21 11:13:01 +03:00
a9f64e474f Merge branch 'master' into feature/user-actions-changes 2020-02-21 10:20:16 +03:00
ed8f6ebc32 Web: Components: removed the click close function in the title, fixed tests 2020-02-21 10:10:32 +03:00
c5dbf8c859 Removed unused dependencies 2020-02-20 17:57:48 +03:00
7436fd8548 web: common: bump version 2020-02-18 14:16:22 +03:00
c248db6cf8 Web: Common: fixed profile avatar size 2020-02-18 14:16:03 +03:00
c7b5d75692 web: common: bump version 2020-02-18 13:16:16 +03:00
f3731820cb Web: Client: change title of pages, added new translations 2020-02-18 13:15:02 +03:00
259cb20de3 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2020-02-18 13:11:27 +03:00
76b9f99623 Web: Common: change title of login page, added new translations 2020-02-18 13:11:16 +03:00
Ilya Oleshko
b11717e23b web: components: bump version 2020-02-18 12:06:41 +03:00
Ilya Oleshko
83a9c6d0b9 Web: Components: RowContent: Fixed main element with CSS property 2020-02-18 12:04:39 +03:00
7a1e6590d2 web: components: bump version 2020-02-18 10:08:09 +03:00
4fff8b93e5 Web: Components: fixed tooltip error 2020-02-18 10:07:10 +03:00
785f002c4d Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2020-02-17 16:50:49 +03:00
0eb0048596 Web: Client: change title of pages 2020-02-17 16:50:42 +03:00
Ilya Oleshko
a2049f2b1d web: common: bump version 2020-02-17 16:38:10 +03:00
Ilya Oleshko
335a612895 web: components: bump version 2020-02-17 16:37:59 +03:00
Ilya Oleshko
2dad1f9894 Web: Components: DropDown: Fixed vertical change direction on mobile 2020-02-17 16:37:42 +03:00
Ilya Oleshko
42e9b3a1a2 Web: Components: ContextMenu: Fixed open property for DropDown 2020-02-17 15:31:02 +03:00
Ilya Oleshko
c0e3e19116 Web: Components: ContextMenuButton: Added vertical direction property for DropDown 2020-02-17 15:30:15 +03:00
Ilya Oleshko
7d911bbb85 Web: Components: FilterInput: Added default direction property for ContextMenuButton 2020-02-17 15:27:29 +03:00
Ilya Oleshko
0d3f403c43 Web: Components: FilterInput: Added default height css property (IOS fix) 2020-02-17 15:26:31 +03:00
Daniil Senkiv
dfe715ab32 web: common: bump version 2020-02-17 15:07:33 +03:00
Daniil Senkiv
312f342fac web.common: PageLayout: fix pin/unpin article for first render, in addition to (efef0090be) 2020-02-17 15:07:25 +03:00
Daniil Senkiv
68c438dd37 web: components: bump version 2020-02-17 14:04:16 +03:00
Daniil Senkiv
f0999bc883 web.components: FilterInput: fix filter-block style 2020-02-17 14:04:06 +03:00
a5280a1694 Added DIHelper 2020-02-17 11:58:14 +03:00