|
|
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 |
|
TatianaLopaeva
|
b57a5d0627
|
Web: Files: Fixed displaying icons.
|
2021-03-11 14:18:23 +03:00 |
|
|
|
30e4390a39
|
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-11 13:57:24 +03:00 |
|
|
|
e17f7d7799
|
Web: Files: fixed sharing panel
|
2021-03-11 13:57:14 +03:00 |
|
Viktor Fomin
|
24b212246c
|
Web: Files: fixed favorite icon click
|
2021-03-11 11:00:53 +03:00 |
|
Viktor Fomin
|
56a5c1bf20
|
Web: Files: fixed lock file
|
2021-03-11 10:46:55 +03:00 |
|
Viktor Fomin
|
2872b75768
|
Web: Files: deleted extra icon
|
2021-03-10 22:29:23 +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 |
|
|
|
62488521e3
|
Web: Files: Modified production build
|
2021-03-10 19:07:54 +03:00 |
|
|
|
4eeb6322bd
|
Web: Files: added file actions notification
|
2021-03-10 18:04:21 +03:00 |
|
|
|
4ed3a1a777
|
Web: Files: fixed files selection
|
2021-03-10 16:44:24 +03:00 |
|
|
|
fde03a699a
|
Web: Files: moved downloadFiles action from Header
|
2021-03-10 12:14:23 +03:00 |
|
|
|
7c04c68274
|
Web: Files: moved EmptyFilesContainer from Body
|
2021-03-09 19:23:17 +03:00 |
|
|
|
26cf03878a
|
Web: Files: moved MediaViewer from Body
|
2021-03-09 15:25:46 +03:00 |
|
|
|
2a5a78bc74
|
Web: Packages: stable versions
|
2021-03-06 21:46:04 +03:00 |
|
|
|
a8a55167eb
|
Web: Editor: Optimization
|
2021-03-06 18:50:06 +03:00 |
|
|
|
d4abc1dcdc
|
Web: Files: fix
|
2021-03-05 17:51:39 +03:00 |
|
|
|
653440772d
|
Web: Files: added translations to SimpleFilesRow
|
2021-03-05 17:27:44 +03:00 |
|
|
|
cee06497f8
|
Web: Files: fixed context menu actions
|
2021-03-05 17:06:23 +03:00 |
|
|
|
2e96e29f58
|
Web: Files: fixed context menu actions
|
2021-03-05 17:03:44 +03:00 |
|
|
|
46f1495de5
|
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-05 14:38:50 +03:00 |
|
|
|
c52052a152
|
Web: Files: fixed context menu delete action, removed useless code
|
2021-03-05 14:38:41 +03:00 |
|
|
|
877016d8e3
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-05 12:41:08 +03:00 |
|
|
|
7db261fea4
|
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-05 11:46:27 +03:00 |
|
|
|
25a2daeab5
|
Web: Files: moved editCompleteAction to store
|
2021-03-05 11:46:16 +03:00 |
|
TatianaLopaeva
|
5412f7b860
|
Web: NavMenu: Fixed icon path, deleted useless icons from modules.
|
2021-03-05 11:09:23 +03:00 |
|
TatianaLopaeva
|
993ddf9ac8
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-05 11:02:18 +03:00 |
|
TatianaLopaeva
|
e81d2c8bb7
|
Web: Common: Fixed logoUrl.
|
2021-03-05 11:01:49 +03:00 |
|
Ilya Oleshko
|
6442dfddca
|
Web: Files: Fixed share icon path
|
2021-03-05 10:46:02 +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 |
|
|
|
4c1913c28a
|
Web: Files: fixed files creation
|
2021-03-04 18:44:30 +03:00 |
|
