Commit Graph

10781 Commits

Author SHA1 Message Date
79cb70bc1f Web: Added opportunity to load people page by primary link 2021-03-01 17:00:54 +03:00
0cf1150288 Web: Added opportunity to load files page by primary link 2021-03-01 16:29:37 +03:00
d280a6dca7 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-01 15:29:00 +03:00
b9b4c4b1e2 Web: Added opportunity to load login page by primary link 2021-03-01 15:28:51 +03:00
Viktor Fomin
6dd4847ea9 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-01 15:16:17 +03:00
Viktor Fomin
149e44b088 Web: Client: fixed loader width 2021-03-01 15:16:09 +03:00
09d330104b Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-01 15:03:21 +03:00
1cfb03810e Web: Added imports 2021-03-01 15:03:13 +03:00
d66f299f87 Web: Files: fixed mobx warnings 2021-03-01 14:43:19 +03:00
7339fec101 Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-01 14:16:47 +03:00
e6aeaac4a5 Web: Files: decomposed the settings store object 2021-03-01 14:16:37 +03:00
Vladislav Makhov
603db877b5 web: people: fix import 2021-03-01 12:30:33 +03:00
Vladislav Makhov
ea7697d461 web: common: fix import 2021-03-01 12:30:21 +03:00
Vladislav Makhov
23e77d4822 web: components: fix import 2021-03-01 12:29:59 +03:00
Vladislav Makhov
1695b9649d web: common: fix title 2021-03-01 12:03:12 +03:00
Vladislav Makhov
7709a2c59f web: components: return color declaration 2021-03-01 12:00:53 +03:00
Vladislav Makhov
c38fd63c75 web: components: fix import 2021-03-01 12:00:34 +03:00
Vladislav Makhov
db85598b4f web: components: fix svg import 2021-03-01 11:59:45 +03:00
Vladislav Makhov
4f8ad66cc3 web: common: fix svg import 2021-03-01 11:56:44 +03:00
Vladislav Makhov
628916a1c1 web: people: fix svg import 2021-03-01 11:56:11 +03:00
TatianaLopaeva
b8fabd5de0 Update webpack.config for fix displaying of icons. 2021-02-28 21:59:50 +03:00
TatianaLopaeva
5ac0124640 Upgrade version of react-svg to remove additional wrapper and fix problem with displaying icons. 2021-02-28 21:39:50 +03:00
TatianaLopaeva
ee23adac7c Web: Components: Deleted useless code. 2021-02-28 21:36:51 +03:00
TatianaLopaeva
c52680d4c8 Web: Settings: Fix displaying of icons. 2021-02-28 21:25:14 +03:00
TatianaLopaeva
1e266d6fc8 Web: Files: Fix not displaying icon at actions. 2021-02-28 21:24:13 +03:00
Vladislav Makhov
7bf2a8e9b5 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-02-26 18:33:28 +03:00
Viktor Fomin
375c38770d Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-02-26 16:50:14 +03:00
Viktor Fomin
604ff5d925 Web: Client: added loading shell 2021-02-26 16:49:55 +03:00
f357c8b78c Web: fixed icons for files module 2021-02-26 16:29:50 +03:00
Vladislav Makhov
fc67abd6b5 web: components : return colors declaration 2021-02-26 15:53:59 +03:00
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
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