|
|
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 |
|
|
|
335f4f2fe7
|
Merge pull request #119 from ONLYOFFICE/bugfix/x-www-form-urlencoded
Bugfix/x www form urlencoded
|
2020-11-13 10:08:33 +03:00 |
|
|
|
2ec76cae70
|
Merge branch 'develop' into bugfix/x-www-form-urlencoded
|
2020-11-12 18:03:10 +03:00 |
|
|
|
7ad7cab1d3
|
Merge pull request #123 from ONLYOFFICE/hotfix/section-loader
Hotfix/section loader
|
2020-11-11 22:19:04 +03:00 |
|
|
|
d8bd2b7d21
|
Update yarn.lock files
|
2020-11-11 22:03:47 +03:00 |
|
|
|
8c7d0746cd
|
web: common: bump version
|
2020-11-11 21:55:43 +03:00 |
|
|
|
c4411f7b00
|
Merge branch 'develop' into hotfix/section-loader
|
2020-11-11 21:54:02 +03:00 |
|
SuhorukovAnton
|
9039c810c5
|
x-www-form-urlencoded: fix
|
2020-11-11 18:36:58 +03:00 |
|
|
|
1c6c47cbf2
|
nginx: fix
|
2020-11-11 18:02:38 +03:00 |
|
|
|
a556b8bd97
|
Merge pull request #124 from ONLYOFFICE/bugfix/aside-fix
Fixed aside
|
2020-11-11 16:27:17 +03:00 |
|
Artem Tarasov
|
006ac1bb19
|
Update yarn.lock files
|
2020-11-11 16:16:30 +03:00 |
|
Artem Tarasov
|
bcd4744798
|
web: components: bump version
|
2020-11-11 16:05:34 +03:00 |
|
|
|
e79c06ad31
|
Merge branch 'develop' into hotfix/section-loader
|
2020-11-11 15:50:14 +03:00 |
|
Alexey Kostenko
|
63dad62226
|
Web: People: Do not show the loader if the data has already been loaded (Switching from the profile page to the main page)
|
2020-11-11 15:46:46 +03:00 |
|
Artem Tarasov
|
252f0d9bde
|
Web: Components: aside: fixed transform: translateX
|
2020-11-11 15:42:45 +03:00 |
|
|
|
503d2c1948
|
fix loginproviders
|
2020-11-11 15:21:15 +03:00 |
|
Alexey Kostenko
|
7a6a9b539b
|
Web: People: Fixed loading of the main page when switching from a profile
|
2020-11-11 14:09:40 +03:00 |
|
Alexey Kostenko
|
28dec136a7
|
Web: Common: Added new loader state to redux
|
2020-11-11 13:43:30 +03:00 |
|
|
|
dbe2ca72c1
|
Merge pull request #122 from ONLYOFFICE/feature/oauth
Feature/oauth
|
2020-11-11 12:30:29 +03:00 |
|
|
|
6c5728a1cb
|
Merge branch 'develop' into feature/oauth
|
2020-11-11 12:14:05 +03:00 |
|
|
|
09c07e5060
|
Api: ThirdPartyController
|
2020-11-11 12:11:44 +03:00 |
|
|
|
9aba8ec982
|
Merge pull request #120 from ONLYOFFICE/hotfix/documents-bugfix
Hotfix/documents bugfix
|
2020-11-10 14:52:52 +03:00 |
|
SuhorukovAnton
|
6e2860a7e5
|
Merge branch 'develop' into bugfix/x-www-form-urlencoded
|
2020-11-10 14:51:33 +03:00 |
|
Artem Tarasov
|
02aed65d60
|
Web: Files: DocEditor: fixed of mobile view
|
2020-11-10 14:29:59 +03:00 |
|
SuhorukovAnton
|
44e565ca37
|
x-www-form-urlencoded: add models
|
2020-11-10 13:41:32 +03:00 |
|
Artem Tarasov
|
4031a609b8
|
Merge branch 'develop' into hotfix/documents-bugfix
# Conflicts:
# web/ASC.Web.Common/package.json
# web/ASC.Web.Components/src/components/icons/svg/index.js
|
2020-11-10 13:34:04 +03:00 |
|
Artem Tarasov
|
f578e43662
|
Web: Files: Settings: refactoring
|
2020-11-10 13:31:16 +03:00 |
|
|
|
1490332568
|
Merge branch 'develop' into refactoring/scope
# Conflicts:
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
# products/ASC.Files/Core/Helpers/WordpressHelper.cs
# products/ASC.Files/Server/Controllers/PrivacyRoomController.cs
# products/ASC.Files/Server/Startup.cs
|
2020-11-10 11:42:50 +03:00 |
|
|
|
4458bca039
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop
|
2020-11-10 11:21:34 +03:00 |
|
|
|
6947185bab
|
Files: refactoring
|
2020-11-10 11:21:22 +03:00 |
|
|
|
ccf8eb8e59
|
Merge pull request #118 from ONLYOFFICE/feature/third-party-settings
Feature/third party settings
|
2020-11-10 10:51:01 +03:00 |
|
Vladislav Makhov
|
9cc469a51c
|
Merge branch 'develop' into feature/third-party-settings
|
2020-11-10 08:39:33 +03:00 |
|
Vladislav Makhov
|
633a5415c0
|
Fix url
|
2020-11-10 08:14:56 +03:00 |
|
Artem Tarasov
|
2f19e504aa
|
Web: Components: refactoring css rule, deleted incorrect description
|
2020-11-09 19:02:40 +03:00 |
|
Ilya Oleshko
|
d169eeac26
|
Merge pull request #121 from ONLYOFFICE/feature/creating-redirect
Feature/creating redirect
|
2020-11-09 19:01:46 +03:00 |
|
Artem Tarasov
|
066140f388
|
Web: Files\Components: VersionHistory: removed tags from css rule, added className for header and body in modal
|
2020-11-09 18:59:06 +03:00 |
|
Vladislav Makhov
|
0df2b1e956
|
web: common: bump version
|
2020-11-09 18:48:08 +03:00 |
|
Artem Tarasov
|
57ca2d2603
|
Web: Files/Components: fixed viewBox for folder.svg, fixed margin between checkbox and icon of file
|
2020-11-09 18:33:45 +03:00 |
|
Ilya Oleshko
|
3411513117
|
web: common: bump version
|
2020-11-09 18:31:13 +03:00 |
|
Ilya Oleshko
|
b16448bea3
|
Web: Common: Article: Fixed after merge
|
2020-11-09 18:30:57 +03:00 |
|
Ilya Oleshko
|
82a2520150
|
Web: Files : Body : Fixed preload tab for new documents
|
2020-11-09 18:29:06 +03:00 |
|
|
|
3c38343063
|
Fix download.
fix thirdparty
|
2020-11-09 17:46:49 +03:00 |
|
Vladislav Makhov
|
982fbdd593
|
Merge branch 'develop' into feature/third-party-settings
|
2020-11-09 16:44:18 +03:00 |
|
Vladislav Makhov
|
21234d6a39
|
Remove unused data
|
2020-11-09 16:24:32 +03:00 |
|
Vladislav Makhov
|
078bb238fd
|
Add url to store
|
2020-11-09 16:15:36 +03:00 |
|
Vladislav Makhov
|
7c6d5a9e54
|
Add translation
|
2020-11-09 15:58:58 +03:00 |
|
Vladislav Makhov
|
8ac2ad73d6
|
Fix title
|
2020-11-09 15:31:24 +03:00 |
|
Vladislav Makhov
|
cdaa816b36
|
Fix Help center link
|
2020-11-09 15:27:07 +03:00 |
|
Artem Tarasov
|
46ed4741a6
|
Web: Files/Components: deleted console.log, unusing code, refactoring
|
2020-11-09 15:23:20 +03:00 |
|
Artem Tarasov
|
11d91fe21f
|
Web: Files/Components: tree-menu: fixed selection
|
2020-11-09 15:16:15 +03:00 |
|
