Commit Graph

225 Commits

Author SHA1 Message Date
a289256846 Web: Files: added ConflictResolveDialog, refactoring files operations 2021-04-16 16:04:50 +03:00
TatianaLopaeva
052157d1fe Web: Rename functions. 2021-04-16 15:35:02 +03:00
33f5a07c70 Web: Files: fixed search by subfolders 2021-04-15 10:27:23 +03:00
TatianaLopaeva
fc40487de0 Web: Added setCurrentShema and setCustomShema methods, added form validation. 2021-04-14 14:26:26 +03:00
TatianaLopaeva
3487e40c51 Web: Settings: Added logic for team template, added getCustomSchema. 2021-04-13 14:34:04 +03:00
Alexey Kostenko
ec6c1df3cf Merge branch 'develop' into feature/oauth2.0 2021-04-08 11:59:08 +03:00
Artem Tarasov
e304af064b Web: People: fixed group list query 2021-04-05 16:18:41 +03:00
Alexey Kostenko
3e4424b67b Web: People/Common: Refactoring 2021-03-25 16:10:10 +03:00
Alexey Kostenko
1e17f4c4ae Web: Common: Added api for oauth login 2021-03-24 16:49:42 +03:00
Alexey Kostenko
34973b123a Web: Common: Added api for linking providers and get available linked providers 2021-03-24 14:19:46 +03:00
5dd30c9502 Web: Client: fixed owner change 2021-03-22 20:56:53 +03:00
628f9c8d5c Web: Common: fixed getShortenedLink 2021-03-22 19:18:30 +03:00
a8a6121e59 Web: Proxy fixes 2021-03-22 17:35:33 +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
126bbda1b1 Web: Files: refactoring 2021-03-20 13:17:17 +03:00
75859212ab Web: People: Fix conversation of Filter to URL and back 2021-03-20 13:16:45 +03:00
deafba32a7 Web: Files: Fix conversation of Filter to URL and back 2021-03-20 12:51:08 +03:00
40557ccedc Web: Files: fixed filter 2021-03-19 22:16:47 +03:00
97ec05e8ff Web: People: fixed filter 2021-03-19 20:45:57 +03:00
e63fc30a2e Web: People: Fixed move to direct link 2021-03-19 16:31:41 +03:00
a25261f242 Web: Files: Fixed move from Folder to Settings and back 2021-03-16 22:47:41 +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
Vladislav Makhov
66daf1e21f web: common: remove not needed import 2021-03-12 10:17:38 +03:00
Vladislav Makhov
10763bd9a3 web: people: fix import 2021-03-12 09:10:09 +03:00
Artem Tarasov
fe7cb5364d Web: Common: chsnged component hierarchy 2021-02-25 11:04:22 +03:00