Viktor Fomin
|
6e6d706b23
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/upload-panel
|
2021-01-27 16:09:59 +03:00 |
|
Ilya Oleshko
|
0efe6140c9
|
web: common: bump version
|
2021-01-27 13:57:15 +03:00 |
|
Ilya Oleshko
|
5037c2210e
|
Web: Common: Selectors: Fixed module wrapper, if dummy module comes from api.
|
2021-01-27 13:57:04 +03:00 |
|
Ilya Oleshko
|
bd38b065cb
|
Web: Common: Api: Get modules with info
|
2021-01-27 13:55:31 +03:00 |
|
TatianaLopaeva
|
0cf5c0e39f
|
Web:Common: ScrollToTop component refactoring.
|
2021-01-27 11:09:28 +03:00 |
|
|
|
436bf7a06e
|
Web: People: Added routes
|
2021-01-27 10:31:29 +03:00 |
|
Artem Tarasov
|
8829da29b0
|
Web: Common: Layout: fixed recalculation of height in Safari for large tablets
|
2021-01-26 20:20:21 +03:00 |
|
TatianaLopaeva
|
943015a8d6
|
Web: Fixed after merge.
|
2021-01-26 18:59:19 +03:00 |
|
TatianaLopaeva
|
951961ad35
|
Web: Refactoring.
|
2021-01-26 18:21:50 +03:00 |
|
Artem Tarasov
|
7bd819a1ae
|
Merge branch 'feature/fix-hide/show-header' of github.com:ONLYOFFICE/AppServer into feature/fix-hide/show-header
|
2021-01-26 16:29:06 +03:00 |
|
|
|
3efedf74eb
|
Web: Fixed routing on Module link
|
2021-01-26 16:28:51 +03:00 |
|
Artem Tarasov
|
8082be3eb4
|
Web: Common: Layout: fixed page height for large tablets
|
2021-01-26 16:28:45 +03:00 |
|
TatianaLopaeva
|
99162c3c2a
|
Web: Common: PageLayout: Deleted useless condition.
|
2021-01-26 16:25:53 +03:00 |
|
TatianaLopaeva
|
3ccf73adb7
|
Web: Common: PageLayout: Fixed margin top for Ipad.
|
2021-01-26 15:41:03 +03:00 |
|
TatianaLopaeva
|
40d94e48e5
|
Web: Common: PageLayout: Changed the height of section header for Ipad.
|
2021-01-26 15:06:02 +03:00 |
|
TatianaLopaeva
|
d8a17e6443
|
Web: Common: PageLayout: Added the condition for margin top for Ipad.
|
2021-01-26 14:39:44 +03:00 |
|
TatianaLopaeva
|
2b8dfc80e9
|
Web: Common/Files/People: Fixed "jumps" when go to the next page.
|
2021-01-26 13:50:29 +03:00 |
|
|
|
36c7a171df
|
Web: Fixed load/unload People store
|
2021-01-26 13:36:05 +03:00 |
|
|
|
f0e227731f
|
Fixed loading products, lazy loading webitemmanager
|
2021-01-26 12:29:50 +03:00 |
|
|
|
b9ed789746
|
Web: Applied WP:ModuleFederation best practices
|
2021-01-26 00:55:46 +03:00 |
|
Artem Tarasov
|
4165af21ea
|
web: components: bump version
|
2021-01-25 19:41:07 +03:00 |
|
Artem Tarasov
|
d2e930a4a1
|
Web: Components: Backdrop: fixed the ability to scroll the page when the backdrop is active
|
2021-01-25 19:40:52 +03:00 |
|
|
|
64655a7da0
|
Api: modules. Added info method
|
2021-01-25 17:37:26 +03:00 |
|
Artem Tarasov
|
3c815511ac
|
Web: Common: Layout: fixed the ability to scroll the page when the dropdown is open
|
2021-01-25 16:34:56 +03:00 |
|
Ilya Oleshko
|
83ae407486
|
web: common: bump version
|
2021-01-25 15:03:20 +03:00 |
|
Ilya Oleshko
|
f95d9ea71f
|
Web: Common: Pages: ComingSoon: Added to title product name
|
2021-01-25 15:03:07 +03:00 |
|
Ilya Oleshko
|
d803f4a45b
|
web: common: bump version
|
2021-01-25 14:31:42 +03:00 |
|
Ilya Oleshko
|
1f5e6ab1f4
|
Web: Common: Selectors: Added missing props, fixed icons route
|
2021-01-25 14:31:34 +03:00 |
|
Ilya Oleshko
|
1eefebb69b
|
Web: Common: NavMenu: Beta badge only for menu icon
|
2021-01-25 14:30:36 +03:00 |
|
Ilya Oleshko
|
9f3d803af5
|
Web: Client: Fixed modules list
|
2021-01-25 14:29:42 +03:00 |
|
Ilya Oleshko
|
e486a7919a
|
Web: Fixed modules icons
|
2021-01-25 14:28:51 +03:00 |
|
Ilya Oleshko
|
f96a168b55
|
Web: Client: Added talk route, removed community
|
2021-01-25 14:27:49 +03:00 |
|
Ilya Oleshko
|
8a31b1d6d1
|
web: common: bump version
|
2021-01-25 12:49:28 +03:00 |
|
Ilya Oleshko
|
4df2c8d8b0
|
Web: Common: Selectors: Fixed inserting for dummy modules, added dummy community module
|
2021-01-25 12:49:15 +03:00 |
|
Ilya Oleshko
|
fe12c8f7d4
|
Web: Client: Home: Added selectors usage
|
2021-01-25 12:48:00 +03:00 |
|
Ilya Oleshko
|
bf0d15546e
|
Web: Client: Added redirect to coming soon page for community route
|
2021-01-25 12:47:18 +03:00 |
|
Ilya Oleshko
|
253d48b53c
|
Web: Restored default page, fixed infinite redirect loop on home page
|
2021-01-25 11:57:15 +03:00 |
|
Ilya Oleshko
|
6c5f58c351
|
web: common: bump version
|
2021-01-25 11:44:29 +03:00 |
|
Ilya Oleshko
|
6515b8c9ef
|
Web: Common: Selectors: Added dummy modules to module selector
|
2021-01-25 11:44:07 +03:00 |
|
Ilya Oleshko
|
554e16d47d
|
Web: Client: Added redirect to coming soon page for new dummy modules
|
2021-01-25 11:43:26 +03:00 |
|
Artem Tarasov
|
0622f3003f
|
Web: Client: App: fixed tag name
|
2021-01-25 10:36:50 +03:00 |
|
TatianaLopaeva
|
545dacc8ca
|
Web: Common: Fixed scrolling of article on small tablet and mobile, fixed margin top of unpin article.
|
2021-01-22 16:50:20 +03:00 |
|
|
|
711fc4954e
|
web: components: bump version
|
2021-01-22 15:53:54 +03:00 |
|
|
|
167c20b06a
|
Web: Components: fixed drop-down event function
|
2021-01-22 15:53:31 +03:00 |
|
|
|
789b547ccf
|
Merge branch 'develop' into feature/workspaces
# Conflicts:
# packages/asc-web-components/src/components/icons/svg/icon_box.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_dropbox.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_google_drive.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_kdrive.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_nextcloud.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_onedrive.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_owncloud.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_sharepoint.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_webdav.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_yandex_disk.react.svg
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/dialogs/DownloadDialog/index.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/index.js
# products/ASC.Files/Client/src/store/files/actions.js
# products/ASC.People/Client/package.json
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/package.json
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/yarn.lock
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/yarn.lock
# yarn.lock
|
2021-01-22 11:24:16 +03:00 |
|
Vladislav Makhov
|
93af940e51
|
web: commented console.log
|
2021-01-21 20:55:36 +03:00 |
|
|
|
4f1398e33e
|
web: common: bump version
|
2021-01-21 18:44:13 +03:00 |
|
|
|
3b43cfa334
|
Web: Files: fixed header styles
|
2021-01-21 18:43:48 +03:00 |
|
Artem Tarasov
|
cdecfc3ed3
|
Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/store/files/selectors.js
# web/ASC.Web.Client/src/App.js
|
2021-01-21 16:45:35 +03:00 |
|
Artem Tarasov
|
560a12e157
|
Merge branch 'feature/fix-hide/show-header' of github.com:ONLYOFFICE/AppServer into feature/fix-hide/show-header
|
2021-01-21 16:27:35 +03:00 |
|
Artem Tarasov
|
50552cfb15
|
Web: Common: Layout: fixed bugs of recalculation of height on large tablets (ios)
|
2021-01-21 16:27:04 +03:00 |
|
TatianaLopaeva
|
e871a0793a
|
Web: Common: Fixed displaying of context menu.
|
2021-01-21 14:19:15 +03:00 |
|
TatianaLopaeva
|
16c6389215
|
Web:Common: Fixed styles for Ipad.
|
2021-01-21 13:41:59 +03:00 |
|
TatianaLopaeva
|
f44b086598
|
Web: Common: Fixed non-loadable content in the landscape version. (ios)
|
2021-01-21 13:03:00 +03:00 |
|
TatianaLopaeva
|
beb349e26a
|
Web: Common: Removed useless horizontal scroll bar.
|
2021-01-21 11:38:53 +03:00 |
|
TatianaLopaeva
|
d033841728
|
Web: Common: Removed scrolled of article on mobile/tablet devices.
|
2021-01-20 21:56:32 +03:00 |
|
TatianaLopaeva
|
4c262c2854
|
Web: Common: Changed mobile layout only for mobile/tablet devices.
|
2021-01-20 21:04:00 +03:00 |
|
|
|
8d62eb5fbf
|
Update yarn.lock files
|
2021-01-20 12:55:23 +03:00 |
|
|
|
b07e76d993
|
web: common: bump version
|
2021-01-20 12:49:23 +03:00 |
|
|
|
ceb1da1c06
|
Web: Files: fix "getsharingkeys" condition
|
2021-01-20 12:49:14 +03:00 |
|
|
|
39d904a7c5
|
web: common: bump version
|
2021-01-20 12:36:58 +03:00 |
|
|
|
bf7a5d81df
|
Web: Files: fix "getsharingkeys" working
|
2021-01-20 12:36:35 +03:00 |
|
Artem Tarasov
|
ce98d325b7
|
Web: Common: Layout: removed the white bar in the selector if there is a hidden block in the fileter
|
2021-01-19 21:16:09 +03:00 |
|
TatianaLopaeva
|
cb2ccc35a4
|
Web: Common: Fixed hiding of header on scrolling down when page is short. (ios)
|
2021-01-19 17:48:03 +03:00 |
|
Viktor Fomin
|
67836795c4
|
Web: Common: rename download panel
|
2021-01-19 15:27:09 +03:00 |
|
Viktor Fomin
|
97e4e859d7
|
Web: Common: open download panel
|
2021-01-19 14:40:04 +03:00 |
|
Viktor Fomin
|
f2ee1b2747
|
Web: Common: fixed floating button
|
2021-01-19 14:14:15 +03:00 |
|
Viktor Fomin
|
62bafef07e
|
Web: Components: added new icons
|
2021-01-19 14:09:41 +03:00 |
|
Artem Tarasov
|
bad83853d9
|
Merge branch 'feature/fix-hide/show-header' of github.com:ONLYOFFICE/AppServer into feature/fix-hide/show-header
|
2021-01-18 22:55:21 +03:00 |
|
Artem Tarasov
|
ce04e3b3fe
|
Web: Common: Layout: fixed bugs when changing orientation (ios, chrome)
|
2021-01-18 22:54:52 +03:00 |
|
|
|
3b959f81ed
|
Bump version to v0.0.9
|
2021-01-18 19:06:31 +03:00 |
|
Artem Tarasov
|
2619753ade
|
Web: Client: TgirdPartySettings: removed unused code
|
2021-01-18 17:57:51 +03:00 |
|
TatianaLopaeva
|
9273fd82f4
|
Web: Common: Fixed auto scrolling down on ios.
|
2021-01-18 17:30:28 +03:00 |
|
TatianaLopaeva
|
97e6c6037a
|
Web: Common: PageLayout: Fixed width of section-header, when width of article more than 240px.
|
2021-01-18 17:10:22 +03:00 |
|
TatianaLopaeva
|
a4f416789a
|
Merge branch 'develop' into feature/fix-hide/show-header
|
2021-01-18 12:02:40 +03:00 |
|
|
|
83368921d3
|
web: common: bump version
|
2021-01-18 12:02:15 +03:00 |
|
|
|
35be26204c
|
Web: Common: fixed SettingsFilesLoader width
|
2021-01-18 12:01:36 +03:00 |
|
|
|
ef22eb04c5
|
Web: Client: Fix third-party response page displaying
|
2021-01-15 18:15:07 +03:00 |
|
TatianaLopaeva
|
26c680010a
|
Web: Common/People: Deleted useless imports.
|
2021-01-15 17:50:30 +03:00 |
|
TatianaLopaeva
|
f869209eee
|
Web: Common: Fixed automatic scrolling down after loading the page.
|
2021-01-15 17:48:05 +03:00 |
|
Ilya Oleshko
|
8f3b4a60dd
|
Web: Files: Added ThirdPartyResponse page error container, fixed router
|
2021-01-15 16:28:08 +03:00 |
|
TatianaLopaeva
|
f7fbbceeb6
|
Web: Common: Layout: Set height to 100% for mobile.
|
2021-01-15 16:05:54 +03:00 |
|
TatianaLopaeva
|
acbfd88658
|
Web: Common: Layout: Fixed issue with title not displaying when scrolling up. Fixed the disappearance of the header only if you can make the scroll larger than the width of the header and section header.
|
2021-01-15 16:04:34 +03:00 |
|
TatianaLopaeva
|
31d053bc13
|
Web: Common: Fixed the issue of not scrolling horizontally (touchpad).
|
2021-01-15 14:41:44 +03:00 |
|
|
|
90f81df4c7
|
Merge branch 'develop' into feature/thirdparty-integrations
|
2021-01-15 13:39:31 +03:00 |
|
|
|
7650acfec3
|
Bump version to v0.0.8
|
2021-01-15 13:03:47 +03:00 |
|
Ilya Oleshko
|
24127929aa
|
Web: Files: Added ThirdParty response page, fixed oAuth connect/reconnect
|
2021-01-15 11:52:29 +03:00 |
|
TatianaLopaeva
|
d300de9839
|
Web: Common: PageLayout: Refactoring styles.
|
2021-01-15 10:04:24 +03:00 |
|
TatianaLopaeva
|
e6ba5cf5ab
|
Web: Common: NavMenu: Deleted useless console.log.
|
2021-01-14 20:50:10 +03:00 |
|
TatianaLopaeva
|
3440ae9bb4
|
Web: Common: NavMenu/PageLayout: Fixed incorrect display of the modal dialog, as a result of which the appeared problems with z-index in the Navigation Menu were fixed & Refactoring.
|
2021-01-14 20:44:59 +03:00 |
|
|
|
4ea47886f6
|
Bump version to v0.0.7
|
2021-01-14 17:56:05 +03:00 |
|
TatianaLopaeva
|
e0980d3b02
|
Web: Common: PageLayout: Fixed animation of section header visibility.
|
2021-01-14 14:16:09 +03:00 |
|
|
|
4c6538f849
|
Merge branch 'feature/thirdparty-integrations' of https://github.com/ONLYOFFICE/AppServer into feature/thirdparty-integrations
|
2021-01-14 11:00:18 +03:00 |
|
Vladislav Makhov
|
2391bc001c
|
web: common: bump version
|
2021-01-14 10:59:03 +03:00 |
|
Vladislav Makhov
|
567c951dfd
|
web: common: fix language data in private browsing mode
|
2021-01-14 10:58:49 +03:00 |
|
|
|
2848c39c57
|
Merge branch 'develop' into feature/thirdparty-integrations
|
2021-01-14 10:14:46 +03:00 |
|
TatianaLopaeva
|
02df0294cf
|
Web: Common: Removed inactive scrollbars in tablet view, horizontal scroll added to the end of the visible page height.
|
2021-01-13 15:21:06 +03:00 |
|
TatianaLopaeva
|
9bcb922c1a
|
Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/index.js
# web/ASC.Web.Common/src/components/Layout/index.js
# web/ASC.Web.Common/src/components/NavMenu/index.js
# web/ASC.Web.Common/src/components/PageLayout/index.js
# web/ASC.Web.Common/src/components/PageLayout/sub-components/section-header.js
# web/ASC.Web.Common/src/store/auth/actions.js
# web/ASC.Web.Common/src/store/auth/reducer.js
# web/ASC.Web.Common/src/store/auth/selectors.js
|
2021-01-13 13:27:55 +03:00 |
|
|
|
ae69a9559e
|
Files: removed temp
|
2021-01-13 12:41:29 +03:00 |
|
Vladislav Makhov
|
7289f53628
|
web: common: bump version
|
2021-01-13 11:27:59 +03:00 |
|
Vladislav Makhov
|
754ae6713d
|
web: common: fix link
|
2021-01-13 11:27:41 +03:00 |
|
|
|
f6ca373137
|
MemoryCache -> IMemoryCache
|
2021-01-12 20:51:14 +03:00 |
|
Artem Tarasov
|
9e9cf3face
|
web: components: bump version
|
2021-01-12 17:27:26 +03:00 |
|
Artem Tarasov
|
9df05a53c9
|
Web: Components: ModalDialog: fixed cursor type in modal
|
2021-01-12 17:27:03 +03:00 |
|
Artem Tarasov
|
adc795feb4
|
Web: Client: thirdPartySettings: changed the cursor to default
|
2021-01-12 13:24:44 +03:00 |
|
Vladislav Makhov
|
7ad7d4556e
|
web: common: fix links in tpi settings
|
2021-01-12 09:27:04 +03:00 |
|
Vladislav Makhov
|
745bd8be2c
|
web: common: bump version
|
2021-01-12 09:25:42 +03:00 |
|
|
|
c7c9225923
|
Merge branch 'develop' into feature/thirdparty-integrations
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.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/locales/en/translation.json
# products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json
# products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
# products/ASC.Files/Client/src/store/files/selectors.js
|
2021-01-11 12:37:31 +03:00 |
|
|
|
889949eb95
|
Merge branch 'develop' into feature/workspaces
# Conflicts:
# packages/asc-web-common/src/components/Layout/index.js
# packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/HistoryRowsLoader.js
# packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/HistoryRowsLoader.stories.js
# packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/README.md
# packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/StyledHistoryRowsLoader.js
# packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/index.js
# packages/asc-web-common/src/components/NavMenu/sub-components/nav-item.js
# packages/asc-web-common/src/components/PageLayout/sub-components/section.js
# packages/asc-web-common/src/desktop/index.js
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/public/index.html
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/dialogs/DownloadDialog/DownloadContent.js
# products/ASC.Files/Client/src/components/pages/DocEditor/index.js
# products/ASC.Files/Client/src/components/pages/Home/index.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Header/index.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/index.js
# products/ASC.Files/Client/src/components/panels/AddGroupsPanel/index.js
# products/ASC.Files/Client/src/components/panels/AddUsersPanel/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/SharingRow.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.People/Client/package.json
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/package.json
# web/ASC.Web.Client/src/helpers/confirmRoute.js
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/src/pages/login/i18n.js
# web/ASC.Web.Common/yarn.lock
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/yarn.lock
# web/ASC.Web.Login/src/LoginContent.jsx
# yarn.lock
|
2021-01-11 12:21:59 +03:00 |
|
|
|
60022bbc06
|
Update yarn.lock files
|
2020-12-30 21:33:07 +03:00 |
|
Vladislav Makhov
|
1f8769cd6b
|
Update yarn.lock
|
2020-12-30 19:51:17 +03:00 |
|
Vladislav Makhov
|
d87f9d0864
|
web: common: bump version
|
2020-12-30 19:45:24 +03:00 |
|
Vladislav Makhov
|
b2c6669e42
|
web: components: bump version
|
2020-12-30 19:45:01 +03:00 |
|
|
|
f40b347289
|
Merge branch 'develop' into feature/desktop-view
|
2020-12-30 19:42:59 +03:00 |
|
|
|
fc55550521
|
Merge pull request #166 from ONLYOFFICE/feature/asc-files-tests
Feature/asc files tests
|
2020-12-30 18:03:11 +03:00 |
|
Vladislav Makhov
|
44ba6f350f
|
Merge branch 'develop' into feature/desktop-view
|
2020-12-30 16:20:47 +03:00 |
|
TatianaLopaeva
|
f3cfcdde7e
|
Web: Common: Fixed displaying of article.
|
2020-12-30 14:08:48 +03:00 |
|
Artem Tarasov
|
3d7eada1a6
|
Web: Cluient/Files/People: fix for safari - disabled security zone (white stripes around the edges of the screen in landscape orientation
|
2020-12-30 12:15:50 +03:00 |
|
Artem Tarasov
|
f419dadb6f
|
Web: Common: Layout: fix resize event listener for safari versions less then 14
|
2020-12-30 11:35:24 +03:00 |
|
TatianaLopaeva
|
e6bc57c4b1
|
Web: Common: Removed jumps of header.
|
2020-12-30 10:08:31 +03:00 |
|
|
|
74aa0abca8
|
Bump version to v0.0.6
|
2020-12-29 19:43:37 +03:00 |
|
|
|
fa7c2bf9f1
|
Merge branch 'develop' into feature/asc-files-tests
|
2020-12-29 18:37:28 +03:00 |
|
|
|
7b4dc42620
|
Fix displaying header pre-loader on Desktop
|
2020-12-29 17:19:02 +03:00 |
|
TatianaLopaeva
|
f4b2922663
|
Web: Common: Fixed displaying of article header loading.
|
2020-12-29 16:36:08 +03:00 |
|
TatianaLopaeva
|
d988d44b11
|
Web: Common: Fixed displaying of aside header.
|
2020-12-29 16:15:24 +03:00 |
|
Vladislav Makhov
|
e6cf51575a
|
Merge branch 'develop' into feature/desktop-view
|
2020-12-29 16:08:08 +03:00 |
|
TatianaLopaeva
|
8e64d66239
|
WEb: Common: Fixed displaying of article header.
|
2020-12-29 14:38:10 +03:00 |
|
TatianaLopaeva
|
300fcfde5d
|
Web: Common: Fixed resize of article.
|
2020-12-29 14:34:56 +03:00 |
|
|
|
39a0cb99de
|
Update yarn.lock files
|
2020-12-29 14:03:05 +03:00 |
|
|
|
e70e845c5f
|
web: common: bump version
|
2020-12-29 13:52:50 +03:00 |
|
|
|
675599c57d
|
web: components: bump version
|
2020-12-29 13:52:38 +03:00 |
|
Vladislav Makhov
|
7dfdae8a72
|
Merge branch 'develop' into feature/desktop-view
|
2020-12-29 09:33:55 +03:00 |
|
TatianaLopaeva
|
da06f84d49
|
Web: Common: Fixed z-index when drop down is open.
|
2020-12-28 19:35:55 +03:00 |
|
|
|
f18d535cb1
|
Merge branch 'develop' into feature/upgrade-dependencies
|
2020-12-28 18:30:50 +03:00 |
|
Vladislav Makhov
|
d840506715
|
Fix desktop styles
|
2020-12-28 16:49:01 +03:00 |
|
|
|
e6943a4544
|
Merge branch 'develop' into feature/11.0.2
|
2020-12-28 16:28:26 +03:00 |
|
|
|
bfa73ec5c2
|
moved from 2e37dcd0
|
2020-12-28 16:22:08 +03:00 |
|
TatianaLopaeva
|
6f8df750ba
|
Web: Common: Refactoring.
|
2020-12-28 16:21:59 +03:00 |
|
TatianaLopaeva
|
a9d7228dcb
|
Web: Common: Fixed padding-right of section.
|
2020-12-28 15:42:51 +03:00 |
|
TatianaLopaeva
|
78b7315a6e
|
Web: Common/Components: Fixed the problem of updating data when switching from desktop to tablet view.
|
2020-12-28 15:34:05 +03:00 |
|
Vladislav Makhov
|
737605b01e
|
Merge branch 'develop' into feature/desktop-view
# Conflicts:
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/locales/en/translation.json
# products/ASC.Files/Client/src/components/panels/SharingPanel/locales/ru/translation.json
|
2020-12-28 11:34:26 +03:00 |
|
|
|
a21fff2ab1
|
Fix warning " > react-tooltip@3.11.6" has incorrect peer dependency "react@>=^16.0.0".
|
2020-12-28 11:04:34 +03:00 |
|
Vladislav Makhov
|
2ff0b2471d
|
Add isEditor param to regDesktop
|
2020-12-28 10:40:50 +03:00 |
|
Vladislav Makhov
|
17fd85b5c7
|
Update props validation
|
2020-12-28 10:39:30 +03:00 |
|
Vladislav Makhov
|
4c5131211c
|
Fix styles
|
2020-12-28 10:37:53 +03:00 |
|
|
|
472cb4bb0b
|
Fix warning Resolution field "js-yaml@3.13.1" is incompatible with requested version "js-yaml@~3.7.0"
|
2020-12-25 18:10:54 +03:00 |
|
|
|
2be04b3bc0
|
Update package.json and yarn.lock files
|
2020-12-25 17:48:11 +03:00 |
|
|
|
04e387f8d0
|
web: common: bump version
|
2020-12-25 17:03:03 +03:00 |
|
|
|
d31d0c7d03
|
Web: Common: fixed PeopleSelector employee status PropType
|
2020-12-25 17:01:42 +03:00 |
|
|
|
9f8ff83084
|
Update yarn.lock files
|
2020-12-25 16:24:26 +03:00 |
|
|
|
2b08c711dc
|
Update Create-react-app to v4.0.1
|
2020-12-25 16:01:04 +03:00 |
|
|
|
b88d418d41
|
Merge branch 'develop' into feature/thirdparty-integrations
# 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/components/pages/Settings/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Settings/index.js
# 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-12-25 15:27:44 +03:00 |
|
Vladislav Makhov
|
497b725a59
|
Merge branch 'develop' into feature/desktop-view
# Conflicts:
# products/ASC.Files/Client/src/App.js
# web/ASC.Web.Common/src/store/auth/reducer.js
|
2020-12-25 12:58:30 +03:00 |
|
|
|
25817f24ae
|
Merge branch 'develop' into bugfix/sharing-panel-refactoring
|
2020-12-25 12:38:03 +03:00 |
|
|
|
20900eeb72
|
Merge branch 'master' into develop
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
|
2020-12-25 12:09:52 +03:00 |
|
TatianaLopaeva
|
e79eb283a3
|
Web: Common/People: Deleted useless scroll up.
|
2020-12-24 18:06:20 +03:00 |
|
TatianaLopaeva
|
9c7936327a
|
Web: Common: Layout: Refactoring.
|
2020-12-24 18:03:51 +03:00 |
|
TatianaLopaeva
|
4e7b414c03
|
Web: Common/People: Fixed display downloading of profile & edit profile.
|
2020-12-24 18:02:49 +03:00 |
|
Vladislav Makhov
|
c9a5dd2ba8
|
hide header nav in desktop
|
2020-12-24 13:27:57 +03:00 |
|
|
|
9350f1189e
|
Bump version to v0.0.5
|
2020-12-24 12:22:48 +03:00 |
|
TatianaLopaeva
|
6a1e80f1fb
|
Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/index.js
|
2020-12-24 11:03:52 +03:00 |
|
|
|
9fbf5a5be5
|
Merge branch 'develop' into bugfix/sharing-panel-refactoring
# Conflicts:
# products/ASC.Files/Client/src/components/panels/SharingPanel/SharingRow.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/store/files/selectors.js
# web/ASC.Web.Common/src/components/PeopleSelector/PeopleSelector.js
|
2020-12-24 10:52:01 +03:00 |
|
Vladislav Makhov
|
79989f7bf4
|
Merge branch 'develop' into feature/desktop-view
# Conflicts:
# products/ASC.Files/Client/src/components/Article/MainButton/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
# web/ASC.Web.Common/src/store/auth/actions.js
|
2020-12-24 10:21:02 +03:00 |
|
Artem Tarasov
|
ae682e2746
|
web: common: bump version
|
2020-12-24 10:16:16 +03:00 |
|
Artem Tarasov
|
d756354ece
|
Merge branch 'develop' into feature/version-hostory-redesign
# Conflicts:
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Header/index.js
# web/ASC.Web.Common/package.json
|
2020-12-24 09:47:22 +03:00 |
|
Diana
|
e20b87447e
|
Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into develop
|
2020-12-24 03:18:47 +03:00 |
|
|
|
76d7ed6c73
|
Merge branch 'master' into develop
# Conflicts:
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/src/components/drop-down/index.js
|
2020-12-23 21:42:44 +03:00 |
|
Vladislav Makhov
|
87ffdf40ad
|
Merge branch 'hotfix/v0.0.4' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.4
# Conflicts:
# web/ASC.Web.Components/package.json
|
2020-12-23 17:56:44 +03:00 |
|
Vladislav Makhov
|
9a567d3e53
|
web: components: added possibility to hide combo box with count items info
|
2020-12-23 17:55:03 +03:00 |
|
Vladislav Makhov
|
3d46b8e516
|
web: components: bump version
|
2020-12-23 17:53:00 +03:00 |
|
TatianaLopaeva
|
5c12649789
|
Web: Common: Fixed displaying when changing window height at desktop.
|
2020-12-23 16:28:37 +03:00 |
|
|
|
a21531dd15
|
web: components: bump version
|
2020-12-23 13:55:41 +03:00 |
|
|
|
c15072b982
|
Web: Components : DropDown : Fixed calculating open direction
|
2020-12-23 13:55:02 +03:00 |
|
|
|
a21c16ff1d
|
web: components: bump version
|
2020-12-23 13:33:48 +03:00 |
|
|
|
7a22da766a
|
Web: Components: added convertSideInfo to row-content
|
2020-12-23 13:31:17 +03:00 |
|
Vladislav Makhov
|
3cbf601f8d
|
Merge branch 'develop' into feature/desktop-view
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# 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/selectors.js
# web/ASC.Web.Common/src/store/auth/actions.js
|
2020-12-23 12:58:11 +03:00 |
|
|
|
7803696e01
|
Update yarn.lock files
|
2020-12-23 12:43:27 +03:00 |
|
|
|
ce0e041b16
|
web: common: bump version
|
2020-12-23 12:30:08 +03:00 |
|
|
|
21d8c3db79
|
Web: Common: Changed Filter DEFAULT_EMPLOYEE_STATUS to Active
|
2020-12-23 12:29:42 +03:00 |
|
TatianaLopaeva
|
0bd9a4001a
|
Web: Common/People: Fixed automatic scrolling when loading, viewing a profile and updating a profile and refactoring.
|
2020-12-23 11:30:48 +03:00 |
|
TatianaLopaeva
|
91f09ed700
|
Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
# web/ASC.Web.Common/src/store/auth/actions.js
|
2020-12-23 11:01:34 +03:00 |
|
|
|
73f92d0897
|
Web: Client: fixed user activation
|
2020-12-22 18:48:05 +03:00 |
|
Diana
|
9b338e0f78
|
Merge branch 'feature/asc-files-tests' of https://github.com/ONLYOFFICE/AppServer into develop
|
2020-12-22 15:37:10 +03:00 |
|
|
|
3d23422ff5
|
web: common: bump version
|
2020-12-22 15:35:50 +03:00 |
|
|
|
2d9906f6a1
|
Web: Common: added employeeStatus to PeopleSelector, fixed display of disabled users
|
2020-12-22 15:34:19 +03:00 |
|
TatianaLopaeva
|
fe697b401d
|
web: common: bump version
|
2020-12-22 12:17:05 +03:00 |
|
TatianaLopaeva
|
d1c415feca
|
Web: Common: MediaViewer: Fixed closing unsupported video in app.
|
2020-12-22 12:16:22 +03:00 |
|
|
|
06de1efbae
|
Update yarn.lock files
|
2020-12-22 11:59:57 +03:00 |
|
|
|
20c7ee108e
|
Merge branch 'develop' into bugfix/sharing-panel-refactoring
# Conflicts:
# products/ASC.Files/Client/src/store/files/selectors.js
|
2020-12-22 11:59:26 +03:00 |
|
|
|
48463f897c
|
web: common: bump version
|
2020-12-22 11:51:31 +03:00 |
|
Artem Tarasov
|
e6938def26
|
Web: Files VersionHistory: refactoring
|
2020-12-22 11:46:22 +03:00 |
|
|
|
19d72f2fe8
|
Web: Setup i18next fallbackLng to "en"
|
2020-12-22 11:03:15 +03:00 |
|
Artem Tarasov
|
10979b7fa2
|
web: common: bump version
|
2020-12-21 18:45:39 +03:00 |
|
Alexey Kostenko
|
344cca51f8
|
web: components: bump version
|
2020-12-21 17:56:40 +03:00 |
|
Alexey Kostenko
|
f9257786c9
|
Web: Components: Added "disableHover" prop to button and paging components
|
2020-12-21 17:54:34 +03:00 |
|
Artem Tarasov
|
6fdbdb0d83
|
Web: Common: added isTabletView flag to store
|
2020-12-21 15:19:34 +03:00 |
|
Artem Tarasov
|
9dcde2d268
|
Web: Common: Layout: added new component Layout (from featature/fix-hide/show-header
|
2020-12-21 15:14:55 +03:00 |
|
Artem Tarasov
|
bfd11ede79
|
Merge branch 'develop' into feature/version-hostory-redesign
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/store/files/actions.js
# web/ASC.Web.Common/src/components/PageLayout/index.js
|
2020-12-21 13:15:43 +03:00 |
|
TatianaLopaeva
|
c88f63ba19
|
web: common: bump version
|
2020-12-21 11:14:07 +03:00 |
|
TatianaLopaeva
|
d07c28f184
|
Web: Common: Return a check condition for IOS. (iPad)
|
2020-12-21 11:13:56 +03:00 |
|
TatianaLopaeva
|
37046fc6a9
|
web: common: bump version
|
2020-12-21 10:46:45 +03:00 |
|
TatianaLopaeva
|
d7170bd448
|
Web: Common: PageLayout: Added a check condition if the device type is tablet. (iPad)
|
2020-12-21 10:46:35 +03:00 |
|
TatianaLopaeva
|
baf27c6cd2
|
web: common: bump version
|
2020-12-21 10:45:00 +03:00 |
|
TatianaLopaeva
|
0ac797a726
|
Web: Common: Added a check condition for Chrome. (iPad)
|
2020-12-21 10:44:40 +03:00 |
|
TatianaLopaeva
|
a6a8df6733
|
web: common: bump version
|
2020-12-18 21:24:47 +03:00 |
|
TatianaLopaeva
|
f967897db0
|
Web: Common: PageLayout: Refactoring.
|
2020-12-18 21:24:37 +03:00 |
|
TatianaLopaeva
|
3ab27c8280
|
web: common: bump version
|
2020-12-18 20:19:41 +03:00 |
|
TatianaLopaeva
|
256e1eb0e0
|
Web: Common: PageLayout: Refactoring.
|
2020-12-18 20:19:32 +03:00 |
|
TatianaLopaeva
|
3a017b57de
|
web: common: bump version
|
2020-12-18 20:16:25 +03:00 |
|
TatianaLopaeva
|
d5d71d0a7e
|
Web: Common: PageLayout: Fixed displaying at "Slide Over" on iPad.
|
2020-12-18 20:16:13 +03:00 |
|
Artem Tarasov
|
ec09f9ed2e
|
web: common: bump version
|
2020-12-18 18:32:36 +03:00 |
|
Artem Tarasov
|
ec190a5b98
|
Merge branch 'hotfix/v0.0.4' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.4
|
2020-12-18 18:23:15 +03:00 |
|
Artem Tarasov
|
3f7a2d3231
|
web: common: bump version
|
2020-12-18 18:23:04 +03:00 |
|
Artem Tarasov
|
6551e88c1e
|
Web: Common/Client: fix redirect after logout in Confirm
|
2020-12-18 18:22:53 +03:00 |
|
TatianaLopaeva
|
52627caab9
|
web: common: bump version
|
2020-12-18 18:14:21 +03:00 |
|
TatianaLopaeva
|
b967fe9925
|
Web: Common: PageLayout: Fixed displaying at "Slide Over" and "Split View" on iPad.
|
2020-12-18 18:13:25 +03:00 |
|
|
|
344139a262
|
Web: Client: About: Fixed padding between "copyright" and lines
|
2020-12-18 17:31:29 +03:00 |
|
|
|
b8c2165b93
|
Web: Client: About: added link target
|
2020-12-18 17:27:26 +03:00 |
|
Artem Tarasov
|
4c6ff22e64
|
Web: Client: Confirm: fix activateUser
|
2020-12-18 17:03:34 +03:00 |
|
Artem Tarasov
|
eeaf50d312
|
Merge branch 'hotfix/v0.0.4' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.4
|
2020-12-18 16:22:55 +03:00 |
|
Artem Tarasov
|
a4aa7d7e9c
|
Web: Client: Confirm: fix createUser
|
2020-12-18 16:22:41 +03:00 |
|
|
|
52798af66e
|
Notification images
|
2020-12-18 16:12:48 +03:00 |
|
|
|
9c51a031de
|
web: components: bump version
|
2020-12-18 15:44:49 +03:00 |
|
|
|
60b172e8d8
|
Web: Components: fixed SelectedItem and SelectorAddButton click when components is disabled
|
2020-12-18 15:34:36 +03:00 |
|
Artem Tarasov
|
a965583c94
|
Merge branch 'hotfix/v0.0.4' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.4
|
2020-12-18 14:04:22 +03:00 |
|
Artem Tarasov
|
ba075ecc47
|
Web: Client: About: fixed copyright style
|
2020-12-18 14:04:11 +03:00 |
|
|
|
a2d97d2612
|
Web: About: Fixed SourceCode url
|
2020-12-18 11:42:29 +03:00 |
|
|
|
f42fc72cf9
|
Merge branch 'master' into develop
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
# web/ASC.Web.Common/package.json
# web/ASC.Web.Components/package.json
|
2020-12-17 21:03:48 +03:00 |
|
|
|
53f510ae18
|
Bump version to v0.0.4
|
2020-12-17 21:00:36 +03:00 |
|
Artem Tarasov
|
bbea13bb4b
|
Web: Client: Confirm: changePassword fix
|
2020-12-17 19:49:20 +03:00 |
|
Artem Tarasov
|
51d07b5652
|
Web: Client: Confirm: refactoring
|
2020-12-17 19:37:52 +03:00 |
|
Artem Tarasov
|
68d6c1872f
|
Merge branch 'hotfix/v0.0.3' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.3
|
2020-12-17 19:28:24 +03:00 |
|
Artem Tarasov
|
5542a09575
|
Web: Clietn: Confirm: fixed redirect (changePassword)
|
2020-12-17 19:27:56 +03:00 |
|
|
|
326d234773
|
Update yarn.lock files
|
2020-12-17 18:35:04 +03:00 |
|
|
|
fb571c3ae6
|
web: common: bump version
|
2020-12-17 18:22:37 +03:00 |
|
|
|
76b04db830
|
Web: Common: Added VerstionBadge "Beta"
|
2020-12-17 18:21:48 +03:00 |
|
Artem Tarasov
|
9943d2c2ca
|
web: common: bump version
|
2020-12-17 16:26:35 +03:00 |
|
Artem Tarasov
|
fceb96c386
|
Merge branch 'hotfix/v0.0.3' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.3
|
2020-12-17 16:21:18 +03:00 |
|
Artem Tarasov
|
e0478dd2b3
|
web: common: bump version
|
2020-12-17 16:21:06 +03:00 |
|
Artem Tarasov
|
7851635005
|
Web: Client: Confirm: fix change password
|
2020-12-17 16:20:53 +03:00 |
|
Alexey Kostenko
|
e6d5c38059
|
web: common: bump version
|
2020-12-17 15:22:19 +03:00 |
|
Alexey Kostenko
|
fb2b591603
|
Merge branch 'hotfix/v0.0.3' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.3
|
2020-12-17 14:54:24 +03:00 |
|
Alexey Kostenko
|
86ef386d1b
|
web: common: bump version
|
2020-12-17 14:54:15 +03:00 |
|
Alexey Kostenko
|
b62695dc59
|
Web: Common: MediaViewer: Title style fix
|
2020-12-17 14:54:05 +03:00 |
|
Artem Tarasov
|
63c01a7ff6
|
Merge branch 'hotfix/v0.0.3' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.3
|
2020-12-17 14:50:32 +03:00 |
|
Artem Tarasov
|
cacfabdd04
|
web: common: bump version
|
2020-12-17 14:49:52 +03:00 |
|
Artem Tarasov
|
16d738e5ca
|
Web: Common/Client: changePassword: added logout if user is logged in
|
2020-12-17 14:49:30 +03:00 |
|
Diana
|
fada5e278b
|
Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer into feature/asc-files-tests
|
2020-12-17 13:20:52 +03:00 |
|
Artem Tarasov
|
3daee8efbb
|
Web: Client: Confirm: fixed api method call
|
2020-12-17 12:38:23 +03:00 |
|
|
|
c573e23b0b
|
Merge branch 'hotfix/v0.0.3' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.3
|
2020-12-17 12:37:41 +03:00 |
|
