Commit Graph

178 Commits

Author SHA1 Message Date
5744f7e67c Web: Added team training alert. 2023-04-03 15:42:51 +03:00
c0eedf719c Web: Added AlertComponent. 2023-04-03 13:52:06 +03:00
c88c6da4b5 Web: PortalSettings: Payments: Added check for nonProfit. 2023-04-03 12:03:21 +03:00
1ef1998541 Web: PortalSettings: Payments: Changed translation. 2023-03-29 10:41:03 +03:00
Timofey Boyko
27428ea2d9 Web: remove async operation from useEffect hook 2023-03-24 17:17:52 +03:00
Viktor Fomin
a2cffa2501 Common: Article: fix logo size 2023-03-23 09:30:57 +03:00
Timofey Boyko
26aa156350 Web:Common:Article: fix styles for low size devices 2023-03-22 14:59:37 +03:00
Timofey Boyko
4560f58fc5 Web:Common:Article: fix styles 2023-03-20 12:57:44 +03:00
Timofey Boyko
acf1d9b6dd Web:Common:Article: fix styles for mobile only devices 2023-03-20 12:14:01 +03:00
Timofey Boyko
03f1ad32d0 Web:Common:Article: fix memory leak for mobile only devices 2023-03-20 11:29:36 +03:00
Timofey Boyko
214886b550 Web:Common:Article: fix height for tablet devices 2023-03-20 10:04:14 +03:00
1ebc887717 Web: Fix Payments translation issues (moved some keys to Common) 2023-03-14 15:00:19 +04:00
696b6504fc Web: Hid upgrade button in dialog for room admin. 2023-03-13 17:23:36 +03:00
122f9065dc Web: Added errors handler, getting link was moved to init function. 2023-03-10 18:25:24 +03:00
4e33c27532 Web: fix Safari selection 2023-02-09 14:28:01 +03:00
Timofey Boyko
baa30e0305 Web:Common/Client/Components: add PUBLIC_DIR alias 2023-01-27 17:08:30 +03:00
Akmal Isomadinov
c507ac87f3 Web:Article Refactoring 2023-01-26 18:46:47 +05:00
Akmal Isomadinov
a758d400cb Web: Fixed settings article 2023-01-26 18:03:03 +05:00
Timofey Boyko
0300c5990d Web: delete useless ?url for png images 2023-01-24 18:29:33 +03:00
Timofey Boyko
98d652ed9a Merge branch 'release/rc-v1.2.0' into feature/static-versioned 2023-01-24 10:05:04 +03:00
Akmal Isomadinov
dd03fa21d8 Web:Common:Component:Article Fixed the disappearance of the menu content when pressing the "Back" button on the mobile device 2023-01-20 14:24:48 +05:00
7939bd693b Web: Files: added selection with Shift 2023-01-16 18:16:08 +03:00
Timofey Boyko
0cb238e5d3 Merge branch 'release/rc-v1.2.0' into feature/static-versioned 2023-01-16 10:36:22 +03:00
Viktor Fomin
59d7ed3242 Client: fix get logo theme 2023-01-13 18:46:19 +03:00
Timofey Boyko
6b8afcaa33 Web: add import svg with url 2023-01-11 18:08:01 +03:00
Timofey Boyko
dbb4d7aca0 Web: move all images from client to public 2023-01-11 12:56:54 +03:00
Timofey Boyko
c9ed3a42ef Web: delete useless images 2023-01-11 12:32:15 +03:00
Timofey Boyko
96d3458e2d Merge branch 'release/rc-v1.2.0' into feature/static-versioned 2023-01-09 11:03:08 +03:00
8c300ade62 Web: Article: Changed translation. 2022-12-29 10:37:02 +03:00
Timofey Boyko
774065c165 Web: fix default logo import 2022-12-27 17:04:56 +03:00
Timofey Boyko
08fb97d7fd Web:Common:Article: remove fetch default avatar 2022-12-26 18:31:26 +03:00
e8141c6f22 Web: Changed load Docspace config for clients 2022-12-20 19:51:49 +03:00
426a11d080 Merge branch 'develop' into release/rc-v1.2.0 2022-12-12 19:33:41 +03:00
Timofey Boyko
8abbb0f250 Web:Common:Article: fix show text button color 2022-12-08 16:24:34 +03:00
Viktor Fomin
15ff7aa19d Merge branch 'develop' into feature/fix-whitelable 2022-12-06 16:50:55 +03:00
8e0bc0a732 Merge branch 'develop' into release/rc-v1.2.0 2022-12-02 19:56:43 +03:00
Viktor Fomin
f703d1b47e Common: Article: open profile by click username 2022-12-02 17:22:29 +03:00
Viktor Fomin
f6d5d22987 Common: Article: add background 2022-12-02 17:20:08 +03:00
Elyor Djalilov
7e06c67e00 Merge branch 'develop' into feature/new-docspace-translations
# Conflicts:
#	packages/client/src/pages/Home/InfoPanel/Header/index.js
2022-11-30 23:07:13 +05:00
Viktor Fomin
366d92abb2 Merge branch 'develop' into feature/fix-whitelable 2022-11-28 12:09:11 +03:00
Elyor Djalilov
b8348af578 Merge branch 'develop' into feature/new-docspace-translations
# Conflicts:
#	packages/client/public/locales/en/DeleteDialog.json
#	packages/client/public/locales/en/Files.json
#	packages/client/public/locales/en/InfoPanel.json
#	packages/client/public/locales/en/InviteDialog.json
#	packages/client/public/locales/en/Payments.json
#	packages/client/public/locales/en/Profile.json
#	packages/client/public/locales/en/Settings.json
#	packages/client/public/locales/en/Translations.json
#	packages/client/public/locales/ru/Files.json
#	packages/client/public/locales/ru/InfoPanel.json
#	packages/client/public/locales/ru/Payments.json
#	packages/client/src/components/GlobalEvents/RenameEvent.js
#	packages/client/src/pages/Home/Section/Filter/index.js
2022-11-25 16:27:23 +05:00
f929e42dcb Merge branch 'develop' into bugfix/fix-article-iphone 2022-11-25 14:04:37 +03:00
Viktor Fomin
e48ffdd62f Common: Article: delete console 2022-11-24 12:16:23 +05:00
Viktor Fomin
f52ec4e467 Common: Article: fix 2022-11-24 05:39:13 +05:00
Viktor Fomin
1fb1228dbd Merge branch 'develop' into feature/fix-whitelable 2022-11-24 02:33:13 +05:00
d3d91ba54e Merge branch 'develop' into feature/custom-theme 2022-11-23 19:57:15 +03:00
Viktor Fomin
fd181baae3 Merge branch 'develop' into feature/fix-whitelable 2022-11-23 15:01:42 +05:00
Viktor Fomin
5c997947f8 Common: Article: fix close 2022-11-23 14:45:22 +05:00
Viktor Fomin
004aceda28 Common: Article: fix logo 2022-11-23 06:19:01 +05:00
TimofeyBoyko
91835c2b95 Web:Common:Article: add render with portal for mobile devices 2022-11-22 12:16:53 +03:00
Viktor Fomin
50c55f0e29 Common: fix logo 2022-11-22 13:06:07 +05:00
999e892b7e Merge branch 'develop' into feature/custom-theme 2022-11-17 17:30:46 +03:00
2636ec0705 Web:Common:Fix accent color theme. 2022-11-14 15:51:53 +03:00
Akmal Isomadinov
f96d664904 Web:Common:Components:Article:Sub-Components: Updated id 2022-11-14 15:38:32 +05:00
Akmal Isomadinov
c6ac0e417c Web:Common:Components:Article:Sub-Components: Updated id 2022-11-14 15:19:03 +05:00
Akmal Isomadinov
94ea046a68 Web:Common:Components:Article:Sub-Components: Updated id 2022-11-14 15:15:51 +05:00
Akmal Isomadinov
d81ad1a7fe Web:Common:Components:Article:Sub-Components:Article-Payment-Alert: Update id 2022-11-14 13:04:18 +05:00
Akmal Isomadinov
e37776195a Web:Common:Components:Article:Sub-Components:Article-Hide-Menu-Button: Added identifiers to components 2022-11-14 13:04:18 +05:00
Akmal Isomadinov
bc942c568c Web:Common:Components:Article:Sub-Components:Article-Profile: Added id 2022-11-14 13:04:18 +05:00
Akmal Isomadinov
23faa6f5ee Web:Common:Components:Article:Sub-Components: Added id for test 2022-11-14 13:04:18 +05:00
Viktor Fomin
7bb4cc73b7 Common: Article: fix 2022-11-09 18:55:58 +05:00
Viktor Fomin
657ccbb7c8 Common: Article: add support color scheme 2022-11-07 16:58:53 +05:00
Viktor Fomin
1cb56a31fe Merge branch 'develop' into bugfix/smart-banner 2022-11-07 15:09:16 +05:00
d7abe3b9da
Merge pull request #963 from ONLYOFFICE/feature/whitelabel
Feature/whitelabel
2022-11-03 20:10:06 +03:00
Viktor Fomin
48c01a82fb Web: revert 2022-11-03 18:41:59 +05:00
6dd55c2643 Web: Common: fixed article height 2022-11-03 15:46:56 +03:00
Viktor Fomin
67d6ce5378 Common: Article: fix size 2022-11-03 17:40:16 +05:00
Viktor Fomin
e512015e70 Common: Article: fix img size 2022-11-03 16:44:54 +05:00
Viktor Fomin
28846ea77d Common: Article: fix position with smart banner 2022-11-02 17:13:23 +05:00
Viktor Fomin
20878155eb Common: Article: add theme for logo 2022-10-31 19:22:30 +05:00
Viktor Fomin
eded0a3a50 Merge branch 'develop' into feature/whitelabel 2022-10-28 16:05:38 +05:00
TimofeyBoyko
3baf50db59 Web:Common:Article: add theme support for vertical line 2022-10-28 12:54:06 +05:00
TimofeyBoyko
5bcbbb9b90 Web:Common:Article: add vertical line and fix styles 2022-10-28 12:42:43 +05:00
Viktor Fomin
1a25afd518 Common: Article: fix 2022-10-27 23:50:23 +05:00
073aa9943f Fix WrongTranslationVariablesTest issues + added missing files and key sorting 2022-10-25 14:52:15 +03:00
Viktor Fomin
9033164e4a Common: Article: fix style 2022-10-25 14:30:44 +05:00
Viktor Fomin
3a61992044 Common: Article: use logos from whitelabel 2022-10-25 14:27:30 +05:00
TimofeyBoyko
7a1ddd3c20 Merge branch 'develop' into feature/portal-access-rights 2022-10-11 14:04:42 +05:00
ba6b92c7c2 Web: Added the ability to see alert in the article for administrators only. 2022-10-06 14:26:36 +03:00
TimofeyBoyko
5cfc7cf8d0 Merge branch 'develop' into feature/portal-access-rights 2022-10-06 13:41:14 +03:00
c3c64d847c Web: removed useless translations. 2022-10-05 11:55:15 +03:00
ca1cd06fad Merge branch 'develop' into feature/stripe
# Conflicts:
#	packages/client/public/images/plus.react.svg
#	packages/client/src/pages/PortalSettings/categories/common/branding.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/auto-backup/index.js
#	packages/client/src/pages/PortalSettings/index.js
#	packages/common/components/PrivateRoute/index.js
2022-10-04 17:13:46 +03:00
TimofeyBoyko
019745b090 Web:Common:Article: open profile on avatar click 2022-10-04 07:31:06 +03:00
TimofeyBoyko
ae584739e8 Merge branch 'develop' into feature/portal-access-rights 2022-10-04 06:58:16 +03:00
955a9379de Web: Ipad: fixed Safari styles 2022-09-29 17:29:09 +03:00
58def6cbb2 Web: Common: HideArticleMenuButton: fixed z-index 2022-09-26 16:11:22 +03:00
d59bd852d2 Web: Common: fixed HideArticleMenuButton styles for table view 2022-09-26 14:57:27 +03:00
1f5384dc0c Web: Common: added hide menu translation 2022-09-26 12:37:21 +03:00
db047d72a9 Web: Common: removed log 2022-09-26 11:24:28 +03:00
0c8703a58c Web: Common: added show/hide article button 2022-09-26 11:22:46 +03:00
46370b588c Web: Fixed bugs. 2022-09-26 11:19:10 +03:00
7f1d946269 Merge branch 'develop' into feature/stripe
# Conflicts:
#	packages/client/src/Shell.jsx
#	packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
#	packages/client/src/pages/PortalSettings/categories/common/settingsCustomization/dns-settings.js
#	packages/client/src/pages/PortalSettings/index.js
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.People/Server/Api/UserController.cs
#	products/ASC.People/Server/GlobalUsings.cs
#	web/ASC.Web.Core/HttpHandlers/SsoHandler.cs
2022-09-23 16:11:23 +03:00
389298dfd6 Web: Client: added theme to logo 2022-09-23 13:32:43 +03:00
TimofeyBoyko
7a2e3fea01 Merge branch 'develop' into feature/portal-access-rights 2022-09-22 16:24:57 +03:00
723a5709a6 Web: Common: fixed logo loader 2022-09-21 16:24:57 +03:00
31458b11e5
Merge branch 'develop' into bugfix/fixed-settings-loaders 2022-09-21 12:32:57 +03:00
c61d11024c Web: Common: fixed burger loader 2022-09-20 11:26:14 +03:00
f36b38cbe5 Merge branch 'bugfix/fixed-settings-loaders' of github.com:ONLYOFFICE/AppServer into bugfix/fixed-settings-loaders 2022-09-20 10:59:41 +03:00
f607382b3a Web:Common:Delete isLoadedSetting, setIsLoadedArticleHeader. 2022-09-20 10:59:31 +03:00
6448b63318 Merge branch 'develop' into feature/stripe
# Conflicts:
#	common/ASC.Api.Core/Extensions/HostBuilderExtension.cs
#	common/services/ASC.Notify/Program.cs
#	common/services/ASC.Webhooks.Service/Program.cs
#	packages/common/constants/index.js
#	web/ASC.Web.Api/Program.cs
2022-09-19 18:16:34 +03:00