Commit Graph

28354 Commits

Author SHA1 Message Date
649b541adb Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-11-29 13:53:43 +03:00
7cd4c7f737 Web: Removed menu item inside the room. 2022-11-29 13:52:57 +03:00
ad51993902 Web: Files: fixed setTreeFolders 2022-11-29 13:20:18 +03:00
49f4fa126b Merge branch 'develop' into release/rc-v1.2.0 2022-11-29 12:54:57 +03:00
39f708128b
Update 4testing-multi-build.yml 2022-11-29 12:54:17 +03:00
Sergey Kirichenko
a0dcdfdf20
Update 4testing-multi-build.yml
fix action
2022-11-29 12:43:58 +03:00
c3dfe6121a Merge branch 'develop' into release/rc-v1.2.0 2022-11-29 12:27:14 +03:00
a907c659dc Web: Client: InvitePanel: Added missing property for Item access selector 2022-11-29 12:23:24 +03:00
Sergey Kirichenko
4723682eb4
Update 4testing-multi-build.yml
Modify branch, teg for building
2022-11-29 12:05:21 +03:00
75e1a925a6
Merge pull request #1087 from ONLYOFFICE/sk81biz-patch-1
Update action
2022-11-29 11:29:58 +03:00
Akmal Isomadinov
9e4ccb56bc Web:Client:Store:ContextOptionsStore Fixed double separator in the file context menu 2022-11-29 13:29:00 +05:00
Sergey Kirichenko
8c350ead38
Update 4testing-multi-build.yml
changed branch building form develop to release/rc-v1.2.0
2022-11-29 11:26:38 +03:00
baf08554d6
Merge pull request #1083 from ONLYOFFICE/bugfix/157
Bugfix/157
2022-11-29 10:28:36 +03:00
d66777b221 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-11-29 10:04:27 +03:00
975378d072 Web: Removed jumps from the interface in an empty folder. 2022-11-29 10:04:20 +03:00
f1b4eae7eb Web: Components: AccessSelector: Fixed zIndex on mobile 2022-11-28 18:05:01 +03:00
431c7ca4f0 Web: Components: AccessSelector: Added property`s for Background component 2022-11-28 18:04:18 +03:00
1ba24cbe36 Web: Components: Aside: Fixed height for appended aside component 2022-11-28 18:02:05 +03:00
f52af1934a Web: Client: fixed duplicate id 2022-11-28 17:16:26 +03:00
788bd17c1a Web: Files: fixed CreateRoom translation 2022-11-28 15:44:15 +03:00
d886cc12f7 Web: Files: fixed null in url 2022-11-28 15:00:02 +03:00
6077a2288f Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-11-28 14:56:08 +03:00
8b2ebb2c09 Web: Added the ability to remove users from an archived room. 2022-11-28 14:56:01 +03:00
59cade3ff9 Web: Files: fixed click on pencil 2022-11-28 14:03:31 +03:00
6c7221cfcd
Merge pull request #1066 from ONLYOFFICE/bugfix/149
Bugfix/149
2022-11-28 10:04:32 +03:00
Timofey Boyko
3703d3f7aa Merge branch 'develop' into bugfix/149 2022-11-25 20:53:31 +03:00
e39f42288a AllowNotPayment for colortheme method 2022-11-25 20:41:47 +03:00
3ef3ffb617 fixed telegram resources 2022-11-25 20:37:48 +03:00
cc77986859 Files: folders renamed 2022-11-25 18:07:47 +03:00
49dd8f538e DocSpace: hide recent and favorites 2022-11-25 17:44:15 +03:00
78bbd45fdc DI: optimization 2022-11-25 17:00:49 +03:00
2cb8ff5536
Merge pull request #1067 from ONLYOFFICE/bugfix/153
bugfix/153: fixed bug with text
2022-11-25 16:19:52 +03:00
7fda8f1bf0 Merge branch 'develop' into bugfix/153 2022-11-25 16:18:23 +03:00
67b2cc7505
Merge pull request #1070 from ONLYOFFICE/bugfix/fix-article-iphone
Bugfix/fix scroll behind dialog
2022-11-25 15:41:11 +03:00
8826c473eb Merge branch 'develop' into bugfix/fix-article-iphone 2022-11-25 15:40:47 +03:00
0dce5ee718
Merge pull request #1082 from ONLYOFFICE/bugfix/156
Bugfix/156
2022-11-25 15:37:02 +03:00
78f406f4d3
Merge pull request #1084 from ONLYOFFICE/bugfix/payments-page-loading
Bugfix/payments page loading
2022-11-25 14:13:03 +03:00
f929e42dcb Merge branch 'develop' into bugfix/fix-article-iphone 2022-11-25 14:04:37 +03:00
ac236c8399 Web: Fixed checks. 2022-11-25 13:24:27 +03:00
95ff7c57e8 Web: Changed dependency array. 2022-11-25 13:08:34 +03:00
a8ebab9510 Web: Deleted useless code. 2022-11-25 12:37:19 +03:00
e02b4ec633 Web: Changed the check for getting a link to an account. 2022-11-25 12:33:48 +03:00
0999986a8c Web: Renamed function. 2022-11-25 12:32:43 +03:00
4469e4aa63 Web: Added waiting for receiving information on the tariff on the payment page. 2022-11-25 12:31:18 +03:00
14aae505bc
Merge pull request #1061 from ONLYOFFICE/bugfix/access-rights
Bugfix/access rights
2022-11-24 22:15:08 +03:00
a714937a2c Merge branch 'develop' into bugfix/access-rights 2022-11-24 22:14:26 +03:00
f8165f7640 Fixed Dockerfile.dev after merge 2022-11-24 21:36:13 +03:00
b77c6c9c03 Update Dockerfile.dev
Fix unknown "service_migration" variable
2022-11-24 21:35:00 +03:00
fa0146416b Update docspace.dev.yml
Restored variables for nginx upstream
2022-11-24 21:23:38 +03:00
23a7210fbc Merge branch 'develop' into bugfix/access-rights 2022-11-24 20:33:59 +03:00