|
352c04fd5f
|
Merge branch 'develop' into feature/files-recent
|
2020-10-20 19:14:43 +03:00 |
|
Vladislav Makhov
|
967a01061a
|
Merge branch 'develop' into feature/files-recent
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json
# products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json
# products/ASC.Files/Client/src/store/files/selectors.js
# web/ASC.Web.Common/src/api/files/index.js
# web/ASC.Web.Components/src/components/icons/svg/index.js
|
2020-10-20 09:23:58 +03:00 |
|
|
05a6034b05
|
Merge branch 'develop' into feature/people-filter-empty-screen
|
2020-10-19 20:53:59 +03:00 |
|
Vladislav Makhov
|
e0dacb3a60
|
Merge branch 'develop' into feature/files-recent
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
# web/ASC.Web.Common/src/api/files/index.js
|
2020-10-19 18:20:36 +03:00 |
|
Vladislav Makhov
|
2757a785a0
|
Merge branch 'develop' into feature/files-favorites
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# web/ASC.Web.Common/src/api/files/index.js
|
2020-10-19 17:54:41 +03:00 |
|
TatianaLopaeva
|
2dd956c700
|
Update yarn.lock files
|
2020-10-19 13:41:22 +03:00 |
|
TatianaLopaeva
|
2509d7128e
|
web: components: bump version
|
2020-10-19 13:26:51 +03:00 |
|
TatianaLopaeva
|
41d0c3e9d9
|
Merge branch 'develop' into feature/people-filter-empty-screen
|
2020-10-19 12:11:34 +03:00 |
|
TatianaLopaeva
|
14af00ffd7
|
Web: Added styles and changed images by layout
|
2020-10-16 16:21:33 +03:00 |
|
|
f78d6c14f3
|
web: components: bump version
|
2020-10-16 16:18:11 +03:00 |
|
|
8058981447
|
Web: Components: Applied prettier style fix
|
2020-10-16 16:16:01 +03:00 |
|
Vladislav Makhov
|
3491938aa4
|
Merge branch 'feature/files' into feature/files-favorites
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/components/pages/Home/index.js
# products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
# products/ASC.Files/Client/src/store/files/selectors.js
# web/ASC.Web.Common/src/api/files/index.js
|
2020-10-16 14:33:20 +03:00 |
|
Vladislav Makhov
|
ccab1949d5
|
Merge branch 'feature/files' into feature/files-recent
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/store/files/selectors.js
|
2020-10-16 11:28:31 +03:00 |
|
|
fe708b9793
|
Merge pull request #98 from ONLYOFFICE/feature/selectors-refactoring
Feature/selectors refactoring
|
2020-10-15 19:04:04 +03:00 |
|
|
f7c9c62adf
|
web: components: bump version
|
2020-10-15 19:03:05 +03:00 |
|
|
e7b02a0782
|
Web: Components: fixed text-input ios styles
|
2020-10-15 19:02:33 +03:00 |
|
Ilya Oleshko
|
3e66f95546
|
Merge branch 'feature/files' into feature/selectors-refactoring
|
2020-10-15 13:39:31 +03:00 |
|
TatianaLopaeva
|
14bb36900c
|
Update yarn.lock files
|
2020-10-15 11:22:58 +03:00 |
|
Artem Tarasov
|
3ee236c25b
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-15 10:56:57 +03:00 |
|
Artem Tarasov
|
6967267341
|
web: components: bump version
|
2020-10-15 10:55:38 +03:00 |
|
Artem Tarasov
|
da6c1b1962
|
Web: Components: tree-menu: added props showBadge, PropTypes, fixed tree-menu.stories
|
2020-10-15 10:50:49 +03:00 |
|
Artem Tarasov
|
e965e529c6
|
Web: Components: added props newItems and onClickBadge() for render Badge witch counter new Items
|
2020-10-14 19:09:03 +03:00 |
|
Ilya Oleshko
|
834ab29b35
|
web: components: bump version
|
2020-10-14 17:57:48 +03:00 |
|
Ilya Oleshko
|
83a69c91b5
|
Web: Components : GroupButtonsMenu : Fixed render
|
2020-10-14 17:57:38 +03:00 |
|
|
ea97ca05c2
|
Update yarn.lock files
|
2020-10-14 17:57:29 +03:00 |
|
Ilya Oleshko
|
2ba9b52c2f
|
web: components: bump version
|
2020-10-14 17:40:50 +03:00 |
|
Ilya Oleshko
|
d5bf9d0d82
|
Web: Components : GroupButtonsMenu : Fixed render
|
2020-10-14 17:38:20 +03:00 |
|
Ilya Oleshko
|
97c5c41aef
|
Web: Components : GroupButton : Fixed render
|
2020-10-14 17:38:04 +03:00 |
|
Vladislav Makhov
|
4531619362
|
Merge branch 'feature/files' into feature/files-favorites
|
2020-10-14 13:45:13 +03:00 |
|
|
f294b60940
|
Merge branch 'feature/files' into feature/selectors-refactoring
|
2020-10-14 10:26:00 +03:00 |
|
|
bac77e0ebd
|
Merge branch 'feature/files' into feature/selectors-refactoring
# Conflicts:
# products/ASC.Files/Client/src/components/Article/MainButton/index.js
|
2020-10-13 18:17:31 +03:00 |
|
Alexey Kostenko
|
09d4229c8c
|
web: components: bump version
|
2020-10-13 17:44:51 +03:00 |
|
Alexey Kostenko
|
9bdf52ce07
|
Web: Components: Fix warning
|
2020-10-13 17:44:42 +03:00 |
|
Alexey Kostenko
|
52b1c73edf
|
web: components: bump version
|
2020-10-13 17:31:43 +03:00 |
|
Alexey Kostenko
|
87d2c42a6b
|
Web: Component: Style fix
|
2020-10-13 17:31:36 +03:00 |
|
Alexey Kostenko
|
f16145ae62
|
Merge branch 'feature/files' into feature/avatar-editor-redesign
|
2020-10-13 17:00:18 +03:00 |
|
Alexey Kostenko
|
d99d4f5f99
|
web: components: bump version
|
2020-10-13 16:57:58 +03:00 |
|
Alexey Kostenko
|
e95be64ea6
|
Web: Components/People: Small refactoring
|
2020-10-13 16:57:44 +03:00 |
|
|
49f5a52433
|
Update yarn.lock files
|
2020-10-13 16:52:17 +03:00 |
|
Alexey Kostenko
|
1bf8b3e886
|
web: components: bump version
|
2020-10-13 14:52:55 +03:00 |
|
Alexey Kostenko
|
9a144cb8c4
|
Web: Components: Style fix
|
2020-10-13 14:52:45 +03:00 |
|
Vladislav Makhov
|
632f83927b
|
Merge branch 'feature/files' into feature/files-favorites
|
2020-10-13 14:26:31 +03:00 |
|
|
3d34978bf0
|
Merge branch 'feature/files' into feature/selectors-refactoring
|
2020-10-13 13:39:10 +03:00 |
|
TatianaLopaeva
|
4ef2db2ed0
|
Web: Update yarn.lock
|
2020-10-13 12:37:34 +03:00 |
|
TatianaLopaeva
|
f0299db016
|
Update yarn.lock
|
2020-10-13 11:14:09 +03:00 |
|
TatianaLopaeva
|
df8fbcc050
|
Web: Components: Update icon by layout
|
2020-10-12 16:58:06 +03:00 |
|
TatianaLopaeva
|
1010886262
|
Web: Refactoring
|
2020-10-12 16:56:34 +03:00 |
|
|
824961ddec
|
Web: Files: added upload files-converter, fixed upload filer for tree folders, refactoring
|
2020-10-12 15:28:36 +03:00 |
|
Vladislav Makhov
|
a179ae0e6c
|
Merge branch 'feature/files' into feature/files-favorites
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# web/ASC.Web.Common/src/api/files/index.js
|
2020-10-12 14:45:53 +03:00 |
|
Vladislav Makhov
|
2476b306f9
|
Merge branch 'feature/files' into feature/files-recent
# Conflicts:
# web/ASC.Web.Common/src/api/files/index.js
# web/ASC.Web.Components/package.json
|
2020-10-12 10:04:24 +03:00 |
|