|
|
b6c595bb8a
|
Web:Studio:Added Consumer and conditions for mobile display.
|
2022-03-16 15:46:59 +03:00 |
|
|
|
f212ffb5d1
|
Web:Studio:Added Consumer.
|
2022-03-16 15:46:02 +03:00 |
|
|
|
2ede5d8df7
|
HealthChecksUI: updated packages
|
2022-03-16 15:12:15 +03:00 |
|
|
|
58e1ec015b
|
WebCore: updated packages
|
2022-03-16 15:09:49 +03:00 |
|
Vashchuk Nikita
|
bd6126189e
|
Moved SSO from communityServer
|
2022-03-16 13:32:30 +03:00 |
|
|
|
c001de8f74
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/login-redesign
|
2022-03-16 13:03:29 +03:00 |
|
|
|
7ad41b219e
|
Web: Client: Confirm: fix button size
|
2022-03-16 12:49:31 +03:00 |
|
|
|
9056b14453
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-16 12:11:48 +03:00 |
|
|
|
ba7ea3f9d6
|
Web:Studio:Styling, added "resize" event, added checkInnerWidth function, removed Consumer, added useEffect, useState hooks for Customization component.
|
2022-03-16 12:11:08 +03:00 |
|
|
|
fcb41aeb9e
|
Web:Studio:Styling, added a "resize" event, changed the checkInnerWidth function, removed the Consumer for the LanguageAndTimeZone component.
|
2022-03-16 12:07:33 +03:00 |
|
|
|
b637ccc76a
|
WEb: RestoreBackup: Added loader for restore button.
|
2022-03-16 12:05:17 +03:00 |
|
|
|
6f7cb4c6f4
|
Web:Studio:Changed the margin-right of the arrow-button for the HeaderContainer.
|
2022-03-16 12:03:34 +03:00 |
|
|
|
a7c631d11c
|
Web: Client: Confirm: fix style, button size
|
2022-03-16 11:54:05 +03:00 |
|
|
|
b05aa5048b
|
Web:Studio:Styling the PortalRenaming component.
|
2022-03-16 11:36:26 +03:00 |
|
|
|
2ea15ac80f
|
Web: Login: fix button size
|
2022-03-16 11:36:00 +03:00 |
|
|
|
d9dec883b8
|
Web:Studio:Styling the CustomizationNavbar component.
|
2022-03-16 11:35:54 +03:00 |
|
|
|
f9b1e26b0b
|
Web:Studio:Styling the CustomTitles component.
|
2022-03-16 11:35:28 +03:00 |
|
|
|
c4c02698d3
|
Web:Studio:Changed the name "Time Zone" to "Time zone".
|
2022-03-16 11:32:41 +03:00 |
|
|
|
0a87411fbc
|
Web: Login: fix buttons size
|
2022-03-16 11:26:28 +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 |
|
|
|
1f7f9e0aa6
|
Web: Backup: Added translations (en).
|
2022-03-16 10:05:29 +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 |
|
|
|
6af313db1d
|
WebApi: refactor
|
2022-03-15 18:48:29 +03:00 |
|
|
|
0c61081921
|
Merge branch 'feature/backend-refactor' into feature/builder-extension
|
2022-03-15 18:33:58 +03:00 |
|
|
|
2d2182d171
|
Web: RestoreStorage: Deleted unused code.
|
2022-03-15 16:36:37 +03:00 |
|
|
|
9886c434b2
|
Web: Login: fix
|
2022-03-15 14:32:53 +03:00 |
|
|
|
07bacab25d
|
fix merge: ThrowIfNull
|
2022-03-15 14:12:29 +03:00 |
|
|
|
5dd68fee6c
|
automapper instead of ToSmtpSettings
|
2022-03-15 14:11:19 +03:00 |
|
|
|
2f4a93188f
|
Web: delete feature disallow char
|
2022-03-15 13:57:33 +03:00 |
|
|
|
82daaf4029
|
rename model to inDto
|
2022-03-15 13:56:22 +03:00 |
|
|
|
39bca9a805
|
Web: RestoreBackup: Fixed page crash.
|
2022-03-15 13:47:55 +03:00 |
|
|
|
82aac7c696
|
rename dtos
|
2022-03-15 13:00:41 +03:00 |
|
|
|
0019a8fd3e
|
Merge branch 'feature/backend-refactor' into feature/web.api-refactoring
|
2022-03-15 12:51:15 +03:00 |
|
|
|
de81329df2
|
WEb: Backup: Added help button component.
|
2022-03-15 12:43:02 +03:00 |
|
|
|
8231afe6d1
|
Web: Client: fixed visible for banner
|
2022-03-15 14:38:26 +05:00 |
|
|
|
969f62a99c
|
Web: PreparationPortal: Removed settings request.
|
2022-03-15 10:05:05 +03:00 |
|
|
|
8cbc15a15d
|
Web: Backup: Fixed language for weekdays and for help url.
|
2022-03-15 09:09:22 +03:00 |
|
|
|
bce9e824c8
|
Web: Deleted useless code.
|
2022-03-15 08:13:23 +03:00 |
|
mushka
|
57f75cd8a5
|
merge with feature/virtual-rooms-1.2
|
2022-03-14 18:53:15 +03:00 |
|
|
|
48f747fa5e
|
Web: Client: added inMaintenance prop
|
2022-03-14 19:40:08 +05:00 |
|
|
|
55ef22b5f5
|
Web: Login: fix
|
2022-03-14 17:13:22 +03:00 |
|
|
|
5ea216e0c9
|
Web: Login: fix
|
2022-03-14 17:08:33 +03:00 |
|
|
|
4538a11b89
|
Web: Login: fix
|
2022-03-14 14:21:42 +03:00 |
|
|
|
115aa461c6
|
Merge branch 'develop' into hotfix/campaigns-banner
|
2022-03-14 15:51:38 +05:00 |
|
|
|
780ec9a251
|
Web: Client: fix
|
2022-03-14 12:49:50 +03:00 |
|
|
|
dcb22b1189
|
Web: Client: fix password input behavior
|
2022-03-14 12:28:41 +03:00 |
|
|
|
7e54c41394
|
Web: Client: fix email input behavior
|
2022-03-14 11:53:46 +03:00 |
|
|
|
edc20a1f9e
|
Web: Login: fix email input behavior
|
2022-03-14 11:48:45 +03:00 |
|
|
|
5cff781339
|
Web:Studio:Added a CustomizationNavbar component to Customization. Refactoring of the Customization component.
|
2022-03-13 16:30:53 +03:00 |
|
|
|
b089ee1105
|
Web:Studio:Added CustomizationNavbar component.
|
2022-03-13 16:29:09 +03:00 |
|
|
|
6552301f90
|
Web:Studio:Added the field-container-width class for the Automatic time zone setting.
|
2022-03-11 18:33:24 +03:00 |
|
|
|
015998da34
|
Web:Studio:Removed passing props sectionWidth for the LanguageAndTimeZone component.
|
2022-03-11 18:23:09 +03:00 |
|
|
|
f05f986f7e
|
Web:Studio:Added the checkSectionWidth function to change the view, added a Consumer to the LanguageAndTimeZone component. Added a condition for heading not to be shown on mobile.
|
2022-03-11 18:22:11 +03:00 |
|
|
|
4b32423c3c
|
Web: Backup: MobileView: Added showing and hiding of section header.
|
2022-03-11 16:49:22 +03:00 |
|
|
|
36959d8eec
|
Web: Backup: Fixed styles for backup.
|
2022-03-11 16:40:00 +03:00 |
|
|
|
934b9824d4
|
Web: Changed translation according layouts.
|
2022-03-11 16:07:05 +03:00 |
|
|
|
32f4b30e3e
|
WEb: AutoBackup: Refactoring, deleted useless code.
|
2022-03-11 15:55:43 +03:00 |
|
|
|
0533670187
|
Web: RestoreBackup: Deleted useless code, refactoring.
|
2022-03-11 15:38:32 +03:00 |
|
|
|
12174c73b1
|
Web: ManualBackup: Refactoring, deleted useless code.
|
2022-03-11 15:23:48 +03:00 |
|
|
|
ef2e13007e
|
Web: Backup: Adding storage information from the store.
|
2022-03-11 15:04:42 +03:00 |
|
mushka
|
25ad35ab6a
|
added Normal Touchscreen/Desktop differentiation
|
2022-03-11 13:41:48 +03:00 |
|
|
|
95742e0ad6
|
Web: Backup: changed routing for mobile view.
|
2022-03-11 11:37:54 +03:00 |
|
|
|
5e2f575483
|
added builders extensions
|
2022-03-10 20:30:29 +03:00 |
|
|
|
ed4cb3ab74
|
Web: Arrangement of translations alphabetically.
|
2022-03-10 18:35:16 +03:00 |
|
|
|
ed9ea31b73
|
Web: Backup: Deleted useless translations.
|
2022-03-10 17:52:57 +03:00 |
|
|
|
aa5fde9b18
|
Web:Studio:Changed translation of CustomizationDescription for locales ru. Added translation of CustomizationDescription for locales en.
|
2022-03-10 17:06:50 +03:00 |
|
|
|
79e1b0e082
|
Web: Login: disable with error
|
2022-03-10 17:01:42 +03:00 |
|
|
|
644d6ac8b6
|
Web:Studio:Page layout Customization.
|
2022-03-10 16:24:47 +03:00 |
|
|
|
2738687cfd
|
Web:Studio:Added translation for the Title in the CustomTitles component.
|
2022-03-10 16:21:14 +03:00 |
|
|
|
48c35f981b
|
Web:Studio:Added locales en for CustomTitlesTooltip tooltip.
|
2022-03-10 16:18:46 +03:00 |
|
mushka
|
c3c59ceaff
|
changed size names in app buttons
|
2022-03-10 15:59:04 +03:00 |
|
|
|
64dfd61858
|
Merge branch 'develop' into feature/backup
|
2022-03-10 12:15:26 +03:00 |
|
|
|
5585a28f0b
|
Web: Login: use email inputs
|
2022-03-10 11:58:12 +03:00 |
|
|
|
a43c41b251
|
Web: Added translation for Data Management on en, ru.
|
2022-03-10 11:21:24 +03:00 |
|
|
|
899e8bfb84
|
Web: Client: disallow char on email
|
2022-03-10 11:08:47 +03:00 |
|
|
|
c95d3e910d
|
Web: Arrangement of translations alphabetically.
|
2022-03-10 10:22:26 +03:00 |
|
|
|
ae267b9e18
|
WEb: Separated translations.
|
2022-03-10 09:24:03 +03:00 |
|
|
|
b9719755be
|
Added ThrowIfNull
|
2022-03-09 20:15:51 +03:00 |
|
|
|
3bbf82d918
|
add new lines
|
2022-03-09 19:07:24 +03:00 |
|
|
|
d2a1d0b3b8
|
Web: Client: delete useless
|
2022-03-09 18:01:27 +03:00 |
|
|
|
37f42e57c4
|
Web: RestoreBackup: Deleted useless code.
|
2022-03-09 17:53:39 +03:00 |
|
|
|
eafb96796b
|
Web: RestoreBackup: Added socketHelper to the backup list dialog.
|
2022-03-09 17:49:23 +03:00 |
|
|
|
949acc338d
|
Web: Client: fix styles
|
2022-03-09 16:53:49 +03:00 |
|
|
|
c3e92ba5ee
|
Web: Client: fix
|
2022-03-09 16:22:09 +03:00 |
|
|
|
e38ac6393b
|
Web: RestoreProgress: Fixed storage.
|
2022-03-09 15:42:22 +03:00 |
|
|
|
5655f57acd
|
Web:Studio:Changed CustomTitlesSettingsDescription and LanguageAndTimeZoneSettingsDescription for locales en, pt-BR, ru, de, fr, it. Added CustomTitlesWelcome for locales en, pt-BR, de, fr, it.
|
2022-03-09 12:16:04 +03:00 |
|
|
|
2aa0a97f98
|
Web: AutoBackup/ManualBackup: Deleted useless code.
|
2022-03-09 12:10:36 +03:00 |
|
|
|
2585c22b3b
|
merge from feature/backend-refactor
|
2022-03-09 12:10:30 +03:00 |
|
|
|
ce4f4cb9b6
|
Web: AutoBackup: Renaming.
|
2022-03-09 12:04:45 +03:00 |
|
|
|
69ea81d70e
|
Web: Login: Tests: update screenshots
|
2022-03-09 11:55:46 +03:00 |
|
|
|
aaf50bdc85
|
Web: BackupStore: Fixed backup progress.
|
2022-03-09 11:54:14 +03:00 |
|
|
|
947115a6ca
|
Web: Login: fix modal style
|
2022-03-09 11:43:08 +03:00 |
|
|
|
df920f7b4e
|
Web: Login: delete useless
|
2022-03-09 11:30:34 +03:00 |
|
|
|
c0b0a26faa
|
Web: Backup: Moved common third-party list to the story.
|
2022-03-09 11:08:58 +03:00 |
|
|
|
7130cd884a
|
Web: Fixed translation for max copies.
|
2022-03-09 10:42:38 +03:00 |
|
|
|
17743d3e9b
|
Web: Files: Added translation for fr, de, it, zh-CH languages translation.
|
2022-03-09 10:39:38 +03:00 |
|
|
|
78fafb08ab
|
Microsoft.NET.Sdk.Worker
|
2022-03-05 18:38:42 +03:00 |
|
|
|
b43220100f
|
Web: BackupStore: Fixed period label.
|
2022-03-05 14:53:14 +03:00 |
|
|
|
44dd382bbe
|
Web: Client: add error translate
|
2022-03-05 14:32:50 +03:00 |
|
|
|
ef2d2e5a1c
|
Web: Backup: Moved backup progress to the store, refactoring.
|
2022-03-05 14:30:07 +03:00 |
|
|
|
8e23ef6a15
|
Web: Client: fix text error
|
2022-03-05 14:02:15 +03:00 |
|
|
|
7abf49c62a
|
Web: Client: fix autoFocus
|
2022-03-05 13:58:35 +03:00 |
|
|
|
d8f5861c7e
|
Web: Client: logout user on confirm
|
2022-03-05 13:44:06 +03:00 |
|
|
|
14c51ff4a6
|
Web: Login: fix form jump
|
2022-03-05 11:57:41 +03:00 |
|
|
|
cd8e90cb9c
|
Web: Client: email autofocus
|
2022-03-05 11:55:16 +03:00 |
|
|
|
ce57be48c1
|
Api: fixed usings
|
2022-03-05 11:43:36 +03:00 |
|
|
|
ac9c1bf409
|
Merge branch 'feature/backend-refactor' into feature/web.api-refactoring
# Conflicts:
# web/ASC.Web.Api/ASC.Web.Api.csproj
# web/ASC.Web.Api/GlobalUsings.cs
|
2022-03-05 11:41:27 +03:00 |
|
|
|
f3df5c04a3
|
Web: Client: fix validate inputs
|
2022-03-05 11:39:20 +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 |
|
|
|
e3285ce44e
|
Web: Client: fix by layout
|
2022-03-05 11:02:48 +03:00 |
|
|
|
fe1c01e4c1
|
Web:Studio:Styling the Customization Component.
|
2022-03-05 10:18:06 +03:00 |
|
|
|
264637510d
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-05 09:15:15 +03:00 |
|
|
|
cde35d334f
|
Web:Studio:Styling the Customization Component.
|
2022-03-05 09:14:55 +03:00 |
|
|
|
9be309da10
|
Web:Studio:Added encoding of uploaded logo to base64.
|
2022-03-04 18:30:42 +03:00 |
|
|
|
1fce535cfb
|
WEb: Backup: Added constants.
|
2022-03-04 17:00:04 +03:00 |
|
|
|
d6fe627217
|
Web: AutoBackup: Refactoring.
|
2022-03-04 16:12:06 +03:00 |
|
|
|
10e8ab7a12
|
Web: Backup: Moved auto backup information to the store.
|
2022-03-04 15:55:04 +03:00 |
|
|
|
a603abf556
|
Web: Login: disabled social buttons on loading
|
2022-03-04 12:32:39 +03:00 |
|
|
|
bf46d007a7
|
Web: Client: fix page change password crash
|
2022-03-04 10:50:43 +03:00 |
|
|
|
4965f9ffb6
|
Web:Studio:Added a CustomizationDescription in the Customization component. Added ru locales for CustomizationDescription.
|
2022-03-04 09:29:12 +03:00 |
|
|
|
aa4a65ba8f
|
Web: Login: fix styles
|
2022-03-03 22:23:25 +03:00 |
|
|
|
e9cfff3013
|
Web: Login: add cancel buttons
|
2022-03-03 22:16:06 +03:00 |
|
|
|
48f9afd6b0
|
Web: Login: delete useless
|
2022-03-03 21:51:09 +03:00 |
|
|
|
a83ad2abdd
|
Web: Login: delete useless
|
2022-03-03 18:37:50 +03:00 |
|
|
|
ab12f85eb4
|
Web: Client: add loader
|
2022-03-03 17:58:47 +03:00 |
|
|
|
6209ff6d93
|
Web: Login: fix modal
|
2022-03-03 17:51:51 +03:00 |
|
|
|
2961873796
|
Web: Client: fix password change page render
|
2022-03-03 17:31:44 +03:00 |
|
|
|
a3530a2e33
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/confirm-test
|
2022-03-03 17:25:25 +03:00 |
|
|
|
8bba8e8345
|
Web: Login: wait all promise
|
2022-03-03 17:22:02 +03:00 |
|
|
|
da121a1bfe
|
Web: Client: disable code route for standart mode
|
2022-03-03 17:14:03 +03:00 |
|
|
|
80194bb222
|
Web:Studio:Changed setMailDomainSettings, setLifetimeAuditSettings. Added setDNSSettings, getAuditTrailReport to SettingsSetupStore.
|
2022-03-03 16:05:52 +03:00 |
|
|
|
960c6f5449
|
Merge branch 'feature/backend-refactor' into feature/web.api-refactoring
# Conflicts:
# web/ASC.Web.Api/Startup.cs
|
2022-03-03 14:53:23 +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 |
|
|
|
a27734ed97
|
Web: Added new translations.
|
2022-03-03 14:06:06 +03:00 |
|
|
|
1b352c76f6
|
Added using AddControllers method
|
2022-03-03 14:04:17 +03:00 |
|
|
|
9c98b70686
|
Web: Login: add loader
|
2022-03-03 13:13:56 +03:00 |
|
|
|
5a355090dd
|
Web: Login: add loader
|
2022-03-03 13:08:56 +03:00 |
|
|
|
f161598193
|
Merge branch 'feature/login-redesign' of github.com:ONLYOFFICE/AppServer into feature/login-redesign
|
2022-03-03 12:54:59 +03:00 |
|
|
|
6822fafda0
|
Web: Login: fix buttons width
|
2022-03-03 12:47:20 +03:00 |
|
|
|
6102b15c6d
|
Web: Login: fix dialog
|
2022-03-03 12:44:09 +03:00 |
|
|
|
03d8f803cd
|
Web:Studio:Encoding images in base64 format. Checking the save White label method when loading an image.
|
2022-03-03 10:22:19 +03:00 |
|
|
|
85e8ceede5
|
Web: Added new translations for help information.
|
2022-03-02 18:54:39 +03:00 |
|
|
|
2978adcdf3
|
Merge branch 'develop' into feature/virtual-rooms-1.2
|
2022-03-02 18:18:05 +03:00 |
|
|
|
1abe5f4122
|
Merge branch 'develop' into feature/login-redesign
|
2022-03-02 18:15:03 +03:00 |
|
|
|
1ce9b25093
|
Web: Campaigns: Added more locales
|
2022-03-02 17:43:10 +03:00 |
|
|
|
6fe7eb39cf
|
Web: Deleted close button from dialog.
|
2022-03-02 16:33:02 +03:00 |
|
|
|
53eef1101b
|
WEb: PreparationPortal: Deleted useless code.
|
2022-03-02 16:26:18 +03:00 |
|
|
|
d565fffc07
|
Web: Added preparation portal dialog.
|
2022-03-02 16:19:34 +03:00 |
|
|
|
57633ad222
|
Web: Client: Tests: change password test
|
2022-03-02 12:30:13 +03:00 |
|
Timofey Boyko
|
48ad201583
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-02 11:57:20 +03:00 |
|
Timofey Boyko
|
fdd1975a3a
|
Web:Client: fix double settings item in user actions
|
2022-03-02 11:56:17 +03:00 |
|
Timofey Boyko
|
02b225b78b
|
Web:Client: fix double navigation icon
|
2022-03-02 11:54:39 +03:00 |
|
|
|
ea9a0c5703
|
Web:Studio:Added theme for links in WhiteLabel component.
|
2022-03-02 11:43:59 +03:00 |
|
|
|
2309bc060f
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-02 11:25:08 +03:00 |
|
|
|
f57cff1dcc
|
Merge branch 'develop' into feature/backup
|
2022-03-02 11:21:57 +03:00 |
|
|
|
f2505f7575
|
Web:Studio:Added layout to the PortalRenaming component.
|
2022-03-02 11:21:40 +03:00 |
|
|
|
6aa9a4a926
|
Added the WhiteLabe component to the Customization component.
|
2022-03-02 11:17:08 +03:00 |
|
|
|
efcfd69ef3
|
Web:Studio:Added setWhiteLabelSettings, restoreWhiteLabelSettings to the WhiteLabe component. Added the onSave method to the WhiteLabe component.
|
2022-03-02 11:16:19 +03:00 |
|
|
|
97b3b8daf7
|
Web:Common:Added setWhiteLabelSettings, restoreWhiteLabelSettings, setPortalRename, setMailDomainSettings, setIpRestrictions, setIpRestrictionsEnable, setMessageSettings, setCookieSettings, setLifetimeAuditSettings to SettingsSetupStore.
|
2022-03-02 11:13:02 +03:00 |
|
|
|
4b59e111af
|
Web: PreparationPortal: Added progress initiation when restore portal.
|
2022-03-02 11:12:59 +03:00 |
|
|
|
4805ea2178
|
Api: fix warnings
|
2022-03-02 11:08:59 +03:00 |
|
Timofey
|
19937f50dd
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-01 22:05:41 +08:00 |
|
|
|
609427bf20
|
merge from feature/backend-refactor
|
2022-03-01 15:57:49 +03:00 |
|
|
|
b48bd37ea6
|
Merge branch 'feature/backend-refactor' into feature/people-refactor
|
2022-03-01 15:27:07 +03:00 |
|
|
|
cfbfe84d11
|
ImplicitUsings
|
2022-03-01 14:44:13 +03:00 |
|
|
|
e2c86852a0
|
remove whitespace
|
2022-03-01 14:35:29 +03:00 |
|
|
|
9e8b80c6dd
|
Api: added form method support
|
2022-03-01 14:10:41 +03:00 |
|
|
|
e18d6b8757
|
refactoring: asc.web.api
|
2022-03-01 13:58:02 +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 |
|
|
|
e7259608d1
|
rename dto
|
2022-03-01 13:03:56 +03:00 |
|
|
|
0ff56392f8
|
rename and replace models
|
2022-03-01 13:03:56 +03:00 |
|
|
|
c3742208cc
|
replace controllers
|
2022-03-01 13:03:25 +03:00 |
|
Timofey
|
7bd66a04ab
|
Web:Client:NavMenu: add special name for catalog burger for mobile view
|
2022-03-01 17:53:48 +08:00 |
|
|
|
fd51115811
|
Web: ManualBackup: Fixed progress for desktop view.
|
2022-03-01 09:05:19 +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 |
|
Timofey
|
062cb1e6cd
|
Web:Studio: disable settings icon in header
|
2022-03-01 01:39:24 +08:00 |
|
|
|
fb1dea3522
|
Web: Client: add test:ui script
|
2022-02-28 19:49:36 +03:00 |
|
|
|
a18bcf07b8
|
Web: Client: Tests: change/activation email tests
|
2022-02-28 19:49:06 +03:00 |
|
|
|
eea48ab5eb
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/confirm-test
|
2022-02-28 19:26:48 +03:00 |
|
|
|
de5af49552
|
WEb: AutoBackup: Deleted isDesktop prop;
|
2022-02-28 18:47:42 +03:00 |
|
|
|
e4deaa19b0
|
Web: Settings: Added backup store.
|
2022-02-28 18:31:11 +03:00 |
|
|
|
bbe35750f5
|
Merge branch 'develop' into hotfix/campaigns-banner
|
2022-02-28 19:08:13 +05:00 |
|
|
|
9a64032650
|
Web: Client: added snackbar props for home
|
2022-02-28 18:25:48 +05:00 |
|
|
|
bb27fc60a7
|
Web: Components: added margin for home page
|
2022-02-28 18:25:08 +05:00 |
|
|
|
7a52c38871
|
Web: added set snackbar state
|
2022-02-28 18:24:41 +05:00 |
|
|
|
9aff975cd4
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign
|
2022-02-28 16:17:48 +03:00 |
|
|
|
322b07dd5e
|
Web: Login: Tests: update screenshots
|
2022-02-28 16:16:50 +03:00 |
|
|
|
45a2868f77
|
Web: Login: Tests: add pause
|
2022-02-28 16:16:30 +03:00 |
|
|
|
9354bce5a0
|
Web: Login: fix panel width
|
2022-02-28 16:02:28 +03:00 |
|
|
|
20c0900e12
|
Web: Login: fix panel width
|
2022-02-28 15:54:22 +03:00 |
|
|
|
c2518d3b1e
|
Web: AutoBackup: Fixed styles of schedule component for desktop.
|
2022-02-28 15:08:58 +03:00 |
|
|
|
fe15811c8f
|
Core: refactor
|
2022-02-28 12:06:06 +03:00 |
|
|
|
f576f80fb7
|
Merge branch 'feature/backup' of github.com:ONLYOFFICE/AppServer into feature/backup
|
2022-02-28 11:25:07 +03:00 |
|
|
|
9120fc230f
|
Web: Renamed translations keys, deleted useless.
|
2022-02-28 11:24:54 +03:00 |
|
|
|
e6f111f651
|
Merge branch 'feature/backend-refactor' into feature/asc-core-common-refactor
|
2022-02-25 20:16:00 +03:00 |
|
|
|
6c8165ecdc
|
Merge branch 'feature/backup' of https://github.com/ONLYOFFICE/AppServer into feature/backup
|
2022-02-25 19:08:08 +03:00 |
|
|
|
eae8b7c0bb
|
Web: Socket: Added "restore-backup" event listeners
|
2022-02-25 19:08:02 +03:00 |
|
Dmitry Kulak
|
92d3a3275f
|
Web: Studio: Homepage: Fixed greeting message styles
|
2022-02-25 18:57:24 +03:00 |
|
|
|
5a19f21902
|
Merge pull request #559 from ONLYOFFICE/feautre/asc-messaging-system-refactor
Feautre/asc messaging system refactor
|
2022-02-25 17:53:44 +03:00 |
|
|
|
93e5cf889c
|
Web: RestoreBackup: Added error handler for local file.
|
2022-02-25 17:17:18 +03:00 |
|
|
|
2bb84187e3
|
Web: Backup: Added help information for modules.
|
2022-02-25 17:10:27 +03:00 |
|
|
|
6495da0d0b
|
Merge branch 'feature/backend-refactor' into feature/asc-messaging-system-refactor
|
2022-02-25 16:34:15 +03:00 |
|
|
|
0302dfd9ac
|
Web: ManualBackup: Fixed temporary link for desktop version.
|
2022-02-25 16:27:17 +03:00 |
|
|
|
b1e5a6e28b
|
Merge branch 'feature/backend-refactor' into feature/asc-feed-refactor
|
2022-02-25 16:16:56 +03:00 |
|
|
|
f07aa0a183
|
Merge branch 'develop' into feature/backup
# Conflicts:
# common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs
# config/nginx/onlyoffice.conf
# packages/asc-web-common/constants/index.js
# products/ASC.Files/Client/src/components/panels/StyledPanels.js
# products/ASC.Files/Client/webpack.config.js
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
|
2022-02-25 16:05:43 +03:00 |
|
|
|
d9a8fd58ba
|
Web: Backup: Added max length to the text.
|
2022-02-25 12:05:43 +03:00 |
|
|
|
47faaf1653
|
Web: Backup: Added description of modules.
|
2022-02-25 11:54:21 +03:00 |
|
|
|
a5a72e3e9d
|
Web: Backup: Changed styles.
|
2022-02-25 11:38:07 +03:00 |
|
|
|
2eeed99efa
|
Web: Client: Main: Removed --vh parameter from global styles for non IOS devices
|
2022-02-25 11:28:23 +03:00 |
|
|
|
56caa47575
|
Web: Backup: Added desktop view.
|
2022-02-25 10:46:14 +03:00 |
|
|
|
e066add5ea
|
Web: Client: Tfa auth error test
|
2022-02-25 00:09:49 +03:00 |
|
|
|
cdc8e90b79
|
Web: Client: Tests: update screenshots
|
2022-02-24 23:04:28 +03:00 |
|
|
|
b62f56f7e2
|
Web: Client: Tests: Tfa activation success test
|
2022-02-24 23:03:03 +03:00 |
|
|
|
6e2db127c0
|
Web: Client: Tests: mock data
|
2022-02-24 23:01:52 +03:00 |
|
|
|
86dcb3c62f
|
Web: Client: Tests: TfaActivation render test
|
2022-02-24 22:45:17 +03:00 |
|
|
|
1cbd56bfee
|
Web: Client: Tests: mock data
|
2022-02-24 22:44:54 +03:00 |
|
|
|
d55d1c4905
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/confirm-test
|
2022-02-24 22:20:42 +03:00 |
|
|
|
d40d73a3a5
|
GoogleAuth: fix 94 issue
|
2022-02-24 17:36:44 +03:00 |
|
|
|
7e67e9a41c
|
merge from develop
|
2022-02-24 17:33:02 +03:00 |
|
|
|
32d73f902e
|
Web: Restore: Rename folder.
|
2022-02-24 10:03:24 +03:00 |
|
|
|
c0a1f20984
|
Web: ManualBackup: Rename folder.
|
2022-02-24 09:46:39 +03:00 |
|
|
|
ac595bb1e5
|
Web: Auto: Rename folder.
|
2022-02-24 09:44:59 +03:00 |
|
|
|
dd183de11d
|
Web: Moved files to separate folder.
|
2022-02-24 09:35:27 +03:00 |
|
|
|
bbb01a96d1
|
WEb: Files: Restore: Fixed page fall.
|
2022-02-24 09:02:53 +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 |
|
|
|
944d6df003
|
Web: Client: Tests: profile remove success action test
|
2022-02-22 20:39:38 +03:00 |
|
|
|
8093cbe2e9
|
Web: Client: Tests: init screenshots
|
2022-02-22 17:34:52 +03:00 |
|
|
|
b4a991a1eb
|
Web: Client: Tests: tfa auth success action test
|
2022-02-22 16:26:24 +03:00 |
|
|
|
45c3ae4cb5
|
Web: Client: Tests: mock data
|
2022-02-22 16:25:38 +03:00 |
|
|
|
27254146ae
|
Web: Files: Restore: Added new loader.
|
2022-02-22 15:38:36 +03:00 |
|
|
|
6cac13ee1c
|
Web: Client: Tests: fix urls
|
2022-02-22 14:34:45 +03:00 |
|
|
|
1b562487c7
|
Web: Client: Tests: change password render test
|
2022-02-22 14:33:22 +03:00 |
|
|
|
b00fcfc1b1
|
Web: Client: fix password change page render
|
2022-02-22 14:30:38 +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 |
|
|
|
64fe39d3cc
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/confirm-test
|
2022-02-22 13:50:06 +03:00 |
|
|
|
85d6f3541e
|
Web: Files: Changed styles for empty backup list.
|
2022-02-22 12:37:16 +03:00 |
|
|
|
c29d35c36d
|
Web: Files: Added possibility to delete backup elem without selected file.
|
2022-02-22 12:30:30 +03:00 |
|
|
|
a797b3490e
|
Files: async fixes
|
2022-02-22 12:22:15 +03:00 |
|
|
|
7ff2481e25
|
Web: Client: Tests: activate user render test
|
2022-02-21 22:43:22 +03:00 |
|
|
|
3aeac42444
|
Merge branch 'master' into develop
# Conflicts:
# common/ASC.Core.Common/Data/DbSubscriptionService.cs
# common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
# common/services/ASC.ElasticSearch/Engine/FactoryIndexer.cs
# common/services/ASC.ElasticSearch/Service/Settings.cs
# common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj
# common/services/ASC.Socket.IO.Svc/SocketServiceLauncher.cs
# packages/asc-web-components/combobox/index.js
# packages/asc-web-components/table-container/StyledTableContainer.js
# packages/asc-web-components/table-container/TableGroupMenu.js
# packages/asc-web-components/table-container/TableHeader.js
# packages/asc-web-components/table-container/TableHeaderCell.js
# packages/asc-web-components/table-container/TableRow.js
# products/ASC.Files/Client/public/locales/az/Home.json
# products/ASC.Files/Client/public/locales/bg/Home.json
# products/ASC.Files/Client/public/locales/bg/Translations.json
# products/ASC.Files/Client/public/locales/cs/Home.json
# products/ASC.Files/Client/public/locales/de/ConvertDialog.json
# products/ASC.Files/Client/public/locales/de/Home.json
# products/ASC.Files/Client/public/locales/de/Translations.json
# products/ASC.Files/Client/public/locales/de/UploadPanel.json
# products/ASC.Files/Client/public/locales/el/ConvertDialog.json
# products/ASC.Files/Client/public/locales/el/Home.json
# products/ASC.Files/Client/public/locales/en/ConvertDialog.json
# products/ASC.Files/Client/public/locales/en/Home.json
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/en/UploadPanel.json
# products/ASC.Files/Client/public/locales/es/ConvertDialog.json
# products/ASC.Files/Client/public/locales/es/Home.json
# products/ASC.Files/Client/public/locales/es/UploadPanel.json
# products/ASC.Files/Client/public/locales/fi/Home.json
# products/ASC.Files/Client/public/locales/fr/ConvertDialog.json
# products/ASC.Files/Client/public/locales/fr/Home.json
# products/ASC.Files/Client/public/locales/fr/Translations.json
# products/ASC.Files/Client/public/locales/it/ConvertDialog.json
# products/ASC.Files/Client/public/locales/it/Home.json
# products/ASC.Files/Client/public/locales/it/Translations.json
# products/ASC.Files/Client/public/locales/it/UploadPanel.json
# products/ASC.Files/Client/public/locales/ja/Home.json
# products/ASC.Files/Client/public/locales/ja/UploadPanel.json
# products/ASC.Files/Client/public/locales/lv/Home.json
# products/ASC.Files/Client/public/locales/nl/Home.json
# products/ASC.Files/Client/public/locales/nl/Translations.json
# products/ASC.Files/Client/public/locales/pl/Home.json
# products/ASC.Files/Client/public/locales/pt-BR/ConvertDialog.json
# products/ASC.Files/Client/public/locales/pt-BR/Home.json
# products/ASC.Files/Client/public/locales/pt-BR/Translations.json
# products/ASC.Files/Client/public/locales/ro/Home.json
# products/ASC.Files/Client/public/locales/ro/UploadPanel.json
# products/ASC.Files/Client/public/locales/ru/ConvertDialog.json
# products/ASC.Files/Client/public/locales/ru/Home.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/public/locales/ru/UploadPanel.json
# products/ASC.Files/Client/public/locales/sk/Home.json
# products/ASC.Files/Client/public/locales/tr/Home.json
# products/ASC.Files/Client/public/locales/uk/Home.json
# products/ASC.Files/Client/public/locales/vi/ConvertDialog.json
# products/ASC.Files/Client/public/locales/vi/Home.json
# products/ASC.Files/Client/public/locales/zh-CN/Home.json
# products/ASC.Files/Client/public/locales/zh-CN/UploadPanel.json
# products/ASC.Files/Client/src/HOCs/withBadges.js
# products/ASC.Files/Client/src/HOCs/withContent.js
# products/ASC.Files/Client/src/components/Badges.js
# products/ASC.Files/Client/src/components/EditingWrapperComponent.js
# products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableHeader.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FileTile.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/store/DialogsStore.js
# products/ASC.Files/Client/src/store/FilesActionsStore.js
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Service/Thumbnail/Builder.cs
# products/ASC.Files/Service/Thumbnail/ThumbnailSettings.cs
# products/ASC.Files/Service/Thumbnail/Worker.cs
# products/ASC.People/Client/src/pages/Home/Section/Body/TableView/TableRow.js
# public/locales/de/Common.json
|
2022-02-21 22:22:38 +03:00 |
|
|
|
a842720f6c
|
Web: Client: Tests: change owner render test
|
2022-02-21 22:20:08 +03:00 |
|
|
|
18ae85b164
|
Web: Client: Tests: create user render test
|
2022-02-21 22:12:45 +03:00 |
|
|
|
9e5253a812
|
Web: Client: Tests: mock data
|
2022-02-21 22:12:16 +03:00 |
|
|
|
f59648230d
|
Web: Client: Tests: change phone render test
|
2022-02-21 22:01:36 +03:00 |
|
|
|
9b1b47ae12
|
Web: Client: fix translate
|
2022-02-21 18:43:35 +03:00 |
|
|
|
c0c0188f2c
|
Web: Client: fix by layout
|
2022-02-21 18:43:22 +03:00 |
|
|
|
9fe4971055
|
add mapping, project reorganization
|
2022-02-21 18:35:57 +03:00 |
|
|
|
c69ed2bc18
|
Web: Client: add redirect
|
2022-02-21 18:31:47 +03:00 |
|
|
|
efd4ade61f
|
Web: Client: add translate
|
2022-02-21 18:27:35 +03:00 |
|
|
|
66a410cf1c
|
Web: Client: add invalid error screen
|
2022-02-21 18:27:23 +03:00 |
|
|
|
d09776db37
|
Web: Files: The logic of the dialog with the list of backups has been changed, redesign.
|
2022-02-21 17:21:50 +03:00 |
|
|
|
5b5ed4a4e3
|
Merge branch 'feature/backend-refactor' into feature/asc-feed-refactor
|
2022-02-18 18:55:59 +03:00 |
|
|
|
89cc5bfbec
|
Api: added cookiesettings
|
2022-02-18 18:28:03 +03:00 |
|
|
|
e736ceed72
|
Web: Client: Tests: profile remove render test
|
2022-02-18 17:55:15 +03:00 |
|
|
|
3a0a9cf16e
|
Web: Client: Tests: mock settings
|
2022-02-18 17:53:35 +03:00 |
|
Timofey
|
f30cb432f7
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-02-18 22:31:28 +08:00 |
|
Timofey
|
8c73f93eed
|
Web:Files:Catalog: fix section rerender when catalog opening on mobile
|
2022-02-18 20:46:49 +08:00 |
|
|
|
4143e0cd2c
|
Web: Client: Tests: TfaAuth render test
|
2022-02-18 14:03:55 +03:00 |
|
|
|
f803109419
|
Web: Client: Tests: mock confirm data
|
2022-02-18 14:03:09 +03:00 |
|
|
|
2e424a106a
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-02-18 11:00:40 +03:00 |
|
|
|
f068f60a95
|
Web:Studio:Added languageDefaultFromSessionStorage and timezoneDefaultFromSessionStorage keys to sessionStorage. Fixed showReminder output.
|
2022-02-18 10:59:38 +03:00 |
|
|
|
41b5a1dcd1
|
Web: Files: Hidden elements of NavMenu, disabled click on logo.
|
2022-02-18 10:54:53 +03:00 |
|
|
|
c998797aed
|
Settings: update password settings
|
2022-02-17 18:25:07 +03:00 |
|
|
|
91c3fa878b
|
Portal: portalrename method
|
2022-02-17 16:39:47 +03:00 |
|
|
|
1ef4b32939
|
Settings: added update dns settings method
|
2022-02-17 15:55:42 +03:00 |
|
|
|
ecb5c7fba2
|
Fixed Bug 55614 - Client.ExternalLink. ‘404 Not Found’ when opening an external link.
|
2022-02-17 15:12:54 +03:00 |
|
|
|
4255cec9ad
|
Notify: fix unsubscribe url
|
2022-02-17 11:30:37 +03:00 |
|
|
|
bef7c923db
|
Settings: added method to get current subscription state
|
2022-02-16 19:32:42 +03:00 |
|
Vashchuk Nikita
|
0a384b2c28
|
refactoring async methods
|
2022-02-16 15:57:37 +03:00 |
|
Viktor Fomin
|
fb8e0748f6
|
Web: Campaigns: add ads examples
|
2022-02-16 14:11:49 +03:00 |
|
|
|
f978cb657d
|
Web: files: AutoBackup: Optimization saving process.
|
2022-02-16 11:24:12 +03:00 |
|
|
|
b5ebbef616
|
Web: files: AutoBackup: Delete useless code.
|
2022-02-16 10:11:08 +03:00 |
|
|
|
879a027055
|
Web: Files: AutoBackup: Optimization modules.
|
2022-02-15 18:22:55 +03:00 |
|
|
|
7f4d29da03
|
Web: Editor: fixed canConvert
|
2022-02-15 16:57:32 +03:00 |
|
Vashchuk Nikita
|
b17119b711
|
refactoring async methods
|
2022-02-15 16:20:06 +03:00 |
|
|
|
ca7140186d
|
Core: resolve properties for mapping, add mapping/projection
|
2022-02-15 13:30:05 +03:00 |
|
|
|
af51658493
|
Web: Campaigns: init example
|
2022-02-15 13:09:44 +03:00 |
|
|
|
f26eb17fe1
|
Web: Common: move shell changes from hotfix/campaigns banner
|
2022-02-15 11:37:31 +03:00 |
|
Timofey
|
8ac30689a3
|
Web:Studio:Settings: change props for people selector in owner page
|
2022-02-15 15:01:21 +08:00 |
|
Timofey
|
f9162966b4
|
Web:Studio:Settings: change props for people selector in admin page
|
2022-02-15 15:01:06 +08:00 |
|
|
|
853d2280b6
|
Web: Files: RestoreBackup: Hidden elements of header.
|
2022-02-15 09:24:44 +03:00 |
|
|
|
481581e424
|
Core: private properties replaced by private fields, add braces
|
2022-02-15 00:02:57 +03:00 |
|
|
|
64dd260a07
|
Merge pull request #531 from ONLYOFFICE/feature/refactoring-healthChecks.UI
Feature/refactoring health checks.UI
|
2022-02-14 19:24:08 +03:00 |
|
|
|
4e717e7bcd
|
Merge pull request #530 from ONLYOFFICE/feature/refactoring-webstudio
Feature/refactoring webstudio
|
2022-02-14 19:22:45 +03:00 |
|
|
|
4a6ad133b0
|
Web: files: Changed styles for preparation portal.
|
2022-02-14 17:46:27 +03:00 |
|
|
|
6ba390ea62
|
Web: Files: AutoBackup: optimization, refactoring.
|
2022-02-14 17:06:26 +03:00 |
|
|
|
f0fc434447
|
Web:Studio:Added PortalRenaming component. Removed the TeamTemplate component from the Customization component.
|
2022-02-14 16:33:27 +03:00 |
|
|
|
f6bb6b8ec2
|
Web: Campaigns: add firebase deploy script
|
2022-02-14 16:26:36 +03:00 |
|
|
|
f78bd8224a
|
Web: Campaigns: move bar-templates in root folder
|
2022-02-14 16:06:39 +03:00 |
|
|
|
0ba2e2d933
|
Web: Client: Tests: add test
|
2022-02-14 15:06:27 +03:00 |
|
|
|
b7d6454dbe
|
Merge branch 'hotfix/v1.1.1' into hotfix/campaigns-banner
|
2022-02-14 14:39:31 +03:00 |
|
|
|
11ec12801a
|
Web:Studio:Added showReminder to true on title change.
|
2022-02-14 13:49:48 +03:00 |
|
|
|
530387a258
|
Web: Client: Tests: fix typo
|
2022-02-14 13:20:18 +03:00 |
|
|
|
9cb69a930a
|
Web:Studio:Added props hasChanged to display SaveCancelButtons.
|
2022-02-14 13:13:55 +03:00 |
|
|
|
8b5a4f4670
|
Web: Client: add start tests commands
|
2022-02-14 12:58:58 +03:00 |
|
|
|
89e4fabe2d
|
Web: Client: Tests: add helpers
|
2022-02-14 12:58:20 +03:00 |
|
|
|
8288f3c4ca
|
Common: return IEventBust to ICacheNotify
|
2022-02-14 12:05:05 +03:00 |
|
|
|
11f9c2727b
|
Web:Studio:Added translation of CustomTitlesTooltip. Added keys CustomTitlesFrom, CustomTitlesHeader, CustomTitlesSettingsTooltip, CustomTitlesSettingsTooltip, CustomTitlesText, CustomTitlesWelcome for locales ru.
|
2022-02-14 00:00:06 +03:00 |
|
|
|
0bd6afb49d
|
Web:Studio:Removed the onCancelClick method in the CustomTitles component.
|
2022-02-13 19:48:37 +03:00 |
|
|
|
bd5a3a8a01
|
Web:Components:Added styles to SaveCancelButtons.
|
2022-02-13 19:33:20 +03:00 |
|
|
|
80bb051d2b
|
Web:Studio:Delete flagChanges key to sessionStorage.
|
2022-02-13 16:29:46 +03:00 |
|
Vashchuk Nikita
|
631dcdc2e8
|
Merge branch 'develop' into feature/async
# Conflicts:
# common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
# common/ASC.Data.Backup.Core/Storage/BackupRepository.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.Storage/CrossModuleTransferUtility.cs
# common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
# common/ASC.Data.Storage/Extensions.cs
# common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
# common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
# common/ASC.Data.Storage/S3/S3Storage.cs
# common/ASC.Data.Storage/StorageHandler.cs
# common/services/ASC.ApiSystem/Controllers/PortalController.cs
# products/ASC.CRM/Server/Api/VoipController.cs
# products/ASC.CRM/Server/Core/Dao/RelationshipEventDao.cs
# products/ASC.CRM/Server/Utils/PdfCreator.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Security/FileSecurity.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/CrossDao.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/GoogleDrive/GoogleDriveFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.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/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/SharePoint/SharePointFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/HttpHandlers/SearchHandler.cs
# products/ASC.Files/Core/Services/DocumentService/Configuration.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceConnector.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.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/ThirdPartyApp/BoxApp.cs
# products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.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/MailMergeTask.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.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/Recaptcha.cs
# web/ASC.Web.Core/Utility/UrlShortener.cs
|
2022-02-12 00:51:48 +03:00 |
|
|
|
ab0378aed3
|
Merge branch 'feature/backend-refactor' into feature/refactoring-healthChecks.UI
|
2022-02-11 18:11:04 +03:00 |
|
|
|
adc406fba1
|
refactoring: reorganizing
|
2022-02-11 18:10:40 +03:00 |
|
|
|
d101aaa3ba
|
refactoring: reorganizing
|
2022-02-11 18:05:40 +03:00 |
|
|
|
1ff67b6b1c
|
Merge branch 'feature/backend-refactor' into feature/refactoring-webstudio
|
2022-02-11 18:00:03 +03:00 |
|
|
|
7b36caac60
|
Merge branch 'feature/backend-refactor' into feature/asc-common-refactor
|
2022-02-11 16:19:25 +03:00 |
|
|
|
dba3efb235
|
Merge branch 'feature/backend-refactor' into feature/asc-common-refactor
# Conflicts:
# common/ASC.Api.Core/GlobalUsings.cs
# common/ASC.Common/Caching/AscCache.cs
# common/ASC.Common/Collections/CachedDictionaryBase.cs
# common/ASC.Common/Collections/HttpRequestDictionary.cs
# common/ASC.Common/DIHelper.cs
# common/ASC.Common/Data/StreamExtension.cs
# common/ASC.Common/Data/TempStream.cs
# common/ASC.Common/DependencyInjection/AutofacExtension.cs
# common/ASC.Common/Logging/Log.cs
# common/ASC.Common/Logging/SelfCleaningTarget.cs
# common/ASC.Common/Logging/SpecialFolderPathConverter.cs
# common/ASC.Common/Mapping/MappingProfile.cs
# common/ASC.Common/Security/AscRandom.cs
# common/ASC.Common/Security/Authorizing/AuthorizingException.cs
# common/ASC.Common/Security/Authorizing/Constants.cs
# common/ASC.Common/Security/Authorizing/Domain/Role.cs
# common/ASC.Common/Security/Cryptography/Hasher.cs
# common/ASC.Common/Threading/DistributedTask.cs
# common/ASC.Common/Threading/DistributedTaskQueue.cs
# common/ASC.Common/Utils/DnsLookup.cs
# common/ASC.Common/Utils/HtmlUtil.cs
# common/ASC.Common/Utils/HttpRequestExtensions.cs
# common/ASC.Common/Utils/JsonWebToken.cs
# common/ASC.Common/Utils/MailAddressUtils.cs
# common/ASC.Common/Utils/RandomString.cs
# common/ASC.Common/Utils/TimeZoneConverter/TimeZoneConverter.cs
# common/ASC.Common/Utils/VelocityFormatter.cs
# common/ASC.Common/Utils/Wildcard.cs
# common/ASC.Common/Web/MimeMapping.cs
# common/ASC.Common/Web/VirtualPathUtility.cs
# common/services/ASC.ClearEvents/Program.cs
# products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
# products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
|
2022-02-11 16:17:55 +03:00 |
|
|
|
637cdd6ed7
|
Web: Client: init e2e tests
|
2022-02-11 14:59:09 +03:00 |
|
|
|
7face205ea
|
Web:Studio:Added flagChanges key to sessionStorage.
|
2022-02-11 14:57:36 +03:00 |
|
|
|
d9852789e5
|
Web:Studio:Added HelpButton to the CustomTitles component, added props sectionWidth, styled the component. Added CustomTitles to the Customization component.
|
2022-02-11 14:55:04 +03:00 |
|
|
|
6693d56846
|
refactoring: update globalUsings
|
2022-02-11 13:36:06 +03:00 |
|
|
|
05d0fd89ed
|
Merge branch 'feature/backend-refactor' into feature/refactoring-healthChecks.UI
|
2022-02-11 13:35:38 +03:00 |
|
|
|
3182235fc9
|
refactoring: update globalusings
|
2022-02-11 13:24:23 +03:00 |
|
|
|
91736a28d1
|
Merge branch 'feature/backend-refactor' into feature/refactoring-webstudio
|
2022-02-11 13:23:56 +03:00 |
|
|
|
d1f7d41a57
|
Merge branch 'feature/backend-refactor' into feature/asc-audit-trail-refactor
# Conflicts:
# common/ASC.Api.Core/GlobalUsings.cs
# common/ASC.Core.Common/EF/Context/MessagesContext.cs
# common/ASC.MessagingSystem/DbSender/MessagesRepository.cs
# common/services/ASC.AuditTrail/AuditEventsRepository.cs
# common/services/ASC.AuditTrail/LoginEventsRepository.cs
# common/services/ASC.AuditTrail/Mappers/AuditActionMapper.cs
# common/services/ASC.AuditTrail/Mappers/CrmActionMapper.cs
# common/services/ASC.AuditTrail/Mappers/DocumentsActionMapper.cs
# common/services/ASC.AuditTrail/Mappers/LoginActionMapper.cs
# common/services/ASC.AuditTrail/Mappers/OthersActionMapper.cs
# common/services/ASC.AuditTrail/Mappers/PeopleActionMapper.cs
# common/services/ASC.AuditTrail/Mappers/ProjectsActionMapper.cs
# common/services/ASC.AuditTrail/Mappers/SettingsActionMapper.cs
# common/services/ASC.ClearEvents/ClearEventsServiceLauncher.cs
|
2022-02-10 21:54:45 +03:00 |
|
|
|
8a60005fea
|
Feed: add mapping
|
2022-02-10 21:31:44 +03:00 |
|
Vashchuk Nikita
|
7164c54b44
|
fix
|
2022-02-10 21:25:40 +03:00 |
|
|
|
099d7049e3
|
Web: files: Fixed enabling of auto backup/restore.
|
2022-02-10 18:17:34 +03:00 |
|
|
|
d67fb24b68
|
Web: Login: fix translate
|
2022-02-10 18:01:55 +03:00 |
|
|
|
3229019aad
|
Web: move LoginButton key to Common
|
2022-02-10 18:01:40 +03:00 |
|
|
|
d05d770a76
|
Web: Login: fix screenshots
|
2022-02-10 17:46:45 +03:00 |
|
|
|
a09da9d2f2
|
Web: Login: fix test
|
2022-02-10 17:17:13 +03:00 |
|
|
|
fcf8045794
|
Web:Studio: Added Consumer and props sectionWidth to the Customization component.
|
2022-02-10 17:08:29 +03:00 |
|
|
|
5022501e58
|
Merge branch 'feature/backend-refactor' into feature/asc-api-core-refactor
# Conflicts:
# common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
# common/ASC.Api.Core/Auth/CookieAuthHandler.cs
# common/ASC.Api.Core/Core/ApiContext.cs
# common/ASC.Api.Core/Core/ApiDateTime.cs
# common/ASC.Api.Core/Core/BaseStartup.cs
# common/ASC.Api.Core/Core/CustomHealthCheck.cs
# common/ASC.Api.Core/Middleware/ProductSecurityFilter.cs
# common/ASC.Api.Core/Middleware/TenantStatusFilter.cs
# common/ASC.Api.Core/Model/EmployeeWraperFull.cs
# common/ASC.Api.Core/Routing/FormatRoute.cs
|
2022-02-10 13:56:54 +03:00 |
|
|
|
6ee61695be
|
Web: files: added start restore.
|
2022-02-10 13:16:46 +03:00 |
|
|
|
320a1f2250
|
Merge branch 'develop' into feature/backend-refactor
# Conflicts:
# common/ASC.Api.Core/Core/BaseStartup.cs
# common/ASC.Common/Caching/AscCache.cs
# common/ASC.Common/Data/StreamExtension.cs
# common/ASC.Common/Utils/RandomString.cs
# common/ASC.Core.Common/Billing/CouponManager.cs
# common/ASC.Core.Common/Billing/License/LicenseReader.cs
# common/ASC.Core.Common/Core/UserGroupRef.cs
# common/ASC.Core.Common/Data/DbTenantService.cs
# common/ASC.Core.Common/Notify/Jabber/JabberServiceClientWcf.cs
# common/ASC.Core.Common/Notify/Telegram/Dao/CachedTelegramDao.cs
# common/ASC.Data.Backup.Core/Core/DbHelper.cs
# common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
# common/ASC.Data.Backup.Core/Tasks/Data/TableInfo.cs
# common/ASC.Data.Storage/BaseStorage.cs
# common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
# common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
# common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
# common/ASC.Data.Storage/S3/S3Storage.cs
# common/ASC.Notify.Textile/JabberStyler.cs
# common/ASC.Textile/Blocks/GlyphBlockModifier.cs
# common/ASC.Textile/States/TableRowFormatterState.cs
# common/services/ASC.ApiSystem/Classes/CommonMethods.cs
# common/services/ASC.ApiSystem/Controllers/PortalController.cs
# common/services/ASC.ClearEvents/Program.cs
# common/services/ASC.TelegramService/Startup.cs
# common/services/ASC.UrlShortener.Svc/Program.cs
# products/ASC.Files/Core/Core/Entries/File.cs
# products/ASC.Files/Core/Core/Entries/FileEntry.cs
# products/ASC.Files/Core/Core/Entries/FileHelper.cs
# products/ASC.Files/Core/Core/Entries/Folder.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
# products/ASC.Files/Core/Helpers/ThirdpartyConfiguration.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/Services/DocumentService/Configuration.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceConnector.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Server/Startup.cs
# products/ASC.Files/Service/Thumbnail/Builder.cs
# products/ASC.Files/Service/Thumbnail/FileDataProvider.cs
# products/ASC.People/Server/Startup.cs
# web/ASC.Web.Core/Files/DocumentService.cs
# web/ASC.Web.Core/Files/DocumentServiceLicense.cs
# web/ASC.Web.Core/QuotaSync.cs
# web/ASC.Web.Core/Sms/SmsKeyStorage.cs
# web/ASC.Web.Core/Users/UserManagerWrapper.cs
# web/ASC.Web.HealthChecks.UI/Program.cs
# web/ASC.Web.Studio/Startup.cs
|
2022-02-10 13:16:33 +03:00 |
|
|
|
e825bc4fe3
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-02-09 21:16:05 +03:00 |
|
|
|
f4391be6f7
|
Web:Studio:Added displaySettings prop for SaveCancelButtons.
|
2022-02-09 21:13:22 +03:00 |
|
|
|
8f52c452e8
|
Web:Studio:Added a new key "LanguageTimeSettingsTooltipDescription" for locales fr, de, it, pr-BR.
|
2022-02-09 21:09:15 +03:00 |
|
|
|
3429b83f3f
|
Web:Studio:Added a new key "LanguageTimeSettingsTooltipDescription" to the LanguageTimeSettingsTooltip component and for locales en, ru.
|
2022-02-09 20:41:44 +03:00 |
|
|
|
0069c6e7d4
|
Web: Files: RestoreBackup: Fixed timer.
|
2022-02-09 18:30:36 +03:00 |
|
|
|
ddd2e7182f
|
Web: Files: Backup: Added method to check if automatic backup is available, refactoring.
|
2022-02-09 18:16:07 +03:00 |
|
|
|
f8a748aae3
|
Web: files: Code simplification.
|
2022-02-09 17:25:40 +03:00 |
|
|
|
b3eb58971e
|
Web: Login: fix test
|
2022-02-09 15:57:19 +03:00 |
|
|
|
e8c2ce8294
|
Merge branch 'feature/backup' of github.com:ONLYOFFICE/AppServer into feature/backup
|
2022-02-09 15:29:14 +03:00 |
|
|
|
099387672a
|
Web: Client: add welcome translate
|
2022-02-09 15:23:15 +03:00 |
|
|
|
a7337f6580
|
Web: Files: ManualBackup: Optimization, refactoring.
|
2022-02-09 15:08:48 +03:00 |
|
|
|
142fa78509
|
Web: Client: delete useless
|
2022-02-09 14:52:09 +03:00 |
|
|
|
decb3e2408
|
Web: Client: get user info
|
2022-02-09 14:51:33 +03:00 |
|
|
|
eac90946e6
|
Merge branch 'feature/login-redesign' of github.com:ONLYOFFICE/AppServer into feature/login-redesign
|
2022-02-09 14:13:19 +03:00 |
|
|
|
d27a33f08f
|
People: added simple wrapper for getbyid method
fixed invite link
|
2022-02-09 14:05:21 +03:00 |
|
|
|
f8d4916d99
|
Web: Login: fix style
|
2022-02-09 13:36:50 +03:00 |
|
|
|
2d64c5950f
|
Web:Studio:Added translations of "DescriptionTimeLanguage" and "LanguageTimeSettingsTooltip" for locales de.
|
2022-02-09 12:57:17 +03:00 |
|
|
|
d429bcc731
|
Merge branch 'develop' into feature/backup
|
2022-02-09 12:40:16 +03:00 |
|
Timofey
|
b92763912c
|
Web:Studio:Settings: change consumers icon color for dark-theme
|
2022-02-09 17:24:35 +08:00 |
|
|
|
f9799f8d29
|
Web:Studio:Added translations of "DescriptionTimeLanguage" and "LanguageTimeSettingsTooltip" for locales fr.
|
2022-02-09 11:50:41 +03:00 |
|
|
|
59cd38c8f0
|
Web: Client: fix error position
|
2022-02-09 11:13:32 +03:00 |
|
|
|
85a8c7b75b
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-02-09 10:32:41 +03:00 |
|
|
|
99fae2f881
|
Web:Studio:Fix theme.
|
2022-02-09 10:32:29 +03:00 |
|
Timofey
|
c52628270c
|
Merge branch 'develop' into feature/virtual-rooms-1.2
|
2022-02-09 15:08:53 +08:00 |
|
|
|
f1eef443ff
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign
|
2022-02-08 23:00:28 +03:00 |
|
|
|
b1332d5895
|
Web: Login: fix translate namespace
|
2022-02-08 22:41:28 +03:00 |
|
|
|
cc81a680a3
|
Web: Client: fix translate namespace
|
2022-02-08 22:41:13 +03:00 |
|
|
|
817a155642
|
Web: move ShowMore to Common translate
|
2022-02-08 22:34:21 +03:00 |
|
|
|
0184f2b319
|
Web: Client: fix clear errors, add enter submit
|
2022-02-08 22:31:15 +03:00 |
|
|
|
7c201a4280
|
Web: Client: fix OAuth signup
|
2022-02-08 22:27:56 +03:00 |
|
|
|
e49deab37a
|
Web: Client: fix logic create user
|
2022-02-08 22:16:05 +03:00 |
|
|
|
52ade5183e
|
Web:Studio:Fix.
|
2022-02-08 19:34:58 +03:00 |
|
|
|
b866e5cccc
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-02-08 18:17:41 +03:00 |
|
|
|
783d5bd95e
|
Web: files: restoreBackup: Optimization.
|
2022-02-08 17:53:17 +03:00 |
|
|
|
3998ea06b0
|
Web:Studio:Added the LanguageAndTimeZone component to the Customization component.
|
2022-02-08 17:44:07 +03:00 |
|
|
|
16f3adcb64
|
Web:Studio:Added the "Automatic time zone" method to the LanguageAndTimeZone component. Added HelpButton for StudioTimeLanguageSettings header.Added an image for the HelpButton component.
|
2022-02-08 17:43:56 +03:00 |
|
|
|
51176cae7d
|
Web:Studio:Added common-tooltips file and LanguageTimeSettingsTooltip component. Added translations of "DescriptionTimeLanguage" and "LanguageTimeSettingsTooltip" for locales en, ru.
|
2022-02-08 17:43:32 +03:00 |
|
|
|
74d6b4bfd6
|
Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1
|
2022-02-08 16:06:34 +03:00 |
|
|
|
8d6818c6cd
|
Web: Client: fixed header-logo-wrapper styles
|
2022-02-08 16:06:25 +03:00 |
|
|
|
0a716b181e
|
Web: Client: fix styles
|
2022-02-08 13:36:50 +03:00 |
|
Timofey
|
cbb18e87d2
|
Web:Client: change logo in dark theme for about page
|
2022-02-08 18:31:55 +08:00 |
|
|
|
f879125045
|
Web: Client: added checkMaintenance when firebase helper not enable
|
2022-02-08 14:56:34 +05:00 |
|
Timofey
|
bdb587199b
|
Web:Studio: add support dark-theme for top arrow in profile menu
|
2022-02-08 17:52:22 +08:00 |
|
|
|
0dbf561def
|
Web: Files: AutoBackup: changed schedule styles.
|
2022-02-08 11:11:08 +03:00 |
|
|
|
0c73b7f366
|
Web: Files: AutoBackup: Changed styles.
|
2022-02-08 11:06:53 +03:00 |
|
|
|
7d4069a559
|
WEb: files: ManualBackup: Changed styles.
|
2022-02-08 10:52:00 +03:00 |
|
|
|
d2dfac2ed3
|
Web: RestoreBackup: Changed styles.
|
2022-02-08 10:32:20 +03:00 |
|
|
|
857f068afd
|
Web: Client: delete useless
|
2022-02-07 22:08:33 +03:00 |
|
|
|
bcae8bb718
|
Web: Client: fix submit/oAuth
|
2022-02-07 22:08:02 +03:00 |
|
|
|
8f0f529b1e
|
Web: Client: add new block for create user
|
2022-02-07 21:53:51 +03:00 |
|
|
|
213c8c5756
|
Web: Client: fix create user style
|
2022-02-07 21:07:45 +03:00 |
|
|
|
e39fa3edaf
|
Web: Login: expose more-login
|
2022-02-07 21:07:00 +03:00 |
|
|
|
f9c6cdf038
|
Web: Client: refactoring and redesign create user
|
2022-02-07 20:55:06 +03:00 |
|
|
|
b2079ccace
|
fixed warnings
|
2022-02-07 20:19:58 +03:00 |
|
|
|
9f5a1f3ba7
|
Merge branch 'develop' into feature/analizators
|
2022-02-07 19:28:23 +03:00 |
|
|
|
812241a69a
|
Analyzers: fix
|
2022-02-07 17:53:58 +03:00 |
|
|
|
87b0931f54
|
Web: Files: RestoreBackup: Refactoring.
|
2022-02-07 17:27:07 +03:00 |
|
Timofey
|
5b17663403
|
Web:Studio:Header: add theme support for catalog-burger in mobile view
|
2022-02-07 21:56:03 +08:00 |
|
|
|
33c0e49705
|
add new file (Home) (de, es, fr, it, zh-CN, ro), update ja UploadPanel
|
2022-02-07 16:44:59 +03:00 |
|
|
|
0f714ebd15
|
WEb: Files: RestoreBackup: Added logic for third party storage.
|
2022-02-07 16:37:05 +03:00 |
|
|
|
b47e1f0215
|
Web: files: Fixed upload method.
|
2022-02-07 13:22:19 +03:00 |
|
|
|
a3ffeadafe
|
Web: Files: Added upload method.
|
2022-02-07 13:02:35 +03:00 |
|
|
|
40d56075f1
|
Merge branch 'develop' into feature/backup
# Conflicts:
# common/ASC.Data.Backup.Core/EF/BackupsContext.cs
# common/ASC.Data.Backup.Core/Service/BackupWorker.cs
# common/services/ASC.Data.Backup/Controllers/BackupController.cs
# common/services/ASC.Data.Backup/Startup.cs
# packages/asc-web-common/components/PageLayout/sub-components/section-header.js
# products/ASC.Files/Client/public/locales/en/OperationsPanel.json
# products/ASC.Files/Client/public/locales/en/Settings.json
# products/ASC.Files/Client/public/locales/ru/Settings.json
# products/ASC.Files/Client/src/components/SimpleFileInput/StyledSimpleFileInput.js
# products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFolderInput/StyledSelectFolderInput.js
# products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js
# products/ASC.Files/Client/src/components/panels/StyledPanels.js
# products/ASC.Files/Client/webpack.config.js
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
# web/ASC.Web.Client/webpack.config.js
|
2022-02-07 12:40:50 +03:00 |
|
Timofey
|
6f80b60091
|
Merge branch 'feature/dark-theme' into feature/virtual-rooms-1.2
|
2022-02-07 16:31:56 +08:00 |
|
|
|
c0a83cefac
|
Merge branch 'develop' into feature/dark-theme
|
2022-02-07 11:09:41 +03:00 |
|
|
|
db0f49708a
|
Web: Login/Client: redirect to enter code page
|
2022-02-07 08:10:20 +03:00 |
|
|
|
ea65388497
|
Web: Login: disable input when enter code
|
2022-02-07 08:03:13 +03:00 |
|
|
|
73a0dc5588
|
Web: Login: add manually log in
|
2022-02-06 22:55:59 +03:00 |
|
|
|
246720c4fa
|
Web: Login: fix dialog style
|
2022-02-06 22:53:48 +03:00 |
|
|
|
6b89f94fbb
|
Web: files: ManualBackup: Refactoring.
|
2022-02-06 20:15:27 +03:00 |
|
|
|
80dafc0815
|
Web: files: RestoreBackup: Refactoring.
|
2022-02-06 19:42:40 +03:00 |
|
|
|
988248fbfb
|
Web: Files: AutoBackup: Refactoring modules.
|
2022-02-06 17:09:08 +03:00 |
|
|
|
f12949409c
|
Web: files: AutoBackup: fixed radio button.
|
2022-02-06 17:08:29 +03:00 |
|
|
|
2f0677a532
|
Web: files: AutoBackup: Refactoring.
|
2022-02-06 16:36:45 +03:00 |
|
|
|
b2e779d7d8
|
Merge branch 'feature/backend-refactor' into feature/asc-common-refactor
|
2022-02-04 23:27:29 +03:00 |
|
|
|
c67c5e80e2
|
Merge branch 'feature/backend-refactor' into feature/asc-audit-trail-refactor
|
2022-02-04 23:20:49 +03:00 |
|
|
|
a913fa4589
|
Merge branch 'feature/backend-refactor' into feature/asc-api-core-refactor
|
2022-02-04 23:16:18 +03:00 |
|
|
|
8a90ccc30b
|
Merge pull request #504 from ONLYOFFICE/feature/refactoring
Feature/refactoring
|
2022-02-04 22:42:16 +03:00 |
|
|
|
9395c23081
|
Merge branch 'develop' into feature/cluster-services-backup
|
2022-02-04 21:00:27 +03:00 |
|
|
|
e16d75839a
|
Merge branch 'develop' of github.com:ONLYOFFICE/CommunityServer-AspNetCore into develop
|
2022-02-04 21:00:05 +03:00 |
|
|
|
eed733b83c
|
fixed user photo thumbnail generator
|
2022-02-04 20:59:58 +03:00 |
|
|
|
f3b3b08af1
|
add support rabbitmq. split ASC.Data.Backup service on two services
|
2022-02-04 20:44:03 +03:00 |
|
|
|
acc102fa8d
|
Web: Login: delete useless
|
2022-02-04 18:34:17 +03:00 |
|
|
|
e8feb6af1c
|
Web: Login: delete useless
|
2022-02-04 18:33:09 +03:00 |
|
Vashchuk Nikita
|
5aa99ec811
|
Merge branch 'develop' into feature/async
# Conflicts:
# common/ASC.Common/Caching/KafkaCache.cs
# common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
# common/services/ASC.AuditTrail/AuditEventsRepository.cs
# common/services/ASC.AuditTrail/LoginEventsRepository.cs
# products/ASC.Files/Core/ASC.Files.Core.csproj
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
# products/ASC.Files/Core/Utils/MailMergeTask.cs
# products/ASC.Files/Server/ASC.Files.csproj
# products/ASC.Files/Service/Thumbnail/FileDataProvider.cs
|
2022-02-04 16:04:52 +03:00 |
|
|
|
6ca6233125
|
Web: Files: AutoBackup: Deleted unnecessary request.
|
2022-02-04 13:40:22 +03:00 |
|
|
|
914c4d18af
|
Web: files: AutoBackup: Moved reset module settings to separate function.
|
2022-02-04 13:38:15 +03:00 |
|
|
|
1fdb2b5d59
|
WEb: files: AutoBackup: Fix initial hour.
|
2022-02-04 13:32:02 +03:00 |
|
|
|
99ab37608d
|
Web: Files: Fixed incorrect saving of the day of the week, refactoring.
|
2022-02-04 12:50:16 +03:00 |
|
|
|
077e81227e
|
Web: files: AutoBackup: Refactoring, reset period settings moved to a separate function.
|
2022-02-04 11:55:13 +03:00 |
|
Timofey
|
48f9e4953c
|
Web:Client:Components: refactoring navigation-item icon component and change margin top and bottom for logo
|
2022-02-04 16:12:38 +08:00 |
|
|
|
3a16fdccfd
|
Merge branch 'hotfix/v1.1.1' into hotfix/campaigns-banner
|
2022-02-03 21:05:07 +03:00 |
|
|
|
731cbc649b
|
Merge pull request #500 from ONLYOFFICE/feature/socket-io
Feature/socket io
|
2022-02-03 20:58:18 +03:00 |
|
Timofey
|
bd8d8180f9
|
Web: fixed code format
|
2022-02-03 23:34:19 +08:00 |
|
|
|
0f76ba3613
|
Fixed Bug 55236 - Editor: File from third-party storage is can added to favorites.
|
2022-02-03 17:49:00 +03:00 |
|
|
|
973624c30b
|
Merge branch 'feature/refactoring' into feature/asc-common-refactor
|
2022-02-03 17:30:13 +03:00 |
|
|
|
bd674080fe
|
refactoring: healthChecks
|
2022-02-03 17:08:54 +03:00 |
|
|
|
25504f1d8b
|
refactoring: web.studio
|
2022-02-03 16:53:42 +03:00 |
|
|
|
3ad4ba6c08
|
fix after merge
|
2022-02-03 16:53:34 +03:00 |
|
|
|
e6665bb8c9
|
Merge branch 'feature/refactoring' into feature/asc-audit-trail-refactor
|
2022-02-03 16:46:17 +03:00 |
|
|
|
fd5839822d
|
Web: Client: fix recover access style
|
2022-02-03 16:29:41 +03:00 |
|
|
|
487a55a99e
|
ApiCore: used file-scope namespaces, fix conflicts
|
2022-02-03 16:19:48 +03:00 |
|
|
|
bd8d980f6c
|
Web: Files: Fixed manual backup.
|
2022-02-03 16:12:12 +03:00 |
|
|
|
a477947042
|
Web: Login: add error/warning bar
|
2022-02-03 16:08:22 +03:00 |
|
|
|
524fb32a0d
|
Merge branch 'feauter/refactoring' into feauter/asc-api-core-refactor
|
2022-02-03 16:08:15 +03:00 |
|
|
|
66dfe12d8d
|
Web: Login: add translate
|
2022-02-03 16:07:04 +03:00 |
|
Timofey
|
223c04a3c7
|
Merge branch 'feature/dark-theme' into feature/virtual-rooms-1.2
|
2022-02-03 20:59:26 +08:00 |
|
|
|
92ee0db2f3
|
Web: Files: Refactoring manual backup.
|
2022-02-03 15:21:12 +03:00 |
|
|
|
34dab043e0
|
Merge branch 'develop' into feature/analizators
# Conflicts:
# common/ASC.Core.Common/ASC.Core.Common.csproj
|
2022-02-03 12:55:33 +03:00 |
|
|
|
8819718933
|
Web: Client: show login page by flag
|
2022-02-03 01:39:16 +03:00 |
|
|
|
8e79b98864
|
Web: Login: add webpack expose
|
2022-02-03 01:37:43 +03:00 |
|
|
|
a0e1f31f5b
|
Web: Login: delete useless
|
2022-02-03 01:36:05 +03:00 |
|
|
|
2de4d2b96c
|
Web: Login: add new rooms login page
|
2022-02-03 01:18:24 +03:00 |
|
|
|
6e5a1572b4
|
Web: Login: fix show sso
|
2022-02-03 01:10:36 +03:00 |
|
|
|
14f02ea7f8
|
Web: Login: delete useless
|
2022-02-03 00:59:25 +03:00 |
|
|
|
bc7811b8eb
|
Web: Login: add submit func
|
2022-02-03 00:51:08 +03:00 |
|
|
|
4661ee96d0
|
Packages updated
|
2022-02-02 19:54:23 +03:00 |
|
|
|
d0bb0c18a6
|
Web: Files: Fixed editing of converted file.
|
2022-02-02 19:32:38 +03:00 |
|
|
|
6750931fe9
|
Web: Files: Added error handler for request edit rights function.
|
2022-02-02 18:29:00 +03:00 |
|
|
|
76eead7708
|
Web: Files: Fixed editing of shared form.
|
2022-02-02 18:16:52 +03:00 |
|
|
|
c718ce6cd6
|
Web: Login: add code input page
|
2022-02-02 16:14:19 +03:00 |
|
|
|
e3473c1bde
|
Web: Login: add translate
|
2022-02-02 16:13:57 +03:00 |
|
|
|
c25a57582e
|
Web: Login: fix style
|
2022-02-02 16:13:33 +03:00 |
|
|
|
f6620e34ae
|
Merge branch 'develop' into feature/refactoring
|
2022-02-02 13:09:25 +03:00 |
|
|
|
1049f78462
|
Web: Login: add workspace login page
|
2022-02-02 12:40:25 +03:00 |
|
|
|
c7e0b77883
|
Web: Login: add translations
|
2022-02-02 12:40:07 +03:00 |
|
|
|
5a71df17d3
|
refactoring: bugfix
|
2022-02-02 12:02:49 +03:00 |
|
|
|
94d51d88b5
|
Web: ASC.Web.Campaigns: added gatsby project
|
2022-02-01 20:03:37 +05:00 |
|
|
|
fbf0dcc6f5
|
Web: Login: fix get sso
|
2022-02-01 17:44:12 +03:00 |
|
|
|
01fdb34aaa
|
Web: ACS.Web.Campaigns: delete submodule
|
2022-02-01 19:18:23 +05:00 |
|
|
|
c8f1fc9f03
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign
|
2022-02-01 16:53:56 +03:00 |
|
|
|
a7e710726c
|
Web: Login: add sso in more login
|
2022-02-01 15:20:59 +03:00 |
|
|
|
f2c0f3ec77
|
Common: ICahcheNotify is reduced to IEventBus
|
2022-02-01 14:38:03 +03:00 |
|
|
|
fa175efb73
|
Web: Login: move styles
|
2022-02-01 13:36:08 +03:00 |
|
|
|
94b364efcb
|
Merge branch 'hotfix/v1.1.1' into hotfix/campaigns-banner
|
2022-02-01 13:33:27 +05:00 |
|
|
|
6102fce721
|
Web: ASC.Web.Campaigns:added project for creating banner templates
|
2022-02-01 13:30:32 +05:00 |
|
|
|
f6b374226f
|
Web: Client: added skip maintenance param, added onLoad func for bar config
|
2022-02-01 12:51:49 +05:00 |
|
|
|
a40e8bf755
|
Web: Client: deleted checkedMaintenance
|
2022-02-01 12:49:38 +05:00 |
|
Timofey
|
cf3d4c71e3
|
Merge branch 'devlop' into branch feature/catalog
|
2022-01-31 23:52:52 +08:00 |
|
|
|
55a9310744
|
refactoring: add globalusings: web.api
|
2022-01-31 18:13:08 +03:00 |
|
Vashchuk Nikita
|
2901d837a1
|
async methods for httpClient in ASC.Web
|
2022-01-31 17:35:36 +03:00 |
|
|
|
7ab885b2e2
|
refactoring: bugfix
|
2022-01-31 16:56:30 +03:00 |
|
|
|
47d43fbcfb
|
WebL Editor: Removed commented code
|
2022-01-31 15:16:31 +03:00 |
|
|
|
17cb4a647b
|
analizators: bugfix
|
2022-01-31 14:35:59 +03:00 |
|
|
|
34ff334692
|
Merge branch 'develop' into feature/analizators
|
2022-01-31 14:35:16 +03:00 |
|
|
|
615252c487
|
Web: add sso button
|
2022-01-31 12:33:39 +03:00 |
|
|
|
01831ad0b6
|
refactoring: add globalusings: web.studio
|
2022-01-31 11:33:18 +03:00 |
|
|
|
0f6ec5f532
|
refactoring: add globalusings: web.healthChecks.ui
|
2022-01-31 11:31:43 +03:00 |
|
|
|
cefa25a391
|
refactoring: add globalusings: web.core
|
2022-01-31 11:30:08 +03:00 |
|
Timofey
|
21cd73a698
|
Web: restore code format
|
2022-01-28 21:44:58 +08:00 |
|
Timofey
|
95da73cda6
|
Web:Editor: app theme-support for loader background-color
|
2022-01-28 20:49:37 +08:00 |
|
Timofey
|
98e4233a2d
|
Web:Studio:Settings: add support dark-theme for link in tooltip
|
2022-01-28 19:31:56 +08:00 |
|
|
|
5db134933b
|
Web: Files: Fixed error when clicked on "change access rights" twice.
|
2022-01-28 13:01:08 +03:00 |
|
|
|
663c7aef90
|
Web: Login: fix or label
|
2022-01-28 03:12:24 +03:00 |
|
|
|
24261c843a
|
Web: Files: fix buttons width
|
2022-01-28 02:40:47 +03:00 |
|
|
|
03512706f0
|
Web: Login: fix show social buttons
|
2022-01-28 02:27:02 +03:00 |
|
|
|
429266b5e5
|
Web: Login: add social auth
|
2022-01-28 02:13:49 +03:00 |
|
|
|
53179bb9e3
|
Web: Login> fix body style
|
2022-01-28 02:06:54 +03:00 |
|
|
|
c03ea33c4d
|
Web: Login: fix styles
|
2022-01-27 19:33:55 +03:00 |
|
Timofey
|
15dd9b0642
|
Merge branch 'develop' into feature/dark-theme
|
2022-01-27 22:21:06 +08:00 |
|
Timofey
|
18ed20569d
|
Web:Editor: wrap editor in theme provider and delete theme as props in components
|
2022-01-27 21:54:58 +08:00 |
|
|
|
dbafbc738c
|
Web: Client: fixed the navbar positioning
|
2022-01-27 17:45:01 +05:00 |
|
|
|
1908af64f0
|
cache: return support kafka. refactoring
|
2022-01-27 15:20:51 +03:00 |
|
|
|
5f843a1d5d
|
Web: Client: added checked and exist params for maintenance banner
|
2022-01-27 17:19:03 +05:00 |
|
|
|
988e822a80
|
Web: Client: changed positioning when there is a banner on the page
|
2022-01-27 17:16:47 +05:00 |
|
|
|
9ce1930f9a
|
Web: Login: add more login panel
|
2022-01-26 21:06:57 +03:00 |
|
|
|
79cd500028
|
Web: Login: fix greeting title style
|
2022-01-26 19:22:33 +03:00 |
|
|
|
3447ec4834
|
Web: Login: redesign login page
|
2022-01-26 19:13:26 +03:00 |
|
|
|
cbb58fdf09
|
Web: Login: fix width modal aside
|
2022-01-26 19:12:44 +03:00 |
|
|
|
4177cd35ec
|
Web: Login: add translations
|
2022-01-26 19:11:54 +03:00 |
|
|
|
5169d60783
|
Web: Client: added checkedMaintenance
|
2022-01-25 20:10:54 +05:00 |
|
Timofey
|
31a8b00313
|
Merge branch 'develop' into feature/catalog
|
2022-01-25 17:35:06 +08:00 |
|
Vashchuk Nikita
|
3e03f820bb
|
async IDataStore
|
2022-01-25 12:29:11 +03:00 |
|
Timofey
|
f955bea115
|
Web:Client:Components: fixed product name color for dark and base theme
|
2022-01-25 16:32:35 +08:00 |
|
Timofey
|
f98812e233
|
Merge branch 'develop' into feature/dark-theme
|
2022-01-25 15:04:38 +08:00 |
|
|
|
445f03097d
|
Fix content-type header
|
2022-01-24 22:44:18 +03:00 |
|
|
|
eb75b0b32a
|
Web: Files: Added opportunity to react on modify-folder with socket
|
2022-01-24 20:43:24 +03:00 |
|
Timofey
|
ff370ebe1d
|
Web:Editor: add support dark-theme
|
2022-01-24 22:32:05 +08:00 |
|
|
|
1f61f4bd4c
|
Web: Client: created checkBar function
|
2022-01-24 18:49:23 +05:00 |
|
|
|
b25f339c3e
|
Merge branch 'hotfix/v1.1.1' into feature/socket-io
|
2022-01-24 15:43:04 +03:00 |
|
|
|
fce8d26cef
|
analizators/ca1507
|
2022-01-24 13:49:00 +03:00 |
|
|
|
fb3a61d0d2
|
analizators/s3442
|
2022-01-24 12:57:01 +03:00 |
|
|
|
a66964e0b8
|
Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/campaigns-banner
|
2022-01-21 18:46:20 +03:00 |
|
|
|
f7689fefe6
|
Web: add campaigns folder
|
2022-01-21 18:32:33 +03:00 |
|
Timofey
|
f2eb9be2fc
|
Web:Studio:About: inject theme in about content
|
2022-01-21 23:14:20 +08:00 |
|
|
|
667697f933
|
analizators/s2259
|
2022-01-21 16:46:30 +03:00 |
|
|
|
510bd4d731
|
analizators/s2219
|
2022-01-21 16:42:02 +03:00 |
|
|
|
f3d8b8d17a
|
analizators/s1854
|
2022-01-21 16:36:36 +03:00 |
|
|
|
2f5a70e6ef
|
analizators/s1940
|
2022-01-21 16:27:09 +03:00 |
|
|
|
fb65d3a09d
|
analizators/1481
|
2022-01-21 16:15:15 +03:00 |
|
|
|
3d635a4824
|
analizators/1643
|
2022-01-21 16:12:05 +03:00 |
|
Timofey
|
f5ae02dfc9
|
Merge branch 'develop' into feature/catalog
|
2022-01-21 21:06:40 +08:00 |
|
|
|
893c4ddc5a
|
Wen: Editor: Added a new parameter to the conversion api method.
|
2022-01-21 15:07:32 +03:00 |
|
Timofey
|
47974e378f
|
Merge branch 'develop' into feature/dark-theme
|
2022-01-21 19:31:48 +08:00 |
|
|
|
2029c34f9c
|
analizators/s1121
|
2022-01-21 14:02:17 +03:00 |
|
|
|
cd12b41cc6
|
analizators/s1125
|
2022-01-21 14:01:52 +03:00 |
|
|
|
473259657e
|
analizators/s1118
|
2022-01-21 13:47:56 +03:00 |
|
|
|
32c398c044
|
Web: Tests: Added opportunity to sort translation files by Key with new Configurations -> SORT in VS
|
2022-01-21 12:53:29 +03:00 |
|
|
|
728c1b896e
|
analizators/s1104
|
2022-01-21 12:19:57 +03:00 |
|
|
|
bf3b0395a5
|
analizators/s1116
|
2022-01-21 11:04:08 +03:00 |
|
Timofey
|
e5f06b932d
|
Merge branch 'develop' into feature/dark-theme
|
2022-01-20 21:18:30 +08:00 |
|
|
|
5f78b37e25
|
analizators/U2U1000
|
2022-01-20 12:28:48 +03:00 |
|
|
|
eb9a33c660
|
analizators/s3218
|
2022-01-20 11:36:56 +03:00 |
|
|
|
3f28dfe78a
|
analizators/s3237
|
2022-01-20 11:36:42 +03:00 |
|
|
|
f2e33fa4aa
|
analizators/s2365
|
2022-01-19 18:16:59 +03:00 |
|
|
|
25050cb5fd
|
analizators/s2223
|
2022-01-19 17:16:15 +03:00 |
|
|
|
85f1660b39
|
analizators/U2U1203
|
2022-01-19 13:46:21 +03:00 |
|
|
|
20b60958a8
|
analizators/U2U1022
|
2022-01-19 13:24:11 +03:00 |
|
|
|
17a06e66f2
|
Web: Client: get banners every 12h
|
2022-01-19 13:23:29 +03:00 |
|
|
|
fbb50e676e
|
analizators/U2U1202
|
2022-01-19 12:51:30 +03:00 |
|
|
|
1403afbc16
|
analizators/U2U1209
|
2022-01-19 11:59:14 +03:00 |
|
Vashchuk Nikita
|
5b9668c14f
|
ILinkDao, fix
|
2022-01-18 19:50:31 +03:00 |
|
|
|
78047d3b93
|
analizators/U2U1210
|
2022-01-18 18:29:46 +03:00 |
|
|
|
f1f7a82b39
|
analizators/U2U1208
|
2022-01-18 17:00:48 +03:00 |
|
|
|
84638feaf0
|
analizators/U2U1202
|
2022-01-18 16:54:24 +03:00 |
|
|
|
36c26bc803
|
analizators/U2U1117
|
2022-01-18 15:40:28 +03:00 |
|
|
|
21f3c390bb
|
Web: Studio: fixed file name
|
2022-01-18 14:45:45 +03:00 |
|
