Commit Graph

6615 Commits

Author SHA1 Message Date
414e17ac1f DocumentService log error 2020-07-15 17:40:58 +03:00
SuhorukovAnton
83a88d0240 Merge branch 'master' into feature/ASC.Files.Core 2020-07-15 17:38:40 +03:00
Artem Tarasov
4b942c6964 added min-width 2020-07-15 17:34:01 +03:00
Vladislav Makhov
e5bdfe32d7 Merge branch 'master' into feature/text-input-large 2020-07-15 17:24:33 +03:00
Artem Tarasov
db7669eccd added button size large in all.button.stories.js 2020-07-15 17:20:11 +03:00
Artem Tarasov
4ee0cee88d added large button size 2020-07-15 17:17:37 +03:00
Vladislav Makhov
5393bec4af web: components: bump version 2020-07-15 17:17:18 +03:00
Vladislav Makhov
1c0db2edfd Update README.md 2020-07-15 17:09:29 +03:00
Vladislav Makhov
eac05e5750 Add large prop 2020-07-15 17:07:58 +03:00
Alexey
356a18acc6 Web:Files: Added translation to tile view 2020-07-15 17:04:29 +03:00
a54be3b64c Merge branch 'master' into feature/files 2020-07-15 16:57:14 +03:00
480d3dd0f6
Merge pull request #47 from ONLYOFFICE/feature/general-startup
Feature/general startup
2020-07-15 16:45:23 +03:00
Vladislav Makhov
a7b0968252 Add social buttons mock 2020-07-15 16:18:09 +03:00
Alexey
dd000d197d Web: Common: Removed viewSelector from people module 2020-07-15 16:12:10 +03:00
e10ac2ccfa BaseStartup: refactoring 2020-07-15 15:33:44 +03:00
d50ead401b Merge branch 'master' into feature/new-login-page 2020-07-15 15:27:44 +03:00
7f095f03d1 Merge branch 'master' into feature/Wizard
# Conflicts:
#	common/ASC.Resource.Manager/Startup.cs
#	config/kafka.json
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.Designer.cs
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.de.resx
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.es.resx
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.fr.resx
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.it.resx
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.resx
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.ru.resx
#	web/ASC.Web.Core/TariffSettings.cs
2020-07-15 15:23:28 +03:00
Artem Tarasov
2469126f7a hidden input license file 2020-07-15 14:26:49 +03:00
47e597d3b0 Autofac: fix 2020-07-15 14:18:47 +03:00
Artem Tarasov
7e3ba192b1 fixed file name in input type=file 2020-07-15 14:01:29 +03:00
baa71247d8 Merge branch 'master' into feature/general-startup 2020-07-15 13:06:32 +03:00
533935906f Resource: fix 2020-07-15 12:55:31 +03:00
Artem Tarasov
765a209de5 Merge branch 'feature/Wizard' of github.com:ONLYOFFICE/AppServer into feature/Wizard 2020-07-15 11:54:58 +03:00
Artem Tarasov
6d2deca3c6 layout fix 2020-07-15 11:47:21 +03:00
4e5c187851 EF: DateTime? hack 2020-07-15 11:38:00 +03:00
Alexey
4bf9133851 Web: Files: Tile: fix styles and small refactoring 2020-07-15 11:31:23 +03:00
Vladislav Makhov
55a0c01183 Fix styles 2020-07-15 10:12:49 +03:00
Alexey
b573555024 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-07-15 08:00:04 +03:00
Alexey
62ed90e9a0 web: common: bump version 2020-07-15 07:59:56 +03:00
Alexey
e886437d83 Web: Files: Fix tile styles 2020-07-15 07:30:59 +03:00
f8b026a7b9 Merge branch 'feature/Wizard' of github.com:ONLYOFFICE/AppServer into feature/Wizard 2020-07-15 00:05:26 +03:00
Artem Tarasov
84ca1146a0 layout fix 2020-07-14 17:46:00 +03:00
Vladislav Makhov
5af854226a Fix styles 2020-07-14 13:40:56 +03:00
SuhorukovAnton
5bf0bd22b6 ASC.Files.Core: first version 2020-07-14 13:03:53 +03:00
Vladislav Makhov
806f64abae Fix styles and responsive layout 2020-07-14 12:55:09 +03:00
Vladislav Makhov
505e98b1a1 Add textAlign prop (left as default) 2020-07-14 12:54:11 +03:00
bb507b5aeb Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-07-14 10:16:21 +03:00
bc671b4332 Web: Files: fixed pathParts error 2020-07-14 10:14:53 +03:00
88e932a0a7 Merge branch 'master' into feature/files 2020-07-13 16:46:42 +03:00
3d7e1f114c
Merge pull request #46 from ONLYOFFICE/feature/api-defaultvalue
Feature/api defaultvalue
2020-07-13 16:41:31 +03:00
Vladislav Makhov
3b8c2f0e69 Fix responsive layout for start login page
Move header logo to a separate component
2020-07-13 16:20:02 +03:00
a347f4e4f3 fix 2020-07-13 16:18:31 +03:00
Alexey
41f59c9130 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-07-13 16:00:51 +03:00
Alexey
e5b71cff4f Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/store/files/actions.js
2020-07-13 16:00:32 +03:00
a822f9b349 Files: fix 2020-07-13 15:57:39 +03:00
Ilya Oleshko
c9eb590f1e web: common: bump version 2020-07-13 15:56:36 +03:00
Ilya Oleshko
2d8b694374 Web: Common: Fixed order of returning filter props, add new 2020-07-13 15:56:24 +03:00
Alexey
8612f32ae5 web: common: bump version 2020-07-13 15:54:43 +03:00
Alexey
665915804e Web: Common: Fixed mobile view selector 2020-07-13 15:53:29 +03:00
dfd8bbfdb8 Merge branch 'master' into feature/api-defaultvalue 2020-07-13 15:28:11 +03:00