Commit Graph

24929 Commits

Author SHA1 Message Date
edd01a2d91 Web:Common:Add whiteLabelLogoUrls. 2022-09-14 17:25:31 +03:00
f4e6828cc8 Web:Client:Delete getWhiteLabelLogoText, getWhiteLabelLogoSizes. 2022-09-14 17:25:01 +03:00
447a9c12cc Web:Client:Add whiteLabelLogoSizes, whiteLabelLogoText, getWhiteLabelLogoText, getWhiteLabelLogoSizes, setLogoText, setLogoSizes. 2022-09-14 17:24:37 +03:00
193a415fa4 fix whitelabel/logos 2022-09-14 16:23:24 +03:00
651ab44fd0 remove DemandPermissions in httpGet methods in WhitelabelController 2022-09-14 15:43:46 +03:00
c7ca4f856c Web:Client:Add logoDocSpace from the backend. 2022-09-14 14:01:00 +03:00
f320b9c926 Web:Client:Change store in WhiteLabel. 2022-09-14 14:00:25 +03:00
ac4e9bfcaa Web:Client:Delete whiteLabel methods. 2022-09-14 13:59:58 +03:00
cdc9102dd8 Web:Common:Add whiteLabel methods. 2022-09-14 13:59:39 +03:00
9b15ddf9ac Web:Common:Add whiteLabel methods. 2022-09-14 13:59:17 +03:00
42131ad0c3 Web.Client:Fix import isEqual. 2022-09-14 13:28:03 +03:00
6fa12fc67a Web:Client:Fix hasСhangeDefault. 2022-09-14 13:24:29 +03:00
c4cf1a03ee Web:Client:Change link replaced by DocSpace. 2022-09-14 13:19:11 +03:00
1c31018d8d Web:Client:Change duplicate logo. 2022-09-14 13:17:27 +03:00
1cec4ef21f Web:Delete img. 2022-09-14 12:52:56 +03:00
768437a7cb Web:Client:Take out the necessary fields from the object for comparison. 2022-09-14 12:50:58 +03:00
229400b830 Web:Common:Removed the removal of extra fields from the object in the methods getAdditionalResources, getCompanyInfoSettings. 2022-09-14 12:48:09 +03:00
7decafcdc0 Merge branch 'develop' into feature/company-info-settings 2022-09-14 10:18:22 +03:00
355982e198
Merge pull request #813 from ONLYOFFICE/feature/additional-resources
Feature/additional resources
2022-09-13 20:22:46 +03:00
856e5b30d7 Images: Removed useless 2022-09-13 20:22:24 +03:00
140631c5de
Merge branch 'develop' into feature/additional-resources 2022-09-13 20:10:42 +03:00
44ffae469c
Merge pull request #818 from ONLYOFFICE/bugfix/fixed-main-button-preview-translation
Web: Client: fixed MainButton preview translation
2022-09-13 20:10:02 +03:00
a6fbec5e2f
Merge branch 'develop' into bugfix/fixed-main-button-preview-translation 2022-09-13 20:08:51 +03:00
09296e742d
Merge pull request #817 from ONLYOFFICE/bugfix/fixed-skeleton-loaders
Web: Files: fixed skeleton-loaders styles, fixed header styles, remov…
2022-09-13 20:08:27 +03:00
32c5c9907d Web: Files: fixed header-container styles 2022-09-13 18:19:23 +03:00
820cc5a9b8 Web: Common: fixed header styles 2022-09-13 18:09:40 +03:00
d5090bf92b Web: Client: fixed the closing of the article panel 2022-09-13 18:01:00 +03:00
a23ddbacbf Merge branch 'develop' into feature/additional-resources 2022-09-13 17:59:51 +03:00
6acca331b4 Merge branch 'develop' into feature/company-info-settings 2022-09-13 17:56:02 +03:00
45bcf68af3 Web: Common: fixed section-header styles 2022-09-13 17:53:45 +03:00
7433574b71 Web:Login:Add greetingSettings. 2022-09-13 17:51:31 +03:00
4bf6b4d2c8 Web: Files: fixed header styles for mobile 2022-09-13 17:38:59 +03:00
d02f70a4c2 Web: Client: fixed MainButton preview translation 2022-09-13 17:17:30 +03:00
084e3c02f0 Web:Client:Fix styles ComboBox in LanguageAndTimeZone. 2022-09-13 16:59:36 +03:00
d5d70947ca Web:Client:Add translation Actions, removed styles on button click. 2022-09-13 16:44:31 +03:00
a074d6bebe Web:Components:Fix for page crash when preview is clicked on ContextMenuButton when data for array is not passed. 2022-09-13 16:25:21 +03:00
fb64c8cda8 Web:Client:Delete props isLoading. 2022-09-13 14:11:14 +03:00
64233cb606 Web:Client:Add BreakpointWarning. 2022-09-13 14:10:51 +03:00
7325a7b1e1 Web:Client:Change styles BreakpointWarning, add styles tor tablet. 2022-09-13 14:09:41 +03:00
9614fcab32 Web:Client:Add "TheBrandingSettings" translation. 2022-09-13 14:08:32 +03:00
281ec9ec57 Web: Files: fixed skeleton-loaders styles, fixed header styles, removed useless code 2022-09-13 13:01:31 +03:00
Sergey Kirichenko
dd21a1b290
Add github action (#804)
* Modified Dockerfile.app

* Add github workflow

* Modify GIT_BRANCH

* Modify Dockerfile.app, change github repo

* Add prefix for name services

* Add login image build

* Change nginx config loclahost to 127.0.0.1

* Del static login files from proxy image

* Modify environmet for yml files

* Fix build hooks

* Add env STATUS for build hooks

* For testinig dockerhub build

* Fix

* Branch for action feature/github-action-build-docker

* Modify hooks

* Modify hooks, develop branch for action

* Add service-login to proxy

* Action test amd64

* Action test amd64

* Git  action  build only amd64

* Github action from develop
2022-09-13 10:54:45 +03:00
d94918a1de Merge branch 'develop' into feature/additional-resources 2022-09-13 10:52:26 +03:00
b3692a0711 Web:Client:Changed the availability of the RestoreToDefault button depending on whether the data is equal to the default. 2022-09-13 10:39:49 +03:00
0f063b7502 Web:Common:Removed unnecessary fields from the object, added a defaultAdditionalResources entry to localStorage. 2022-09-13 10:38:25 +03:00
8cd48f12f4 Web:Components:Change props disableRestoreToDefault in SaveCancelButtons 2022-09-13 10:37:26 +03:00
753816e62a Web:Client:Added the onChangeDefault function, which compares the entered value with the default one and changes the availability of the RestoreToDefault button. 2022-09-13 10:15:06 +03:00
0bf768efda Web:Common:Add defaultWelcomePageSettings in localStorage. 2022-09-13 10:13:10 +03:00
4bdfc23230 Web:Client:Fixed page crash on logout. 2022-09-12 21:25:51 +03:00
2438acf1e2 Web:Client:Changed the disable of the RestoreToDefault button. Added comparison of new data with default ones from localStorage. 2022-09-12 21:11:10 +03:00