Artem Tarasov
|
dfef5346ff
|
Web: Files: Tiles: fix after merge
|
2021-04-27 14:52:29 +03:00 |
|
Artem Tarasov
|
5d2264d483
|
Merge branch 'develop' into feature/thumbnails
# Conflicts:
# products/ASC.Files/Client/src/components/EditingWrapperComponent.js
# products/ASC.Files/Client/src/components/FileItem.js
# products/ASC.Files/Client/src/components/FilesContainer.js
# products/ASC.Files/Client/src/components/FilesContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/EditingWrapperComponent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/SimpleFilesRow.js
# products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
# products/ASC.Files/Client/src/components/sub-components/Badges.js
# products/ASC.Files/Client/src/components/sub-components/EditingWrapperComponent.js
# products/ASC.Files/Client/src/components/sub-components/Icons.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/FilesRowContainer.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleRowContent.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/BadgesFileTile.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FilesTileContainer.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/SimpleTileContent.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/TileContainer.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/TileContent.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
|
2021-04-27 13:40:38 +03:00 |
|
Alexey Kostenko
|
bf963f511b
|
Merge branch 'develop' into bugfix/thirdparty
|
2021-04-27 11:25:30 +03:00 |
|
|
8bb173fa92
|
Thirdparty: fix providers
|
2021-04-26 21:42:39 +03:00 |
|
Alexey Kostenko
|
a96ae77570
|
OAuth: Fixed crash on login page
|
2021-04-26 16:41:57 +03:00 |
|
Artem Tarasov
|
8c939c77bb
|
Web: Files: refactoring: renamed HOCs
|
2021-04-26 15:46:26 +03:00 |
|
Artem Tarasov
|
4b2f116044
|
Web: Files: refactoring: fix after merge
|
2021-04-25 20:41:57 +03:00 |
|
Artem Tarasov
|
42ed75d786
|
Merge branch 'develop' into refactoring/files-list
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/FilesRowContent.js
|
2021-04-25 19:09:48 +03:00 |
|
|
e89c8a6f76
|
Files: fixed getfolderID
|
2021-04-25 12:58:26 +03:00 |
|
|
6d2f417c5c
|
Method GetAuthProviders moved to PeopleController
|
2021-04-25 11:46:44 +03:00 |
|
|
d2588270cf
|
Merge branch 'master' into develop
|
2021-04-23 20:16:42 +03:00 |
|
|
4bdf5e4e55
|
Web: Fix fallback language apply on new language setup
|
2021-04-23 19:51:10 +03:00 |
|
|
00b46fbfad
|
Web: Files: Fix Copy/Move to "Shared with Me" sub-folder with full access rights
|
2021-04-23 19:03:25 +03:00 |
|
|
838435bab5
|
Merge branch 'hotfix/v0.1.7' of https://github.com/ONLYOFFICE/AppServer into hotfix/v0.1.7
|
2021-04-23 18:00:17 +03:00 |
|
|
cd699e37e2
|
Files: Fix opening of version
|
2021-04-23 18:00:05 +03:00 |
|
|
8c3212bc9f
|
Merge branch 'hotfix/v0.1.7' of https://github.com/ONLYOFFICE/AppServer into hotfix/v0.1.7
|
2021-04-23 17:48:24 +03:00 |
|
|
9f91ff6f5c
|
Web: Files: fixed display of third-party folders in the tree menu
|
2021-04-23 17:48:15 +03:00 |
|
|
fc297faa52
|
Merge branch 'develop' into feature/products
|
2021-04-23 17:35:11 +03:00 |
|
|
20c0795204
|
Mail: resources
|
2021-04-23 17:31:15 +03:00 |
|
Artem Tarasov
|
a3408860c3
|
Web: Files: refactoring: FilesRow, FilesTile renamed to RowsView, TilesView, pages moved to /src/
|
2021-04-23 17:17:11 +03:00 |
|
|
9f072c313b
|
Web: Files: Store: Fixed actions for Favorites and Recent folders
|
2021-04-23 17:09:52 +03:00 |
|
|
96e662f723
|
Web: Files: fixed displaying thirdpaty items
|
2021-04-23 17:06:50 +03:00 |
|
Artem Tarasov
|
d61f4a6984
|
Web: Files: refactoring: moved hocs to HOCs folder, Badges, Icons, EditingWrapperComponents, EmptyContainer to components folder
|
2021-04-23 16:47:37 +03:00 |
|
|
15414c84f2
|
Web: Files: Store: Fixed displaying "Add account" for third-party accounts if setting disabled
|
2021-04-23 16:44:59 +03:00 |
|
Artem Tarasov
|
02f16eb2e1
|
Web: Files: refactoring: moved onFilesClick to withFileActions HOC
|
2021-04-23 16:21:09 +03:00 |
|
|
70aef7aefa
|
Merge branch 'hotfix/v0.1.7' of https://github.com/ONLYOFFICE/AppServer into hotfix/v0.1.7
|
2021-04-23 16:16:07 +03:00 |
|
|
953b907f32
|
Web: Files: added rename notifications
|
2021-04-23 16:15:46 +03:00 |
|
|
33d7e89552
|
Web: Files: Store: Fixed displaying "view" action inside recycle bin
|
2021-04-23 16:15:44 +03:00 |
|
|
b5d84566b9
|
Web: Files: Dialog: Fixed setting token data for oAuth providers for ThriParty page, fixed opening WebDav connect window
|
2021-04-23 16:09:29 +03:00 |
|
|
75b62bf81b
|
Calendar: translations
|
2021-04-23 16:01:14 +03:00 |
|
Artem Tarasov
|
9f7bc2d3f2
|
Web: Files: refactoring: created withContextOptions HOC, refactoring withFileActions
|
2021-04-23 15:57:49 +03:00 |
|
|
76d619d7d6
|
Web: Files: Fix ConnectedClouds openLocation
|
2021-04-23 15:18:49 +03:00 |
|
|
02bcb50e67
|
Web: Files: Fix ConnectedClouds context-options work
|
2021-04-23 15:02:57 +03:00 |
|
Artem Tarasov
|
39780ab498
|
Merge branch 'develop' into refactoring/files-list
|
2021-04-23 14:47:40 +03:00 |
|
Artem Tarasov
|
e90a9201bb
|
Web: Files: refactoring: created withBadges HOC, rename withLoader, applied changes
|
2021-04-23 14:10:42 +03:00 |
|
|
17ead73174
|
Web: Files: Fix EmptyTrashDialog texts
|
2021-04-23 12:30:01 +03:00 |
|
Artem Tarasov
|
e22c641c9c
|
Web: Files: refactoring: created withLoadingCheck HOC
|
2021-04-22 23:56:18 +03:00 |
|
Artem Tarasov
|
22b15ac51a
|
Web: Files: refactoring: created Badges component, refactoring EditingWrapperComponent, FilesTileContent, FilesRowContent
|
2021-04-22 17:28:49 +03:00 |
|
Artem Tarasov
|
0bf59a8c98
|
Web: Files: refactoring FilesTileContent
|
2021-04-22 16:48:32 +03:00 |
|
Alexey Kostenko
|
c79c248b3a
|
Web: People: OAuth buttons have been moved from the edit profile section to the profile view section
|
2021-04-22 16:09:56 +03:00 |
|
|
c4e934f83f
|
Web: Files: Fix DeleteDialog texts and styles
|
2021-04-22 16:03:35 +03:00 |
|
Artem Tarasov
|
6381a0c524
|
Web: Files: refactoring FilesRowContent, withContentActions
|
2021-04-22 16:00:19 +03:00 |
|
Alexey Kostenko
|
8519fe4d60
|
Web: Components: SocialButton style fix
|
2021-04-22 14:54:06 +03:00 |
|
|
553ac70278
|
Bump version v0.1.7
|
2021-04-22 14:13:12 +03:00 |
|
Alexey Kostenko
|
667a76b95f
|
Oauth: Refactoring
|
2021-04-22 13:34:42 +03:00 |
|
Ilya Oleshko
|
c02656d200
|
Web: Files: Dialog: Fixed setting token data for oAuth providers for ThriParty page
|
2021-04-22 12:50:16 +03:00 |
|
Artem Tarasov
|
0131520988
|
Web: Files: refactoring Tile, fix drag, moved EditingWraperComponent to sub-components
|
2021-04-22 11:42:19 +03:00 |
|
Artem Tarasov
|
813e17cac2
|
Web: Files: created withFileaActions HOC, refactoring SimpleFilesRow
|
2021-04-22 03:12:50 +03:00 |
|
|
3782ea4bc3
|
Applied last changes in Mail/Calendar ComingSoon pages
|
2021-04-21 22:03:49 +03:00 |
|
|
1516fe0249
|
Merge branch 'develop' into feature/products
|
2021-04-21 21:49:39 +03:00 |
|