Vladislav Makhov
|
ae45d875f6
|
web: people: fix group fetching
|
2021-02-26 15:53:06 +03:00 |
|
TatianaLopaeva
|
6d70daa26a
|
Web: Headline: Fix headline color.
|
2021-02-26 15:46:02 +03:00 |
|
TatianaLopaeva
|
ca0c86f2d4
|
Web/Common: Fix active title of menu, fix transition without redirect.
|
2021-02-26 13:50:20 +03:00 |
|
|
a2ace1a012
|
Web: People: Fix opening
|
2021-02-26 13:06:59 +03:00 |
|
|
96c4d63abe
|
Web: Fixed Files opening + added devtool: "inline-source-map"
|
2021-02-26 12:02:54 +03:00 |
|
Artem Tarasov
|
f10d8ae11d
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-02-26 00:20:24 +03:00 |
|
Artem Tarasov
|
487fd2affc
|
Web: Components/Common: fix imports
|
2021-02-26 00:19:45 +03:00 |
|
Artem Tarasov
|
904813031b
|
Web; People/Files/Login: fix imports
|
2021-02-26 00:19:04 +03:00 |
|
Artem Tarasov
|
7af174ca65
|
Web: Client: fix imports
|
2021-02-26 00:17:25 +03:00 |
|
|
2215e0f329
|
Merge pull request #195 from ONLYOFFICE/feature/dataannotations
delete dataannotations
|
2021-02-25 21:35:50 +03:00 |
|
|
dccbe81002
|
DataAnnotations: fix
|
2021-02-25 21:18:27 +03:00 |
|
TatianaLopaeva
|
99ef717815
|
Web: Files: Fix url for common icons.
|
2021-02-25 19:12:39 +03:00 |
|
TatianaLopaeva
|
b7fc7dd523
|
Web: Files: Fix tree-folder icons.
|
2021-02-25 19:03:36 +03:00 |
|
Artem Tarasov
|
c35d0612f0
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
# products/ASC.Files/Client/src/store/InitFilesStore.js
|
2021-02-25 18:42:10 +03:00 |
|
Artem Tarasov
|
15602c3a8f
|
Web: Files: fix after merge
|
2021-02-25 18:41:06 +03:00 |
|
TatianaLopaeva
|
ab93fac698
|
Web: Files: Fix icons size.
|
2021-02-25 18:30:31 +03:00 |
|
|
ba7abf65d4
|
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
|
2021-02-25 18:04:12 +03:00 |
|
|
933a1aec48
|
Web: Files: fixed tree menu
|
2021-02-25 18:03:54 +03:00 |
|
TatianaLopaeva
|
60ea0b189a
|
Web: Components: icon-button: Deleted default color.
|
2021-02-25 17:58:23 +03:00 |
|
TatianaLopaeva
|
dde6e2a78a
|
Web: Common: FilterInput: Deleted useless color.
|
2021-02-25 17:58:01 +03:00 |
|
Artem Tarasov
|
9b27d51ac5
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/ThirdPartyList.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/AccessComboBox.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/linkRow.js
# products/ASC.Files/Client/src/helpers/desktop.js
# products/ASC.Files/Client/src/i18n.js
# products/ASC.Files/Client/src/store/FilesStore.js
# products/ASC.Files/Client/src/store/SettingsStore.js
# products/ASC.Files/Client/src/store/ThirdPartyStore.js
# products/ASC.Files/Client/src/store/TreeFoldersStore.js
# products/ASC.Files/Client/src/store/UploadDataStore.js
# products/ASC.Files/Client/src/store/VersionHistoryStore.js
# products/ASC.People/Client/src/helpers/converters.js
# products/ASC.People/Client/src/helpers/people-helpers.js
|
2021-02-25 17:57:32 +03:00 |
|
|
8b962cd88d
|
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
|
2021-02-25 17:20:19 +03:00 |
|
Artem Tarasov
|
48b3c6b445
|
Web: Common: fix after merge, fix imports and hierarchy
|
2021-02-25 17:20:11 +03:00 |
|
|
b4fa1b2bb1
|
Web: Files: fixed icons imports, fixed components imports, fixed files module
|
2021-02-25 17:20:06 +03:00 |
|
Artem Tarasov
|
69ed46e8ae
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
# products/ASC.People/Client/src/components/Article/Body/index.js
# web/ASC.Web.Login/src/Login.jsx
|
2021-02-25 15:27:36 +03:00 |
|
Artem Tarasov
|
989fba5ecc
|
Web: applied new import from appserver/common
|
2021-02-25 15:22:53 +03:00 |
|
Vladislav Makhov
|
ea3c558a33
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-02-25 15:17:15 +03:00 |
|
Vladislav Makhov
|
e91bb64d03
|
web: people: fix imports
|
2021-02-25 15:16:52 +03:00 |
|
TatianaLopaeva
|
89cefb6bd1
|
Web: Components: Fix styles for role icons.
|
2021-02-25 13:52:31 +03:00 |
|
TatianaLopaeva
|
4ed139caef
|
Web: Common: NavMenu: Fix styles of link and added history for transition without redirect.
|
2021-02-25 13:38:23 +03:00 |
|
Diana
|
5c3f2975e8
|
fix NotMapped
|
2021-02-25 13:23:26 +03:00 |
|
TatianaLopaeva
|
65949fa1a9
|
Web: Common: Fix not displaying icons at nav and header.
|
2021-02-25 13:08:20 +03:00 |
|
|
55a4a53bbc
|
Web: Fixed 404 error on translation.json loading
|
2021-02-25 12:25:16 +03:00 |
|
Diana
|
f1091f409a
|
fix dataannotations
|
2021-02-25 12:00:53 +03:00 |
|
|
35a4eca247
|
Web: Login: Fixed translation
|
2021-02-25 11:44:46 +03:00 |
|
|
89bc3bdd08
|
Web: Common: Fixed logout
|
2021-02-25 11:35:31 +03:00 |
|
Artem Tarasov
|
fe7cb5364d
|
Web: Common: chsnged component hierarchy
|
2021-02-25 11:04:22 +03:00 |
|
|
4a40c8f894
|
Fix dependencies
|
2021-02-25 10:29:57 +03:00 |
|
|
368b44071f
|
Web: Common: Added other props to routes
|
2021-02-25 10:10:39 +03:00 |
|
|
a84a0ae691
|
Web: Common: AuthStore: simplified init sub-stores
|
2021-02-25 10:09:50 +03:00 |
|
|
36f6feec83
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-02-24 20:26:01 +03:00 |
|
|
471dcb1de7
|
Removed useless import
|
2021-02-24 20:25:54 +03:00 |
|
|
7572171ed9
|
Update yarn.lock
|
2021-02-24 20:25:07 +03:00 |
|
|
72675eb198
|
Web: Client: Simplified imports
|
2021-02-24 20:24:38 +03:00 |
|
Artem Tarasov
|
69dd27fac7
|
Web: applied new import from appserver/components
|
2021-02-24 20:11:23 +03:00 |
|
Artem Tarasov
|
5f2d0e4616
|
Web: Components: changed component hierarchy
|
2021-02-24 17:42:09 +03:00 |
|
|
38a00bdd7d
|
Merge branch 'develop' into feature/dataannotations
|
2021-02-24 15:38:34 +03:00 |
|
|
d696f18801
|
Jenkinsfile: fix notify
|
2021-02-24 15:37:40 +03:00 |
|
|
2007d9b3da
|
Web: People: Changed imports
|
2021-02-24 12:25:18 +03:00 |
|
|
507fadff55
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
# packages/asc-web-common/src/components/NavMenu/sub-components/nav-item.js
# packages/asc-web-common/src/store/auth/selectors.js
# packages/asc-web-components/src/components/icons/svg/index.js
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/Article/Body/TreeSettings.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/BadgesFileTile.js
# 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/Settings/Section/Body/ConnectedClouds.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/AccessComboBox.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/SharingRow.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/linkRow.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/ShareButton.js
# 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/Home/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Body/userContent.js
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Client/src/Shell.jsx
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
# yarn.lock
|
2021-02-24 10:57:03 +03:00 |
|