Commit Graph

30476 Commits

Author SHA1 Message Date
DmitrySychugov
e1e9577ff6 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2023-01-27 20:20:59 +05:00
DmitrySychugov
cdddb4e4ac Fix Bug 60879 - Web: Client: removed an extra check for an event when closing the viewer 2023-01-27 20:20:48 +05:00
Elyor Djalilov
289dbab023 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2023-01-27 19:54:48 +05:00
Elyor Djalilov
14c0d8ce09 Fix Bug - Accounts. Upload multiple image 2023-01-27 19:54:41 +05:00
0c3554fcd7 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2023-01-27 17:42:35 +03:00
e780a10311 Socket: delete folder 2023-01-27 17:42:21 +03:00
03753ccdc6
Merge pull request #1154 from ONLYOFFICE/bugfix/images-static-versioned
Bugfix/images static versioned
2023-01-27 17:42:16 +03:00
Timofey Boyko
7e1e9ad20b Web:Components: add alias PUBLIC_DIR for storybook 2023-01-27 17:10:22 +03:00
Timofey Boyko
baa30e0305 Web:Common/Client/Components: add PUBLIC_DIR alias 2023-01-27 17:08:30 +03:00
Timofey Boyko
064c7b593d Web:Editor: fix PUBLIC_DIR 2023-01-27 17:07:56 +03:00
Viktor Fomin
97238451b0 Client: FilesStore: fix for create folder 2023-01-27 16:59:29 +03:00
Timofey Boyko
d3e28341a7 Web:Login: add PUBLIC_DIR alias 2023-01-27 16:30:33 +03:00
Timofey Boyko
46fd0401c8 Web:Editor: add PUBLIC_DIR alias 2023-01-27 16:27:39 +03:00
Timofey Boyko
b1a260bdbb Merge branch 'bugfix/images-static-versioned' of https://github.com/ONLYOFFICE/DocSpace into bugfix/images-static-versioned 2023-01-27 16:01:16 +03:00
Timofey Boyko
ab7e49b93e Merge branch 'release/rc-v1.2.0' into bugfix/images-static-versioned 2023-01-27 16:01:11 +03:00
Timofey Boyko
0574f8d3d8 Web:Client: fix svg import 2023-01-27 15:59:55 +03:00
82bd6ed86b Merge branch 'release/rc-v1.2.0' into bugfix/images-static-versioned 2023-01-27 15:52:32 +03:00
Timofey Boyko
0ce27827a3 Web:Client:InfoPanel: fix svg import 2023-01-27 15:51:01 +03:00
1639173950 Bug 60878 2023-01-27 15:44:17 +03:00
676ecb379c Merge branch 'release/rc-v1.2.0' into bugfix/images-static-versioned 2023-01-27 15:37:59 +03:00
0ea6aefa8e
Merge pull request #1152 from ONLYOFFICE/bugfix/restoring-portal
Bugfix/restoring portal
2023-01-27 15:28:11 +03:00
1402137756 Merge branch 'bugfix/restoring-portal' of github.com:ONLYOFFICE/AppServer into bugfix/restoring-portal 2023-01-27 15:24:30 +03:00
31784ada66 Web: PortalSettings: Restore: Fixed options. 2023-01-27 15:23:55 +03:00
5343ad2c23 Merge branch 'release/rc-v1.2.0' into bugfix/restoring-portal 2023-01-27 15:01:35 +03:00
Elyor Djalilov
799fdd9679 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2023-01-27 15:56:14 +05:00
Elyor Djalilov
418bc2d3c3 Fix Bug 60695 - Settings: Common. The minimum length of the portal name cannot be less than 6 characters. 2023-01-27 15:56:07 +05:00
Timofey Boyko
cfe642a82f Web:Login:Server: disable cache-control 2023-01-27 13:53:34 +03:00
Timofey Boyko
046df1e16e Web:Editor:Server: disable cache-control 2023-01-27 13:53:13 +03:00
Viktor Fomin
2672c870d2 Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2023-01-27 13:05:58 +03:00
b85f012310 fix Bug 60861 2023-01-27 13:04:47 +03:00
7db5e5f353 Merge branch 'release/rc-v1.2.0' into bugfix/restoring-portal 2023-01-27 12:11:11 +03:00
0105f7fadc fix 2023-01-27 12:08:30 +03:00
Timofey Boyko
76bd31350f Merge branch 'release/rc-v1.2.0' into bugfix/images-static-versioned 2023-01-27 11:42:52 +03:00
Timofey Boyko
ee8c60ac60 Update images tests 2023-01-27 11:16:28 +03:00
Timofey Boyko
a355ab240e Web:fix wrong images import 2023-01-27 11:16:07 +03:00
451c076b55 Web: PreparationPortal: Added clear local storage, deleted useless code. 2023-01-27 10:58:30 +03:00
5d4081da4b Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2023-01-27 10:25:15 +03:00
783653850d Web: PortalSettings: Added toasts about the error if the urls for going to the Stripe are not available. 2023-01-27 10:20:41 +03:00
Timofey Boyko
ef5f72bc4e Add tests for wrong images import 2023-01-27 10:19:49 +03:00
ccfc9c62a6 Web: Deleted useless code. 2023-01-27 10:01:03 +03:00
14204efc52 Web: PortalSettings: Payments: Changed styles according to layouts. 2023-01-27 09:59:37 +03:00
Viktor Fomin
e4f7f3aa92 Client: Wizard: fix style 2023-01-26 21:39:38 +03:00
Viktor Fomin
b41d5f911e Components: Combobox: add withoutPadding 2023-01-26 21:39:27 +03:00
5fd084a1b6 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2023-01-26 20:45:08 +03:00
e2e73d7ced Files: autocleanup 2023-01-26 20:44:53 +03:00
761a8357dd Fix Bug 60788 - Rooms.Search. The background scrolls behind the List accounts panel on the touchpad in Chrome on MacOS. 2023-01-26 20:23:50 +03:00
Viktor Fomin
bad353a3f3 Client: Wizard: fix translate 2023-01-26 18:40:37 +03:00
Viktor Fomin
e9946006e6 Components: Themes: fix text input padding 2023-01-26 18:25:15 +03:00
4aa1e74f8b Fix Bug 60865 - Rooms. The room icon does not change when editing. 2023-01-26 18:24:34 +03:00
Timofey Boyko
c87c82a6ea Web:Editor: change 'client/' to '/docedtor/' to images 2023-01-26 18:12:08 +03:00