Commit Graph

6937 Commits

Author SHA1 Message Date
TatianaLopaeva
24cc620904 Web: Fixed displaying of shared files at aside & Deleted useless code. 2021-03-22 18:11:39 +03:00
d7981f3f53 Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 17:35:41 +03:00
a8a6121e59 Web: Proxy fixes 2021-03-22 17:35:33 +03:00
Viktor Fomin
0da17ef641 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 16:15:07 +03:00
Viktor Fomin
74e5686a0e Web: Client: fixed language-timezone settings 2021-03-22 16:14:41 +03:00
89f2431e1c Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 15:33:50 +03:00
Alexey Kostenko
3524f3b6c6 Web: Client/Common: Fixed Route to homepage (Incorrect header on homepage) 2021-03-22 15:27:36 +03:00
83e9a8b4a4 Web: Add URL proxy on tryRedirectTo usage 2021-03-22 12:16:41 +03:00
b6a5249147 Web: Editor: Add URL proxy 2021-03-22 12:12:34 +03:00
Viktor Fomin
d3fdc2d8a3 Web: Client: fixed greeting settings 2021-03-22 11:57:08 +03:00
25bbd0cf2a Merge branch 'develop' into feature/workspaces 2021-03-22 11:34:54 +03:00
d568693154 Big Fix commit:
+ Added new Clients for CRM/Products
+ Removed old fake coming-soon pages
+ Added combineUrl and AppSettingsConfig with proxyUrl
+ Added new fields to modules info on Server
+ Fixed work with icon and image urls
+ Added CRM/Projects to nginx/onlyoffice.conf
+ Applied combineUrl in studio links
+ Added and applied "id" field in package.json of all Clients
+ Added new bat files CrmClient.bat and ProjectsClient.bat
+ Fixed ProductClassName for Files
2021-03-22 00:34:21 +03:00
fc7bd11088 Fix getshortenlink 2021-03-21 18:29:35 +03:00
335cc31939 Notify: fix 2021-03-21 17:51:49 +03:00
accd318dc0 Web: Fixed z-index of #ipl-progress-indicator 2021-03-20 11:24:33 +03:00
6b8d644aab Web: Replaced all homepages to config variant 2021-03-19 18:22:35 +03:00
1e02f165ca Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
#	products/ASC.People/Client/src/components/PeopleSelector/i18n.js
2021-03-19 10:55:22 +03:00
Artem Tarasov
dabf704485 Web: Client/Components: Wizard: layout fix 2021-03-18 22:55:15 +03:00
8e6b2c78d8 Web: Moved ipl-progress-indicator to NavMenu 2021-03-18 22:26:52 +03:00
f3f4037282 Web: Fixed Wizard 2021-03-18 21:54:03 +03:00
330c156cb8 Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-18 18:20:31 +03:00
544abc2321 Web: Client: fixed changePassword form, removed debugger 2021-03-18 16:00:58 +03:00
TatianaLopaeva
2898cabc3f Web: NavMenu: Fixed styles of title. 2021-03-18 13:53:21 +03:00
TatianaLopaeva
80247cbb1a Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-18 13:30:53 +03:00
TatianaLopaeva
242d6870aa Web: PaymentsEnterprise: Fix styles & Added lost import. 2021-03-18 13:30:38 +03:00
23a23a0c68 Web: Client: fixed changeEmail confirm page 2021-03-18 12:29:16 +03:00
a861371826 Web: Client: fixed activateUser confirm page 2021-03-18 12:28:49 +03:00
6e2b2d5095 Web: Removed old svg 2021-03-17 21:26:28 +03:00
c3b49a713d Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-17 18:34:09 +03:00
409073eff7 Web: Client: fixed change password 2021-03-17 18:33:05 +03:00
Alexey Kostenko
15a212a567 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-17 17:02:30 +03:00
Alexey Kostenko
15c1d087f7 Web: Client: Hidden AdminsSettings 2021-03-17 17:01:59 +03:00
TatianaLopaeva
a6e3349d9e Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-17 16:46:25 +03:00
Alexey Kostenko
73727dc01f Web: Client: Fixed infinity loading in language-and-time-zone page 2021-03-17 16:41:53 +03:00
TatianaLopaeva
7beba532dd Web: Settings: Fixed displaying of icon. 2021-03-17 16:41:02 +03:00
86a63e6330 Web: Client: fixed createUser form 2021-03-17 16:35:45 +03:00
8036cb3401 Web: fixed confirm route 2021-03-17 15:56:09 +03:00
Alexey Kostenko
602ca59f2e Web: Client: Close menu after switch module 2021-03-17 15:38:21 +03:00
Artem Tarasov
1841730e20 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-17 13:38:16 +03:00
Artem Tarasov
c9e4df5f1b Web: moved PeopleSelector to People 2021-03-17 13:37:22 +03:00
062cc4cc78 Web: Disabled initialization of service-workers on development 2021-03-17 12:59:11 +03:00
f56970ed15 Web: Login: Fixed base urls 2021-03-17 12:48:22 +03:00
391b60c79d Web: Login: Commented logs 2021-03-17 12:47:49 +03:00
Vladislav Makhov
b0c00fe749 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
#	products/ASC.People/Client/src/Routes.jsx
2021-03-16 16:33:18 +03:00
Vladislav Makhov
1c59410c38 web: client: remove history props drilling 2021-03-16 16:31:49 +03:00
7b5a9ab80d Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-16 14:10:29 +03:00
24a6d61205 Web: Added creation and run of service-worker to all client apps 2021-03-16 14:10:20 +03:00
Ilya Oleshko
d99e7b731f Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-15 17:58:45 +03:00
Ilya Oleshko
24d0af3851 Web: Client: Shell: Added route to ThirdPartyResponse page 2021-03-15 17:12:46 +03:00
Ilya Oleshko
c2902461cb Web: Client: ThirdParty: Fixed import 2021-03-15 17:12:09 +03:00
TatianaLopaeva
eac9bb9b3b Web: Settings: Fix icons displaying when moving from other modules. 2021-03-15 17:08:35 +03:00
a015b618a2 Web: Client: Added new service-worker on workbox v6 2021-03-14 23:36:20 +03:00
708a10a3f4 Web: Fixed logo displaying 2021-03-14 00:21:22 +03:00
b7a7be3d1f Web: Refactoring 2021-03-13 18:33:43 +03:00
145d720299 Web: Webpack: Added base url and commented proxy 2021-03-13 18:31:09 +03:00
ad8d6d89d2 Web: Shell: Added virtualPath (proxy: /appserver) 2021-03-13 16:03:31 +03:00
8e1f5b30b5 Merge branch 'develop' into feature/workspaces
# Conflicts:
#	products/ASC.Files/Client/package.json
#	products/ASC.Files/Client/yarn.lock
#	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.Components/yarn.lock
#	yarn.lock
2021-03-13 16:01:41 +03:00
4d5ca86a74 Merge branch 'master' into develop
# Conflicts:
#	products/ASC.Files/Client/yarn.lock
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/.env
#	web/ASC.Web.Client/src/App.js
#	web/ASC.Web.Client/src/helpers/i18n.js
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Common/src/api/modules/index.js
#	web/ASC.Web.Common/src/store/auth/reducer.js
#	web/ASC.Web.Common/yarn.lock
#	web/ASC.Web.Components/yarn.lock
2021-03-12 19:52:01 +03:00
e8e1a176ea Update yarn.lock files 2021-03-12 18:38:55 +03:00
94b6750a6b web: common: bump version 2021-03-12 18:28:14 +03:00
22c3cfffcd Web: Restored defaultPage 2021-03-12 18:27:52 +03:00
bc8943083f Web: Clinet: Added default params to .env 2021-03-12 18:16:51 +03:00
c2338d6636 Merge branch 'hotfix/v0.0.11' of https://github.com/ONLYOFFICE/AppServer into hotfix/v0.0.11 2021-03-12 18:00:33 +03:00
e2061cd427 CustomNamingPeople: fix 2021-03-12 18:01:11 +03:00
b1dfa97386 Web: Client: Added support of homepage 2021-03-12 17:53:02 +03:00
ae7b7484b1 Web: Common: Fixed API proxy issue 2021-03-12 17:35:51 +03:00
b90876c97d Bump version to v0.0.11 2021-03-12 17:20:24 +03:00
e514fe1a57 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
#	web/ASC.Web.Client/src/Shell.jsx
2021-03-12 14:58:24 +03:00
e8e78604f1 Web: Added products/apps dynamic loading 2021-03-12 13:52:30 +03:00
7465b6cda4 Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-12 13:12:03 +03:00
25cbaf3c0c Web: Files: fixed NavMenu clickOutsideAction 2021-03-12 13:11:53 +03:00
TatianaLopaeva
6c4329f9c7 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-12 13:10:26 +03:00
TatianaLopaeva
b68487716b Web: Added translation for setting at Nav. 2021-03-12 13:09:58 +03:00
Alexey Kostenko
91b5fc5795 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-12 12:50:25 +03:00
TatianaLopaeva
dd92aa049f Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-12 12:06:32 +03:00
TatianaLopaeva
43d7f6ba68 Web: Fix translation. 2021-03-12 12:05:12 +03:00
Alexey Kostenko
16eca008cd Web: Client: Added bodyLoader to accessRights page 2021-03-12 11:54:53 +03:00
Artem Tarasov
7846f41a06 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-12 10:12:12 +03:00
Viktor Fomin
ca4727978c Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-12 00:14:08 +03:00
Viktor Fomin
59aa9ccd8f Web: Client: hide header in editor 2021-03-12 00:14:00 +03:00
Artem Tarasov
63f1e788ad Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-11 21:14:21 +03:00
Artem Tarasov
96271b4dfb Web: Components/Client: changed the way of passing elements to TabContainer component 2021-03-11 13:43:54 +03:00
TatianaLopaeva
749e028beb Web: Layout: Fixed displaying of article. 2021-03-11 13:12:35 +03:00
TatianaLopaeva
9362f3cd2d Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-11 10:20:25 +03:00
TatianaLopaeva
1afbcc0009 Web: Settings: Added top loading indicator. 2021-03-11 10:19:56 +03:00
392984ded3 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-10 19:33:18 +03:00
f0829f059d Webpack: Fix loading react.svg 2021-03-10 19:33:10 +03:00
970ec1eecf Web: Login: Modified production build 2021-03-10 19:24:15 +03:00
bac65c6744 Web: Client: Modified production build 2021-03-10 18:31:21 +03:00
6db29575b1 Web: Editor: Modified production build 2021-03-10 18:27:40 +03:00
Alexey Kostenko
26a4d5e4cf Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-10 13:41:02 +03:00
Alexey Kostenko
960342236d Web: Client: Fixed transition from documents to settings 2021-03-10 13:40:39 +03:00
Viktor Fomin
585dbf3680 Web: fixed loader 2021-03-10 11:27:20 +03:00
40c7261fb1 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-10 10:36:14 +03:00
f962a2737b Web: Remove slash 2021-03-10 10:35:43 +03:00
Viktor Fomin
9d06a6618a Web: Client: change loader 2021-03-09 19:36:15 +03:00
b33b4990d1 Web: Login: fix register empty render 2021-03-09 13:58:03 +03:00
2a5a78bc74 Web: Packages: stable versions 2021-03-06 21:46:04 +03:00
20ef359023 Web: Restored package 2021-03-06 21:09:12 +03:00
fd05ceba27 Web: Editor: Upgrade dependencies 2021-03-06 18:54:32 +03:00
a8a55167eb Web: Editor: Optimization 2021-03-06 18:50:06 +03:00
c96e783eab Web: Added new @appserver/editor app 2021-03-05 21:15:48 +03:00
b65d83cc01 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-05 17:42:04 +03:00
32b8c7f6fe Web: Fixed login work 2021-03-05 17:41:55 +03:00
TatianaLopaeva
289f749288 Web: About: Fix translation. 2021-03-05 14:24:34 +03:00
877016d8e3 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-05 12:41:08 +03:00
TatianaLopaeva
5412f7b860 Web: NavMenu: Fixed icon path, deleted useless icons from modules. 2021-03-05 11:09:23 +03:00
TatianaLopaeva
e81d2c8bb7 Web: Common: Fixed logoUrl. 2021-03-05 11:01:49 +03:00
82a6dafb0f Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-04 19:09:58 +03:00
28a798c542 Web: Fixed work with translations + refactoring:
+ Login re-written to functional component
+ Replaced css to scss
2021-03-04 19:09:46 +03:00
Alexey Kostenko
b0f3a4e426 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-04 17:32:09 +03:00
TatianaLopaeva
b64736c363 Web: Added translation to PeopleSelector. 2021-03-04 14:57:48 +03:00
TatianaLopaeva
5c826bcf29 Web: Added top loading indicator for desktop. 2021-03-04 14:36:31 +03:00
Alexey Kostenko
9e80a2010c Web: Common/Files/People: Refactoring routing (fixed transition between people module and files module) 2021-03-04 13:13:26 +03:00
Alexey Kostenko
b3a3851d68 Web: Client: Fixed the transition from the people module to the documents module 2021-03-03 19:17:00 +03:00
8e1d5fb0b4 Web: webpack: changed devtool 2021-03-03 17:58:16 +03:00
68930abdcb Web: Move toastr function to Web Client (mf: "studio/toastr") 2021-03-03 16:46:04 +03:00
fe39c60633 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-03 16:19:09 +03:00
TatianaLopaeva
ada47512f1 Web: Moved PeopleSelector to the Web Client. 2021-03-03 15:41:28 +03:00
efaeaff894 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-03 14:46:45 +03:00
684c0e777f Web: Refactoring 2021-03-03 14:46:37 +03:00
TatianaLopaeva
7b0faa4747 Web: Moved Main into the Web Client. 2021-03-03 13:02:56 +03:00
TatianaLopaeva
d6cf286cd0 Web: Moved Layout to the Web Client. 2021-03-03 12:47:28 +03:00
TatianaLopaeva
988afe48fd Web: Moved profile menu to the NavMenu. 2021-03-03 11:25:28 +03:00
TatianaLopaeva
5212633a8d Web: Moved errors from Common to the Web Client. 2021-03-03 11:15:11 +03:00
d6f593e4d4 Web: Fixed loading NavMenu translations on different pages 2021-03-02 20:21:37 +03:00
bf7f680d08 Web: Moved NavMenu to Web Client 2021-03-02 18:25:20 +03:00
b9ad73b9ce Web: Added useful imports 2021-03-01 22:59:47 +03:00
94708ed455 Web: Fixed opening /products/(files|people) with /filter (or profile) + proxy 2021-03-01 22:48:48 +03:00
8a6afa8111 Web: Fixed load source maps 2021-03-01 18:21:40 +03:00
79cb70bc1f Web: Added opportunity to load people page by primary link 2021-03-01 17:00:54 +03:00
Ilya Oleshko
c618740db1 Merge branch 'master' into develop 2021-03-01 16:46:32 +03:00
0cf1150288 Web: Added opportunity to load files page by primary link 2021-03-01 16:29:37 +03:00
Ilya Oleshko
0c1689bec5 Bump version to v0.0.10 2021-03-01 16:27:21 +03:00
Ilya Oleshko
66bb7567aa web: common: bump version 2021-03-01 16:25:52 +03:00
Ilya Oleshko
cb861508d3 Web: Common: Added getting api url from package.json, fixed "hardcode" from api client. 2021-03-01 16:25:41 +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
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
c52680d4c8 Web: Settings: Fix displaying of icons. 2021-02-28 21:25:14 +03:00
693a633dee fix auth via password 2021-02-26 22:32:03 +03:00
Viktor Fomin
604ff5d925 Web: Client: added loading shell 2021-02-26 16:49:55 +03:00
TatianaLopaeva
ca0c86f2d4 Web/Common: Fix active title of menu, fix transition without redirect. 2021-02-26 13:50:20 +03:00
96c4d63abe Web: Fixed Files opening + added devtool: "inline-source-map" 2021-02-26 12:02:54 +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