Vladislav Makhov
|
b4d3dc0114
|
Fix code after merge
|
2020-10-08 16:23:57 +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 |
|
TatianaLopaeva
|
54d2a99d29
|
Web: People: Added font-weight and color by layout
|
2020-10-08 14:49:57 +03:00 |
|
TatianaLopaeva
|
0e7f19332e
|
Web: People: Deleted unnecessary for EmptyScreenContainer widthProps
|
2020-10-08 14:25:28 +03:00 |
|
TatianaLopaeva
|
51b86b2620
|
Merge branch 'feature/files' into feature/people-filter-empty-screen
|
2020-10-08 14:15:51 +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 |
|
|
|
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 |
|
|
|
bc1438ba92
|
EF: rename
|
2020-10-08 12:07:05 +03:00 |
|
TatianaLopaeva
|
43dbd9e511
|
Web: People: Changed margin-right by layout
|
2020-10-08 12:04:35 +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 |
|
Vladislav Makhov
|
aef6e4035f
|
Fix code after merge
|
2020-10-08 11:16:08 +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
|
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 |
|
|
|
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 |
|
Vladislav Makhov
|
a72c087e2a
|
Merge branch 'feature/files' into feature/files-favorites
# Conflicts:
# web/ASC.Web.Common/src/api/files/index.js
|
2020-10-08 10:18:06 +03:00 |
|
Vladislav Makhov
|
716a9f387e
|
Fix code after merge
|
2020-10-08 10:14: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
|
5806daa594
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-07 18:23:34 +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 |
|
Vladislav Makhov
|
b24bc1f05a
|
Merge branch 'feature/files' into feature/files-favorites
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/index.js
# products/ASC.Files/Client/src/store/files/selectors.js
|
2020-10-07 17:11: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 |
|
TatianaLopaeva
|
da23f36f09
|
Merge branch 'feature/files' into feature/empty-screen
|
2020-10-07 16:02:18 +03:00 |
|
Alexey Kostenko
|
98fef4e364
|
Web: People: Changed text in header ( avatar editor page )
|
2020-10-07 16:01:42 +03:00 |
|
TatianaLopaeva
|
34506827b5
|
Update yarn.lock
|
2020-10-07 15:53:29 +03:00 |
|
TatianaLopaeva
|
449bc0e0b2
|
Web: Files: Deleted unnecessary fontSize
|
2020-10-07 15:32:03 +03:00 |
|
Alexey Kostenko
|
d5b62f7bb2
|
Merge branch 'feature/files' into feature/avatar-editor-redesign
|
2020-10-07 15:30:56 +03:00 |
|
TatianaLopaeva
|
17b8a00a62
|
Web: Files: Deleted unnecessary box
|
2020-10-07 15:21:46 +03:00 |
|
|
|
fc71716044
|
Web: Files: fixed SectionFilter import
|
2020-10-07 15:21:26 +03:00 |
|
TatianaLopaeva
|
de7e4fe062
|
Merge branch 'feature/files' into feature/empty-screen
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
|
2020-10-07 15:14:54 +03:00 |
|
Artem Tarasov
|
84bb49c0e3
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-07 15:14:26 +03:00 |
|
Ilya Oleshko
|
94d2ae1d07
|
Web: Files : Selectors : Added missing property
|
2020-10-07 14:46:59 +03:00 |
|
TatianaLopaeva
|
9ac0d6f73a
|
Web: Files: Changed margin
|
2020-10-07 14:42:09 +03:00 |
|
Vladislav Makhov
|
e7fc2fef13
|
Add Recent to the tree node.
|
2020-10-07 14:26:08 +03:00 |
|
Artem Tarasov
|
36158ded1d
|
Web: Files: fixed inability to navigate from TreeSettings to TreeFolders
|
2020-10-07 14:12:45 +03:00 |
|
|
|
c879c55009
|
Web: Files: fixed SharingPanel selectors
|
2020-10-07 14:05:14 +03:00 |
|
|
|
3fd94c1db9
|
Web: Files: fixed OperationsPanel selectors
|
2020-10-07 14:04:48 +03:00 |
|
|
|
ddc953bcf5
|
Web: Files: fixed NewFilesPanel selectors
|
2020-10-07 14:04:31 +03:00 |
|
|
|
9a87a89d0c
|
Web: Files: fixed VersionHistory selectors
|
2020-10-07 14:04:13 +03:00 |
|
|
|
f737bb1deb
|
Web: Files: fixed SectionHeaderContent selectors
|
2020-10-07 14:03:56 +03:00 |
|
|
|
254c158bef
|
Web: Files: fixed VersionRow selectors
|
2020-10-07 14:03:40 +03:00 |
|
|
|
ea11614b86
|
Web: Files: fixed Settings selectors
|
2020-10-07 14:03:22 +03:00 |
|
|
|
0d2eec0647
|
Web: Files: fixed SectionBodyContent selectors
|
2020-10-07 14:03:03 +03:00 |
|
|
|
06bc431f3e
|
Web: Files: fixed Home selectors
|
2020-10-07 14:02:42 +03:00 |
|
|
|
c789743835
|
Web: Files: fixed SectionPagingContent selectors
|
2020-10-07 14:02:19 +03:00 |
|
|
|
da1249cf4a
|
Web: Files: fixed SectionHeaderContent selectors
|
2020-10-07 14:00:46 +03:00 |
|
|
|
190460a797
|
Web: Files: fixed SectionFilterContent selectors
|
2020-10-07 14:00:28 +03:00 |
|
|
|
74dda40b90
|
Web: Files: fixed SectionBodyContent selectors
|
2020-10-07 14:00:05 +03:00 |
|
|
|
b265a01603
|
Web: Files: fixed FilesTileContent selectors
|
2020-10-07 13:59:36 +03:00 |
|
|
|
446c4575d3
|
Web: Files: fixed FilesRowContent selectors
|
2020-10-07 13:59:15 +03:00 |
|
|
|
2667c4928c
|
Web: Files: fixed DocEditor selectors
|
2020-10-07 13:58:54 +03:00 |
|
|
|
d5ed8c78e1
|
Web: Files: fixed EmptyTrashDialog selectors
|
2020-10-07 13:58:37 +03:00 |
|
|
|
8ee8bc2369
|
Web: Files: fixed DownloadDialog selectors
|
2020-10-07 13:58:16 +03:00 |
|
|
|
10fcad6c0e
|
Web: Files: fixed DeleteDialog selectors
|
2020-10-07 13:57:47 +03:00 |
|
|
|
44b525a042
|
Web: Files: fixed MainButton selectors
|
2020-10-07 13:57:19 +03:00 |
|
|
|
8a132dbd62
|
Web: Files: fixed TreeSettings selectors
|
2020-10-07 13:56:47 +03:00 |
|
|
|
478a7909fc
|
Web: Files: fixed TreeFolders selectors
|
2020-10-07 13:55:56 +03:00 |
|
|
|
ba3c40634d
|
Web: Files: added new selectors
|
2020-10-07 13:55:05 +03:00 |
|
|
|
e76e50dc79
|
Web: ServiceWorkers: Turned off debug mode
|
2020-10-07 13:43:51 +03:00 |
|
|
|
7d958b7f9b
|
Web: Files: Restored Suspense
|
2020-10-07 13:39:07 +03:00 |
|
Artem Tarasov
|
a49b2581d9
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/index.js
# products/ASC.Files/Client/src/store/files/reducers.js
|
2020-10-07 13:24:20 +03:00 |
|
|
|
11348e5fba
|
Update yarn.lock files
|
2020-10-07 12:58:38 +03:00 |
|
|
|
2e74a1bde3
|
Web: Replaced some code tot selectors
|
2020-10-07 12:47:55 +03:00 |
|
Ilya Oleshko
|
19f5206e3f
|
Web: Files : Home : Fixed existing items check on add temp item on create
|
2020-10-07 11:45:20 +03:00 |
|
Alexey Kostenko
|
90a045fa1c
|
Web: People: Refactoring (Moved mobile view of avatar editor from page to component)
|
2020-10-07 11:42:07 +03:00 |
|
Ilya Oleshko
|
066a396dbd
|
Web: Files : Home : Fixed double add temp item on create
|
2020-10-07 11:33:10 +03:00 |
|
TatianaLopaeva
|
ee6f71d6ae
|
Web: Files: Refactoring
|
2020-10-07 11:03:19 +03:00 |
|
TatianaLopaeva
|
da9611bd4b
|
Merge branch 'feature/files' into feature/empty-screen
|
2020-10-07 10:58:27 +03:00 |
|
TatianaLopaeva
|
650b5d076a
|
Web: Files: Refactoring
|
2020-10-07 10:57:05 +03:00 |
|
Alexey Kostenko
|
5b7b9aacbb
|
Web: People: Added toggle AvatarEditor in redux (this state need for mobile view AvatarEditor)
|
2020-10-07 10:05:44 +03:00 |
|
|
|
ac7eda1b93
|
Web: Files: fixed filter
|
2020-10-06 22:56:22 +03:00 |
|
Ilya Oleshko
|
2632a0d3da
|
Web: Files : Home : Fixed loopTree after create or update items at row
|
2020-10-06 21:48:55 +03:00 |
|
|
|
b8d2407530
|
Merge branch 'feature/loading-acceleration' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/loading-acceleration
|
2020-10-06 19:33:57 +03:00 |
|
|
|
201126834f
|
Web: Files: fixed url filter, fixed selectedFolder error
|
2020-10-06 19:33:41 +03:00 |
|
|
|
42d7ffae45
|
Web: People: Fixed loading Profile info after change People filter fields
|
2020-10-06 19:26:01 +03:00 |
|
|
|
7fb3ce6c09
|
Web: People: Added groups for API people loading
|
2020-10-06 19:07:10 +03:00 |
|
|
|
6cd15ef176
|
Merge branch 'feature/loading-acceleration' of github.com:ONLYOFFICE/AppServer into feature/loading-acceleration
|
2020-10-06 18:18:46 +03:00 |
|
|
|
c2cd41f8f2
|
Web: People: Fixed working of GroupMenu after applied reselect
|
2020-10-06 18:18:01 +03:00 |
|
Artem Tarasov
|
ef602b578f
|
Web: Files: fixed selected tree node on click in row
|
2020-10-06 17:07:58 +03:00 |
|
Alexey Kostenko
|
4a318d4e13
|
Web: People: Removed the ability to go to the avatar editor from the context menu
|
2020-10-06 16:44:01 +03:00 |
|
TatianaLopaeva
|
88d6a3ad07
|
Web: Files: Re-wrote styles for SectionBody and deleted unnecessary for EmptyFolderContainer widthProp
|
2020-10-06 16:04:33 +03:00 |
|
Alexey Kostenko
|
9a80672059
|
Web: People: Fixed saving empty avatar, removed unused code
|
2020-10-06 15:57:55 +03:00 |
|
TatianaLopaeva
|
b76bf8f3a0
|
Web: Files: Re-wrote styles EmptyFoldersContainer
|
2020-10-06 15:39:28 +03:00 |
|
|
|
a664bc9795
|
Web: Files: fixed Home selectors, added new selectors
|
2020-10-06 15:35:46 +03:00 |
|
|
|
fa4f3d5d7b
|
Web: Files: renamed setNewTreeFilesBadge action to setUpdateTree
|
2020-10-06 15:35:12 +03:00 |
|
|
|
5ae3b98548
|
Web: Files: fixed article body selectors, added redux to TreeFolders.js
|
2020-10-06 15:32:57 +03:00 |
|
Vladislav Makhov
|
e265dbf7c5
|
fix index by agreement
|
2020-10-06 15:03:29 +03:00 |
|
Ilya Oleshko
|
2732f892da
|
Web: Files : Home : Added events for rename and create, fixed loop folder data
|
2020-10-06 14:57:16 +03:00 |
|
Ilya Oleshko
|
a522433ed7
|
Web: Files : Home : Added selectors for fileRow
|
2020-10-06 14:56:31 +03:00 |
|
Diana
|
5c2b6debac
|
fix migrations
|
2020-10-06 14:39:44 +03:00 |
|
Artem Tarasov
|
0244d97007
|
Web: People: rename component LeaveFormDialog to DataLossWarningDialog, action setIsVisibleModalLeave to setIsVisibleDataLossDialog
|
2020-10-06 13:29:11 +03:00 |
|
|
|
3ad873f1c8
|
Web: People: Restored fields in filtering data
|
2020-10-06 12:46:10 +03:00 |
|
Artem Tarasov
|
045e618c3a
|
Merge branch 'feature/files' into feature/fix-redirect-after-update-profile
|
2020-10-06 12:20:21 +03:00 |
|
Artem Tarasov
|
e0547caad7
|
Web: People: fix routing
|
2020-10-06 11:49:36 +03:00 |
|
Vladislav Makhov
|
1992be53b8
|
Merge branch 'feature/files' into feature/files-favorites
# Conflicts:
# products/ASC.Files/Client/yarn.lock
|
2020-10-06 11:40:12 +03:00 |
|
|
|
af756a1e76
|
Web: Fixed opening @self profile view
|
2020-10-06 11:33:53 +03:00 |
|
Alexey Kostenko
|
39ee2f972c
|
Merge branch 'feature/files' into feature/avatar-editor-redesign
|
2020-10-06 11:15:53 +03:00 |
|
Alexey Kostenko
|
2249cec75a
|
Web: People: Fixed upload new photo on avatar page
|
2020-10-06 10:53:26 +03:00 |
|
Alexey Kostenko
|
f429c75ab5
|
Web: People: Added Loader on avatar-editor page
|
2020-10-06 09:38:35 +03:00 |
|
Alexey Kostenko
|
f0f12bff69
|
Web: People: Code formatting
|
2020-10-06 08:46:47 +03:00 |
|
Alexey Kostenko
|
28b2f7630e
|
Web: People: Added translation keys
|
2020-10-06 08:23:20 +03:00 |
|
Alexey Kostenko
|
5df3850527
|
Web: People/Components: Added handling of the cancel button
|
2020-10-06 07:00:37 +03:00 |
|
|
|
c5f87f8200
|
Web: People: Fixed refresh page with Filter
|
2020-10-05 21:41:04 +03:00 |
|
|
|
8d7cf4f2dc
|
Web: Replaced getCurrentModule with getCurrentProduct selector
|
2020-10-05 20:56:36 +03:00 |
|
|
|
c336279bf1
|
Web: Files: Fixed IsAdmin issues
|
2020-10-05 20:38:45 +03:00 |
|
Artem Tarasov
|
16d70a4168
|
Web: People: added LeaveFormDialog to updateUserForm
|
2020-10-05 18:54:57 +03:00 |
|
Artem Tarasov
|
3493ec390a
|
Web: People: added LeaveFormDialog to article, createUser
|
2020-10-05 18:13:33 +03:00 |
|
Artem Tarasov
|
a0873f6db2
|
Web: People: refactoring LeaveFormDialog
|
2020-10-05 18:12:32 +03:00 |
|
|
|
bf20339e47
|
Web: Files: fixed upload folder
|
2020-10-05 17:17:08 +03:00 |
|
Alexey Kostenko
|
b45965a15c
|
Web: Components/People: Added cancel button on avatar editor page
|
2020-10-05 17:15:25 +03:00 |
|
Artem Tarasov
|
5765475684
|
Web: People: added check for editing a form when clicking on a tree
|
2020-10-05 17:13:52 +03:00 |
|
Artem Tarasov
|
09a91ba47f
|
Web: People: refactoring LeaveFormDialog
|
2020-10-05 17:11:58 +03:00 |
|
Artem Tarasov
|
c44543e177
|
Web: People: deleted unusing variables
|
2020-10-05 17:10:28 +03:00 |
|
Vladislav Makhov
|
6d3bb5fd0e
|
Refactoring
|
2020-10-05 16:08:24 +03:00 |
|
Vladislav Makhov
|
5d1a84737c
|
Fix selected tree node initialization during first render
|
2020-10-05 16:06:26 +03:00 |
|
Alexey Kostenko
|
e6572e9574
|
Web: People/Components: Style fix, added translate keys
|
2020-10-05 15:39:55 +03:00 |
|
|
|
63ee865d98
|
Merge branch 'feature/files' into feature/loading-acceleration
# Conflicts:
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/index.js
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/src/pages/login/index.js
# web/ASC.Web.Common/src/utils/index.js
|
2020-10-05 15:37:09 +03:00 |
|
Artem Tarasov
|
5159b5c5b1
|
Web: People: added component LeaveFormDialog
|
2020-10-05 15:01:10 +03:00 |
|
Ilya Oleshko
|
df7a8c6515
|
Web: People: Home : Fixed status display
|
2020-10-05 14:59:42 +03:00 |
|
|
|
978b67f7a7
|
Update yarn.lock files
|
2020-10-05 14:46:07 +03:00 |
|
Vladislav Makhov
|
d6e5f1171d
|
Add reselect lib
|
2020-10-05 14:17:01 +03:00 |
|
|
|
53365f4c27
|
Merge branch 'feature/loading-acceleration' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/loading-acceleration
|
2020-10-05 14:01:39 +03:00 |
|
|
|
9269465e59
|
Web: Files: moved upload to actions
|
2020-10-05 14:01:32 +03:00 |
|
|
|
d00d16ee02
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Client/yarn.lock
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/src/components/pages/Wizard/index.js
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/src/api/settings/index.js
# web/ASC.Web.Common/src/pages/login/index.js
# web/ASC.Web.Common/src/store/auth/reducer.js
# web/ASC.Web.Common/src/utils/index.js
# web/ASC.Web.Common/yarn.lock
|
2020-10-05 13:32:26 +03:00 |
|
Artem Tarasov
|
0a248e6f3b
|
Web: People: fixed updating avatar in user list after creating new user
|
2020-10-05 13:29:14 +03:00 |
|
|
|
9c6812a9c3
|
EF: refactoring
|
2020-10-05 13:02:28 +03:00 |
|
Artem Tarasov
|
0836a55d68
|
Web: People: fixed redirect after editing user via direct link
|
2020-10-05 12:45:16 +03:00 |
|
|
|
9b5f32be30
|
Merge branch 'feature/schema' of github.com:ONLYOFFICE/AppServer into feature/schema
|
2020-10-05 12:27:33 +03:00 |
|
|
|
07263e58e8
|
EF: removed partial
Files: removed DbEncryptedData.cs
|
2020-10-05 12:27:15 +03:00 |
|
Artem Tarasov
|
a92365df79
|
fixed filter setting after returning from user/group view/edit
|
2020-10-05 11:29:01 +03:00 |
|
Vladislav Makhov
|
cfdfcf44ca
|
Remove unnecessary code
|
2020-10-05 11:04:15 +03:00 |
|
Vladislav Makhov
|
5afa1aa96a
|
Add possibility to remove via icon
|
2020-10-05 10:56:27 +03:00 |
|
Artem Tarasov
|
0cac098bdf
|
Web: People: fixed updating list of users after creating user
|
2020-10-05 10:50:50 +03:00 |
|
TatianaLopaeva
|
37e195ba53
|
Web: Re-wrote condition if the nameSchemaId is not set
|
2020-10-05 09:48:11 +03:00 |
|
Artem Tarasov
|
b82b55217b
|
Web: People: fixed inability to close the modal window for adding an avatar when creating a user
|
2020-10-05 09:35:50 +03:00 |
|
Alexey Kostenko
|
98d006d825
|
Web: Components: Fix mobile styles on AvatarEditor
|
2020-10-04 14:41:39 +03:00 |
|
Artem Tarasov
|
7dcc96b716
|
Web: People: added update state.people.users after update profile
|
2020-10-02 22:57:41 +03:00 |
|
|
|
3947b45177
|
Merge branch 'feature/loading-acceleration' of github.com:ONLYOFFICE/AppServer into feature/loading-acceleration
# Conflicts:
# products/ASC.Files/Client/src/store/files/selectors.js
|
2020-10-02 18:36:11 +03:00 |
|
|
|
9d32d7629a
|
Web: People: Re-written Home/Header with selectors and reselect + refactoring
|
2020-10-02 18:34:50 +03:00 |
|
Ilya Oleshko
|
80066c1877
|
Web: Files : Home : Fixed mapStateToProps with new selectors
|
2020-10-02 17:36:47 +03:00 |
|
Ilya Oleshko
|
adfb3ccc4f
|
Web: Files : Home : Fixed simple selectors
|
2020-10-02 17:35:57 +03:00 |
|
Ilya Oleshko
|
70fb72e628
|
Web: Files : Home : Added simple selectors, fixed mapStateToProps
|
2020-10-02 16:21:36 +03:00 |
|
TatianaLopaeva
|
7bbc5bb693
|
Web: Added mapDispatchToProps at ProfileInfo
|
2020-10-02 15:47:13 +03:00 |
|
Vladislav Makhov
|
119409958d
|
Add checking event is in Favorite dir or not
|
2020-10-02 15:23:35 +03:00 |
|
Vladislav Makhov
|
51eee12e90
|
Remove unnecessary code
|
2020-10-02 14:37:38 +03:00 |
|
Vladislav Makhov
|
b60c186417
|
Remove unnecessary code
|
2020-10-02 14:37:12 +03:00 |
|
Vladislav Makhov
|
0da00c3760
|
Refactoring
|
2020-10-02 14:36:45 +03:00 |
|
Vladislav Makhov
|
0d2f199572
|
Remove mock
|
2020-10-02 14:36:10 +03:00 |
|
Vladislav Makhov
|
14677d0b6b
|
Refactoring
|
2020-10-02 13:25:20 +03:00 |
|
Vladislav Makhov
|
93e9113a76
|
Add several thunks
|
2020-10-02 10:46:44 +03:00 |
|
Vladislav Makhov
|
dae2cf4f80
|
Add func's to add/remove item from fav's
|
2020-10-02 10:38:39 +03:00 |
|
Vladislav Makhov
|
298f342a5e
|
Add temporary "star" mock
|
2020-10-02 10:36:34 +03:00 |
|
Vladislav Makhov
|
157369bfb9
|
Add several reducers
|
2020-10-02 10:35:17 +03:00 |
|
Vladislav Makhov
|
520443f09d
|
Add several selectors
|
2020-10-02 10:34:57 +03:00 |
|
Alexey Kostenko
|
19a7d88fe1
|
Web: People/Components: Fix save avatar, added AvatarEditor component on AvatarEditor page
|
2020-10-02 10:10:40 +03:00 |
|
|
|
7bbba5f158
|
Web: People: Re-written Home/Body with selectors and reselect + refactoring
|
2020-10-01 22:01:52 +03:00 |
|
Diana
|
04ee542f22
|
fix migrations, models, added migration and model schema TelegramDbContext
|
2020-10-01 20:08:55 +03:00 |
|
|
|
c008acee57
|
Merge branch 'feature/files' into feature/loading-acceleration
# Conflicts:
# products/ASC.Files/Client/yarn.lock
# products/ASC.People/Client/src/components/Article/MainButton/index.js
# products/ASC.People/Client/src/components/pages/Profile/index.js
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
|
2020-10-01 17:32:12 +03:00 |
|
|
|
b5d6f589c8
|
fix Migration
|
2020-10-01 13:17:00 +03:00 |
|
|
|
6bad98e277
|
Merge branch 'master' into feature/schema
# Conflicts:
# config/appsettings.json
# products/ASC.Files/Server/ASC.Files.csproj
# web/ASC.Web.Studio/ASC.Web.Studio.csproj
|
2020-10-01 12:25:07 +03:00 |
|
|
|
0bd5099c00
|
Removed Migrations()
|
2020-10-01 11:39:21 +03:00 |
|
SuhorukovAnton
|
59e3c629b1
|
fix-messages: IDE0058
|
2020-10-01 10:58:57 +03:00 |
|
SuhorukovAnton
|
cb2e656e21
|
fix-messages: IDE0066
|
2020-10-01 10:57:35 +03:00 |
|
|
|
1b15795d7a
|
Web: Files: fixed fetchFiles action, refactoring
|
2020-10-01 10:41:00 +03:00 |
|
Alexey Kostenko
|
721d4d6d83
|
Merge branch 'feature/files' into feature/avatar-editor-redesign
|
2020-10-01 10:21:56 +03:00 |
|
TatianaLopaeva
|
01423d1159
|
Merge branch 'feature/files' into featrure/fixe-switching-language
|
2020-10-01 09:38:28 +03:00 |
|
TatianaLopaeva
|
b33328218a
|
Update yarn.lock files
|
2020-10-01 09:37:25 +03:00 |
|
TatianaLopaeva
|
82fac1f54d
|
Deleted unnecessary constant
|
2020-10-01 08:58:17 +03:00 |
|
TatianaLopaeva
|
6cfdee13b0
|
Added language into array of useEffect
|
2020-10-01 08:55:59 +03:00 |
|
|
|
ccd1aef9f8
|
Web: Re-written NavMenu with selectors and reselect
|
2020-10-01 01:25:08 +03:00 |
|
|
|
2f1d43df7b
|
Merge branch 'feature/files' into feature/loading-acceleration
|
2020-09-30 21:11:08 +03:00 |
|
|
|
140d57d5d4
|
Merge branch 'master' into feature/files
|
2020-09-30 18:28:27 +03:00 |
|
SuhorukovAnton
|
edbc0f247c
|
fix-messages: IDE0022
|
2020-09-30 17:47:42 +03:00 |
|
Artem Tarasov
|
8db1420cdd
|
Merge branch 'master' into feature/hash-password
|
2020-09-30 17:24:51 +03:00 |
|
|
|
58126fd98d
|
Auth by passwordHash
|
2020-09-30 17:16:48 +03:00 |
|
Alexey Kostenko
|
31391676cb
|
Web: People: Added conditions for going to the page with the avatar editor
|
2020-09-30 15:50:39 +03:00 |
|
Artem Tarasov
|
14f0d0f2be
|
update yarn.lock
|
2020-09-30 15:00:27 +03:00 |
|
SuhorukovAnton
|
ba1ed22345
|
fix-messages: IDE0058
|
2020-09-30 14:50:39 +03:00 |
|
Ilya Oleshko
|
a9163c06be
|
Web: Files : Fixed open files after create
|
2020-09-30 11:57:22 +03:00 |
|
Vladislav Makhov
|
7e14f4418b
|
Add actions to work with Favorites
|
2020-09-30 11:27:50 +03:00 |
|
Vladislav Makhov
|
8f240a4914
|
Add reducers to work with Favorites
|
2020-09-30 11:27:32 +03:00 |
|
Artem Tarasov
|
c68b6d6b7f
|
update yarn.lock
|
2020-09-30 10:53:51 +03:00 |
|
Diana
|
9e32aaca03
|
migration process
|
2020-09-29 20:17:06 +03:00 |
|
Diana
|
7888c8d501
|
added schema for mysql and npgsql
|
2020-09-29 20:12:07 +03:00 |
|
|
|
4ac2767afb
|
Web: Files: removed useless actions, fixed clearProgressData
|
2020-09-29 18:24:49 +03:00 |
|
|
|
4b302d1634
|
Web: People: Replaced RequestLoader to showLoader/hideLoader function calls
|
2020-09-29 17:43:13 +03:00 |
|
|
|
f96e5cee1a
|
Web: Files: Replaced RequestLoader to showLoader/hideLoader function calls
|
2020-09-29 17:40:42 +03:00 |
|
Vladislav Makhov
|
7bd39e2152
|
Extend several actions & selectors
|
2020-09-29 16:52:05 +03:00 |
|
Vladislav Makhov
|
993a5a58ad
|
Add Favorites to the tree node
|
2020-09-29 16:50:08 +03:00 |
|
Alexey Kostenko
|
c8374e3fa8
|
Web: People: Added a template for the avatar editor page
|
2020-09-29 16:46:27 +03:00 |
|
SuhorukovAnton
|
31cc18f568
|
fix-messages: IDE1006
|
2020-09-29 15:27:28 +03:00 |
|
SuhorukovAnton
|
9b6ccc19f0
|
fix-messages: IDE0074
|
2020-09-29 14:51:34 +03:00 |
|
|
|
80853762b1
|
Web: Files: Fixed mapDispatchToProps
|
2020-09-29 14:47:29 +03:00 |
|
|
|
86207e27fc
|
Web: Applied prettier styled and removed debugger
|
2020-09-29 14:46:28 +03:00 |
|
|
|
981e7646ca
|
Web: Files: Fixed opening DocEditor
|
2020-09-29 14:21:37 +03:00 |
|
Vladislav Makhov
|
5309d8ecf6
|
Add Favorites empty screen picture
|
2020-09-29 13:34:59 +03:00 |
|
SuhorukovAnton
|
1da0de1200
|
fix-messages: IDE0065
|
2020-09-29 13:28:03 +03:00 |
|
SuhorukovAnton
|
135a845eaf
|
fix-messages: IDE0063
|
2020-09-29 12:16:07 +03:00 |
|
SuhorukovAnton
|
b7cc10c13a
|
fix-messages: IDE0054
|
2020-09-29 12:03:37 +03:00 |
|
SuhorukovAnton
|
2d34d70a4e
|
fix-messages: IDE0051 and IDE0052
|
2020-09-29 11:57:37 +03:00 |
|
|
|
ad4b28d1f2
|
Merge branch 'feature/files' into feature/loading-acceleration
# Conflicts:
# products/ASC.Files/Client/public/index.html
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/Article/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/components/pages/Home/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Common/src/components/index.js
|
2020-09-29 11:48:36 +03:00 |
|
Vladislav Makhov
|
4d45163704
|
Add Favorites options to dropdown menu
|
2020-09-29 11:41:02 +03:00 |
|
TatianaLopaeva
|
ea2f5ec097
|
Merge branch 'feature/files' into feature/payments-enterprise
|
2020-09-29 09:06:16 +03:00 |
|
SuhorukovAnton
|
d866eccade
|
fix-messages: IDE0044
|
2020-09-28 18:42:03 +03:00 |
|
SuhorukovAnton
|
29ec562a78
|
fix-messages: IDE0038
|
2020-09-28 18:21:29 +03:00 |
|
Ilya Oleshko
|
ac9262f4c9
|
Web: Files : Fixed editor url, always last
|
2020-09-28 17:46:27 +03:00 |
|
SuhorukovAnton
|
e3e12c7fb0
|
fix-messages: IDE0030
|
2020-09-28 17:31:07 +03:00 |
|
Ilya Oleshko
|
9933b768d0
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-28 17:23:32 +03:00 |
|
Ilya Oleshko
|
e4764828f3
|
Web: Files: Editor : Fixed frame height for tablet
|
2020-09-28 17:23:11 +03:00 |
|
SuhorukovAnton
|
ba07caf1c8
|
fix-messages: IDE0017
|
2020-09-28 17:22:46 +03:00 |
|
SuhorukovAnton
|
3b0a86a536
|
fix-messages: IDE0016
|
2020-09-28 16:48:27 +03:00 |
|
TatianaLopaeva
|
fbc9e7a354
|
Merge branch 'feature/files' into feature/payments-enterprise
|
2020-09-28 16:22:49 +03:00 |
|
|
|
5ad8730c46
|
Web: People: Fixed open @self profile
|
2020-09-28 16:20:16 +03:00 |
|
Artem Tarasov
|
bb905602de
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-28 16:19:47 +03:00 |
|
|
|
b05bbc236a
|
Files: fix openedit
|
2020-09-28 16:04:57 +03:00 |
|
TatianaLopaeva
|
eaa24436db
|
Merge branch 'feature/files' into feature/payments-enterprise
|
2020-09-28 16:04:54 +03:00 |
|
Ilya Oleshko
|
61655a5790
|
Web: Files: App : Fixed initial requests, removed fetchMyFolder
|
2020-09-28 14:48:25 +03:00 |
|
Artem Tarasov
|
01eae38cec
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-28 13:48:44 +03:00 |
|
|
|
c593620865
|
Files: fix count
|
2020-09-28 13:41:48 +03:00 |
|
Artem Tarasov
|
6e832d47c2
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-28 13:10:23 +03:00 |
|
Artem Tarasov
|
1328eec01b
|
Web: Files: refactoring translate SettingsTree
|
2020-09-28 12:55:59 +03:00 |
|
Ilya Oleshko
|
ecd18e2a13
|
Web: Files: Editor : Fixed frame height for tablet
|
2020-09-28 12:47:12 +03:00 |
|
|
|
2c1d473314
|
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
# products/ASC.Files/Server/Controllers/FilesController.cs
|
2020-09-28 12:29:33 +03:00 |
|
Alexey Kostenko
|
c8b88c507f
|
Web: People: Updated toast notifications
|
2020-09-28 11:48:35 +03:00 |
|
Alexey Kostenko
|
99026e36be
|
Web: Files: Updated toast notifications
|
2020-09-28 11:34:52 +03:00 |
|
|
|
a6180afa35
|
Web: Normalize routing + refactoring
|
2020-09-25 19:14:50 +03:00 |
|
|
|
89df700fb1
|
Files: fix
|
2020-09-25 13:47:21 +03:00 |
|
|
|
69b21cd7a5
|
Web: People: Fixed routing to GroupAction from Home page
|
2020-09-25 11:04:34 +03:00 |
|
|
|
c5ed32f384
|
Web: People: Fixed routing to view/edit Profile from Home page
|
2020-09-25 10:53:39 +03:00 |
|
TatianaLopaeva
|
eac4556983
|
Merge branch 'feature/files' into feature/payments-enterprise
|
2020-09-25 10:44:31 +03:00 |
|
|
|
63a973375a
|
Web: People: Added RowsLoader to Section Body
|
2020-09-25 10:39:21 +03:00 |
|
|
|
72cf8e4f2b
|
Web: Moved RowsLoader to ASC.Web.Common
|
2020-09-25 10:36:13 +03:00 |
|
Alexey Kostenko
|
69dcd77129
|
Web: People: Moved indication of success of link copy in InviteDialog
|
2020-09-24 16:18:37 +03:00 |
|
|
|
5cef360ade
|
Web: Files: added hideAside prop to PageLayout
|
2020-09-24 15:07:08 +03:00 |
|
