Commit Graph

7992 Commits

Author SHA1 Message Date
718dc8cc5a Web: Files: fixed dragging 2020-10-08 17:54:04 +03:00
Ilya Oleshko
fa0c649fe2 Web: Files : Home : Added icon for temp item on create 2020-10-08 17:13:49 +03:00
Ilya Oleshko
0e4698b8f0 Merge branch 'feature/selectors-refactoring' of github.com:ONLYOFFICE/AppServer into feature/selectors-refactoring 2020-10-08 16:58:39 +03:00
4e84d5f5ae Merge branch 'feature/files' into feature/selectors-refactoring
# Conflicts:
#	web/ASC.Web.Common/package.json
2020-10-08 16:58:09 +03:00
Ilya Oleshko
033a67863e Web: Files : Selectors : Fixed isMediaOrImage usage for context menu 2020-10-08 16:56:01 +03:00
Ilya Oleshko
1d79a2709f Web: Files : Home : Added selectors for formats and media viewer 2020-10-08 16:03:37 +03:00
Ilya Oleshko
a0a680aa7e Web: Files : Home : Added selectors for formats 2020-10-08 16:02:52 +03:00
Ilya Oleshko
79b6f43df0 Web: Files : Selectors : Added file format selectors, fixed fileList params 2020-10-08 16:02:03 +03:00
Ilya Oleshko
16cbf4436a Web: Files : Reducer : Added default formats 2020-10-08 16:01:08 +03:00
Alexey Kostenko
1f91802257 Web: People: Fixed opening avatar editor (Create user) 2020-10-08 15:17:44 +03:00
Alexey Kostenko
1129a00d21 Merge branch 'feature/files' into feature/avatar-editor-redesign 2020-10-08 14:00:50 +03:00
b4675941f6 Web: Files: fixed selectors 2020-10-08 13:54:34 +03:00
43a085eb18
Merge pull request #88 from ONLYOFFICE/feature/schema
Feature/schema
2020-10-08 13:51:06 +03:00
4059c94e34
Merge pull request #91 from ONLYOFFICE/feature/fix-redirect-after-update-profile
Feature/fix redirect after update profile
2020-10-08 13:20:31 +03:00
798170e402 web: common: bump version 2020-10-08 12:43:21 +03:00
34575dab83 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-10-08 12:43:07 +03:00
e3fde6fd77 Web: Common: fixed main height 2020-10-08 12:42:59 +03:00
42e723ea49 Kafka: fix 2020-10-08 12:15:16 +03:00
bc1438ba92 EF: rename 2020-10-08 12:07:05 +03:00
b9e74c0e4d DbContextManager: fix 2020-10-08 11:56:46 +03:00
573dc8922b Merge branch 'master' into feature/schema
# Conflicts:
#	common/ASC.Common/DIHelper.cs
2020-10-08 11:42:57 +03:00
e8061d10bd DI: refactoring 2020-10-08 11:36:47 +03:00
Artem Tarasov
3d60e9ac63 Web: People: fixed isEdit flag 2020-10-08 11:10:55 +03:00
Alexey Kostenko
95c3a379f7 Merge branch 'feature/files' into feature/avatar-editor-redesign 2020-10-08 11:03:59 +03:00
Alexey Kostenko
28ae6d6d6f web: components: bump version 2020-10-08 11:02:02 +03:00
Alexey Kostenko
1f1dbdee36 Web: People: Desktop avatarEditor - Fix rotation bug, fixed Wheel empty image bug, fixed twitching of the picture when saving 2020-10-08 10:55:30 +03:00
Alexey Kostenko
a1e1915085 Web: Components: Hidden buttons for symmetrical reflection of the avatar 2020-10-08 10:47:49 +03:00
Artem Tarasov
608109f4a0 web: common: bump version 2020-10-08 10:29:06 +03:00
Artem Tarasov
e1fd3f211a Web: Client: confirm: added paswordHash to createUser, activateUser, changePassword 2020-10-08 10:28:36 +03:00
6cf7358b92 Merge branch 'feature/files' into feature/selectors-refactoring
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Filter/index.js
#	web/ASC.Web.Common/src/api/files/index.js
2020-10-08 10:25:37 +03:00
Alexey Kostenko
6d154a6019 web: components: bump version 2020-10-08 09:55:38 +03:00
Alexey Kostenko
f5592333c8 Web: People/Client: Fix rotation bug, fixed Wheel empty image bug, fixed twitching of the picture when saving, refactoring (remove callback using) 2020-10-08 09:55:20 +03:00
Artem Tarasov
e2f3daacec Web: Client: confirm: added passwordHash to co createUser, activateUser 2020-10-07 19:52:25 +03:00
Artem Tarasov
2547a70498 Web: Client: confirm: fixed the name of the passed parameter in /people 2020-10-07 19:10:35 +03:00
Artem Tarasov
5806daa594 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-10-07 18:23:34 +03:00
Artem Tarasov
5e0e8e9b3b Web: Client: confirm: added transfer of hash instead of password 2020-10-07 18:23:14 +03:00
954fe70035 Web: Files: fixed isCanCreate and isCanBeDeleted selectors 2020-10-07 18:09:08 +03:00
Ilya Oleshko
be48e703b9 Web: Files : Home : Fixed context menu separator key 2020-10-07 17:31:59 +03:00
41eaf5d885 Files: api. AddToRecent 2020-10-07 17:31:17 +03:00
cbcf6bef85 Web: Files: removed auth selectors from files 2020-10-07 17:23:02 +03:00
Artem Tarasov
17daf4e847 Web: Files: settings: fix warning 2020-10-07 17:15:40 +03:00
Artem Tarasov
c5dfb870b3 Web: People: deleted unusaed variables 2020-10-07 17:09:14 +03:00
fdd0b945b0 Web: Files: fixed SectionHeaderContent selectors 2020-10-07 17:05:50 +03:00
Artem Tarasov
974ccdbf48 Merge branch 'feature/files' into feature/fix-redirect-after-update-profile
# Conflicts:
#	products/ASC.People/Client/src/components/Article/Body/index.js
#	products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js
#	products/ASC.People/Client/src/components/pages/Profile/Section/Header/index.js
#	products/ASC.People/Client/src/components/pages/Profile/index.js
#	products/ASC.People/Client/src/store/profile/actions.js
2020-10-07 16:56:36 +03:00
9d87b8de09
Merge pull request #94 from ONLYOFFICE/feature/empty-screen
Feature/empty screen
2020-10-07 16:52:54 +03:00
b375463d02 Web: Files: added getRootFolderId, fixed sharing panel 2020-10-07 16:42:37 +03:00
3bf8bd5103 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-10-07 16:41:24 +03:00
ca37d2134d Web: Files: Applied API changes on server in files filtering 2020-10-07 16:41:05 +03:00
37d36ce86c Supervisor: fix backup 2020-10-07 16:10:20 +03:00
TatianaLopaeva
da23f36f09 Merge branch 'feature/files' into feature/empty-screen 2020-10-07 16:02:18 +03:00