Artem Tarasov
|
bed5352e20
|
Web: Components: TextArea: added props fontSize
|
2020-10-28 13:20:21 +03:00 |
|
Artem Tarasov
|
ed5edd48fe
|
Web: Components: Buttons: fixed text position of label when size=base
|
2020-10-28 12:52:18 +03:00 |
|
Artem Tarasov
|
40f0693727
|
web: common: bump version
|
2020-10-27 15:16:38 +03:00 |
|
Artem Tarasov
|
e4599f8279
|
Web: Files: VersionHistory: added props borderBottom for header(tablet)
|
2020-10-27 15:15:57 +03:00 |
|
Vladislav Makhov
|
3b6883595a
|
Move selector to auth
|
2020-10-27 14:47:07 +03:00 |
|
Vladislav Makhov
|
81f0342127
|
web: common: bump version
|
2020-10-27 14:46:39 +03:00 |
|
Vladislav Makhov
|
eab8d8e8e2
|
update yarn.lock
|
2020-10-27 14:28:56 +03:00 |
|
Vladislav Makhov
|
6249fd948d
|
web: common: bump version
|
2020-10-27 14:16:39 +03:00 |
|
|
|
b548870886
|
Web: Files: Removed useless calls of API by Privacy folder + Added isEncryptionSupport selector
|
2020-10-27 13:15:06 +03:00 |
|
Artem Tarasov
|
851e4cb660
|
Web: Components: row: fixed padding options button
|
2020-10-27 11:53:36 +03:00 |
|
Artem Tarasov
|
590975ce99
|
web: components: bump version
|
2020-10-27 11:49:56 +03:00 |
|
Artem Tarasov
|
0322fdcd8e
|
Web: Components/Files: fixed style Share button
|
2020-10-27 11:49:41 +03:00 |
|
Vladislav Makhov
|
64a72b522f
|
Update yarn.lock
|
2020-10-27 10:49:55 +03:00 |
|
Vladislav Makhov
|
198ae9d38b
|
Update prop types
|
2020-10-27 10:32:50 +03:00 |
|
Vladislav Makhov
|
a5ed82695b
|
web: components: bump version
|
2020-10-27 10:32:22 +03:00 |
|
Vladislav Makhov
|
d91e79c011
|
web: common: bump version
|
2020-10-27 10:25:59 +03:00 |
|
Vladislav Makhov
|
1a3397f183
|
web: components: bump version
|
2020-10-27 10:25:50 +03:00 |
|
Artem Tarasov
|
710024c6f7
|
web: components: bump version
|
2020-10-26 15:41:12 +03:00 |
|
Artem Tarasov
|
5ef8010b53
|
web: common: bump version
|
2020-10-26 15:41:05 +03:00 |
|
Artem Tarasov
|
795dcde768
|
Web: Components: row: fixed margin
|
2020-10-26 15:40:49 +03:00 |
|
Artem Tarasov
|
5c07f4a631
|
Web: Common: PageLayout: fixed padding between filter and row
|
2020-10-26 14:24:09 +03:00 |
|
Artem Tarasov
|
faf0adf664
|
Web: Common: PageLayout: fixed layout section-header
|
2020-10-26 13:53:42 +03:00 |
|
Artem Tarasov
|
57b5296da0
|
Web: Components: Avatar: fixed small size
|
2020-10-26 13:11:26 +03:00 |
|
Artem Tarasov
|
61443b6e0a
|
Web: Common: PageLayout: fixed position SectionToggler
|
2020-10-26 13:02:52 +03:00 |
|
Artem Tarasov
|
5f59dc385b
|
Web: Common: PageLayout: fix article layout
|
2020-10-26 12:32:51 +03:00 |
|
Artem Tarasov
|
ebc9ae958b
|
Web: Common: PageLayout: fixed article-pin-panel size
|
2020-10-26 11:59:46 +03:00 |
|
Artem Tarasov
|
1469c09786
|
Web: Components: tree-menu: fixed margin tablet
|
2020-10-26 10:52:49 +03:00 |
|
Artem Tarasov
|
b787b58b6c
|
Merge branch 'develop' into hotfix/documents-bugfix
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# web/ASC.Web.Common/package.json
# web/ASC.Web.Components/package.json
|
2020-10-26 09:32:29 +03:00 |
|
Artem Tarasov
|
a220443afb
|
Web: Components: tree-menu: fixed props
|
2020-10-26 08:38:04 +03:00 |
|
Vladislav Makhov
|
7b458a72c9
|
Merge branch 'develop' into feature/private-room
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
|
2020-10-23 15:49:10 +03:00 |
|
Vladislav Makhov
|
664b9b2a62
|
Add private room catalog icon
|
2020-10-23 15:30:04 +03:00 |
|
Artem Tarasov
|
bd2e8a374a
|
web: components: bump version
|
2020-10-23 14:26:34 +03:00 |
|
Artem Tarasov
|
c5f260f060
|
Web: Components: tree-menu: fixed desctop layout
|
2020-10-23 14:26:10 +03:00 |
|
|
|
cb849577fb
|
Update yarn.lock files
|
2020-10-23 13:45:17 +03:00 |
|
|
|
e6f1e8241d
|
web: components: bump version
|
2020-10-23 13:37:35 +03:00 |
|
|
|
c0484e1f05
|
Web: Components: Update react-dropzone
|
2020-10-23 13:37:19 +03:00 |
|
|
|
b585313aa5
|
Update yarn.lock files
|
2020-10-23 12:21:57 +03:00 |
|
|
|
f6e261fc59
|
web: common: bump version
|
2020-10-23 12:02:09 +03:00 |
|
|
|
dc667af6ad
|
Web: Common: Fixed login error handling
|
2020-10-23 11:51:53 +03:00 |
|
|
|
9df3a1cf64
|
Web: Files: Fixed display folder icon
|
2020-10-22 19:32:45 +03:00 |
|
|
|
2f86aef863
|
Web: Common: Applied display order on getRootForlders
|
2020-10-22 19:19:44 +03:00 |
|
|
|
6f8ed00dff
|
Web: Common: Replaced getFoldersTree with single @root request
|
2020-10-22 18:51:31 +03:00 |
|
|
|
86a15c35aa
|
Added root folder request
|
2020-10-22 17:17:20 +03:00 |
|
Alexey Kostenko
|
92f5a41604
|
web: components: bump version
|
2020-10-22 16:24:34 +03:00 |
|
Alexey Kostenko
|
926e3c3362
|
Web: Files/Components: Fixed styles dropDownItem in mainButton
|
2020-10-22 16:24:24 +03:00 |
|
Alexey Kostenko
|
64a49dae95
|
web: common: bump version
|
2020-10-22 14:13:06 +03:00 |
|
Alexey Kostenko
|
9c124bdbe1
|
web: components: bump version
|
2020-10-22 14:12:53 +03:00 |
|
Alexey Kostenko
|
bb00498c44
|
Web: Common/Components/Files: Fixed filter and file create field styles
|
2020-10-22 14:10:58 +03:00 |
|
Alexey Kostenko
|
e1693adcdb
|
Web: Files/Components: Fixed mobile row styles
|
2020-10-22 13:47:54 +03:00 |
|
Alexey Kostenko
|
b6aefda481
|
Web: Files/Components: Fixed file creation field
|
2020-10-22 13:21:37 +03:00 |
|
Alexey Kostenko
|
747bf783b8
|
Web: Components/Files: Fixed row styles
|
2020-10-22 10:38:43 +03:00 |
|
Vladislav Makhov
|
06ecce0ca5
|
Add "isEncryptionSupport" mock.
|
2020-10-21 17:08:36 +03:00 |
|
Alexey Kostenko
|
3ff8dbca5e
|
web: common: bump version
|
2020-10-21 16:54:43 +03:00 |
|
Alexey Kostenko
|
715bcff59b
|
web: components: bump version
|
2020-10-21 16:54:32 +03:00 |
|
Alexey Kostenko
|
5f4921d341
|
Web: Files/Components/Common: Fixed row styles
|
2020-10-21 16:54:22 +03:00 |
|
Alexey Kostenko
|
d8fa9b1b60
|
Web: Common/Components: Style fix in filter and rowContainer
|
2020-10-21 15:05:08 +03:00 |
|
SuhorukovAnton
|
01e473f7d1
|
connect-controlPanel: fix audit/login events and fix whitelabel
|
2020-10-21 12:55:13 +03:00 |
|
Alexey Kostenko
|
5ce0299f8f
|
Merge branch 'develop' into feature/avatar-fix
|
2020-10-21 09:17:00 +03:00 |
|
Alexey Kostenko
|
8804048a2c
|
web: components: bump version
|
2020-10-21 09:09:54 +03:00 |
|
Alexey Kostenko
|
ef6145abd5
|
Web: Components: Removed rotate buttons (will be fixed in the next version)
|
2020-10-21 09:09:45 +03:00 |
|
|
|
352c04fd5f
|
Merge branch 'develop' into feature/files-recent
|
2020-10-20 19:14:43 +03:00 |
|
Alexey Kostenko
|
f2711a7eca
|
Web: Components: Fixed creating cropped image, when resize
|
2020-10-20 10:17:09 +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 |
|
|
|
181ac04fd8
|
DI: register fix
|
2020-10-18 19:34:30 +03:00 |
|
|
|
18ef6e7cb6
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Core/Core/FileStorageService.cs
|
2020-10-16 16:57:21 +03:00 |
|
|
|
ed50f3bc98
|
Update yarn.lock files
|
2020-10-16 16:38:11 +03:00 |
|
|
|
fc20655f0a
|
web: common: bump version
|
2020-10-16 16:27:42 +03:00 |
|
|
|
5eed00dd28
|
Removed sq bugs and code smells
|
2020-10-16 16:21:59 +03:00 |
|
TatianaLopaeva
|
14af00ffd7
|
Web: Added styles and changed images by layout
|
2020-10-16 16:21:33 +03:00 |
|
|
|
00c5f40cf8
|
Web: Client: Applied prettier style fix
|
2020-10-16 16:20:12 +03:00 |
|
|
|
f78d6c14f3
|
web: components: bump version
|
2020-10-16 16:18:11 +03:00 |
|
|
|
142c6d5e07
|
Web: Common: Added prettier package
|
2020-10-16 16:17:49 +03:00 |
|
|
|
8058981447
|
Web: Components: Applied prettier style fix
|
2020-10-16 16:16:01 +03:00 |
|
|
|
69bca43c6c
|
web: common: bump version
|
2020-10-16 15:58:30 +03:00 |
|
|
|
f2fcf077a2
|
Web: Common: Fixed start PageLayout story and README
|
2020-10-16 15:56:35 +03:00 |
|
|
|
0181514267
|
Web: Common: Fixed self link
|
2020-10-16 15:55:47 +03:00 |
|
|
|
1a484f1805
|
Web: Common: Applied prettier style fix
|
2020-10-16 15:38:04 +03:00 |
|
|
|
7251a1e4d8
|
Web: Common: Fixed error handling
|
2020-10-16 15:24:37 +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 |
|
|
|
e6be6f5072
|
References updated
|
2020-10-16 10:27:44 +03:00 |
|
|
|
f69281a07d
|
References updated
|
2020-10-15 21:30:16 +03:00 |
|
|
|
11c2efde81
|
Web: Client: Removed old loader and toast
|
2020-10-15 19:28:31 +03:00 |
|
|
|
fa54990786
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-15 19:04:19 +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 |
|
|
|
ff1c1765b5
|
Web: Clients: Turned off Suspense fallback
|
2020-10-15 18:07:23 +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
|
165b5b907f
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-15 10:57:19 +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 |
|
TatianaLopaeva
|
917cbe8a38
|
web: common: bump version
|
2020-10-15 10:56:17 +03:00 |
|
TatianaLopaeva
|
d4d7c9db0d
|
Web: Common: fixed changing language of title toastr
|
2020-10-15 10:55:47 +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 |
|
Vladislav Makhov
|
02faf2a407
|
Refactoring
|
2020-10-14 19:01:53 +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 |
|
|
|
d442e490f4
|
web: common: bump version
|
2020-10-14 17:47:23 +03:00 |
|
|
|
53c77d1a81
|
Web: Common: Removed useless folder param from API Files->getFolder with filter
|
2020-10-14 17:46:40 +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 |
|
|
|
c1b046f954
|
Audit: resources. refactoring
|
2020-10-14 16:58:53 +03:00 |
|
Vladislav Makhov
|
4531619362
|
Merge branch 'feature/files' into feature/files-favorites
|
2020-10-14 13:45:13 +03:00 |
|
|
|
4a0a683c68
|
fix
|
2020-10-14 12:11:04 +03:00 |
|
|
|
f294b60940
|
Merge branch 'feature/files' into feature/selectors-refactoring
|
2020-10-14 10:26:00 +03:00 |
|
|
|
f252ef2a7f
|
Merge branch 'master' into features/ASC.AuditTrail
# Conflicts:
# ASC.Web.sln
|
2020-10-13 18:17:59 +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 |
|
|
|
2884bd8de3
|
web: common: bump version
|
2020-10-13 16:33:22 +03:00 |
|
|
|
2fa205cb6f
|
Web: Clients: Fixed catching of initial API errors
|
2020-10-13 16:31:21 +03:00 |
|
|
|
746ecc7f40
|
Web: Clients: Fixed applying single cursor on loading
|
2020-10-13 16:20:49 +03:00 |
|
|
|
3dd9f71dda
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-13 15:51:24 +03:00 |
|
|
|
5d76e7e6b0
|
Web: Redesigned displaying of loading processes
|
2020-10-13 15:51:14 +03:00 |
|
|
|
668cb3e893
|
Merge branch 'master' into feature/files
|
2020-10-13 15:27:31 +03:00 |
|
|
|
bcbefb8f26
|
Merge branch 'feature/files' into feature/selectors-refactoring
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/TreeSettings.js
# products/ASC.Files/Client/src/components/pages/Settings/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Settings/index.js
# products/ASC.Files/Client/src/store/files/actions.js
# products/ASC.Files/Client/src/store/files/reducers.js
# products/ASC.Files/Client/src/store/files/selectors.js
|
2020-10-13 15:08:22 +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 |
|
Artem Tarasov
|
24a0fe17b4
|
web: common: bump version
|
2020-10-13 13:45:40 +03:00 |
|
Artem Tarasov
|
a4a959f972
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-13 13:43:16 +03:00 |
|
|
|
3d34978bf0
|
Merge branch 'feature/files' into feature/selectors-refactoring
|
2020-10-13 13:39:10 +03:00 |
|
|
|
9968873305
|
Merge branch 'master' into feature/fix_API_return
# Conflicts:
# web/ASC.Web.Api/Controllers/SettingsController.cs
|
2020-10-13 13:33:24 +03:00 |
|
|
|
01f00d49ae
|
web: common: bump version
|
2020-10-13 13:32:46 +03:00 |
|
|
|
1d4b3785bb
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-10-13 13:31:24 +03:00 |
|
|
|
0712677297
|
Web: Common: fixed MediaViewer close, fixed share dropdown styles
|
2020-10-13 13:30:26 +03:00 |
|
Vladislav Makhov
|
6bcfcc4987
|
Merge branch 'feature/files' into feature/files-recent
|
2020-10-13 13:16:37 +03:00 |
|
|
|
a504251359
|
Merge pull request #99 from ONLYOFFICE/feature/fix-changing-language
Feature/fix changing language
|
2020-10-13 12:55:37 +03:00 |
|
|
|
02f39a9c71
|
Merge branch 'master' into feature/files
# Conflicts:
# common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20201006101804_WebstudioDbContextMySql.cs
# common/ASC.Core.Common/Migrations/Npgsql/WebstudioDbContextNpgsql/20200929102646_WebstudioDbContextNpgsql.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# web/ASC.Web.Core/Files/FileUtility.cs
|
2020-10-13 12:52:28 +03:00 |
|
TatianaLopaeva
|
4ef2db2ed0
|
Web: Update yarn.lock
|
2020-10-13 12:37:34 +03:00 |
|
TatianaLopaeva
|
dbdc134ef0
|
web: common: bump version
|
2020-10-13 12:18:48 +03:00 |
|
TatianaLopaeva
|
ac697d28fc
|
Web: Added getLanguage selector
|
2020-10-13 12:17:45 +03:00 |
|
|
|
b1d50e5702
|
Core: fix DI
|
2020-10-13 11:26:17 +03:00 |
|
TatianaLopaeva
|
f0299db016
|
Update yarn.lock
|
2020-10-13 11:14:09 +03:00 |
|
|
|
65fd5ee2f3
|
Api: fix DI
|
2020-10-13 11:13:24 +03:00 |
|
|
|
fb5a6b9926
|
Api: fix DI
|
2020-10-13 11:11:03 +03:00 |
|
|
|
bead971061
|
Api: fix DI
|
2020-10-13 11:09:22 +03:00 |
|
TatianaLopaeva
|
8d09a45fab
|
web: common: bump version
|
2020-10-13 10:54:49 +03:00 |
|
TatianaLopaeva
|
6a0e34a7a2
|
Web: Common: Added language into array of useEffect
|
2020-10-13 10:52:44 +03:00 |
|
|
|
c622be89a3
|
revert discard
|
2020-10-12 22:39:23 +03:00 |
|
|
|
43b9c33979
|
fix formating
|
2020-10-12 19:23:15 +03:00 |
|
|
|
383478d3bd
|
fix
|
2020-10-12 19:13:51 +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 |
|
|
|
36034bf97a
|
fix warnings
|
2020-10-12 16:52:31 +03:00 |
|
|
|
577fc5ac70
|
Merge branch 'feature/files' into feature/selectors-refactoring
# Conflicts:
# products/ASC.Files/Client/src/components/pages/DocEditor/index.js
|
2020-10-12 15:36:26 +03:00 |
|
Vladislav Makhov
|
22da8b836d
|
fix after merge
|
2020-10-12 15:31:21 +03:00 |
|
|
|
824961ddec
|
Web: Files: added upload files-converter, fixed upload filer for tree folders, refactoring
|
2020-10-12 15:28:36 +03:00 |
|
Artem Tarasov
|
8453611714
|
Web: Common: added SettingsFiles loader
|
2020-10-12 14:52:49 +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
|
7aaeddedb2
|
Add pushing to recently viewed
|
2020-10-12 14:37:52 +03:00 |
|
Artem Tarasov
|
679413c7b1
|
Web: Client: wizard: fixed layout
|
2020-10-12 12:01:27 +03:00 |
|
Vladislav Makhov
|
9ea5a648e9
|
Fix code after merge
|
2020-10-12 11:02:22 +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 |
|
Alexey Kostenko
|
237f737ba7
|
Merge branch 'feature/files' into feature/avatar-editor-redesign
|
2020-10-11 20:04:18 +03:00 |
|
|
|
ee6307e288
|
Web: People: Added hack for build machine only
|
2020-10-09 19:14:48 +03:00 |
|
|
|
3afd5dedda
|
web: common: bump version
|
2020-10-09 19:07:10 +03:00 |
|
|
|
f4ed52d985
|
Web: Added and applied new API method getDocServiceUrl
|
2020-10-09 19:06:50 +03:00 |
|
|
|
a01fb879a4
|
Web: Common: remove duplicate getIsLoaded selector
|
2020-10-09 18:28:02 +03:00 |
|
|
|
615f514bfd
|
Merge branch 'feature/files' into feature/selectors-refactoring
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Filter/index.js
# web/ASC.Web.Common/src/store/auth/selectors.js
|
2020-10-09 17:24:50 +03:00 |
|
Ilya Oleshko
|
ef545675d2
|
web: components: bump version
|
2020-10-09 17:08:40 +03:00 |
|
Ilya Oleshko
|
5e8a4727ac
|
Web: Components : Row : Added contentElement
|
2020-10-09 17:07:35 +03:00 |
|
Artem Tarasov
|
128d25ef9b
|
web: common: bump version
|
2020-10-09 16:11:00 +03:00 |
|
Artem Tarasov
|
421d71c4fe
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
# web/ASC.Web.Common/src/components/Loaders/index.js
|
2020-10-09 15:58:50 +03:00 |
|
Artem Tarasov
|
5a5fb5b036
|
Web: Common: added ProfileViewLoader
|
2020-10-09 15:57:04 +03:00 |
|
|
|
e01ee037f2
|
Merge branch 'master' into feature/fix-messages
# Conflicts:
# common/ASC.Core.Common/Billing/TariffService.cs
# common/ASC.Core.Common/EF/Context/BaseDbContext.cs
# common/ASC.Core.Common/EF/Context/CoreDbContext.cs
# common/ASC.Core.Common/EF/Context/DbContext.cs
# common/ASC.Core.Common/EF/Context/DbContextManager.cs
# common/ASC.Core.Common/EF/Context/FeedDbContext.cs
# common/ASC.Core.Common/EF/Context/FilesDbContext.cs
# common/ASC.Core.Common/EF/Context/MessagesContext.cs
# common/ASC.Core.Common/EF/Context/ResourceDbContext.cs
# common/ASC.Core.Common/EF/Context/TelegramDbContext.cs
# common/ASC.Core.Common/EF/Context/WebstudioDbContext.cs
# common/ASC.Core.Common/EF/Model/AccountLinks.cs
# common/ASC.Core.Common/EF/Model/Core/Acl.cs
# common/ASC.Core.Common/EF/Model/Core/DbCoreSettings.cs
# common/ASC.Core.Common/EF/Model/Core/DbSubscriptionMethod.cs
# common/ASC.Core.Common/EF/Model/Core/Subscription.cs
# common/ASC.Core.Common/EF/Model/DbWebstudioSettings.cs
# common/ASC.Core.Common/EF/Model/DbWebstudioUservisit.cs
# common/ASC.Core.Common/EF/Model/Feed/FeedReaded.cs
# common/ASC.Core.Common/EF/Model/Feed/FeedUsers.cs
# common/ASC.Core.Common/EF/Model/FilesConverts.cs
# common/ASC.Core.Common/EF/Model/MobileAppInstall.cs
# common/ASC.Core.Common/EF/Model/Resource/ResAuthorsFile.cs
# common/ASC.Core.Common/EF/Model/Resource/ResAuthorsLang.cs
# common/ASC.Core.Common/EF/Model/TelegramUser.cs
# common/ASC.Core.Common/EF/Model/Tenant/DbButton.cs
# common/ASC.Core.Common/EF/Model/Tenant/DbQuotaRow.cs
# common/ASC.Core.Common/EF/Model/User/UserGroup.cs
# common/ASC.Core.Common/HostedSolution.cs
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# common/ASC.Data.Reassigns/QueueWorker.cs
# common/ASC.Data.Reassigns/ReassignProgressItem.cs
# common/ASC.Data.Reassigns/RemoveProgressItem.cs
# common/ASC.VoipService/Dao/CachedVoipDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/DaoFactory.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/EF/DbEncryptedData.cs
# products/ASC.Files/Core/Core/EF/DbFile.cs
# products/ASC.Files/Core/Core/EF/DbFilesBunchObjects.cs
# products/ASC.Files/Core/Core/EF/DbFilesSecurity.cs
# products/ASC.Files/Core/Core/EF/DbFilesTagLink.cs
# products/ASC.Files/Core/Core/EF/DbFilesThirdpartyApp.cs
# products/ASC.Files/Core/Core/EF/DbFilesThirdpartyIdMapping.cs
# products/ASC.Files/Core/Core/EF/DbFolderTree.cs
# products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
# products/ASC.Files/Core/Core/Search/FactoryIndexerFolder.cs
# products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderTagDao.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Server/Startup.cs
# web/ASC.Web.Studio/Startup.cs
|
2020-10-09 15:40:44 +03:00 |
|
|
|
1dfd7afe1c
|
Update yarn.lock files
|
2020-10-09 15:07:41 +03:00 |
|
|
|
4a57d0d646
|
web: common: bump version
|
2020-10-09 14:58:32 +03:00 |
|
|
|
065c8daaa0
|
Web: People: Applied Filter loader
|
2020-10-09 14:57:43 +03:00 |
|
|
|
226d4c6cc5
|
Web: Files: Add and applied Filter loader
|
2020-10-09 14:23:40 +03:00 |
|
SuhorukovAnton
|
370400e4c0
|
fix_API_return: first version
|
2020-10-09 13:05:48 +03:00 |
|
|
|
a969f26f05
|
Web: Common: fixed getFoldersTree api
|
2020-10-09 00:23:36 +03:00 |
|
|
|
cedca7b3c3
|
Web: Common: added rootFolderType to getFoldersTree api
|
2020-10-08 23:56:57 +03:00 |
|
|
|
3ca0990715
|
Merge branch 'master' into feature/files
# Conflicts:
# common/ASC.Core.Common/EF/Model/FilesConverts.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
|
2020-10-08 19:01:09 +03:00 |
|
|
|
718dc8cc5a
|
Web: Files: fixed dragging
|
2020-10-08 17:54:04 +03:00 |
|
|
|
4e84d5f5ae
|
Merge branch 'feature/files' into feature/selectors-refactoring
# Conflicts:
# web/ASC.Web.Common/package.json
|
2020-10-08 16:58:09 +03:00 |
|
TatianaLopaeva
|
0b56cae632
|
Web: Added className and color for icon, margin-right moved to styles
|
2020-10-08 16:35:43 +03:00 |
|
Vladislav Makhov
|
b4d3dc0114
|
Fix code after merge
|
2020-10-08 16:23:57 +03:00 |
|
TatianaLopaeva
|
3fb980fefc
|
Web: Added font-weight and color by layout
|
2020-10-08 14:51:40 +03:00 |
|
TatianaLopaeva
|
51b86b2620
|
Merge branch 'feature/files' into feature/people-filter-empty-screen
|
2020-10-08 14:15:51 +03:00 |
|
Alexey Kostenko
|
1129a00d21
|
Merge branch 'feature/files' into feature/avatar-editor-redesign
|
2020-10-08 14:00:50 +03:00 |
|
|
|
798170e402
|
web: common: bump version
|
2020-10-08 12:43:21 +03:00 |
|
|
|
34575dab83
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-10-08 12:43:07 +03:00 |
|
