Commit Graph

1700 Commits

Author SHA1 Message Date
89f2431e1c Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 15:33:50 +03:00
05b417f63d Web: People: hidden the phone field 2021-03-22 15:31:42 +03:00
Viktor Fomin
5a9c782fc5 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 13:08:46 +03:00
Viktor Fomin
12f920047c Web: People: fixed translate 2021-03-22 13:08:40 +03:00
TatianaLopaeva
7dc1b80ab6 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 13:00:35 +03:00
TatianaLopaeva
7c56caf2a6 Web: People: Fixed returned to the homepage after created group. 2021-03-22 12:59:06 +03:00
f8a2b438a9 Web: People: Add URL proxy 2021-03-22 12:06:30 +03:00
TatianaLopaeva
d0f2d9871f Web: People: Deleted useless code at icon path. 2021-03-22 11:46:31 +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
75859212ab Web: People: Fix conversation of Filter to URL and back 2021-03-20 13:16:45 +03:00
1c4acb2842 Web: Fixed issue with Tree link first click 2021-03-20 11:54:21 +03:00
e797d01bee Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-19 21:07:16 +03:00
efe94a4589 Web: People: Fixed Filter translations loading 2021-03-19 21:07:10 +03:00
TatianaLopaeva
c1e53e3c6e Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-19 19:21:20 +03:00
Artem Tarasov
aebb3c479f Web: fix after merge 2021-03-19 19:24:16 +03:00
Artem Tarasov
6418c3af89 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
#	products/ASC.People/Client/src/pages/Profile/Section/Header/index.js
#	products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
2021-03-19 19:21:16 +03:00
TatianaLopaeva
7f193e003c Web: People: Fix color of icon. 2021-03-19 19:11:16 +03:00
Artem Tarasov
4d9920a4d0 Web: People: fixed updating of user information after editing 2021-03-19 19:06:55 +03:00
741fca254f Web: Fixed usage of auth.settingsStore 2021-03-19 19:02:43 +03:00
b42eb03270 Web: People: Hide reasign button 2021-03-19 18:41:22 +03:00
60b57e5535 Web: People: Fixed move to edit profile (double slash in URL) 2021-03-19 18:36:11 +03:00
2df2b6809e Web: People: Fixed primary link redirect to default filter 2021-03-19 18:23:14 +03:00
6b8d644aab Web: Replaced all homepages to config variant 2021-03-19 18:22:35 +03:00
06621ca2cb Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-19 16:31:48 +03:00
e63fc30a2e Web: People: Fixed move to direct link 2021-03-19 16:31:41 +03:00
Artem Tarasov
51b978f6a3 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-19 14:13:56 +03:00
Artem Tarasov
7c7e7e8c05 Web: People: fixed transition from profile editing 2021-03-19 14:13:22 +03:00
9fc950665b Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-19 11:22:36 +03:00
e87709dc70 Web: People: fixed InviteDialog styles 2021-03-19 11:22:25 +03:00
Artem Tarasov
a6c21657a1 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-19 11:18:21 +03:00
Artem Tarasov
9cfbc4f6a0 Web: People: fix position of email value in Profile 2021-03-19 11:17:36 +03:00
33281d9260 Web: Files: commented debug in i18n config 2021-03-19 10:53:13 +03:00
c862bbc7ef Web: People: Fixed loading translations 2021-03-19 10:49:50 +03:00
78140c0739 Web: People: Fixed double init 2021-03-19 10:46:49 +03:00
3b340396a7 Web: Fixed jumping of NavMenu 2021-03-19 10:45:34 +03:00
TatianaLopaeva
7299252d8f Web: People: PeopleSelector: Fixed load path of translations. 2021-03-19 10:01:42 +03:00
8e6b2c78d8 Web: Moved ipl-progress-indicator to NavMenu 2021-03-18 22:26:52 +03:00
Vladislav Makhov
12dc227d03 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-18 17:47:44 +03:00
TatianaLopaeva
c8d40e698e Web: People/Files: Fixed color of icons. 2021-03-18 16:30:45 +03:00
Vladislav Makhov
a16a0a833d web: people: fix cancel btn 2021-03-18 14:19:42 +03:00
TatianaLopaeva
0e0624c02d Web: People: Added loader when change language & refactoring. 2021-03-18 12:02:37 +03:00
TatianaLopaeva
7950df5aaa Web: People: Fix translation after reload page. 2021-03-17 16:37:24 +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
8e7cad9b3f Web: Removed useless files 2021-03-17 12:36:14 +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
24a6d61205 Web: Added creation and run of service-worker to all client apps 2021-03-16 14:10:20 +03:00
Vladislav Makhov
3caa960440 web: people: comment out 2021-03-16 13:40:18 +03:00
Artem Tarasov
1ee2e02963 Web: People: TargetUserStore: fixed inability to change the language in the profile (an error appeared) 2021-03-15 10:03:30 +03:00
e47417cda9 Web: People: Moved pages folder from components 2021-03-13 20:07:32 +03:00
491e9c5a39 Web: Refactoring 2021-03-13 19:01: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
Alexey Kostenko
9f458a8bb5 Web: People: Fixed icons path in profile 2021-03-12 15:43:53 +03:00
Vladislav Makhov
6a17922554 web: people: fix routing 2021-03-12 11:06:13 +03:00
Vladislav Makhov
fad5f13110 web: people: remove unused code 2021-03-12 10:23:57 +03:00
Vladislav Makhov
e018a15087 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-12 10:18:18 +03:00
Vladislav Makhov
aeecf33f95 web: people: fix invite dialog 2021-03-12 10:18:05 +03:00
TatianaLopaeva
eaa46e6c0f Web: People: Added reload page when change language. 2021-03-12 09:37:55 +03:00
Vladislav Makhov
f349eb4a96 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-11 16:10:35 +03:00
Vladislav Makhov
1ae9b03a9f web: people: fix empty screen after delete group 2021-03-11 11:18:14 +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
e8992345ba Web: People: Modified production build 2021-03-10 18:38:53 +03:00
Vladislav Makhov
531a6e87d7 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-10 12:05:49 +03:00
Vladislav Makhov
a7e7cf5f1a Web: people: router fix 2021-03-10 12:05:07 +03:00
Vladislav Makhov
41388d6f2a web: people: remove unused code 2021-03-10 11:17:49 +03:00
TatianaLopaeva
79465f6889 Web: People: Added loading when selected group. 2021-03-10 10:51:59 +03:00
Vladislav Makhov
4c37804df4 web: people: fix routing 2021-03-09 15:19:58 +03:00
Vladislav Makhov
f0b82c8cea web: people: fix routing in edit page 2021-03-09 15:05:52 +03:00
Vladislav Makhov
751eb1d4b6 web: people: refactoring 2021-03-09 14:53:33 +03:00
Vladislav Makhov
111c45f40a Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
#	products/ASC.People/Client/src/components/pages/Profile/Section/Header/index.js
#	yarn.lock
2021-03-09 09:46:45 +03:00
Vladislav Makhov
54ff155c85 web: people: add experimental separate context menu file 2021-03-09 09:44:08 +03:00
Vladislav Makhov
a7f5f57e55 web: people: fix routing 2021-03-09 09:37:51 +03:00
2a5a78bc74 Web: Packages: stable versions 2021-03-06 21:46:04 +03:00
Vladislav Makhov
012a3d0129 web: people: fix routing in user row 2021-03-05 16:46:08 +03:00
Alexey Kostenko
9a791c61ad Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-05 14:47:33 +03:00
Alexey Kostenko
80de5fcab9 Web: People: Fixed navigating from profile page to list 2021-03-05 14:47:12 +03:00
877016d8e3 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-05 12:41:08 +03:00
TatianaLopaeva
58bebe1b83 Web: People: Fix icon path at profile menu. 2021-03-05 11:53:52 +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
TatianaLopaeva
5c826bcf29 Web: Added top loading indicator for desktop. 2021-03-04 14:36:31 +03:00
Vladislav Makhov
22c7dcb414 web: people: refactoring 2021-03-03 19:11:12 +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
TatianaLopaeva
17ac53d015 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-03 15:42:58 +03:00
TatianaLopaeva
ada47512f1 Web: Moved PeopleSelector to the Web Client. 2021-03-03 15:41:28 +03:00
Vladislav Makhov
57609a6e7e web: people: ProfileAction refactoring 2021-03-03 14:54:26 +03:00
Vladislav Makhov
1dbfd7f105 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-03 12:33:25 +03:00
Vladislav Makhov
d2dd11ef91 web: people: isMe refactoring 2021-03-03 12:33:17 +03:00
TatianaLopaeva
90831adc31 Web: Moved GroupSelector to the People module. 2021-03-03 12:09:12 +03:00
Vladislav Makhov
b8702eb270 web: people: add isMe 2021-03-03 12:05:34 +03:00
Vladislav Makhov
c2a5eea4be web: people: refactoring 2021-03-03 12:05:08 +03:00
TatianaLopaeva
5212633a8d Web: Moved errors from Common to the Web Client. 2021-03-03 11:15:11 +03:00
Vladislav Makhov
756039eccd Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-03 09:33:53 +03:00
bf7f680d08 Web: Moved NavMenu to Web Client 2021-03-02 18:25:20 +03:00