Commit Graph

220 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
Alexey Kostenko
96ec652313 Merge branch 'develop' into feature/oauth2.0 2021-04-16 14:25:37 +03:00
Vladislav Makhov
c60d653bc1 web: fix hiding unpinned article when menu item clicked 2021-04-16 13:41:36 +03:00
TatianaLopaeva
297e4f42e9 Merge branch 'develop' into feature/team-template 2021-04-16 09:25:43 +03:00
TatianaLopaeva
e738cab4a2 Web: Added Error message & Added loader. 2021-04-15 19:51:59 +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
ff370259e9 Web: Added "learn more and help url for common setting. 2021-04-13 14:47:46 +03:00
TatianaLopaeva
3487e40c51 Web: Settings: Added logic for team template, added getCustomSchema. 2021-04-13 14:34:04 +03:00
c324404767 Web: fixed firefox frame 2021-04-13 14:07:44 +03:00
c7017920e8 Web: fixed selection for mobile devices 2021-04-13 12:56:03 +03:00
5daf690ffb Web: fixed selection 2021-04-13 12:49:37 +03:00
5936640ce2 Web: fixed selection 2021-04-13 12:43:17 +03:00
8cfd5eb644 Web: Added SelectedFrame 2021-04-13 09:35:07 +03:00
Alexey Kostenko
cf7072a714 Refactoring 2021-04-12 10:57:21 +03:00
Alexey Kostenko
ec6c1df3cf Merge branch 'develop' into feature/oauth2.0 2021-04-08 11:59:08 +03:00
96d67be68c Web: Fix hashSettings setup 2021-04-08 10:24:06 +03:00
bcf350c1d9 Bump version to v0.1.1 2021-04-08 10:23:33 +03:00
c314b6e192 Web: Change bad language setup 2021-04-07 16:33:00 +03:00
559d7a9940 Web: Fixed export and import registerSW 2021-04-07 15:41:42 +03:00
4484d609a6 Web: Added registerSW for start Service-Worker + Added post SkipWaiting on update 2021-04-07 15:27:51 +03:00
TatianaLopaeva
8419167825 Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0 2021-04-07 13:35:39 +03:00
TatianaLopaeva
cdef097fdd Web: Fixed hiding header when switching group. 2021-04-07 13:35:32 +03:00
Alexey Kostenko
aad5255cd8 Web: Common: Fixed setting user culture 2021-04-07 12:19:12 +03:00
TatianaLopaeva
6b7bc650da Web: components: Added margin-bottom for fixed height of article. 2021-04-06 17:23:32 +03:00
Artem Tarasov
e304af064b Web: People: fixed group list query 2021-04-05 16:18:41 +03:00
b9fe2c338f Added New Proxy settings 2021-04-05 15:49:02 +03:00
Alexey Kostenko
866a1bfa68 Web: People: Removed unused method 2021-04-05 13:36:04 +03:00
Alexey Kostenko
e333e7e82d Web: People: Clear interval if getter token window is closed (connecting providers) 2021-04-04 16:53:27 +03:00
Alexey Kostenko
df635f3bfd Web: Login/Common: Clear interval if getter token window is closed 2021-04-04 16:39:35 +03:00
Vladislav Makhov
555bb28e47 web: common: remove unused imports 2021-04-02 15:36:40 +03:00
Vladislav Makhov
ff04684f53 web: remove unused code 2021-04-02 13:49:42 +03:00
Vladislav Makhov
cb10e850cd web: common: switch to makeAutoObservable, add action setIsEncryptionSupport 2021-04-01 12:42:23 +03:00
166aaa8239
Merge branch 'develop' into bugfix/privacy-room 2021-03-31 18:01:58 +03:00
Vladislav Makhov
1a66373c16 web: fix defaultPage 2021-03-30 15:01:25 +03:00
Vladislav Makhov
be3c97bce2 web: fix opening Files as default page, if desktop client uses 2021-03-30 13:05:52 +03:00
845105e2f8 Web: Common: removed LayoutContextConsumer wrapper 2021-03-29 10:24:56 +03:00
14dcfb90c1 Web: Common: removed frame for mobile devices 2021-03-29 10:08:50 +03:00
Alexey Kostenko
7ff66e894a Web: Login: Render only available providers for login 2021-03-26 17:19:26 +03:00
Alexey Kostenko
3e4424b67b Web: People/Common: Refactoring 2021-03-25 16:10:10 +03:00
f9f560f351 Web: Common: fixed files selection 2021-03-25 11:27:03 +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
f732f5fba6 Web: Moved sw-template to @appserver/common and removed api cache (translation issue) 2021-03-24 11:45:58 +03:00
TatianaLopaeva
cc707204d9 Web: Removed jumps of article when the page is loading. 2021-03-23 10:39:37 +03:00
fd704ab12a Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 20:58:06 +03:00
5dd30c9502 Web: Client: fixed owner change 2021-03-22 20:56:53 +03:00
0847693c55 Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 20:02:03 +03:00
efcf36a1b0 Web: Common: Revert proxy.url 2021-03-22 20:01:28 +03:00
12af2890dc Web: Files: fixed markAsRead 2021-03-22 19:21:36 +03:00
628f9c8d5c Web: Common: fixed getShortenedLink 2021-03-22 19:18:30 +03:00
TatianaLopaeva
9baae539d2 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 18:11:45 +03:00
TatianaLopaeva
24cc620904 Web: Fixed displaying of shared files at aside & Deleted useless code. 2021-03-22 18:11:39 +03:00
a8a6121e59 Web: Proxy fixes 2021-03-22 17:35:33 +03:00
Alexey Kostenko
3524f3b6c6 Web: Client/Common: Fixed Route to homepage (Incorrect header on homepage) 2021-03-22 15:27:36 +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
Viktor Fomin
4fe20bdca9 Web: Common: fixed article width 2021-03-20 16:20:51 +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
f25d8adbea Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-19 22:17:04 +03:00
40557ccedc Web: Files: fixed filter 2021-03-19 22:16:47 +03:00
e797d01bee Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-19 21:07:16 +03:00
6d29a82d26 Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-19 20:46:06 +03:00
97ec05e8ff Web: People: fixed filter 2021-03-19 20:45:57 +03:00
ec1fc00b90 Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-19 19:02:50 +03:00
741fca254f Web: Fixed usage of auth.settingsStore 2021-03-19 19:02:43 +03:00
Viktor Fomin
ab84569dcf Web: Common: fixed article width 2021-03-19 18:46:05 +03:00
e63fc30a2e Web: People: Fixed move to direct link 2021-03-19 16:31:41 +03:00
e1a477bc64 Web: Common: Restored Selectors in Filter 2021-03-19 10:50:28 +03:00
f9a062fd67 Web: Fix direct move to /wizard 2021-03-18 22:16:09 +03:00
f3f4037282 Web: Fixed Wizard 2021-03-18 21:54:03 +03:00
TatianaLopaeva
a6e3349d9e Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-17 16:46:25 +03:00
TatianaLopaeva
5fc9376021 Web: Deleted useless exports. 2021-03-17 16:45:36 +03:00
86a63e6330 Web: Client: fixed createUser form 2021-03-17 16:35:45 +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
8e7cad9b3f Web: Removed useless files 2021-03-17 12:36:14 +03:00
a25261f242 Web: Files: Fixed move from Folder to Settings and back 2021-03-16 22:47:41 +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
2074cbb0d0 Web: Common: fixed StyledSectionFilter 2021-03-15 16:02:26 +03:00
8279174355 Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
#	products/ASC.Files/Client/src/Files.jsx
2021-03-15 14:57:44 +03:00
9ba58855d4 Web: Files: fixed EmptyContainer 2021-03-15 14:51:23 +03:00
b7a7be3d1f Web: Refactoring 2021-03-13 18:33:43 +03:00
1cf7415db7 Web: Added changing of base href on page load 2021-03-13 18:29:26 +03:00
ad8d6d89d2 Web: Shell: Added virtualPath (proxy: /appserver) 2021-03-13 16:03:31 +03:00
372c06f911 Web: Fix Module not found: Error: Can't resolve 'people/GroupSelector' 2021-03-13 16:02:22 +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
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
Ilya Oleshko
ba92cfa107 Web: Components: PageLayout: Fixed SelectedFrame value level 2021-03-12 12:58:28 +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
Viktor Fomin
4c28a12398 Web: Common: fixed icon position 2021-03-10 20:10:09 +03:00
877016d8e3 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-05 12:41:08 +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