|
1137946577
|
Web:Studio:Added functionality to the PortalRenaming component.
|
2022-04-05 23:04:50 +03:00 |
|
|
fa9b365211
|
Web:Studio:Added the PORTAL_RENAMING route.
|
2022-04-05 23:03:42 +03:00 |
|
|
7deb741978
|
Web:Studio:Added SuccessfullySavePortalNameMessage locales en.
|
2022-04-05 23:02:45 +03:00 |
|
|
4960c16805
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail
|
2022-04-05 18:05:12 +03:00 |
|
|
3b7c80b7b8
|
Web: Client: Settings: fix
|
2022-04-05 17:59:50 +03:00 |
|
|
b97ad7459a
|
Web: Client: Settings: fix btn size
|
2022-04-05 17:27:48 +03:00 |
|
|
c79f294bb3
|
Web: Client: Settings: fix
|
2022-04-05 17:21:04 +03:00 |
|
|
adeff36777
|
Web: Client: Settings: use session storage for tfa
|
2022-04-05 16:42:44 +03:00 |
|
|
6f28c9d187
|
Merge branch 'feature/password-strength' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail
|
2022-04-05 16:33:20 +03:00 |
|
|
e13661c109
|
Web: Client: Settings: use session storage
|
2022-04-05 16:32:41 +03:00 |
|
|
d98ba7574c
|
Web: Client: Settings: use session storage
|
2022-04-05 16:13:54 +03:00 |
|
|
ccbd8c88f5
|
Web: Client: Settings: use settings store
|
2022-04-05 15:35:59 +03:00 |
|
|
5725a87887
|
Web: Client: Settings: use data from store
|
2022-04-05 14:41:16 +03:00 |
|
|
47199aca82
|
Web: Client: Settings: fix dark theme
|
2022-04-05 13:29:02 +03:00 |
|
|
c7edba4cad
|
Web: Client: Settings: add redirect
|
2022-04-05 12:25:25 +03:00 |
|
|
9a1ba0a597
|
Web: Client: Settings: fix learn more
|
2022-04-05 11:59:28 +03:00 |
|
|
7645d0bb1c
|
Web: Client: Settings: delete useless after merge
|
2022-04-05 11:20:28 +03:00 |
|
|
331ab31e02
|
Merge branch 'feature/password-strength' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail
# Conflicts:
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-portal/passwordStrength.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-portal/tfa.js
|
2022-04-05 11:18:28 +03:00 |
|
|
5917b4dcb9
|
Web: Client: Settings: add learn more wrapper
|
2022-04-05 11:15:58 +03:00 |
|
|
f818a364aa
|
Web: Client: Settings: get settings from store
|
2022-04-05 11:10:07 +03:00 |
|
|
6fef466d23
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/password-strength
|
2022-04-04 22:12:05 +03:00 |
|
|
5b825dc6ac
|
Merge pull request #579 from ONLYOFFICE/feature/add-units
add new lines
|
2022-04-04 19:38:45 +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 |
|
|
9ce0f807c5
|
Web: Client: Settings: show loader
|
2022-04-04 19:31:43 +03:00 |
|
|
cb2d6653a8
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-04 19:30:42 +03:00 |
|
|
17787d55ad
|
Web: Fixed toast error for backup
|
2022-04-04 19:27:53 +03:00 |
|
|
d0d2abecea
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-04 19:27:44 +03:00 |
|
|
d7ec0e118c
|
Web:Studio:Add PortalRenaming.
|
2022-04-04 19:27:24 +03:00 |
|
|
f70f51df64
|
Web: Client: Settings: fix style
|
2022-04-04 19:14:27 +03:00 |
|
|
70d41327c9
|
Web: Client: Settings: fix style
|
2022-04-04 19:09:42 +03:00 |
|
|
ac5c548fff
|
Web: Fixed toastr for backup.
|
2022-04-04 19:03:58 +03:00 |
|
|
31011bdbc6
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/password-strength
# Conflicts:
# web/ASC.Web.Client/tests/action_tests.js
|
2022-04-04 17:12:54 +03:00 |
|
|
fd2f767063
|
Web: Client: fix mobile view size
|
2022-04-04 17:12:02 +03:00 |
|
|
f677b0e484
|
Web: Client: delete space
|
2022-04-04 17:11:44 +03:00 |
|
|
d866dfecfb
|
Web: Client: fix
|
2022-04-04 16:59:38 +03:00 |
|
|
1ff94b3d0c
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-04 15:53:01 +03:00 |
|
|
3016f43fab
|
Web:Studio:Added Welcome Page Settings mobile render test, Welcome Page Settings Restore to Default button test, Welcome Page Settings Save button test.
|
2022-04-04 15:52:41 +03:00 |
|
|
1252ccfc38
|
Web:Studio:Added id for TextInput and SaveCancelButtons.
|
2022-04-04 15:50:10 +03:00 |
|
|
fefad51e53
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-04 15:43:07 +03:00 |
|
|
4934edcfba
|
Web:Fixed backup styles after merge.
|
2022-04-04 15:40:45 +03:00 |
|
Timofey Boyko
|
d4b24c6ed7
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-04 15:34:52 +03:00 |
|
|
04907c4532
|
Web: Client: add missed paths
|
2022-04-04 15:11:09 +03:00 |
|
Timofey Boyko
|
6e2c8f0a13
|
Web:Studio:NavMenu: add avatar and change position of catalog-burger for mobile devices
|
2022-04-04 15:03:53 +03:00 |
|
|
e49cbbd0fe
|
Web: Client: Settings: fix logic
|
2022-04-04 14:45:13 +03:00 |
|
Timofey Boyko
|
9b46a23930
|
Web:Studio:NavMenu: fix styles of avatar for mobile devices
|
2022-04-04 14:37:36 +03:00 |
|
Timofey Boyko
|
fc09b493ed
|
Web:Studio:NavMenu: delete useless code from profile-actions
|
2022-04-04 14:36:45 +03:00 |
|
|
c5ccec3087
|
Web: Client: Settings: add logic
|
2022-04-04 14:28:15 +03:00 |
|
Timofey Boyko
|
81f4f60448
|
Web:Studio:NavMenu: add dark mode toggler
|
2022-04-04 13:30:49 +03:00 |
|
|
bd7ebe0238
|
Merge branch 'feature/password-strength' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail
|
2022-04-04 12:35:36 +03:00 |
|
|
f3e75773cb
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/password-strength
|
2022-04-04 11:36:38 +03:00 |
|
|
bdade9be9b
|
Web: Client: Settings: fix
|
2022-04-04 11:36:23 +03:00 |
|
|
e38441d5fc
|
Web: Client: Tests: add password strength change test error
|
2022-04-04 11:36:01 +03:00 |
|
|
b4533f6089
|
Web: Client: fix settings translates
|
2022-04-04 11:22:07 +03:00 |
|
|
06e9e79f65
|
Web:Studio:Added Submenu.
|
2022-04-04 11:01:30 +03:00 |
|
|
0c4bcb2399
|
Web: Client: Settings: move buttons to component
|
2022-04-03 22:18:53 +03:00 |
|
|
ea495d2b13
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail
|
2022-04-03 22:12:30 +03:00 |
|
|
638cb62520
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-03 19:07:56 +03:00 |
|
|
500d5be25c
|
Web:Studio:Opening access to the RestoreDefaultButton button after writing the first name. Adding the isFirstWelcomePageSettings key to localStorage.
|
2022-04-03 18:32:06 +03:00 |
|
|
4d53381840
|
Web:Studio:Fix incorrect display of "YouHaveUnsavedChanges" message. Added greetingTitleDefaultFromSessionStorage.
|
2022-04-03 12:18:22 +03:00 |
|
|
99aa35b528
|
Web: Client: Settings: fix layout
|
2022-04-02 22:40:22 +03:00 |
|
|
30f16c8ab0
|
Web: Client: add settings translates
|
2022-04-02 22:35:01 +03:00 |
|
|
327df7e3f1
|
Web: Client: Settings: add trusted mail
|
2022-04-02 22:23:20 +03:00 |
|
|
22493d1c3d
|
Web: Client: Settings: add user fields component
|
2022-04-02 22:19:58 +03:00 |
|
|
a62959aba1
|
Merge branch 'feature/password-strength' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail
|
2022-04-02 22:02:26 +03:00 |
|
|
b4f7c427f9
|
Web: Client: add settings translates
|
2022-04-02 21:10:58 +03:00 |
|
|
d44921093f
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/password-strength
|
2022-04-02 16:19:23 +03:00 |
|
|
b41682efaa
|
refactoring
|
2022-04-01 19:17:21 +03:00 |
|
|
fc9b40b016
|
Web: Client: Tests: update screenshots
|
2022-04-01 18:58:15 +03:00 |
|
|
410bdd615f
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/password-strength
|
2022-04-01 18:37:15 +03:00 |
|
|
fdfa1142c4
|
Merge branch 'feature/virtual-rooms-1.2' into feature/confirm-redesign
|
2022-04-01 18:18:35 +03:00 |
|
|
a3bdebfe90
|
Merge pull request #495 from ONLYOFFICE/hotfix/campaigns-banner
Hotfix/campaigns banner
|
2022-04-01 18:13:14 +03:00 |
|
|
c81d5e6743
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-01 18:01:00 +03:00 |
|
Timofey Boyko
|
cd2bb74012
|
Web:Studio:Shell: fix render banner when module changed
|
2022-04-01 17:56:08 +03:00 |
|
Timofey Boyko
|
f4bafb03a0
|
Web:Studio: fix scroll page over 100vh
|
2022-04-01 17:24:56 +03:00 |
|
|
1c9e479e08
|
Web: Client: Settings: detect layout by window width
|
2022-04-01 16:36:42 +03:00 |
|
|
fc0f04206a
|
Web: Client: Tests: add setting password strength change test
|
2022-04-01 16:20:24 +03:00 |
|
|
a81ae7852f
|
Web: Client: Settings: fix
|
2022-04-01 16:20:01 +03:00 |
|
|
18cce1c238
|
Web: Client: Settings: use toaster
|
2022-04-01 16:08:17 +03:00 |
|
|
e54d132858
|
Web: : Client: Settings: add logic
|
2022-04-01 16:05:35 +03:00 |
|
|
396c6984c0
|
Web: Client: Settings: add mobile category wrapper
|
2022-04-01 15:22:58 +03:00 |
|
|
d5c2cb87f4
|
Web: Client: Settings: add mobile view for password strength
|
2022-04-01 15:10:38 +03:00 |
|
|
7848f525bb
|
Web: Client: Settings: fix margin
|
2022-04-01 15:10:09 +03:00 |
|
|
9c4746587a
|
Web: Client: Settings: use ButtonsWrapper
|
2022-04-01 15:01:35 +03:00 |
|
|
f362605d56
|
Web: Client: add password strength setting
|
2022-04-01 15:01:09 +03:00 |
|
|
8a8cc4d1f3
|
Web: Client: add settings translates
|
2022-04-01 14:59:55 +03:00 |
|
|
28284cc66c
|
Web:Studio:Moved settings styles to StyledSettings.js
|
2022-04-01 13:37:42 +03:00 |
|
|
712d110235
|
Web: Client: Tests: add/fix tfa tests
|
2022-04-01 13:11:18 +03:00 |
|
Timofey Boyko
|
b105a92239
|
Web:Studio: delete useless code from layout component
|
2022-04-01 12:39:33 +03:00 |
|
|
22da2a8ffa
|
Web:Studio:CustomTitles replaced with WelcomePageSettings.
|
2022-04-01 11:29:58 +03:00 |
|
|
2370f7bad5
|
refactoring DistributedTask. replace return value from string to dynamic for indexer
|
2022-04-01 10:10:15 +03:00 |
|
|
fe6372962c
|
Web: Client: Tests: fix tests
|
2022-03-31 22:46:25 +03:00 |
|
|
49efbc9780
|
refactoring: remove IServiceProvider
|
2022-03-31 20:32:46 +03:00 |
|
|
d5459374b9
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/confirm-redesign
|
2022-03-31 19:05:05 +03:00 |
|
|
9929a88f9e
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-31 19:03:50 +03:00 |
|
|
c503c32333
|
Web:Studio:Styling Settings.
|
2022-03-31 18:24:55 +03:00 |
|
|
710df955dc
|
Web:Studio:Added upper case.
|
2022-03-31 18:24:03 +03:00 |
|
|
968e85b080
|
Web:Studio:Adding the CustomTitles Component.
|
2022-03-31 16:04:42 +03:00 |
|
|
52c0a7680e
|
Web:Studio:Fix tests.
|
2022-03-31 16:03:39 +03:00 |
|
|
90ac7fa268
|
Web: Client: Tests: fix TfaActivation render
|
2022-03-31 16:02:36 +03:00 |
|
|
90a3513630
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/confirm-redesign
|
2022-03-31 15:47:47 +03:00 |
|
|
b232abe163
|
Web: Client: Settings: fix
|
2022-03-31 14:30:34 +03:00 |
|
|
2e7c530c26
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-31 13:13:13 +03:00 |
|
|
87d5128b9b
|
Web: Client: Settings: add learn more block
|
2022-03-31 13:12:43 +03:00 |
|
|
b26f0e3423
|
Web: Client: add settings translates
|
2022-03-31 13:12:18 +03:00 |
|
|
e87aa1a80f
|
Web: Client: delete useless
|
2022-03-31 12:33:46 +03:00 |
|
|
83ba8fa153
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-31 12:18:55 +03:00 |
|
|
0128dd6d32
|
Web:Studio:Changing tests Customization change language, Customization change time zone, Customization cancel button test language, Customization cancel button test time zone.
|
2022-03-31 12:18:22 +03:00 |
|
|
af580ca041
|
Web: Client: Settings: show SMSC balance
|
2022-03-31 01:10:33 +03:00 |
|
|
a7b00a4286
|
Web: Client: add settings translates
|
2022-03-31 01:10:06 +03:00 |
|
|
227821700b
|
Web: Client: Settings: move access-rights
|
2022-03-31 00:54:01 +03:00 |
|
|
ec9a865a44
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-31 00:45:18 +03:00 |
|
|
c1f7a0f880
|
Web: Client: Settings: fix
|
2022-03-31 00:40:39 +03:00 |
|
|
ab8bc6e7dc
|
Web: Client: Settings: fix
|
2022-03-31 00:12:47 +03:00 |
|
|
26d96e3404
|
Web: Client: Settings: tfa refactoring, redesign
|
2022-03-31 00:08:30 +03:00 |
|
|
3af4bbc87a
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-30 23:10:52 +03:00 |
|
|
dd5e90e423
|
Web:Studio:Add Language and Time Zone Settings page mobile render test.
|
2022-03-30 23:09:58 +03:00 |
|
|
6500c666d0
|
Web: Client: Settings: fix title
|
2022-03-30 22:33:43 +03:00 |
|
|
8d3beb4215
|
Web: Client: Settings: add category wrapper
|
2022-03-30 22:23:58 +03:00 |
|
|
58662d60d0
|
Web: Client: Settings: open correct tab
|
2022-03-30 22:02:52 +03:00 |
|
|
eff126236a
|
Web: Client: add settings translates
|
2022-03-30 20:56:56 +03:00 |
|
|
dbfae6d641
|
Web: Client: Settings: refactoring portal access page, add mobile layout
|
2022-03-30 20:56:40 +03:00 |
|
|
2dcace061b
|
Web: Client: Settings: fix crash admins page
|
2022-03-30 20:16:39 +03:00 |
|
|
9d6a9f00cf
|
Web: Client: Settings: add new security layout
|
2022-03-30 19:58:46 +03:00 |
|
|
5368ac030d
|
Web: Client: AccessRights: fix style
|
2022-03-30 19:40:18 +03:00 |
|
|
bd122ed006
|
Web: Client: add settings translates
|
2022-03-30 19:39:34 +03:00 |
|
Timofey Boyko
|
3b2ead5568
|
Merge branch 'feature/virtual-rooms-1.2' into hotfix/campaigns-banner
|
2022-03-30 18:17:50 +03:00 |
|
|
9b2080db04
|
Web:Studio:Improved the Change language and Change time zone tests. Added tests Cancel button test language and Cancel button test time zone.
|
2022-03-30 16:25:29 +03:00 |
|
|
5a5b388e0f
|
Web: Client: fixed skip maintenance render
|
2022-03-30 17:40:40 +05:00 |
|
|
00e9176dbf
|
Web: Login: Added new test: Test fix wrong login
|
2022-03-30 15:04:17 +03:00 |
|
|
d6659bb206
|
Web: Login: fix login after correction input
|
2022-03-30 14:22:29 +03:00 |
|
Timofey Boyko
|
bf87c78046
|
Web:Studio: change position nav menu
|
2022-03-30 11:34:51 +03:00 |
|
|
d92451193d
|
Web: Client: Tests: update screenshots
|
2022-03-29 23:34:23 +03:00 |
|
|
90623263e9
|
merge from feature/backend-refactor
|
2022-03-29 23:29:03 +03:00 |
|
|
3558dde0a2
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-29 22:35:14 +03:00 |
|
|
f7e95db28f
|
Web:Studio:Added mock timezones data.
|
2022-03-29 22:33:30 +03:00 |
|
|
9fdddf09ea
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-29 22:02:30 +03:00 |
|
|
df13a06d39
|
Web: Client: Confirm: fix tablet layout
|
2022-03-29 21:59:51 +03:00 |
|
|
ab05212f59
|
Web:Studio:Added Change language and Change time zone tests.
|
2022-03-29 21:45:21 +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 |
|
|
baba222ac5
|
Notify: refactoring
|
2022-03-29 18:39:09 +03:00 |
|
|
03efcf7f00
|
Notify: remove serviceProvider
|
2022-03-29 13:53:05 +03:00 |
|
|
357bfc216f
|
Merge branch 'feature/virtual-rooms-1.2' of https://github.com/ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-29 11:52:43 +03:00 |
|
Timofey Boyko
|
a38283c33f
|
Web:Client: remove page scrolling for tablet devices and move it to section
|
2022-03-29 10:34:43 +03:00 |
|
|
0efe18f99f
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-28 22:26:23 +03:00 |
|
|
0bc5bc13f6
|
Web:Studio:Moved the checkScrollSettingsBlock function to a separate utils.js file.
|
2022-03-28 22:24:21 +03:00 |
|
|
fe65e040cb
|
Web:Studio:Refactoring of the Customization component. Added SettingsPageLayout, SettingsPageMobileView components.
|
2022-03-28 22:22:29 +03:00 |
|
|
1b6a7ab2ba
|
Web:Studio:Added SettingsPageLayout, SettingsPageMobileView components.
|
2022-03-28 22:18:16 +03:00 |
|
|
51039fa773
|
Web:Studio:Removed CustomizationNavbar component.
|
2022-03-28 22:16:36 +03:00 |
|
|
2112d4d02a
|
Web:Studio:Created a settingsCustomization folder. Moved the CustomTitles, LanguageAndTimeZone, PortalRenaming components there.
|
2022-03-28 22:15:41 +03:00 |
|
|
66c5d14883
|
Web:Studio:Added isMobileViewLanguageTimeSettings to LanguageAndTimeZone component. Added the checkScrollSettingsBlock function to the LanguageAndTimeZone component.
|
2022-03-28 22:14:34 +03:00 |
|
|
c0251f71f3
|
Web: Client: Home: fix tiles align
|
2022-03-28 18:21:17 +03:00 |
|
|
cbfbc4faae
|
Web: Login: fix warning
|
2022-03-28 18:09:08 +03:00 |
|
|
f55a6cb6b2
|
Merge branch 'feature/backend-refactor' into feature/remove-serviceprovider
# Conflicts:
# common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
# web/ASC.Web.Core/Users/UserPhotoManager.cs
# web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
|
2022-03-28 17:45:42 +03:00 |
|
|
d6aaabdd34
|
Web: Client: removed commented code
|
2022-03-28 17:39:59 +05:00 |
|
|
098f054737
|
Web: Client: Tests: update screenshots
|
2022-03-28 15:17:39 +03:00 |
|
|
8235533e10
|
Web: Client: Tests: delete useless
|
2022-03-28 15:16:37 +03:00 |
|
|
cbc143e072
|
Web: Client: Confirm: fix buttons position
|
2022-03-28 14:50:30 +03:00 |
|
|
e3a32cb4bf
|
Web: Client: Confirm: redesign ChangePhone page
|
2022-03-28 14:41:06 +03:00 |
|
|
89bf79e2d3
|
Web: Client: add translates
|
2022-03-28 14:40:32 +03:00 |
|
|
d0c2138f54
|
Web: Client: Confirm: fix class name
|
2022-03-28 14:38:58 +03:00 |
|
|
e7e0f5327a
|
Merge branch 'feature/backend-refactor' into feature/log-refactor
# Conflicts:
# common/ASC.Api.Core/GlobalUsings.cs
|
2022-03-28 14:29:36 +03:00 |
|
|
bd6753df91
|
Merge branch 'develop' into feature/virtual-rooms-1.2
|
2022-03-28 14:17:59 +03:00 |
|
|
1842c39fd8
|
Web: Client: Confirm: redesign ChangeOwner page
|
2022-03-28 14:15:33 +03:00 |
|
|
50a882a2b4
|
merge
|
2022-03-28 12:54:01 +03:00 |
|
|
e5229f12f5
|
Merge branch 'develop' into feature/backend-refactor
# Conflicts:
# common/ASC.Api.Core/Middleware/TenantStatusFilter.cs
# common/ASC.Common/Threading/DistributedTaskQueue.cs
# common/ASC.Data.Backup.Core/BackupAjaxHandler.cs
# common/ASC.Data.Backup.Core/BackupFileUploadHandler.cs
# common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
# common/ASC.Data.Backup.Core/EF/BackupsContext.cs
# common/ASC.Data.Backup.Core/Service/BackupWorker.cs
# common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs
# common/ASC.Data.Backup.Core/Tasks/Data/TableInfo.cs
# common/ASC.Data.Storage/Configuration/StorageSettings.cs
# common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
# products/ASC.Files/Core/Core/ResponseStream.cs
# products/ASC.Files/Core/Helpers/Global.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Service/Thumbnail/Builder.cs
# products/ASC.Files/Service/Thumbnail/Worker.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
|
2022-03-28 12:53:15 +03:00 |
|
|
fc68063599
|
Web: Client: fixed margin top in home page
|
2022-03-28 14:26:58 +05:00 |
|
|
9264302ec4
|
Thumbnail: async operations. Changed thumbnails format requested from editors to jpg. 1879 issue
|
2022-03-28 11:38:50 +03:00 |
|
|
7abe990d96
|
Merge branch 'feature/virtual-rooms-1.2' into hotfix/campaigns-banner
|
2022-03-28 12:36:11 +05:00 |
|
|
81f3a1fb09
|
DistributedTaskQueue refactoring. set MaxThreadsCount to 1
|
2022-03-26 16:31:13 +03:00 |
|
|
1eae6d41cd
|
Web: Client: Confirm: fix buttons size
|
2022-03-26 13:42:26 +03:00 |
|
|
a98b6c22d9
|
Web: Client: Confirm: redesign TfaAuth page
|
2022-03-26 13:40:32 +03:00 |
|
|
c0a41e5843
|
Web: Client: Confirm: redesign TfaActivation page
|
2022-03-26 13:33:23 +03:00 |
|
|
aeb3bd8812
|
Web: Client: Confirm: redesign ProfileRemove page
|
2022-03-26 11:53:03 +03:00 |
|
|
fe890702e8
|
Web: Client: Confirm: change password page fix
|
2022-03-26 11:37:50 +03:00 |
|
|
26d96145de
|
Web: Client: Confirm: redesign ChangePassword page
|
2022-03-26 00:17:56 +03:00 |
|
|
ded958daee
|
Web: Client: add password error message helper
|
2022-03-25 21:32:37 +03:00 |
|
|
ed282be5be
|
Web: Client: Confirm: redesign ActivateUser page
|
2022-03-25 21:20:20 +03:00 |
|
|
e4fb488e30
|
Web: Client: Confirm: fix getSettings
|
2022-03-25 21:19:43 +03:00 |
|
|
d00d8806ab
|
Web: Client: Confirm: add styles
|
2022-03-25 21:19:16 +03:00 |
|
|
067fb96060
|
DistributedTaskQueue: refactoring
|
2022-03-25 21:00:43 +03:00 |
|
|
abae61f2db
|
IDE1006
|
2022-03-25 19:26:06 +03:00 |
|
|
cd1d3058ff
|
DistributedTaskQueue refactoring
|
2022-03-25 19:15:28 +03:00 |
|
|
6fe2178e3e
|
Notify: refactoring
|
2022-03-25 17:51:03 +03:00 |
|
|
e94c4b5679
|
Storage: remove IServiceProvider
|
2022-03-25 12:23:28 +03:00 |
|
|
7cb19512bb
|
Web:Studio:Removed redundant content.
|
2022-03-25 11:07:33 +03:00 |
|
|
68b5a46647
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-25 10:47:48 +03:00 |
|
|
f5b7efe5d7
|
Web:Studio:Fix styles.
|
2022-03-25 10:39:27 +03:00 |
|
Timofey Boyko
|
fe3f9b59e8
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-25 10:11:00 +03:00 |
|
Timofey Boyko
|
bc68ffe870
|
Web:Studio: fixed selected options of group and people selector, fix bugs with display admin selector
|
2022-03-25 10:10:49 +03:00 |
|
|
72fdbe5295
|
Web:Studio:Fix functions checkInnerWidth and checkHeightSettingsBlock.
|
2022-03-25 00:56:05 +03:00 |
|
|
831f70f817
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-24 21:06:02 +03:00 |
|
|
1922da4ab9
|
merge
|
2022-03-24 20:56:51 +03:00 |
|
|
01e283d2cc
|
Web: Fix Wizard opening
|
2022-03-24 20:54:35 +03:00 |
|
|
ec215d8e93
|
Web:Studio:Refactoring the Customization component.
Added to state heightSettingsBlock, heightScrollBody. Refactoring the checkHeightSettingsBlock function.
|
2022-03-24 20:50:01 +03:00 |
|
|
c7712fd7dc
|
Merge branch 'feature/backend-refactor' into feature/warnings
|
2022-03-24 18:01:09 +03:00 |
|
|
b8380c1353
|
refactoring
|
2022-03-24 14:57:39 +03:00 |
|
|
9174a20871
|
Merge branch 'develop' into feature/virtual-rooms-1.2
# Conflicts:
# packages/asc-web-common/api/portal/index.js
# packages/asc-web-common/components/Loaders/index.js
# packages/asc-web-common/store/SettingsStore.js
# packages/asc-web-components/file-input/index.js
# packages/asc-web-components/modal-dialog/index.js
# packages/asc-web-components/save-cancel-buttons/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/FilesListRow.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js
# products/ASC.Files/Client/src/components/panels/StyledPanels.js
# products/ASC.Files/Client/src/store/ContextOptionsStore.js
# public/locales/de/Common.json
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
# web/ASC.Web.Client/src/Shell.jsx
# web/ASC.Web.Client/src/components/NavMenu/index.js
# web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
# web/ASC.Web.Client/src/components/pages/Settings/Layout/Article/Body/index.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-portal.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-rights.js
# web/ASC.Web.Client/webpack.config.js
# web/ASC.Web.Editor/src/Editor.jsx
|
2022-03-24 14:39:52 +03:00 |
|
|
2bd421994e
|
Web: Fixed import.
|
2022-03-24 13:26:20 +03:00 |
|
|
66ccce8eb5
|
Settings: refactoring
|
2022-03-24 12:35:00 +03:00 |
|
|
f464eb6e35
|
Merge branch 'feature/virtual-rooms-1.2' into hotfix/campaigns-banner
|
2022-03-24 12:08:58 +05:00 |
|
|
9d838b265d
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-23 22:12:59 +03:00 |
|
|
c00cbf667d
|
Web:Studio:Refactoring the LanguageAndTimeZone component.
|
2022-03-23 22:12:19 +03:00 |
|
|
c3af9b1998
|
Web:Studio:Refactoring the Customization component.
|
2022-03-23 22:11:15 +03:00 |
|
|
9660b325e9
|
Web:Components:Styling CustomizationNavbar.
|
2022-03-23 22:10:19 +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 |
|
|
63e12f49ab
|
merge from feature/backend-refactor
|
2022-03-23 14:56:18 +03:00 |
|
|
643bf726b3
|
Merge branch 'feature/virtual-rooms-1.2' into hotfix/campaigns-banner
|
2022-03-23 16:10:11 +05:00 |
|
|
cc5e397a9c
|
Web: Client: Tests: update screenshots
|
2022-03-23 12:21:28 +03:00 |
|
|
4840745843
|
Web: Client: Tests: add fake qr image
|
2022-03-23 11:54:01 +03:00 |
|
|
d8bfe32537
|
Web: Client: Confirm: fix inputWidth
|
2022-03-23 11:46:57 +03:00 |
|
|
c0fc2eafd0
|
Web: Client: Confirm: hide qr code on tablet/mobile
|
2022-03-23 11:43:25 +03:00 |
|
|
4eb25bcab5
|
Web: Client: Confirm: fix withLoader
|
2022-03-23 11:39:07 +03:00 |
|
|
07e3e7b1b2
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/confirm-test
|
2022-03-23 10:54:23 +03:00 |
|
|
e05b78bef4
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-22 21:18:27 +03:00 |
|
|
626988a987
|
Web:Studio:Scrollbar styling.
|
2022-03-22 21:17:30 +03:00 |
|
|
51b44186a8
|
Web: Client: About: fix personal logo color
|
2022-03-22 18:00:09 +03:00 |
|
|
202338d1f2
|
fix
|
2022-03-22 15:59:12 +03:00 |
|
|
244e345ac6
|
Merge 'feature/backend-refactor' into feature/builder-extensions
|
2022-03-22 15:57:46 +03:00 |
|
|
f4c75f91f4
|
refactor
|
2022-03-22 15:46:13 +03:00 |
|
|
4e78af53f9
|
refactoring DistributedTaskQueue
|
2022-03-22 15:10:05 +03:00 |
|
|
62afb4800a
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-22 13:46:03 +03:00 |
|
|
0b642fa5a1
|
Web:Studio:Added Scrollbar, LanguageTimeSettings styling.
|
2022-03-22 13:45:33 +03:00 |
|
|
e9928c9814
|
refactor
|
2022-03-22 13:31:41 +03:00 |
|
|
62fbab1185
|
Merge branch 'feature/backend-refactor' into feature/warnings
|
2022-03-22 13:20:43 +03:00 |
|
|
251f149eb6
|
Web: Revert withoutBodyScroll after merge.
|
2022-03-22 13:19:35 +03:00 |
|
|
2559bec9e9
|
Web: RestoreBackup: Fixed offsetLeft of help button component.
|
2022-03-22 12:57:17 +03:00 |
|
|
bbc0d20321
|
Web: Backup: Changed translation.
|
2022-03-22 12:40:57 +03:00 |
|
|
5b6251f5e7
|
WEb: Backup: Deleted useless code.
|
2022-03-22 12:37:51 +03:00 |
|
|
21a2e75ae6
|
Web: RestoreBackup: Added toastr when file wasn't selected and restore button was clicked.
|
2022-03-22 12:36:00 +03:00 |
|
|
fd4320d147
|
Web: RestoreBackup: Added user agreement on restore to the dialog.
|
2022-03-22 12:27:27 +03:00 |
|
|
d13ef622f8
|
Merge branch 'feature/virtual-rooms-1.2' into hotfix/campaigns-banner
|
2022-03-22 14:16:20 +05: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 |
|
|
a4deb55535
|
Web: AutoBackup: Added clarification on the time.
|
2022-03-21 17:32:46 +03:00 |
|
|
010697ec97
|
Merge pull request #592 from ONLYOFFICE/bugfix/refactoring-fix
Bugfix/refactoring fix
|
2022-03-21 17:54:54 +04:00 |
|
|
6e4761b8c2
|
Systemd package moved to shared ASC.Api.Core
|
2022-03-21 16:40:09 +03:00 |
|
|
d3d3d4d7ff
|
fix
|
2022-03-21 16:16:55 +03:00 |
|
|
a3f85f8e0b
|
Merge branch 'feature/backend-refactor' into feature/update-packages
|
2022-03-21 14:44:30 +03:00 |
|
|
eff37db49c
|
Web: Client: fixed maintenance timeout
|
2022-03-21 16:15:56 +05:00 |
|
|
6215091502
|
Web: Added red border when file is not selected and restore button clicked.
|
2022-03-21 13:53:59 +03:00 |
|
|
26272fc2a5
|
Web: Separated BackupTypes constant.
|
2022-03-21 12:06:10 +03:00 |
|
|
8a7641798b
|
Web: Backup: Added organization name from settings.
|
2022-03-21 11:15:51 +03:00 |
|
|
8aa98ef263
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-21 11:06:16 +03:00 |
|
|
33e6f6faaf
|
Web: Client: NavMenu: fix logo padding
|
2022-03-21 11:05:42 +03:00 |
|
|
f54b0d0f25
|
Web: files: Deleted useless code.
|
2022-03-21 10:45:55 +03:00 |
|
|
4e4bea4d02
|
Web: Components: Deleted useless classname.
|
2022-03-21 10:44:52 +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 |
|