Commit Graph

9101 Commits

Author SHA1 Message Date
b3e14265e3 edit ro (Settings) 2022-05-17 20:04:11 +03:00
f6098aea20 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
# Conflicts:
#	web/ASC.Web.Client/public/locales/ro/Settings.json
2022-05-17 19:57:22 +03:00
f1130c51d9 update ro 2022-05-17 19:54:47 +03:00
f466fd2fe4 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-17 18:17:17 +03:00
dad9016695 Web: Translations: Moved "NotFoundTitle" key from "studio" to "Common": (EnDublicatesByContentTest33ms issue fix) 2022-05-17 18:17:11 +03:00
2b804d5ef8 edit es, fr, zh-CN, ja, de, ru 2022-05-17 17:20:59 +03:00
2ed7b96dd9 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-17 16:43:15 +03:00
cc9d934b13 update de, edit en (Confirm) 2022-05-17 16:42:54 +03:00
43da9f3949 Update translation - fi 2022-05-17 15:35:03 +03:00
be3362dbc3 update ja, edit fr, es, zh-CN (Settings) 2022-05-17 12:56:56 +03:00
606f0bca2a update es (Home), add zh 2022-05-16 21:05:58 +03:00
6bfcf86461 update es 2022-05-16 18:48:11 +03:00
0d1a0785d5 Web.Campaigns: Add ONLYOFFICE Docs v7.1 banner. 2022-05-16 18:43:26 +03:00
07cf71b1b7 Web.Campaigns: Include gatsby-plugin-google-fonts. 2022-05-16 18:42:14 +03:00
3818790d1c update ru, fr 2022-05-16 18:01:38 +03:00
778f26c1fc Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-16 17:04:28 +03:00
4264a0da16 update fr 2022-05-16 17:04:04 +03:00
16019a283f Web: Client: Settings: Fixed base header menu component on admin`s settings page 2022-05-16 15:41:02 +03:00
fc74762e0a Web: Client: SelectionStore: Hide header menu if selection empty 2022-05-16 15:38:37 +03:00
4ad45de4b6 Web: Client: NavMenu: fix memory leak 2022-05-16 14:37:08 +03:00
5915c6e23e update es 2022-05-16 12:51:04 +03:00
a962d58b31 Web: Translation: Fix WrongTranslationVariablesTest issues 2022-05-13 19:44:05 +03:00
d12c6f89e4 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-13 19:33:23 +03:00
93a53092d6 Web: Translations: Fix UselessTranslationKeysTest issues 2022-05-13 19:33:16 +03:00
3bf09b4353 add new es-files 2022-05-13 18:22:32 +03:00
294a449d78 add new ru-keys, edit en 2022-05-13 17:30:51 +03:00
b3e1014a71 Web: Translations: Fix ParseJsonTest issues 2022-05-13 14:29:56 +03:00
ed270d5702 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-13 14:22:19 +03:00
6569c18ec4 Web: Settings: Fix translation of Common Settings Header 2022-05-13 14:22:13 +03:00
f76d024042 Web: Settings: Added placeholder 2022-05-13 11:51:56 +03:00
a956c25d16
Merge pull request #639 from ONLYOFFICE/feature/resx-add
Feature/resx add
2022-05-13 11:50:54 +03:00
298587ca46 Web: Settings: Added 'AutoSavePeriodHelp' key en translation (NotFoundKeysTest issue fix) 2022-05-13 11:41:10 +03:00
ea6bb25957 Web: Settings: Removed useless placeholder without translation (NotFoundKeysTest issue fix) 2022-05-13 11:32:44 +03:00
7fd2245587 Web: Translation: Fix NotFoundKeysTest issue -> "White label" 2022-05-13 10:51:16 +03:00
7262c4cbb8 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-12 19:00:51 +03:00
e9be6684ae Resources: fixed projects 2022-05-12 18:32:39 +03:00
mushka
d2cfff7729 finished with ProfileMenu fix 2022-05-12 17:48:07 +03:00
mushka
cc41fc36e2 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into bugfix/ReleaseBugfixes 2022-05-12 17:22:39 +03:00
300bcf2247 Core: Notify. Resource. 2022-05-12 15:52:37 +03:00
01783b3598 Core: Resources. 2022-05-12 15:44:31 +03:00
d7b53943c7 Core: resources. 2022-05-12 15:41:20 +03:00
0b5d7c9320 Core: Resources 2022-05-12 15:36:04 +03:00
c1aa4c9541 Web: resources 2022-05-12 15:33:41 +03:00
3b7309eb6b Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-12 15:12:16 +03:00
d75b1344a4 Web:Studio:Added loader for ArticleHeaderContent. 2022-05-12 15:04:01 +03:00
be926bd7a2 Api: Resources. 2022-05-12 14:25:01 +03:00
Timofey Boyko
f994bf3f27 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-12 11:46:42 +03:00
Timofey Boyko
a8ba24fa0a Web:Client:NavMenu: increase z-index for nav menu when profile actions in opening 2022-05-12 11:39:28 +03:00
Timofey Boyko
18f47d0d0e Web:Client:NavMenu: reduce z-index for nav element 2022-05-12 11:38:48 +03:00
Timofey Boyko
1e8af919ab Web:Client:NavMenu: add blur for profile menu on mobile devices 2022-05-12 10:57:11 +03:00
b2474c409d Web: Translations: Moved "Common" key from "Studio" to "Common" and removed useless "Documents" key (test issue fix) 2022-05-11 19:03:33 +03:00
781b0eb3e4 Web: Translations: Moved "Info" key from "studio" to "Common": (test issue fix) 2022-05-11 17:11:52 +03:00
4ae8a10f7f Web: Translations: Moved "AccessRights" key from "studio" to "Common": (test issue fix) 2022-05-11 16:51:37 +03:00
mushka
b23730ead8 fixed ProfileMenu and MainButton interaction 2022-05-11 12:26:20 +03:00
1d65ca7645 Files: thumbnails extension changed to jpg 2022-05-09 21:15:27 +03:00
e91bce51da Files: thumbnails. BitDepth changed to Bit8 2022-05-09 18:57:07 +03:00
5454eedc78 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-05 19:00:08 +03:00
45c58a029e Files: ThumbnailExtension set to jpg. SixLabors up to 1.0.0-beta0008 2022-05-05 18:43:40 +03:00
6d92b5d829 fixed Resource 2022-05-05 17:34:58 +03:00
e9ee6f1aad Web: Campaigns: Added "firebase:logout" command 2022-05-05 17:10:05 +03:00
Timofey Boyko
d0b8af9d6c Web:Client:DebugInfo: fix padding-right for aside view 2022-05-05 15:49:48 +03:00
Timofey Boyko
dd85148fd4 Web:Client:AboutDialog: fix padding-right for aside view 2022-05-05 15:47:04 +03:00
bdc5aefe34 Web: Client: Layout: fixed layout scroll, fixed IOS height 2022-05-05 14:06:22 +03:00
Timofey Boyko
39e859e5f5 Resolve conflicts after merge 2022-05-05 12:16:56 +03:00
Timofey Boyko
9a3918439f Web:Client: fix display debug info dialog 2022-05-05 12:12:57 +03:00
Timofey Boyko
e3a0556d9f Web:Client: fix display about dialog 2022-05-05 12:12:43 +03:00
d909dd5f5f Web: Client: Ipad: fixed container height after orientation change 2022-05-04 16:24:42 +03:00
3da11e96e1 Web:Studio:Added isTablet for styles HeaderContainer. 2022-04-29 19:23:22 +03:00
17282d4915 Web:Studio:Changed line-height for HeaderContainer for studio settings. 2022-04-29 17:44:55 +03:00
a27933b669 Web:Studio:Added props settingsStudio. 2022-04-29 17:43:12 +03:00
3f4a828771 Web:Studio:Added placeholder "EnterName". 2022-04-29 12:52:06 +03:00
26b84622cf Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-04-29 12:34:37 +03:00
7cadbeb99e Web:Studio:Rewrote whiteLabel to a functional component. 2022-04-29 12:33:52 +03:00
5b2f1e2636 Web:Studio:Added whiteLabel, setLogoText, setLogoSizes, setLogoUrls, getWhiteLabelLogoText, getWhiteLabelLogoSizes, getWhiteLabelLogoUrls to CommonStore. 2022-04-29 12:28:39 +03:00
5ad9e2c23b Web:Studio:Removed from SettingsSetupStore common, setLogoText, setLogoSizes, setLogoUrls, getWhiteLabelLogoText, getWhiteLabelLogoSizes, getWhiteLabelLogoUrls. 2022-04-29 12:26:11 +03:00
d554f0480f Web: Increased stype for Scrollbar (default is mediumBlack) 2022-04-28 16:01:28 +03:00
282ebd69a8 Web: Fix build without --env personal 2022-04-28 10:41:27 +03:00
d2733a2608 Web: Added IS_PERSONAL build parameter (yarn start:personal and yarn build:personal) for hiding useless login and confirm functional
+ removed module federated Login from personal
+ fix potential /login redirect from Editor.jsx
2022-04-27 19:53:25 +03:00
74e8a1fcfd Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-04-26 21:13:58 +03:00
bb7201ef74 Web:Studio:WhiteLabel refactoring. 2022-04-26 21:13:41 +03:00
Timofey Boyko
784ec51c7a Web:Client:Main: add event listener for resize page when orientation changed 2022-04-26 14:05:26 +03:00
Timofey Boyko
edbfd1e237 Web:Client:NavMenu: decrease z-index for header nav menu 2022-04-25 12:27:00 +03:00
Timofey Boyko
258f994a13 Web:Client:Components: delete useless code 2022-04-25 11:43:21 +03:00
c34dac5e60 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-04-22 21:21:07 +03:00
5cf373a7cf Web:Studio:Fix Welcome Page Settings, Portal Renaming. 2022-04-22 21:19:45 +03:00
379b8c0194 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-04-22 17:52:21 +03:00
753f1fe579 Web: Client: NavMenu: hide useless burger 2022-04-22 17:52:12 +03:00
9fcd01fc19 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-04-22 17:39:58 +03:00
db76c19478 Web:Studio:Added "Portal Renaming cancel button test", "Portal Renaming save button test", "Portal Renaming error PortalNameLength test", "Portal Renaming error PortalNameIncorrect test", "Portal Renaming mobile render test". 2022-04-22 17:38:47 +03:00
ba96f1fb16 Web: Client: NavMenu: fix menu display position 2022-04-22 17:10:53 +03:00
Timofey Boyko
0cc9a30483 Web:Common:Article: change height for IOS devices and add padding-bottom 2022-04-22 13:45:20 +03:00
f9fb0777d1 Bump version to v1.2.0 2022-04-21 19:15:08 +03:00
78944a490e Merge branch 'feature/virtual-rooms-1.2' into feature/interface-theme 2022-04-21 18:55:41 +03:00
fd9dc93fe6 Merge branch 'develop' into feature/virtual-rooms-1.2
# Conflicts:
#	config/kafka.json
2022-04-21 18:54:28 +03:00
0c141bba1a Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-21 18:08:42 +03:00
1f9fa82051 Web:Studio:Added validation for setting Portal Renaming. Added locales en "PortalNameEmpty", "PortalNameIncorrect", "PortalNameLength". 2022-04-21 18:07:26 +03:00
d6feda992b Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-21 17:33:16 +03:00
Timofey Boyko
8c12ec36d5 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-21 16:51:59 +03:00
Timofey Boyko
0428c3d6af Web:Client:Components: set correct height for main and article containers for IOS devices 2022-04-21 16:51:51 +03:00
3373a01d9e Web: Client: NavMenu: fix logo pos 2022-04-21 16:25:42 +03:00