Commit Graph

5305 Commits

Author SHA1 Message Date
6f25e2e83e Refacoring: scope 2020-10-21 14:12:08 +03:00
bff9629389 Scope: refactoring 2020-10-20 16:24:46 +03:00
830c73a134 Scope: refactoring 2020-10-19 18:53:15 +03:00
3a29e9970f Merge branch 'develop' into refactoring/scope
# Conflicts:
#	products/ASC.Files/Server/Startup.cs
2020-10-18 22:52:24 +03:00
181ac04fd8 DI: register fix 2020-10-18 19:34:30 +03:00
a4eb45f1ab Scope: refactoring 2020-10-18 19:03:14 +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
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
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
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
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