|
|
90d4a68946
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
# Conflicts:
# web/ASC.Web.Client/public/locales/sl/Settings.json
|
2022-05-18 10:09:44 +03:00 |
|
|
|
9c824a0bfa
|
Update translation - sl
|
2022-05-18 09:59:02 +03:00 |
|
|
|
f1130c51d9
|
update ro
|
2022-05-17 19:54:47 +03:00 |
|
Timofey Boyko
|
263af1cc85
|
Merge branch 'release/v1.2' into feature/change-size-table-view
|
2022-05-17 17:58:49 +03:00 |
|
mushka
|
f1ccf5f34f
|
some tests on asc.files
|
2022-05-17 17:20:57 +03:00 |
|
|
|
232ca0355e
|
edit es, fr
|
2022-05-17 16:48:47 +03:00 |
|
|
|
2ed7b96dd9
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-17 16:43:15 +03:00 |
|
|
|
cc9d934b13
|
update de, edit en (Confirm)
|
2022-05-17 16:42:54 +03:00 |
|
|
|
43da9f3949
|
Update translation - fi
|
2022-05-17 15:35:03 +03:00 |
|
|
|
be3362dbc3
|
update ja, edit fr, es, zh-CN (Settings)
|
2022-05-17 12:56:56 +03:00 |
|
mushka
|
78cd5dce67
|
backup codes dialog redesign + some tests at asc.files
|
2022-05-17 12:49:18 +03:00 |
|
|
|
36855d656f
|
remove application/x-www-form-urlencoded
|
2022-05-17 12:29:24 +03:00 |
|
Timofey Boyko
|
2970f6815d
|
Merge branch 'release/v1.2' into feature/change-size-table-view
|
2022-05-17 10:54:21 +03:00 |
|
|
|
606f0bca2a
|
update es (Home), add zh
|
2022-05-16 21:05:58 +03:00 |
|
|
|
1c4dacf66b
|
added data for validation
|
2022-05-16 20:19:24 +03:00 |
|
|
|
0b92150d57
|
added data check, added audit
|
2022-05-16 20:19:02 +03:00 |
|
|
|
4264a0da16
|
update fr
|
2022-05-16 17:04:04 +03:00 |
|
|
|
39302e3f59
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-16 12:51:35 +03:00 |
|
|
|
5915c6e23e
|
update es
|
2022-05-16 12:51:04 +03:00 |
|
Timofey Boyko
|
1cf0be4369
|
Web:People:TableView: remove useless padding right for icon table cell of name column
|
2022-05-16 11:45:01 +03:00 |
|
Timofey Boyko
|
b542de12a5
|
Web:People:TableView: increase min width for name table column
|
2022-05-16 11:42:55 +03:00 |
|
|
|
44a323b8db
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-05-16 10:25:43 +03:00 |
|
|
|
0d37d2ba1f
|
Web: Common/People: Refactoring.
|
2022-05-16 10:25:25 +03:00 |
|
|
|
7c05eaf14c
|
Web: People: Profile: fix memory leak
|
2022-05-16 00:29:42 +03:00 |
|
|
|
018e77258f
|
added room inviting
|
2022-05-15 23:19:03 +03:00 |
|
|
|
c7c1745528
|
People: changed dto
|
2022-05-15 18:12:51 +03:00 |
|
|
|
d85b208dc9
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-05-13 23:21:42 +03:00 |
|
|
|
d12c6f89e4
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-13 19:33:23 +03:00 |
|
|
|
93a53092d6
|
Web: Translations: Fix UselessTranslationKeysTest issues
|
2022-05-13 19:33:16 +03:00 |
|
|
|
11243c773b
|
Web: People: Profile: fix memory leak
|
2022-05-13 18:59:31 +03:00 |
|
|
|
e39da2cbaa
|
Web: People: Bar: fix memory leak
|
2022-05-13 18:16:19 +03:00 |
|
|
|
294a449d78
|
add new ru-keys, edit en
|
2022-05-13 17:30:51 +03:00 |
|
|
|
ddbf44f6a4
|
Web: People: fixed view of the contact field
|
2022-05-13 18:29:34 +05:00 |
|
|
|
5d3013f44d
|
add logger
|
2022-05-13 14:24:01 +03:00 |
|
|
|
2df77cd8e6
|
Web: Components: DatePicker: Fixed drop-down style for mobile devices
|
2022-05-13 13:38:02 +03:00 |
|
|
|
a956c25d16
|
Merge pull request #639 from ONLYOFFICE/feature/resx-add
Feature/resx add
|
2022-05-13 11:50:54 +03:00 |
|
|
|
7262c4cbb8
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-12 19:00:51 +03:00 |
|
|
|
e9be6684ae
|
Resources: fixed projects
|
2022-05-12 18:32:39 +03:00 |
|
mushka
|
cc41fc36e2
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into bugfix/ReleaseBugfixes
|
2022-05-12 17:22:39 +03:00 |
|
|
|
3b7309eb6b
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-05-12 15:12:16 +03:00 |
|
|
|
fce8bdba20
|
Web:People:Added setIsBurgerLoading to HOC withLoader.
|
2022-05-12 15:02:33 +03:00 |
|
|
|
f7698d6b3f
|
People: Resources
|
2022-05-12 14:22:22 +03:00 |
|
|
|
fc846860f9
|
Web: Translations: Moved "AddUsers" key from "Files,People" to "Common" (test issue fix)
|
2022-05-12 14:18:16 +03:00 |
|
mushka
|
25811f3922
|
fixed AvatarEditor
|
2022-05-12 14:06:20 +03:00 |
|
|
|
58b7c5f678
|
Web: Translations: Moved "Location" key from "People" to "Common": (test issue fix)
|
2022-05-11 17:40:23 +03:00 |
|
|
|
b0450cf55b
|
Web: Translations: Moved "Comments" key from "People" to "Common": (test issue fix)
|
2022-05-11 17:25:10 +03:00 |
|
mushka
|
03544f94c1
|
fixed AvatarEditor centering
|
2022-05-11 14:04:16 +03:00 |
|
|
|
72c04d4791
|
Web: Common/People: Added list loader to people/group selector.
|
2022-05-11 11:46:45 +03:00 |
|
|
|
802e5a773f
|
Web: People: fixed horizontal scroll in profile
|
2022-05-06 14:21:18 +03:00 |
|
Timofey Boyko
|
2df4d09407
|
Web:Components:Aside: fix transform for tablet devices
|
2022-05-05 15:11:51 +03:00 |
|
|
|
9dc03c7b17
|
Web: People: fixed InviteAgainLbl translation
|
2022-05-04 13:34:07 +03:00 |
|
Timofey Boyko
|
fd48db182b
|
Web:People:Article: reduce z-index for mobile view of main button
|
2022-04-29 13:04:31 +03:00 |
|
Timofey Boyko
|
9843557ef0
|
Web:People:Profile: ignore timezone when set birthday and work from dates
|
2022-04-28 15:55:48 +03:00 |
|
Timofey Boyko
|
5033d851ff
|
Web:People:Dialogs: sending password change instructions when enter down
|
2022-04-28 14:56:06 +03:00 |
|
mushka
|
53a53da543
|
finished tests on login, in progress on people and files
|
2022-04-28 13:38:16 +03:00 |
|
|
|
89059cf32e
|
Structured Logging
|
2022-04-28 12:15:33 +03:00 |
|
|
|
282ebd69a8
|
Web: Fix build without --env personal
|
2022-04-28 10:41:27 +03:00 |
|
|
|
33f155f825
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-04-27 19:55:04 +03:00 |
|
|
|
d2733a2608
|
Web: Added IS_PERSONAL build parameter (yarn start:personal and yarn build:personal) for hiding useless login and confirm functional
+ removed module federated Login from personal
+ fix potential /login redirect from Editor.jsx
|
2022-04-27 19:53:25 +03:00 |
|
|
|
833591d2bd
|
Web: People: ProfileAction: fix read more url
|
2022-04-27 19:39:28 +03:00 |
|
|
|
72aceefc6c
|
Web: People: Profile: add container for language selector
|
2022-04-27 19:31:26 +03:00 |
|
|
|
1bd4104c6c
|
Web: People: Profile: fix learn more url
|
2022-04-27 19:28:28 +03:00 |
|
|
|
0d6484f46a
|
Web: People: Profile: fix t key
|
2022-04-27 19:15:10 +03:00 |
|
|
|
c51ed410ef
|
Web: People: ProfileAction: fix tooltip width, offset
|
2022-04-27 12:25:47 +03:00 |
|
|
|
13bbce8ea4
|
Custom logger replaced with Microsoft.Extensions.Logging
|
2022-04-26 20:53:48 +03:00 |
|
Timofey Boyko
|
8ec3d02ab9
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-04-26 17:02:05 +03:00 |
|
Timofey Boyko
|
9f13b0a0ba
|
Web:People:Profile: wrap profile page into withCultureNames HOC
|
2022-04-26 17:01:59 +03:00 |
|
|
|
c4971e8bb3
|
Web: People: ChangeEmailDialog header
|
2022-04-26 15:43:16 +03:00 |
|
|
|
6a7333c7ef
|
Web: People: Article: fix t key
|
2022-04-25 21:40:29 +03:00 |
|
|
|
f86afee2d5
|
Web: move t key from People to Common
|
2022-04-25 21:39:46 +03:00 |
|
|
|
97b45d3bd5
|
ILog: refactoring
|
2022-04-25 21:02:18 +03:00 |
|
mushka
|
cbd91d1500
|
Merge branch 'release/v1.2' into feature/modal-redesign
|
2022-04-25 16:40:40 +03:00 |
|
|
|
7230e146e1
|
Web: People: Dialogs: use modal
|
2022-04-22 18:46:50 +03:00 |
|
mushka
|
6d7d0425b5
|
Merge branch 'release/v1.2' into feature/modal-redesign
|
2022-04-22 16:37:23 +03:00 |
|
|
|
9eba173a44
|
Merge branch 'develop' into feature/backend-refactor
# Conflicts:
# common/ASC.Api.Core/Model/EmployeeWraperFull.cs
# common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Model/CreateFileModel.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
# products/ASC.Files/Core/Utils/SocketManager.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Server/Startup.cs
# products/ASC.People/Server/Controllers/PeopleController.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
|
2022-04-21 22:36:29 +03:00 |
|
|
|
f9fb0777d1
|
Bump version to v1.2.0
|
2022-04-21 19:15:08 +03:00 |
|
|
|
78944a490e
|
Merge branch 'feature/virtual-rooms-1.2' into feature/interface-theme
|
2022-04-21 18:55:41 +03:00 |
|
|
|
1dff9e18c4
|
Merge branch 'develop' into feature/backend-refactor
# Conflicts:
# common/ASC.Api.Core/ASC.Api.Core.csproj
# common/ASC.Api.Core/Core/CustomHealthCheck.cs
# common/ASC.Api.Core/Middleware/IpSecurityFilter.cs
# common/ASC.Api.Core/Model/EmployeeWraperFull.cs
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# common/ASC.IPSecurity/IPRestrictionsRepository.cs
# common/ASC.IPSecurity/IPRestrictionsService.cs
# common/ASC.IPSecurity/IPSecurity.cs
# common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# products/ASC.Files/Core/Utils/FileMarker.cs
# products/ASC.Files/Core/Utils/FileSharing.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.People/Server/Controllers/PeopleController.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Core/Users/UserManagerWrapper.cs
|
2022-04-21 17:51:31 +03:00 |
|
|
|
bef4af84c8
|
Web: People: ProfileInfo: fixed horizontal scroll
|
2022-04-21 13:27:48 +03:00 |
|
Timofey Boyko
|
811c4d1ded
|
Web:People:Profile: add 'onChangeTheme' method and update interface theme radio button group options value
|
2022-04-21 10:35:38 +03:00 |
|
Timofey Boyko
|
216ae27b25
|
Merge branch 'feature/virtual-rooms-1.2' into feature/interface-theme
|
2022-04-20 18:04:57 +03:00 |
|
Timofey Boyko
|
00df2ec2b6
|
Merge branch 'develop' into feature/virtual-rooms-1.2
|
2022-04-20 17:27:27 +03:00 |
|
|
|
6c28b6777d
|
added DarkThemeSettings
|
2022-04-20 17:19:06 +03:00 |
|
Timofey Boyko
|
e9223f91e3
|
Web:People:Article: delete useless code
|
2022-04-20 17:08:50 +03:00 |
|
Timofey Boyko
|
6bd67cb19c
|
Web:People:Components: add HOC withLoader for article components
|
2022-04-20 11:42:22 +03:00 |
|
mushka
|
0cafa97440
|
Merge branch 'feature/virtual-rooms-1.2' into feature/modal-redesign
|
2022-04-19 14:18:53 +03:00 |
|
mushka
|
67cb03cc46
|
redesign of all dialogs
|
2022-04-18 16:41:17 +03:00 |
|
Timofey Boyko
|
8eb578aa4a
|
Web:People:Profile: add interface-theme section into user profile
|
2022-04-18 15:11:08 +03:00 |
|
Timofey Boyko
|
8306b01071
|
Web:People: add new keys 'DarkTheme', 'InterfaceTheme', 'LightTheme', 'SystemTheme' for EN and RU locales
|
2022-04-18 14:41:30 +03:00 |
|
|
|
62d9ef8152
|
Web: Files: connected cloud page redesign
|
2022-04-15 16:41:07 +03:00 |
|
|
|
b9a6c618bc
|
Web: Moved Connect translation, added new translations
|
2022-04-15 16:39:57 +03:00 |
|
|
|
e603b26caa
|
refactoring
|
2022-04-15 13:27:48 +03:00 |
|
|
|
cb2580dd50
|
refactoring
|
2022-04-15 12:08:06 +03:00 |
|
|
|
6ecc8e7071
|
code cleanup
|
2022-04-14 22:42:15 +03:00 |
|
|
|
f138ff7c79
|
fixed warnings
|
2022-04-14 22:23:57 +03:00 |
|
|
|
3979044564
|
Web: People: added filter loader
|
2022-04-12 11:53:50 +03:00 |
|
Timofey Boyko
|
711fc4a279
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-05 10:46:01 +03:00 |
|
Timofey Boyko
|
88c90f25cb
|
Web:People:Section: fix location and size group-button-menu for all device type
|
2022-04-05 10:35:57 +03:00 |
|
|
|
45d2a31d03
|
Merge branch 'feature/virtual-rooms-1.2' into feature/add-units
# Conflicts:
# public/locales/de/Common.json
|
2022-04-04 19:34:51 +03:00 |
|
Timofey Boyko
|
98e80faa5f
|
Web:People:Article: change term for displaying desktop or mobile article main button
|
2022-04-04 10:54:46 +03:00 |
|
|
|
fdfa1142c4
|
Merge branch 'feature/virtual-rooms-1.2' into feature/confirm-redesign
|
2022-04-01 18:18:35 +03:00 |
|
Timofey Boyko
|
3b2ead5568
|
Merge branch 'feature/virtual-rooms-1.2' into hotfix/campaigns-banner
|
2022-03-30 18:17:50 +03:00 |
|
|
|
047a2f18a0
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/confirm-redesign
|
2022-03-29 20:31:17 +03:00 |
|
Timofey Boyko
|
fab034094f
|
Web:People:GroupSelector: add correct total prop
|
2022-03-29 17:58:15 +03:00 |
|
|
|
265132dbec
|
Web: People" ProfileAction: fix dialogs
|
2022-03-28 17:39:53 +03:00 |
|
|
|
dfa851221f
|
Web: moved load language path to utils, added clearInterval
|
2022-03-28 17:33:42 +05:00 |
|
|
|
7abe990d96
|
Merge branch 'feature/virtual-rooms-1.2' into hotfix/campaigns-banner
|
2022-03-28 12:36:11 +05:00 |
|
|
|
8ccfaf1e79
|
Web: People: added ads to the people module
|
2022-03-28 12:27:53 +05:00 |
|
|
|
75cf73d241
|
Web: People: fix unlink two-factor app
|
2022-03-26 13:04:33 +03:00 |
|
|
|
abae61f2db
|
IDE1006
|
2022-03-25 19:26:06 +03:00 |
|
Timofey Boyko
|
7248641545
|
Web:People: fixed selected options of group and people selector
|
2022-03-25 10:10:17 +03:00 |
|
Timofey Boyko
|
5fea741e80
|
Web:People:Components: add 'total' property to state and add it to advanced selector
|
2022-03-25 10:09:39 +03:00 |
|
Timofey Boyko
|
9c331af8dd
|
Web:People:Components: change getting selected options from state to props
|
2022-03-25 10:08:53 +03:00 |
|
|
|
c7712fd7dc
|
Merge branch 'feature/backend-refactor' into feature/warnings
|
2022-03-24 18:01:09 +03:00 |
|
|
|
cb4d39e427
|
refactor
|
2022-03-23 19:23:25 +03:00 |
|
|
|
a857089ee6
|
renamed
|
2022-03-23 17:33:43 +03:00 |
|
|
|
079618e4e2
|
refactor
|
2022-03-23 16:08:27 +03:00 |
|
|
|
244e345ac6
|
Merge 'feature/backend-refactor' into feature/builder-extensions
|
2022-03-22 15:57:46 +03:00 |
|
|
|
62fbab1185
|
Merge branch 'feature/backend-refactor' into feature/warnings
|
2022-03-22 13:20:43 +03:00 |
|
|
|
172eaa8985
|
Merge pull request #589 from ONLYOFFICE/feature/update-packages
Feature/update packages
|
2022-03-21 22:24:11 +04:00 |
|
|
|
e9671701cb
|
Autofact.Extensions.DependencyInjection package moved to ASC.Api.Core
|
2022-03-21 17:39:01 +03:00 |
|
|
|
6e4761b8c2
|
Systemd package moved to shared ASC.Api.Core
|
2022-03-21 16:40:09 +03:00 |
|
Timofey Boyko
|
0d7371b8f7
|
Web:People: remove old filter
|
2022-03-21 13:57:18 +03:00 |
|
Timofey Boyko
|
8355fa388d
|
Web:Common: remove old filter component, update import and change themes
|
2022-03-21 13:56:42 +03:00 |
|
Timofey Boyko
|
0fdf5dd328
|
Web:People: delete useless code
|
2022-03-21 13:20:46 +03:00 |
|
Timofey Boyko
|
df3c3aa574
|
Web:People: delete useless code
|
2022-03-21 12:29:26 +03:00 |
|
Timofey Boyko
|
133dfa3426
|
Web: fix article main button view (now correct display mobile main button when view port is increased/decreased)
|
2022-03-21 11:40:40 +03:00 |
|
|
|
679aecbc76
|
Merge branch 'feature/backend-refactor' into feature/license-refactor
# Conflicts:
# common/services/ASC.Webhooks.Service/WebhookSender.cs
# products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs
|
2022-03-20 16:47:31 +03:00 |
|
|
|
868492b562
|
Merge branch 'develop' into feature/backend-refactor
# Conflicts:
# common/ASC.Common/Threading/DistributedTaskQueue.cs
# common/ASC.Core.Common/Billing/BillingClient.cs
# common/ASC.Core.Common/Billing/TariffService.cs
# common/ASC.Core.Common/Notify/Context.cs
# common/ASC.FederatedLogin/Helpers/OAuth20TokenHelper.cs
# common/ASC.FederatedLogin/Helpers/RequestHelper.cs
# common/ASC.FederatedLogin/LoginProviders/DocuSignLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/FacebookLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/GoogleLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/GosUslugiLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/LinkedInLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/MailRuLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/VKLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/WordpressLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/YandexLoginProvider.cs
# common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs
# common/services/ASC.Studio.Notify/Program.cs
# common/services/ASC.Webhooks.Service/WebhookSender.cs
# products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
# products/ASC.Files/Core/Helpers/DocuSignHelper.cs
# products/ASC.Files/Core/Helpers/EasyBibHelper.cs
# products/ASC.Files/Core/Helpers/WordpressHelper.cs
# products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs
# products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
# products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
# products/ASC.Files/Core/ThirdPartyApp/Token.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
|
2022-03-19 22:16:03 +03:00 |
|
Timofey Boyko
|
fea35b3f4c
|
Web:People: synchronized display first loader with article and section
|
2022-03-18 18:30:53 +03:00 |
|
Timofey Boyko
|
3faaa52276
|
Web:People: increase section header width
|
2022-03-18 12:45:44 +03:00 |
|
Timofey Boyko
|
27fab6de23
|
Merge branch 'feature/virtual-rooms-1.2' into feature/refactoring-pagelayout
|
2022-03-18 11:05:58 +03:00 |
|
|
|
568f427957
|
IDE1006
|
2022-03-17 19:57:02 +03:00 |
|
|
|
80eb1c8257
|
IDE0011
|
2022-03-17 18:01:39 +03:00 |
|
|
|
69950c9d8c
|
IDE0007
|
2022-03-17 17:55:19 +03:00 |
|
|
|
fd8567fd17
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/login-redesign
|
2022-03-17 15:31:26 +03:00 |
|
|
|
b031cadb29
|
Web: People: Badges: fix color
|
2022-03-17 15:10:19 +03:00 |
|
Timofey Boyko
|
47a073f9ca
|
Web:People: create Article and Section as functional component
|
2022-03-16 17:25:53 +03:00 |
|
Timofey Boyko
|
843e327ff8
|
Web:People:Pages: change 'PageLayout' component to 'Section' component in pages
|
2022-03-16 17:25:08 +03:00 |
|
Timofey Boyko
|
25f088462f
|
Web:People:Components: change 'catalog' component to 'article' component
|
2022-03-16 17:21:45 +03:00 |
|
|
|
0cd4cb49ed
|
Merge branch 'feature/virtual-rooms-1.2' into feature/login-redesign
# Conflicts:
# packages/asc-web-components/modal-dialog/index.js
# packages/asc-web-components/themes/dark.js
# public/locales/de/Common.json
# web/ASC.Web.Client/src/Shell.jsx
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js
# web/ASC.Web.Login/src/Login.jsx
|
2022-03-16 11:03:07 +03:00 |
|
|
|
65db98f65c
|
added new license headers
|
2022-03-15 21:00:53 +03:00 |
|
|
|
3d50d7977b
|
removed past license headers
|
2022-03-15 19:59:24 +03:00 |
|
Timofey Boyko
|
a31ef97615
|
Web:People: remove old article
|
2022-03-15 17:49:31 +03:00 |
|
Timofey Boyko
|
3c092803ea
|
Web:People:Components:Catalog: fix loaders for main button and header with isLoaded prop
|
2022-03-15 14:21:53 +03:00 |
|
mushka
|
57f75cd8a5
|
merge with feature/virtual-rooms-1.2
|
2022-03-14 18:53:15 +03:00 |
|
Timofey Boyko
|
4495de8686
|
Web:People: remove catalog from pages and refactoring
|
2022-03-14 17:11:18 +03:00 |
|
mushka
|
25ad35ab6a
|
added Normal Touchscreen/Desktop differentiation
|
2022-03-11 13:41:48 +03:00 |
|
|
|
5e2f575483
|
added builders extensions
|
2022-03-10 20:30:29 +03:00 |
|
mushka
|
c3c59ceaff
|
changed size names in app buttons
|
2022-03-10 15:59:04 +03:00 |
|
|
|
3bbf82d918
|
add new lines
|
2022-03-09 19:07:24 +03:00 |
|
|
|
1062e3bcdf
|
Web: People: fix translates
|
2022-03-09 11:04:28 +03:00 |
|
|
|
ee446c8e67
|
Web: moved translates to Common
|
2022-03-09 11:04:12 +03:00 |
|
Timofey Boyko
|
2fcc7806ea
|
Web:People:Catalog: add translate 'OtherOperations' for main button mobile
|
2022-03-05 19:44:33 +03:00 |
|
Timofey Boyko
|
13f0b2dd5a
|
Web:People: add new key 'OtherOperations' for ru and en locales
|
2022-03-05 19:43:35 +03:00 |
|
Timofey Boyko
|
60110e4e9e
|
Web:People:Filter: add search placeholder
|
2022-03-05 16:59:05 +03:00 |
|
Timofey Boyko
|
02a0bcd610
|
Web:People:Components: update actions model for mobile main button
|
2022-03-05 16:58:42 +03:00 |
|
Timofey Boyko
|
c31d1f171e
|
Web:People:Components: fix click item for catalog body for mobile devices
|
2022-03-05 16:58:01 +03:00 |
|
|
|
bededa43f7
|
Merge branch 'feature/people-refactor' of github.com:ONLYOFFICE/AppServer into feature/people-refactor
|
2022-03-05 16:28:52 +03:00 |
|
|
|
9add54cf6b
|
People: renamed api params
|
2022-03-05 16:20:51 +03:00 |
|
|
|
51475c0c51
|
People: removed engines
|
2022-03-05 15:57:46 +03:00 |
|
|
|
5fb51923b0
|
Web: People: fix translates
|
2022-03-05 14:32:35 +03:00 |
|
|
|
7ffaee6efc
|
Web: moved translates to Common
|
2022-03-05 14:27:59 +03:00 |
|
|
|
475269ee84
|
Merge branch 'feature/backend-refactor' into feature/people-refactor
# Conflicts:
# products/ASC.Files/Core/Model/FileEntryWrapper.cs
# products/ASC.Files/Core/Model/FileShareWrapper.cs
# products/ASC.Files/Core/Model/FileWrapper.cs
# products/ASC.Files/Core/Model/FolderWrapper.cs
# products/ASC.People/Server/GlobalUsings.cs
|
2022-03-05 11:27:58 +03:00 |
|
|
|
99378a027e
|
Csproj: ImplicitUsings
|
2022-03-05 11:20:05 +03:00 |
|
|
|
418ca246c8
|
Merge branch 'feature/backend-refactor' into feature/people-refactor
# Conflicts:
# products/ASC.People/Server/Startup.cs
|
2022-03-03 14:35:22 +03:00 |
|
|
|
1b352c76f6
|
Added using AddControllers method
|
2022-03-03 14:04:17 +03:00 |
|
|
|
0600452b87
|
People: renamed
|
2022-03-02 21:24:45 +03:00 |
|
|
|
b48bd37ea6
|
Merge branch 'feature/backend-refactor' into feature/people-refactor
|
2022-03-01 15:27:07 +03:00 |
|
|
|
2719149f3d
|
People: used imlicit usings
|
2022-03-01 14:58:37 +03:00 |
|
|
|
b21891ef78
|
People: logic transferred to engines
|
2022-03-01 14:52:52 +03:00 |
|
|
|
f3afd79a3f
|
Merge branch 'develop' into feature/virtual-rooms-1.2
# Conflicts:
# packages/asc-web-common/components/AdvancedSelector/AdvancedSelector.js
# packages/asc-web-common/components/AdvancedSelector/sub-components/Selector.js
# packages/asc-web-common/components/FilterInput/sub-components/SortComboBox.js
# packages/asc-web-common/components/PageLayout/index.js
# packages/asc-web-common/store/SettingsStore.js
# packages/asc-web-components/avatar-editor/sub-components/avatar-editor-body.js
# packages/asc-web-components/combobox/index.js
# packages/asc-web-components/context-menu/styled-context-menu.js
# packages/asc-web-components/drop-down/index.js
# packages/asc-web-components/link-with-dropdown/index.js
# packages/asc-web-components/row/index.js
# packages/asc-web-components/table-container/StyledTableContainer.js
# packages/asc-web-components/table-container/TableHeaderCell.js
# packages/asc-web-components/themes/dark.js
# products/ASC.Files/Client/public/images/files.menu.svg
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/Badges.js
# products/ASC.Files/Client/src/components/QuickButtons.js
# products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
# products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/AsideView.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/ModalView.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/components/panels/StyledPanels.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableContainer.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/sub-components/FileNameCell.js
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/pages/Home/index.js
# products/ASC.Files/Client/src/pages/VersionHistory/Section/Body/VersionRow.js
# products/ASC.Files/Client/src/store/UploadDataStore.js
# products/ASC.People/Client/public/images/people.menu.svg
# products/ASC.People/Client/src/components/GroupSelector/index.js
# products/ASC.People/Client/src/components/PeopleSelector/index.js
# products/ASC.People/Client/src/pages/Home/Section/Body/RowView/userContent.js
# products/ASC.People/Client/src/pages/Home/index.js
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
# web/ASC.Web.Client/src/components/NavMenu/sub-components/header-nav.js
# web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
# web/ASC.Web.Client/src/components/NavMenu/sub-components/nav-item.js
# web/ASC.Web.Client/src/components/NavMenu/sub-components/profile-menu.js
# web/ASC.Web.Client/src/components/pages/Home/index.js
|
2022-03-01 13:50:26 +03:00 |
|
|
|
0a51cf1cd5
|
remove unnecessary
|
2022-02-28 23:30:49 +03:00 |
|
|
|
8474cb8d37
|
refactor
|
2022-02-28 23:25:25 +03:00 |
|
|
|
c887362ea3
|
People: separated people controller
|
2022-02-28 22:23:39 +03:00 |
|
|
|
1665fe7bf6
|
People: refactor
|
2022-02-28 21:54:08 +03:00 |
|
|
|
c252b94060
|
People: reorganize
|
2022-02-28 21:38:25 +03:00 |
|
|
|
542ce9c414
|
People: rename
|
2022-02-28 21:36:40 +03:00 |
|
|
|
6be380656f
|
People: model to dto
|
2022-02-28 21:12:18 +03:00 |
|
|
|
f8d3d46e28
|
People: rename
|
2022-02-28 20:58:24 +03:00 |
|
|
|
1097d5e246
|
People: Controllers to ApiControllers, Models to ApiModels
|
2022-02-28 20:56:05 +03:00 |
|
|
|
9aff975cd4
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign
|
2022-02-28 16:17:48 +03:00 |
|
|
|
e6f111f651
|
Merge branch 'feature/backend-refactor' into feature/asc-core-common-refactor
|
2022-02-25 20:16:00 +03:00 |
|
|
|
cae358636e
|
Merge branch 'develop' into bugfix/fixed-dates-in-profile
|
2022-02-25 17:51:06 +03:00 |
|
|
|
dc78ff3a33
|
Web: Client: People: Added fixedDirection property for DateField
|
2022-02-25 16:48:12 +03:00 |
|
|
|
6495da0d0b
|
Merge branch 'feature/backend-refactor' into feature/asc-messaging-system-refactor
|
2022-02-25 16:34:15 +03:00 |
|
|
|
7e50d1b097
|
Web: People: Profile: fixed help-icon styles
|
2022-02-25 13:41:47 +03:00 |
|
|
|
64473bb70e
|
Merge branch 'develop' into bugfix/fixed-dates-in-profile
|
2022-02-25 11:15:20 +03:00 |
|
|
|
ba0bfe7260
|
Merge branch 'develop' into bugfix/fixed-dates-in-profile
# Conflicts:
# packages/asc-web-components/calendar/index.js
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
|
2022-02-24 15:59:56 +03:00 |
|
|
|
2e000f1d9d
|
Web: People: fixed profile dates
|
2022-02-24 15:48:02 +03:00 |
|
|
|
f59fbe71ba
|
Merge branch 'develop' into bugfix/refactoring-table-view
|
2022-02-24 12:04:15 +03:00 |
|
|
|
902b2b54eb
|
Web: People: fixed table style
|
2022-02-24 11:33:58 +03:00 |
|
|
|
6925a83060
|
Merge branch 'develop' into feature/backend-refactor
# Conflicts:
# common/ASC.Common/Caching/ICacheNotify.cs
# common/ASC.Common/Caching/KafkaCache.cs
# common/ASC.Common/Caching/MemoryCacheNotify.cs
# common/ASC.Common/Threading/DistributedTaskProgress.cs
# common/ASC.Common/Threading/DistributedTaskQueue.cs
# common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
# common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
# common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
# common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs
# common/ASC.Data.Backup.Core/Storage/DataStoreBackupStorage.cs
# common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
# common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
# common/ASC.Data.Backup.Core/Tasks/DeletePortalTask.cs
# common/ASC.Data.Backup.Core/Tasks/PortalTaskBase.cs
# common/ASC.Data.Backup.Core/Tasks/RestorePortalTask.cs
# common/ASC.Data.Backup.Core/Tasks/TransferPortalTask.cs
# common/ASC.Data.Reassigns/RemoveProgressItem.cs
# common/ASC.Data.Storage/BaseStorage.cs
# common/ASC.Data.Storage/ChunkedUploader/CommonChunkedUploadSessionHolder.cs
# common/ASC.Data.Storage/CrossModuleTransferUtility.cs
# common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
# common/ASC.Data.Storage/Encryption/EncryptionOperation.cs
# common/ASC.Data.Storage/Extensions.cs
# common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
# common/ASC.Data.Storage/IDataStore.cs
# common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
# common/ASC.Data.Storage/S3/S3Storage.cs
# common/ASC.Data.Storage/S3/S3UploadGuard.cs
# common/ASC.Data.Storage/StaticUploader.cs
# common/ASC.Data.Storage/StorageHandler.cs
# common/ASC.Data.Storage/StorageUploader.cs
# common/ASC.Data.Storage/WebPath.cs
# common/services/ASC.ApiSystem/Controllers/PortalController.cs
# common/services/ASC.AuditTrail/AuditEventsRepository.cs
# common/services/ASC.AuditTrail/AuditReportCreator.cs
# common/services/ASC.AuditTrail/LoginEventsRepository.cs
# products/ASC.Files/Core/Configuration/FilesSpaceUsageStatManager.cs
# products/ASC.Files/Core/Core/Dao/Interfaces/IFolderDao.cs
# products/ASC.Files/Core/Core/Dao/Interfaces/ILinkDao.cs
# products/ASC.Files/Core/Core/Dao/Interfaces/IProviderDao.cs
# products/ASC.Files/Core/Core/Dao/Interfaces/IProviderInfo.cs
# products/ASC.Files/Core/Core/Dao/Interfaces/ITagDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/AbstractDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/LinkDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
# products/ASC.Files/Core/Core/Entries/ChunkedUploadSession.cs
# products/ASC.Files/Core/Core/Entries/EncryptionKeyPair.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/FilesIntegration.cs
# products/ASC.Files/Core/Core/Security/FileSecurity.cs
# products/ASC.Files/Core/Core/Security/IFileSecurity.cs
# products/ASC.Files/Core/Core/Security/ISecurityDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderTagDao.cs
# products/ASC.Files/Core/Core/Thirdparty/RegexDaoSelectorBase.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxProviderInfo.cs
# products/ASC.Files/Core/Helpers/DocuSignHelper.cs
# products/ASC.Files/Core/Helpers/Global.cs
# products/ASC.Files/Core/Helpers/PathProvider.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/HttpHandlers/SearchHandler.cs
# products/ASC.Files/Core/Model/FileEntryWrapper.cs
# products/ASC.Files/Core/Model/FileOperationWraper.cs
# products/ASC.Files/Core/Model/FileWrapper.cs
# products/ASC.Files/Core/Model/FolderContentWrapper.cs
# products/ASC.Files/Core/Model/FolderWrapper.cs
# products/ASC.Files/Core/Services/DocumentService/Configuration.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceConnector.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceHelper.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
# products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
# products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
# products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
# products/ASC.Files/Core/ThirdPartyApp/IThirdPartyApp.cs
# products/ASC.Files/Core/Utils/ChunkedUploadSessionHolder.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# products/ASC.Files/Core/Utils/FileMarker.cs
# products/ASC.Files/Core/Utils/FileShareLink.cs
# products/ASC.Files/Core/Utils/FileSharing.cs
# products/ASC.Files/Core/Utils/FileUploader.cs
# products/ASC.Files/Core/Utils/MailMergeTask.cs
# products/ASC.Files/Core/Utils/SocketManager.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/Controllers/PrivacyRoomController.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.People/Server/Controllers/PeopleController.cs
# web/ASC.Web.Api/Controllers/AuthenticationController.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/BuildVersion.cs
# web/ASC.Web.Core/Files/DocumentService.cs
# web/ASC.Web.Core/Files/DocumentServiceLicense.cs
# web/ASC.Web.Core/Helpers/ApiSystemHelper.cs
# web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
# web/ASC.Web.Core/Notify/StudioPeriodicNotify.cs
# web/ASC.Web.Core/Recaptcha.cs
# web/ASC.Web.Core/Sms/SmsManager.cs
# web/ASC.Web.Core/Sms/SmsProvider.cs
# web/ASC.Web.Core/Sms/SmsSender.cs
# web/ASC.Web.Core/SpaceUsageStatManager.cs
# web/ASC.Web.Core/Utility/UrlShortener.cs
|
2022-02-23 22:42:34 +03:00 |
|
|
|
8563fbc373
|
Merge branch 'develop' into feature/backend-refactor
# Conflicts:
# common/ASC.Api.Core/Middleware/CommonApiResponse.cs
# common/ASC.Api.Core/Middleware/ResponseWrapper.cs
# common/ASC.Core.Common/Context/Impl/SubscriptionManager.cs
# products/ASC.Files/Core/Configuration/FilesSettings.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Utils/FileUploader.cs
# products/ASC.Files/Core/Utils/SocketManager.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Server/Startup.cs
|
2022-02-23 17:37:34 +03:00 |
|
|
|
3d4e000778
|
Merge branch 'develop' into feature/async
# Conflicts:
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceHelper.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# products/ASC.Files/Core/Utils/FileUploader.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
|
2022-02-23 16:01:55 +03:00 |
|
|
|
deeff80f26
|
Web: TabLe: refactoring table view
|
2022-02-22 16:00:26 +03:00 |
|
|
|
32868de412
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign
# Conflicts:
# packages/asc-web-common/api/settings/index.js
# public/locales/de/Common.json
|
2022-02-22 13:53:00 +03:00 |
|
Timofey
|
82e1af9828
|
Web:People: add new key for translations
|
2022-02-22 17:13:00 +08:00 |
|
Timofey
|
f6fdb1ce66
|
Web:People: add new filter
|
2022-02-22 17:12:44 +08:00 |
|
Timofey
|
06a83fdfa7
|
Web:People: fix display catalog main button
|
2022-02-22 17:12:19 +08:00 |
|
