Commit Graph

8750 Commits

Author SHA1 Message Date
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
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
ac5c548fff Web: Fixed toastr for backup. 2022-04-04 19:03:58 +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
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
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
Timofey Boyko
81f4f60448 Web:Studio:NavMenu: add dark mode toggler 2022-04-04 13:30:49 +03:00
06e9e79f65 Web:Studio:Added Submenu. 2022-04-04 11:01: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
fc9b40b016 Web: Client: Tests: update screenshots 2022-04-01 18:58: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
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
fe6372962c Web: Client: Tests: fix tests 2022-03-31 22:46:25 +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