|
4afadf2e0c
|
Web: Added support of public folders + moved back to original index.html
|
2020-12-15 19:27:30 +03:00 |
|
|
c9293ac86d
|
Merge branch 'develop' into feature/workspaces
# Conflicts:
# packages/asc-web-common/src/components/FilterInput/FilterInput.js
# packages/asc-web-common/src/components/FilterInput/sub-components/SortComboBox.js
# packages/asc-web-common/src/components/PageLayout/index.js
# packages/asc-web-common/src/components/PageLayout/sub-components/article-body.js
# packages/asc-web-common/src/components/PageLayout/sub-components/article-header.js
# packages/asc-web-common/src/components/PageLayout/sub-components/article-main-button.js
# packages/asc-web-common/src/components/PageLayout/sub-components/section-body.js
# packages/asc-web-common/src/components/PageLayout/sub-components/section-header.js
# packages/asc-web-common/src/components/PrivateRoute/PrivateRoute.js
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/pages/DocEditor/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
# 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/index.js
# products/ASC.Files/Client/src/store/files/actions.js
# products/ASC.Files/Client/yarn.lock
# products/ASC.People/Client/package.json
# products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/ContactField.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/DateField.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/EmailField.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/RadioField.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/TextChangeField.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/TextField.js
# products/ASC.People/Client/src/index.js
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/package.json
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Client/src/components/pages/Confirm/index.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/activateEmail.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeEmail.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeOwner.js
# web/ASC.Web.Client/src/helpers/confirmRoute.js
# web/ASC.Web.Client/src/index.js
# web/ASC.Web.Common/package.json
# 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
# web/ASC.Web.Login/src/sub-components/register-container.js
# yarn.lock
|
2020-12-15 18:40:27 +03:00 |
|
Ilya Oleshko
|
f43a2562dd
|
web: common: bump version
|
2020-12-14 18:41:53 +03:00 |
|
Ilya Oleshko
|
bdb433ae35
|
Web: Common : Api: Fixed default filter sort order
|
2020-12-14 18:41:44 +03:00 |
|
TatianaLopaeva
|
89f5cb670c
|
web: common: bump version
|
2020-12-11 18:44:44 +03:00 |
|
TatianaLopaeva
|
0657447229
|
Web: Common: PageLayout: Added maximum width when loading an article (tablet/mobile)
|
2020-12-11 18:44:35 +03:00 |
|
Alexey Kostenko
|
a20af486ad
|
web: common: bump version
|
2020-12-11 16:00:06 +03:00 |
|
Alexey Kostenko
|
3340786838
|
Web: Common: FilterInput: Fixed bug in the filter when navigating through groups in the People module
|
2020-12-11 16:00:00 +03:00 |
|
|
b0617ac111
|
Merge branch 'develop' into bugfix/upload-with-convertation
|
2020-12-10 19:35:51 +03:00 |
|
|
8c4be9ab6d
|
Merge branch 'bugfix/upload-with-convertation' of github.com:ONLYOFFICE/AppServer into bugfix/upload-with-convertation
|
2020-12-10 19:15:44 +03:00 |
|
|
2548dba9b7
|
Web: Files: Fixed opening file on external link
|
2020-12-10 19:15:36 +03:00 |
|
|
356ace1c57
|
Merge branch 'develop' into bugfix/upload-with-convertation
|
2020-12-10 19:14:58 +03:00 |
|
|
0b0d7187e0
|
Update yarn.lock files
|
2020-12-10 18:45:49 +03:00 |
|
|
be497b0f3a
|
web: common: bump version
|
2020-12-10 18:38:49 +03:00 |
|
|
b85faae56b
|
Web: Common: fixed filter update
|
2020-12-10 18:41:42 +03:00 |
|
|
419fe93913
|
Merge branch 'develop' into bugfix/toast
|
2020-12-10 18:37:17 +03:00 |
|
Alexey Kostenko
|
3e448ce90e
|
web: common: bump version
|
2020-12-10 14:27:47 +03:00 |
|
Alexey Kostenko
|
ea3f287acb
|
Web: Common: Removed unused prop
|
2020-12-10 14:25:51 +03:00 |
|
Alexey Kostenko
|
abda53a082
|
Web: Files/People/Common: Fixed header styles
|
2020-12-10 13:31:53 +03:00 |
|
TatianaLopaeva
|
8e455a134f
|
web: components: bump version
|
2020-12-10 11:49:00 +03:00 |
|
Alexey Kostenko
|
1a53841499
|
Web: Files/People/Common: Fixed header style
|
2020-12-10 09:48:35 +03:00 |
|
|
09ce302b57
|
Web: Files: Init new conversation process
|
2020-12-09 18:37:24 +03:00 |
|
|
2e0762b2c3
|
Merge branch 'develop' into bugfix/upload-with-convertation
# Conflicts:
# products/ASC.Files/Client/src/store/files/actions.js
|
2020-12-09 16:19:03 +03:00 |
|
TatianaLopaeva
|
4cc62d8fe5
|
Merge branch 'develop' into bugfix/toast
|
2020-12-09 15:36:05 +03:00 |
|
TatianaLopaeva
|
eee2808ed4
|
Web: Components: Removed unnecessary comparison that prevented correct display of toasters when changing the screen width & refactoring
|
2020-12-09 15:34:10 +03:00 |
|
|
254b03032f
|
Web: Common: Fixed status of undefined
|
2020-12-09 13:52:47 +03:00 |
|
|
4d88b2fc28
|
Update yarn.lock files
|
2020-12-08 18:37:19 +03:00 |
|
|
e4a43ff558
|
Merge branch 'bugfix/sharing-settings' of github.com:ONLYOFFICE/AppServer into bugfix/sharing-settings
|
2020-12-08 18:26:11 +03:00 |
|
Alexey Kostenko
|
3c6639c9c9
|
web: components: bump version
|
2020-12-08 18:26:47 +03:00 |
|
Alexey Kostenko
|
06d6994b34
|
web: common: bump version
|
2020-12-08 18:26:38 +03:00 |
|
Alexey Kostenko
|
b0903aa99b
|
Web: Common: added CustomFilter constant
|
2020-12-08 18:25:17 +03:00 |
|
Alexey Kostenko
|
3a94023ba7
|
Web: Components: Added custom filter icon
|
2020-12-08 18:24:04 +03:00 |
|
|
ce4a3e3338
|
Update yarn.lock files
|
2020-12-08 18:17:46 +03:00 |
|
|
c8f7555017
|
Merge branch 'develop' into bugfix/sharing-settings
# Conflicts:
# products/ASC.Files/Client/src/store/files/actions.js
# products/ASC.Files/Client/yarn.lock
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/yarn.lock
# web/ASC.Web.Components/yarn.lock
|
2020-12-08 18:06:31 +03:00 |
|
Alexey Kostenko
|
bc5b17367c
|
Merge branch 'bugfix/sharing-settings' of github.com:ONLYOFFICE/AppServer into bugfix/sharing-settings
|
2020-12-08 17:45:40 +03:00 |
|
Alexey Kostenko
|
74fb9dc052
|
web: components: bump version
|
2020-12-08 17:45:19 +03:00 |
|
Alexey Kostenko
|
96e946491a
|
web: common: bump version
|
2020-12-08 17:45:08 +03:00 |
|
|
7d3dde38c4
|
Update yarn.lock files
|
2020-12-08 15:26:54 +03:00 |
|
|
9f778af8bd
|
web: common: bump version
|
2020-12-08 15:13:29 +03:00 |
|
|
42bfa9a3a6
|
Merge branch 'bugfix/sharing-settings' of github.com:ONLYOFFICE/AppServer into bugfix/sharing-settings
|
2020-12-08 15:12:42 +03:00 |
|
|
694daae135
|
Fixed redirection to default page if already logged-in
|
2020-12-08 15:12:33 +03:00 |
|
Ilya Oleshko
|
d2719e1cd9
|
Web: Fixed usage lodash/isEqual on fast-deep-equal
|
2020-12-08 14:09:46 +03:00 |
|
Ilya Oleshko
|
bd13067d0b
|
Web: Added fast-deep-equal
|
2020-12-08 14:08:26 +03:00 |
|
TatianaLopaeva
|
34583dde7f
|
Web: Common: Added logic for toasts that stack on top of each other and line up one after the other when clicked
|
2020-12-08 13:15:22 +03:00 |
|
Alexey Kostenko
|
6a9b8ca662
|
Merge branch 'develop' into bugfix/sharing-settings
|
2020-12-08 12:23:36 +03:00 |
|
Viktor Fomin
|
d9e95dabab
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/floating-button
|
2020-12-07 21:03:07 +03:00 |
|
TatianaLopaeva
|
47653a2999
|
web: common: bump version
|
2020-12-07 19:02:21 +03:00 |
|
TatianaLopaeva
|
f2a3355ae8
|
Web: Common: Changed import for selector getLanguage
|
2020-12-07 19:01:10 +03:00 |
|
Viktor Fomin
|
982ce4e12c
|
Merge branch 'develop' into feature/floating-button
|
2020-12-07 14:50:49 +03:00 |
|
Viktor Fomin
|
2be2085655
|
Update yarn.lock files
|
2020-12-07 14:48:09 +03:00 |
|