0a9a1b1809
Files: fixed root method
2021-03-22 22:14:43 +03:00
fd704ab12a
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-22 20:58:06 +03:00
Ilya Oleshko
de8dc35fca
Web: Files: Apply route proxy
2021-03-22 20:51:52 +03:00
a1eb540d9d
Web: Files: Fixed routing from settings and folder
2021-03-22 20:34:02 +03:00
92530da98f
Web: Files: Fix proxy
2021-03-22 20:26:35 +03:00
0847693c55
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-22 20:02:03 +03:00
577464933b
Web: Files: Fixed proxy
2021-03-22 20:00:04 +03:00
b0c430b7ba
Merge branch 'develop' into feature/workspaces
2021-03-22 19:46:49 +03:00
12af2890dc
Web: Files: fixed markAsRead
2021-03-22 19:21:36 +03:00
44c4967f0f
Files: indexes renamed
2021-03-22 18:43:51 +03:00
TatianaLopaeva
26ef7bdd65
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-22 18:31:41 +03:00
e279ece3c4
Removed commented code
2021-03-22 18:24:19 +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
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
Artem Tarasov
0fcdbd3fd7
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-22 16:16:03 +03:00
Artem Tarasov
a616d79ccf
Web: Files: fixed folder selection when clicking from settings
2021-03-22 16:15:18 +03:00
Ilya Oleshko
c689b59a03
Web: Files: Added missing ErrorBoundary import
2021-03-22 15:57:44 +03:00
Ilya Oleshko
49e28e53a4
Web: Files: Apply route proxy
2021-03-22 15:55:56 +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
30d7c7bd8f
Web: Files: fixed article width
2021-03-20 16:21:18 +03:00
deafba32a7
Web: Files: Fix conversation of Filter to URL and back
2021-03-20 12:51:08 +03:00
1c4acb2842
Web: Fixed issue with Tree link first click
2021-03-20 11:54:21 +03:00
5f255d7aa4
Web: Files Fixed routing to third-party settings page
2021-03-20 11:45:41 +03:00
27afa22f85
Web: Files: Fixed Filter translations loading
2021-03-19 21:19:05 +03:00
1908c2d608
Web: Files: Refactoring
2021-03-19 21:11:22 +03:00
403487b7de
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-19 18:36:17 +03:00
04d1642fac
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-19 18:24:33 +03:00
fc7d6e170a
Web: Files: added select items to shareButton click
2021-03-19 18:24:14 +03:00
bb898e24cd
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-19 18:23:19 +03:00
6b8d644aab
Web: Replaced all homepages to config variant
2021-03-19 18:22:35 +03:00
TatianaLopaeva
edb57b61d3
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-19 18:08:41 +03:00
1627e94ae9
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-19 18:07:25 +03:00
02c147bd92
Web: Files: added select files on right click event
2021-03-19 18:07:16 +03:00
Vladislav Makhov
62991e25f9
web: files: third party: fix blinking
2021-03-19 18:04:30 +03:00
TatianaLopaeva
e668407d63
Web: Files: Fixed settings styles of connected clouds.
2021-03-19 17:56:01 +03:00
26cb9bf60c
Web: Files: fixed onClickLinkForPortal
2021-03-19 12:18:17 +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
3ab382cb5b
Web: Files: fix position of label ToggleButton in Settings
2021-03-19 11:18:06 +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
33281d9260
Web: Files: commented debug in i18n config
2021-03-19 10:53:13 +03:00
3b340396a7
Web: Fixed jumping of NavMenu
2021-03-19 10:45:34 +03:00
Artem Tarasov
d3d9234d40
Web: fix direct to VersionHistory and back (mobile)
2021-03-18 23:12:19 +03:00
8e6b2c78d8
Web: Moved ipl-progress-indicator to NavMenu
2021-03-18 22:26:52 +03:00
TatianaLopaeva
6e96c56916
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-18 18:09:34 +03:00
Alexey Kostenko
6f2d927e57
Web: Files: Fixed navigating between folders through the tree
2021-03-18 17:48:57 +03:00
TatianaLopaeva
0281e18e20
Web: Files: Fixed color.
2021-03-18 16:39:58 +03:00
TatianaLopaeva
c8d40e698e
Web: People/Files: Fixed color of icons.
2021-03-18 16:30:45 +03:00
Artem Tarasov
66c346b40d
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-18 13:40:16 +03:00
Artem Tarasov
592d51f32e
Web: Files: fixed AppLoader renderer when first opening SharingPanel, VersionHistoryPanel
2021-03-18 13:39:51 +03:00
Alexey Kostenko
b4c89be548
Web: Files: Fixed row in Sharing Panel (mobile width)
2021-03-17 17:32:38 +03:00
Viktor Fomin
26318d3563
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-17 15:29:38 +03:00
Viktor Fomin
27e79b748e
Web: Files: show rows loader on mobile
2021-03-17 15:29:29 +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
323d9fd76e
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-17 13:32:35 +03:00
4c55b2264a
Web: Files: fixed files opening
2021-03-17 13:32:25 +03:00
062cc4cc78
Web: Disabled initialization of service-workers on development
2021-03-17 12:59:11 +03:00
c08aad3ab1
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-16 22:47:49 +03:00
a25261f242
Web: Files: Fixed move from Folder to Settings and back
2021-03-16 22:47:41 +03:00
Artem Tarasov
e85b8f8118
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-16 18:04:54 +03:00
Artem Tarasov
517bbf9885
Web: Files: VersionHistory: fixed constant loading of the history of the first selected file, double request to the srver
2021-03-16 18:04:38 +03:00
Alexey Kostenko
299d7b888f
Web: Files: Fixed first render icons in SharingPanel
2021-03-16 16:49:40 +03:00
Alexey Kostenko
3b6c2dc80b
Web: Files: Fixed sharing panel styles
2021-03-16 16:23:05 +03:00
Alexey Kostenko
72aca76c12
Web: Files/Components: Fixed row styles
2021-03-16 16:17:50 +03:00
Artem Tarasov
f7ca96d0e4
Web: Files: VersionHistory: fixed warrning with keys of elements
2021-03-16 15:14:25 +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
Diana
73731f23b7
fix
2021-03-16 12:53:06 +03:00
Alexey Kostenko
76f06ece3a
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-16 11:26:59 +03:00
Alexey Kostenko
25b136eada
Web: Components: Files: Fixed row styles
2021-03-16 11:26:49 +03:00
3ca1d1553e
Web: Files: fixed fetchTreeFolders
2021-03-16 10:31:02 +03:00
TatianaLopaeva
6cd763a7d0
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-15 18:08:41 +03:00
TatianaLopaeva
9c119ca9c7
Web: Files fixed scroll top when selected a folder. (for Mobile)
2021-03-15 18:08:19 +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
0da65a6675
Web: Files: ConnectDialog: Fixed setting OAuth token after sending request
2021-03-15 17:58:37 +03:00
Ilya Oleshko
1964aaecdd
Web: Files: TreeFoldersStore: Fixed returning folders after set and fetch
2021-03-15 17:57:23 +03:00
Vladislav Makhov
a8d439da3a
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-15 17:22:32 +03:00
Vladislav Makhov
2224ae0b03
web: files: fix item creation render
2021-03-15 17:22:01 +03:00
Ilya Oleshko
dd8257daf5
Web: Files: ThirdPartyDialog: Fixed props usage
2021-03-15 17:16:03 +03:00
3c4f71c355
Web: Files: fixed remove third-party providers
2021-03-15 16:49:21 +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
f3f4cfd0b2
Web: Files: fixed ThirdParty
2021-03-15 14:50:43 +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
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
b90876c97d
Bump version to v0.0.11
2021-03-12 17:20:24 +03:00
Alexey Kostenko
60fca302e0
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-12 16:59:05 +03:00
Alexey Kostenko
2489c25224
Web: Files: Fixed icons path in Sharing panel
2021-03-12 16:53:47 +03:00
ca94ae28cd
Web: Files: fixed empty filter container
2021-03-12 16:30:36 +03:00
Ilya Oleshko
4e5c42ff91
Web: Files: Row: Removed unused props
2021-03-12 13:00:15 +03:00
4ec8f4958b
Web: Files: fixed file action
2021-03-12 11:05:23 +03:00
76ea36e661
Web: Files: added Router to files, fixed VersionHistoryPanel
2021-03-12 10:50:54 +03:00
Alexey Kostenko
d5a6b5d81b
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-11 17:36:01 +03:00
Alexey Kostenko
85fc7535bf
Web: Components/Files: Fixed rendering svg when change folder
2021-03-11 17:35:52 +03:00