TatianaLopaeva
|
f5ffeeca92
|
Web: Common: Changed the condition for moving from tablet to desktop (for documents)
|
2020-11-24 12:56:11 +03:00 |
|
TatianaLopaeva
|
bcadb285c2
|
Web: Common: Rename id for scroll
|
2020-11-24 11:26:10 +03:00 |
|
TatianaLopaeva
|
df1cc9bc80
|
Web: Common: Changed the conditions for scrolling the page up
|
2020-11-24 11:15:37 +03:00 |
|
TatianaLopaeva
|
0a64ce38a4
|
Merge branch 'develop' into feature/fix-hide/show-header
|
2020-11-20 15:51:32 +03:00 |
|
|
|
71b6f71fd7
|
Files: fix dispose
|
2020-11-20 15:49:57 +03:00 |
|
|
|
be081c45b6
|
Files: fixed share folder
|
2020-11-20 13:45:42 +03:00 |
|
|
|
b5a66444d7
|
Thirdparty: fix save
|
2020-11-20 12:24:17 +03:00 |
|
TatianaLopaeva
|
acde944525
|
Merge branch 'develop' into feature/fix-hide/show-header
|
2020-11-20 11:11:12 +03:00 |
|
TatianaLopaeva
|
70f5118e13
|
Web: Common: Fixed issue with displaying context menu
|
2020-11-20 11:08:26 +03:00 |
|
|
|
0337bd58da
|
Files: fixed DI
|
2020-11-20 10:22:15 +03:00 |
|
|
|
2a222a94fc
|
Thirdparty: fix save
|
2020-11-19 22:17:45 +03:00 |
|
|
|
5aef0e809e
|
Files: fix get share
|
2020-11-19 21:48:16 +03:00 |
|
|
|
1ddb6804ed
|
Files: fix share thirdparty
|
2020-11-19 21:47:40 +03:00 |
|
|
|
2ceb845808
|
Thirdparty: fix copy
|
2020-11-19 11:30:00 +03:00 |
|
|
|
93410996f0
|
Merge branch 'develop' into refactoring/files-thirdparty
|
2020-11-18 15:19:36 +03:00 |
|
|
|
2909d9d240
|
Thirdparty: refactoring security, tag
|
2020-11-18 13:37:11 +03:00 |
|
|
|
3c19fda2de
|
Thirdparty: refactoring security
|
2020-11-18 11:28:43 +03:00 |
|
TatianaLopaeva
|
975780ba25
|
Merge branch 'develop' into feature/fix-hide/show-header
|
2020-11-18 11:03:55 +03:00 |
|
|
|
20d37596cf
|
Files: fix share
|
2020-11-17 22:36:27 +03:00 |
|
TatianaLopaeva
|
b0df4eb3c9
|
Web/Common: Fixed show visible header when switching from desktop to tablet
|
2020-11-17 21:23:33 +03:00 |
|
|
|
0c520416fa
|
Files: remove cache
|
2020-11-17 21:17:23 +03:00 |
|
|
|
6cb92946be
|
fix uploadmemberphoto
|
2020-11-17 18:01:34 +03:00 |
|
|
|
f11a11d470
|
Thirdparty: refactoring
|
2020-11-17 17:56:36 +03:00 |
|
|
|
903abca3a8
|
Thirdparty: refactoring
|
2020-11-17 17:41:42 +03:00 |
|
|
|
1b03c87157
|
Thirdparty: refactoring
|
2020-11-17 17:08:54 +03:00 |
|
TatianaLopaeva
|
25fa29f500
|
Merge branch 'develop' into feature/fix-hide/show-header
|
2020-11-17 11:39:40 +03:00 |
|
TatianaLopaeva
|
55ac57816b
|
Web: Common: Refactoring
|
2020-11-17 11:36:49 +03:00 |
|
|
|
2c945b0414
|
Merge branch 'develop' into hotfix/filter-input-hotfix
|
2020-11-17 11:18:59 +03:00 |
|
|
|
121f34946b
|
Files: added base "Only in TMFileDao" methods
|
2020-11-17 11:13:53 +03:00 |
|
Alexey Kostenko
|
3702bd597d
|
Web: Common: Refactoring HOC withLayoutSize
|
2020-11-17 10:32:02 +03:00 |
|
Alexey Kostenko
|
c6d4b5bf60
|
Merge branch 'develop' into hotfix/filter-input-hotfix
|
2020-11-17 08:11:35 +03:00 |
|
Alexey Kostenko
|
99ae4dba20
|
Web: People: Changed Consumer to HOC
|
2020-11-17 06:39:08 +03:00 |
|
Alexey Kostenko
|
e65f2b36c7
|
Web: Files: Filter: Changed Consumer to HOC
|
2020-11-17 06:33:34 +03:00 |
|
|
|
7866ba1212
|
Files: removed dependencies
|
2020-11-16 21:30:33 +03:00 |
|
|
|
77fec89a0f
|
Files: DotNetZip replaced with SharpCompress
|
2020-11-16 19:41:14 +03:00 |
|
|
|
cd523404f1
|
Merge branch 'develop' into refactoring/scope
|
2020-11-16 17:09:19 +03:00 |
|
Alexey Kostenko
|
af8ce86d2d
|
Merge branch 'develop' into hotfix/filter-input-hotfix
|
2020-11-16 12:36:55 +03:00 |
|
TatianaLopaeva
|
e6fac866fe
|
Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
# web/ASC.Web.Common/src/components/NavMenu/index.js
# web/ASC.Web.Common/src/components/NavMenu/sub-components/header.js
|
2020-11-16 10:29:35 +03:00 |
|
|
|
7c228a78e5
|
Files: fix create file in thirdparty
|
2020-11-15 18:34:47 +03:00 |
|
|
|
68483bc979
|
Merge branch 'develop' into refactoring/scope
# Conflicts:
# common/ASC.FederatedLogin/LoginProviders/BoxLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/DocuSignLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/DropboxLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/GoogleLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/OneDriveLoginProvider.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Startup.cs
|
2020-11-13 16:03:17 +03:00 |
|
Alexey Kostenko
|
df060ba8a2
|
Merge branch 'develop' into hotfix/filter-input-hotfix
|
2020-11-13 10:58:34 +03:00 |
|
Viktor Fomin
|
fc33f10e37
|
Merge branch 'develop' into feature/filter-loader
|
2020-11-13 10:30:09 +03:00 |
|
|
|
2ec76cae70
|
Merge branch 'develop' into bugfix/x-www-form-urlencoded
|
2020-11-12 18:03:10 +03:00 |
|
Viktor Fomin
|
4c398104cb
|
Update yarn.lock files
|
2020-11-12 15:06:18 +03:00 |
|
Alexey Kostenko
|
913c45a00b
|
Merge branch 'develop' into hotfix/filter-input-hotfix
|
2020-11-12 14:40:46 +03:00 |
|
Viktor Fomin
|
9890f1cc43
|
Update yarn.lock files
|
2020-11-12 13:37:13 +03:00 |
|
Viktor Fomin
|
0bb00e39db
|
Web: People: added header loader
|
2020-11-12 13:31:19 +03:00 |
|
Viktor Fomin
|
97d9d58a29
|
Web: Files: added header loader
|
2020-11-12 13:30:54 +03:00 |
|
Alexey Kostenko
|
366989ea9c
|
Web: People: Added sectionWidth prop to filterInput
|
2020-11-12 11:23:08 +03:00 |
|
Viktor Fomin
|
3dc69fc9e8
|
Web: People: added group loader
|
2020-11-12 00:12:28 +03:00 |
|
