Commit Graph

15298 Commits

Author SHA1 Message Date
98fa906954 Web:Files:Badges: Added favorite icons to appserver /public /images. Сhanged the onClickFavorite method in HOC withBadges. Changed the display of favorite icons. 2021-12-06 22:00:50 +03:00
Sergey Kirichenko
8d1f9da11c
Modify docker document server run config (#476)
* Fix config

* Modify docker ds config

* Modify docker document server run
2021-12-06 15:21:06 +03:00
d9afc8ff4f Web:Files:Badges: Changed icons of the favorite, edit, lock. Changed the display of lock icons. 2021-12-05 16:37:33 +03:00
9ea13156cb Web:Files:Badges:SharedButton icon change, resize 2021-12-03 12:20:45 +03:00
67fdda2302 Web:Files:Badges: The Text tag has been removed from the SharedButton.
Replaced share-button className with share-button-icon in SimpleFilesRow, TableRow.
Changed styles of share-button-icon className in TableRow.
2021-12-02 18:05:52 +03:00
5590eca01e Web:Files:Badges:Functional badges, styles, moved from the FilesRowContent component to the SimpleFilesRow component.
HOC withBadges removed from the FilesRowContent component, added to the SimpleFilesRow component.
The SharedButton has been added to the Badges component, and the badge className has been added to the SharedButton. Removed SharedButton text.
2021-12-02 17:03:33 +03:00
b9ca3c8bf0
Merge pull request #470 from ONLYOFFICE/bugfix/fix-migration-creator
bugfix/fix-migration-creator
2021-11-30 13:37:21 +03:00
5dff970a42 AutoMigrationCreator: add new ef core dependencies 2021-11-30 13:32:16 +03:00
6f41a7f028 AutoMigrationCreator: net6 2021-11-30 12:02:20 +03:00
3ae54bd590
Merge pull request #467 from ONLYOFFICE/feature/add-table-version
Web: added version for table
2021-11-29 15:22:19 +03:00
653642e1b1
Merge branch 'develop' into feature/add-table-version 2021-11-26 18:23:49 +03:00
dc6999d9ca
Merge pull request #466 from ONLYOFFICE/feature/net6
Feature/net6
2021-11-26 16:47:23 +03:00
043dd3d180 net6: bugfix encrypt 2021-11-26 13:53:06 +03:00
fb637b43f1 Web: added version for table 2021-11-25 17:38:09 +03:00
384e012c5f net 6: remove TryUseWindowsService 2021-11-25 16:48:08 +03:00
fde636c586 net 6: update packages 2021-11-25 16:41:24 +03:00
58d84912dd fix 2021-11-25 11:23:35 +03:00
038cf92a91 ApiSystemHelper: fix check 2021-11-25 11:00:17 +03:00
1d7d29039f Store updated 2021-11-25 10:29:27 +03:00
4273c519e0 Files: dispose custom ResponseStream 2021-11-25 10:02:52 +03:00
13e13f2303 Net: fix requests 2021-11-24 22:34:39 +03:00
b74e4ccfd1 Removed unused dependencies. Fixed tests 2021-11-24 12:39:39 +03:00
59c88e2006 up to 6.0.0 2021-11-23 17:56:27 +03:00
8ca88e4620 Merge branch 'develop' into feature/net6
# Conflicts:
#	common/ASC.Api.Core/Core/BaseStartup.cs
#	common/ASC.Common/ASC.Common.csproj
#	products/ASC.CRM/BackgroundTasks/ASC.CRM.BackgroundTasks.csproj
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Server/ASC.Files.csproj
#	web/ASC.Web.HealthChecks.UI/ASC.Web.HealthChecks.UI.csproj
2021-11-23 16:40:50 +03:00
6ccda4d68d UserManager: revert cache 2021-11-23 15:25:34 +03:00
197ce829b4 Merge branch 'develop' into feature/reworked-user-service 2021-11-23 15:01:23 +03:00
d94ea502df Merge branch 'develop' of github.com:ONLYOFFICE/CommunityServer-AspNetCore into develop 2021-11-21 16:47:25 +03:00
643c1ce6f1 fixed build.bat 2021-11-21 16:46:09 +03:00
d31ea87211 Merge branch 'master' into develop
# Conflicts:
#	packages/asc-web-common/components/PageLayout/sub-components/section-body.js
#	packages/asc-web-components/table-container/TableHeaderCell.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
#	products/ASC.Files/Client/src/store/UploadDataStore.js
2021-11-21 13:57:55 +03:00
366db9d885
Merge pull request #464 from ONLYOFFICE/hotfix/v1.0.1
Hotfix/v1.0.1
2021-11-21 12:36:32 +03:00
9571f6575d Merge branch 'develop' into feature/reworked-user-service 2021-11-19 19:18:41 +03:00
fb197315f9 fix buildAndDeploy.bat 2021-11-19 18:21:21 +03:00
Sergey Kirichenko
2d0bdb0646
Add an additional tag for docker images in push hook script (#462)
* Add tag for hook push sript

* Modify pash hook

* Modify pash hook

* Modify pash hook

* Modify pash hook

* Modify pash hook
2021-11-19 14:19:30 +03:00
9ad5e54c1d Files: optimization 2021-11-18 18:32:12 +03:00
Artem Tarasov
f33d99c9c0 Web: People/Common: added sorting of groups in the tree 2021-11-16 19:27:27 +03:00
62403e127a refactoring build script 2021-11-16 16:14:21 +03:00
f0cfeb1b42 refactoring build script 2021-11-16 16:13:13 +03:00
7db57b3696 Web: Components: SearchInput: Fixed default color for icon inside search input. Added color property at component. 2021-11-16 13:17:45 +03:00
d77a2f4541 Web: Components: ViewSelector: Added loading container for svg 2021-11-16 10:56:30 +03:00
d235288370 refactoring build script 2021-11-15 19:36:09 +03:00
d403fa1dcd Web: People: removed log 2021-11-15 18:37:29 +03:00
7ca1a18a37 Web: People: added translations for column position 2021-11-15 18:35:08 +03:00
adbb316dd2 Web: moved "Owner" translation to Common 2021-11-15 18:33:32 +03:00
13fdab9e1f Web: Files: fixed markAsRead action 2021-11-15 17:55:02 +03:00
afdda8eba0 Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.0.1 2021-11-15 17:44:27 +03:00
b72760c789 Web: People: fixed Paging tReady 2021-11-15 17:44:21 +03:00
39c3d57781 Web: Common: AuthStore: Added reset auth-store after login with app code 2021-11-15 14:29:02 +03:00
5ed03e0351 Web: People: Fix displaying error on Avatar save 2021-11-13 20:31:43 +03:00
f06283bb1a Fix displayName of current user after creation/update if user's display name with diacritics 2021-11-13 20:18:58 +03:00
d6836cc3d3
Merge pull request #457 from ONLYOFFICE/feature/translate-1.0.1
Feature/translate 1.0.1
2021-11-13 20:04:11 +03:00