Vladislav Makhov
|
716a9f387e
|
Fix code after merge
|
2020-10-08 10:14:38 +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
|
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 |
|
Artem Tarasov
|
36158ded1d
|
Web: Files: fixed inability to navigate from TreeSettings to TreeFolders
|
2020-10-07 14:12:45 +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 |
|
Ilya Oleshko
|
066a396dbd
|
Web: Files : Home : Fixed double add temp item on create
|
2020-10-07 11:33:10 +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 |
|
|
|
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 |
|
|
|
3ad873f1c8
|
Web: People: Restored fields in filtering data
|
2020-10-06 12:46:10 +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 |
|
|
|
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 |
|
|
|
bf20339e47
|
Web: Files: fixed upload folder
|
2020-10-05 17:17:08 +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 |
|
|
|
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 |
|
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 |
|
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 |
|
TatianaLopaeva
|
37e195ba53
|
Web: Re-wrote condition if the nameSchemaId is not set
|
2020-10-05 09:48:11 +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 |
|
