TimofeyBoyko
|
93beb16763
|
Web:Common:ColorTheme: fix pin icon styles
|
2022-11-15 13:28:35 +03:00 |
|
|
|
7c0d97361d
|
Merge branch 'develop' into feature/Add-identifier-for-test
|
2022-11-15 10:38:41 +03:00 |
|
|
|
ec49254d56
|
Web:Common:Fix.
|
2022-11-14 17:06:27 +03:00 |
|
|
|
54ccbe0969
|
Web:Common:Fix toggleButton.
|
2022-11-14 17:02:20 +03:00 |
|
|
|
2b3d368a98
|
Web:Common:Fix theme.
|
2022-11-14 16:42:07 +03:00 |
|
|
|
78de751702
|
Web:Common:Fix buttons color theme.
|
2022-11-14 15:52:20 +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
|
6dcc9cb541
|
Web:Common:Components:Dialogs:RecoverAccessModalDialog: Updated id
|
2022-11-14 13:04:18 +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 |
|
Akmal Isomadinov
|
fe47936dfb
|
Web:Common:Components:Dialogs: Added ids to the RecoverAccessModalDialog components for the test
|
2022-11-14 13:04:17 +05:00 |
|
|
|
75ca934448
|
Merge branch 'develop' into feature/custom-theme
|
2022-11-11 22:22:40 +03:00 |
|
Viktor Fomin
|
60852375ca
|
Common: Loaders: ProfileViewLoader: fix
|
2022-11-10 19:53:32 +05:00 |
|
|
|
ddc067f3f0
|
Web:Common:Fix theme.
|
2022-11-10 17:29:55 +03:00 |
|
Viktor Fomin
|
68a4e8cb7c
|
Merge branch 'develop' into feature/new-profile-loader
|
2022-11-10 18:45:22 +05:00 |
|
Viktor Fomin
|
559d995b2c
|
Common: Loaders: ProfileViewLoader: add mobile view
|
2022-11-10 18:45:09 +05:00 |
|
Viktor Fomin
|
719d0a7a12
|
Common: Loaders: ProfileViewLoader: redesign
|
2022-11-10 18:17:09 +05:00 |
|
|
|
564ec4457f
|
Web:Common:Add textColor in toggle button.
|
2022-11-10 15:33:19 +03:00 |
|
|
|
7652fb1d59
|
Web:Common:Add textColor in MainButton.
|
2022-11-09 22:37:28 +03:00 |
|
|
|
72063d86f3
|
Web:Client:Add textColor in FilterBlockItemTag theme.
|
2022-11-09 21:49:12 +03:00 |
|
|
|
096ececd57
|
Web:Common:Add textColor in tabsContainer theme.
|
2022-11-09 21:32:36 +03:00 |
|
|
|
e88b26d3dc
|
Web:Common:Fix.
|
2022-11-09 21:06:44 +03:00 |
|
|
|
1858af3380
|
Web:Common:Add textColor in StyledCircle.
|
2022-11-09 20:33:45 +03:00 |
|
|
|
05ae4683f3
|
Web:Common:Fix displayProgress.
|
2022-11-09 20:33:07 +03:00 |
|
|
|
68b200b3d8
|
Web:Common:Add isPaidBadge.
|
2022-11-09 20:27:43 +03:00 |
|
|
|
dbb724a936
|
Web:Common:Add textColor in FloatingButton.
|
2022-11-09 17:29:38 +03:00 |
|
|
|
a062181894
|
Merge pull request #1003 from ONLYOFFICE/bugfix/portal-deletion
Bugfix/portal deletion
|
2022-11-09 17:18:14 +03:00 |
|
Viktor Fomin
|
1ea6cdd82b
|
Merge branch 'develop' into feature/new-profile-loader
|
2022-11-09 19:15:28 +05:00 |
|
Viktor Fomin
|
f874e8586e
|
Merge branch 'develop' into bugfix/logo
|
2022-11-09 18:56:25 +05:00 |
|
Viktor Fomin
|
7bb4cc73b7
|
Common: Article: fix
|
2022-11-09 18:55:58 +05:00 |
|
|
|
0bc03cd148
|
Web:Common:Add textColor in Calendar.
|
2022-11-09 15:01:17 +03:00 |
|
|
|
0e8e019b22
|
Web:Common:Add textColor in VersionBadge.
|
2022-11-09 14:33:42 +03:00 |
|
TimofeyBoyko
|
cdd2b68324
|
Web:Common:Tags: fix advanced tag
|
2022-11-09 14:28:37 +03:00 |
|
|
|
8f6d197f7e
|
Web: Access to the portal deletion page is prohibited for anyone who is not the owner.
|
2022-11-09 14:07:59 +03:00 |
|
|
|
ce6188e960
|
Web:Common:Add textColor in badge.
|
2022-11-09 13:55:20 +03:00 |
|
|
|
5f49237046
|
Web:Common:Add textColor for button.
|
2022-11-09 13:54:54 +03:00 |
|
|
|
187c61df68
|
Web: Added a page for deleting the portal during the expired period.
|
2022-11-09 13:22:31 +03:00 |
|
Viktor Fomin
|
d6ff6aa69a
|
Common: Loaders: ProfileViewLoader: redesign
|
2022-11-08 18:24:40 +05:00 |
|
Viktor Fomin
|
adf7362477
|
Components: Loaders: SectionHeader: fix style
|
2022-11-07 17:42:13 +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
|
027efa8e8b
|
Merge branch 'develop' into bugfix/smart-banner
|
2022-11-03 18:59:38 +05: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
|
b8e2e49bd0
|
Merge branch 'develop' into feature/whitelabel
|
2022-11-03 15:05:41 +05:00 |
|
TimofeyBoyko
|
71ee8f0cd8
|
Web:Common:FilterInput: fix long tag
|
2022-11-03 12:52:45 +05:00 |
|
Viktor Fomin
|
28846ea77d
|
Common: Article: fix position with smart banner
|
2022-11-02 17:13:23 +05:00 |
|
Viktor Fomin
|
2afea89545
|
Merge branch 'develop' into feature/whitelabel
|
2022-11-01 15:25:52 +05:00 |
|
Viktor Fomin
|
20878155eb
|
Common: Article: add theme for logo
|
2022-10-31 19:22:30 +05:00 |
|
Elyor Djalilov
|
c4ff1d057c
|
Merge branch 'develop' into feature/active-sessions
|
2022-10-31 11:24:05 +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 |
|
Elyor Djalilov
|
42471135ba
|
Merge branch 'develop' into feature/active-sessions
# Conflicts:
# packages/client/src/components/dialogs/index.js
# packages/components/themes/base.js
# packages/components/themes/dark.js
|
2022-10-25 13:41:42 +05:00 |
|
|
|
527e66c25e
|
Merge pull request #934 from ONLYOFFICE/bugfix/fix-memory-leak
Web:Common:FilterInput: fix memory leak
|
2022-10-20 14:44:19 +03:00 |
|
TimofeyBoyko
|
c831a2cfd6
|
Web:Common:FilterInput: fix memory leak
|
2022-10-20 14:17:58 +05:00 |
|
|
|
0d680dd005
|
Merge branch 'develop' into feature/shared-redesign-third-party
|
2022-10-20 11:36:22 +03:00 |
|
|
|
9c99f3a53f
|
Merge branch 'develop' into feature/shared-redesign-third-party
|
2022-10-19 19:41:39 +03:00 |
|
|
|
07f826889b
|
Web:Client:Add styles focus in Button, ComboButton.
|
2022-10-19 14:47:54 +03:00 |
|
|
|
552a7a7b78
|
Web: Files: fixed empty-screen jumps
|
2022-10-17 13:14:57 +03:00 |
|
TimofeyBoyko
|
b3395efe50
|
Merge branch 'develop' into feature/portal-access-rights
|
2022-10-17 11:45:25 +05:00 |
|
Elyor Djalilov
|
fe11164286
|
Merge branch 'develop' into feature/active-sessions
|
2022-10-14 12:38:55 +05:00 |
|
Elyor Djalilov
|
9bde9af673
|
Web: Client: add active sessions
|
2022-10-14 12:21:42 +05:00 |
|
|
|
d084f53802
|
Web:Common:Fix props item.group.
|
2022-10-13 11:55:32 +03:00 |
|
TimofeyBoyko
|
bd396fb9af
|
Web:Common:PrivateRoute: fix restricted routes for room admins
|
2022-10-12 15:41:13 +05:00 |
|
|
|
7273fda06c
|
Web:Common:Add props label, group in SelectedItem.
|
2022-10-12 13:37:09 +03:00 |
|
TimofeyBoyko
|
7a1ddd3c20
|
Merge branch 'develop' into feature/portal-access-rights
|
2022-10-11 14:04:42 +05:00 |
|
|
|
a47ce3d8c0
|
Merge branch 'develop' into feature/invite-panel
|
2022-10-11 11:58:25 +03:00 |
|
|
|
cf2547e030
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/common/constants/index.js
|
2022-10-11 10:20:42 +03:00 |
|
|
|
0d7f77a18a
|
Merge pull request #897 from ONLYOFFICE/bugfix/accounts-filter
Bugfix/accounts filter
|
2022-10-11 10:12:57 +03:00 |
|
TimofeyBoyko
|
da14ffd656
|
Merge branch 'develop' into feature/portal-access-rights
|
2022-10-11 11:52:34 +05:00 |
|
|
|
4dbf1e70b7
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# common/ASC.ActiveDirectory/GlobalUsings.cs
# common/ASC.Data.Storage/StorageFactory.cs
# common/ASC.Data.Storage/TenantQuotaController.cs
# migrations/mysql/CoreDbContext/CoreDbContextModelSnapshot.cs
# migrations/postgre/CoreDbContext/CoreDbContextModelSnapshot.cs
# packages/client/src/pages/PortalSettings/categories/common/settingsBranding/whitelabel.js
# products/ASC.People/Server/Api/UserController.cs
# products/ASC.People/Server/GlobalUsings.cs
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
# web/ASC.Web.Core/PublicResources/Resource.resx
# web/ASC.Web.Core/Sms/StudioSmsNotificationSettings.cs
|
2022-10-10 19:16:03 +03:00 |
|
mushka
|
415c620574
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-10-10 17:27:16 +03:00 |
|
mushka
|
be3bb23144
|
fixed loader error in accounts
|
2022-10-10 17:19:19 +03:00 |
|
TimofeyBoyko
|
998c06d0ea
|
Merge branch 'develop' into feature/portal-access-rights
|
2022-10-10 19:04:53 +05:00 |
|
|
|
368a23fd4e
|
Web: Common: fixed action button styles, removed useless code
|
2022-10-10 15:11:43 +03:00 |
|
TimofeyBoyko
|
b6cf14f62e
|
Merge branch 'develop' into bugfix/accounts-filter
|
2022-10-10 14:57:56 +05:00 |
|
TimofeyBoyko
|
fe310ee9d4
|
Web:Common:FilterInput: fix combo-item styles
|
2022-10-10 14:29:16 +05:00 |
|
TimofeyBoyko
|
763d8ff860
|
Web:Common:Loaders: add support dark-theme for filter block loader
|
2022-10-10 14:11:05 +05:00 |
|
|
|
734a03019a
|
Merge pull request #877 from ONLYOFFICE/feature/phone-input
Feature/phone input
|
2022-10-10 12:04:59 +03:00 |
|
|
|
1ea1cedb3b
|
Merge branch 'develop' into feature/invite-panel
|
2022-10-10 09:32:13 +03:00 |
|
TimofeyBoyko
|
68fc4fb2d4
|
Web:Common:FilterInput: delete useless code
|
2022-10-07 19:24:56 +05:00 |
|
mushka
|
7de3650533
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-10-07 16:21:59 +03:00 |
|
mushka
|
9131dfa55f
|
deleted isRoom prop from SubInfoPanelHeader component
|
2022-10-06 18:25:11 +03:00 |
|
mushka
|
f139b34b74
|
cleaned up InfoPanelHeaderLoader component code
|
2022-10-06 18:24:00 +03: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 |
|
|
|
d37a6068fc
|
Merge branch 'develop' into feature/invite-panel
|
2022-10-05 15:04:24 +03:00 |
|
|
|
2b001f56d6
|
Web: Added transparency when a component is unavailable.
|
2022-10-05 12:18:25 +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 |
|
mushka
|
5c004293d4
|
removed InfoPanelBodyLoader from loaders/index.js
|
2022-10-03 14:18:25 +03:00 |
|
mushka
|
0b8708be93
|
fixed styling of historyView loader in darkTheme
|
2022-10-03 14:17:24 +03:00 |
|
mushka
|
e09c25d9ca
|
deleted infoPanelBodyLoader
|
2022-10-03 14:15:36 +03:00 |
|
Elyor Djalilov
|
41261e64b9
|
Merge branch 'develop' into feature/phone-input
# Conflicts:
# packages/components/index.js
|
2022-10-03 12:20:33 +05:00 |
|
mushka
|
1b2dae0890
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-10-02 03:45:40 +03:00 |
|
mushka
|
419646f8fc
|
complete overhaul for InfoPanelHeaderLoader
|
2022-10-02 02:44:09 +03:00 |
|
mushka
|
d32a2179cb
|
complete overhaul of old styles for InfoPanelHeaderLoader
|
2022-10-02 02:43:55 +03:00 |
|
mushka
|
c056383862
|
added all new loaders to InfoPanelViewLoader
|
2022-10-02 02:43:29 +03:00 |
|
mushka
|
10d698b0d1
|
created new NoItemLoader
|
2022-10-02 02:39:56 +03:00 |
|
mushka
|
2f810c9528
|
created new SeveralItemsLoader
|
2022-10-02 02:39:41 +03:00 |
|
mushka
|
27ca7d62df
|
created new GalleryLoader
|
2022-10-02 02:39:28 +03:00 |
|
mushka
|
f9cc615f0b
|
updated MembersLoader
|
2022-10-02 02:39:18 +03:00 |
|
mushka
|
03b18ef110
|
created new DetailsLoader
|
2022-10-02 02:39:06 +03:00 |
|
mushka
|
94aa2fa3e9
|
created new accounts loader file
|
2022-10-02 02:38:48 +03:00 |
|
|
|
955a9379de
|
Web: Ipad: fixed Safari styles
|
2022-09-29 17:29:09 +03:00 |
|
|
|
26af985bd4
|
Web: Common: fixed floating button display for safari browser
|
2022-09-29 14:09:35 +03:00 |
|
|
|
7164d4b25c
|
Merge pull request #861 from ONLYOFFICE/bugfix/restore-portal
Bugfix/restore portal
|
2022-09-27 10:41:55 +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 |
|
|
|
0b66a94bbb
|
Merge branch 'develop' into bugfix/restore-portal
|
2022-09-26 14:50:40 +03:00 |
|
|
|
56c4c35ca0
|
Merge pull request #858 from ONLYOFFICE/feature/added-show-article-button
Feature/added show article button
|
2022-09-26 12:52:14 +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 |
|
mushka
|
af16f21d4a
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-26 11:00:34 +03:00 |
|
mushka
|
e9ae801528
|
removed unused files
|
2022-09-26 10:43:37 +03:00 |
|
mushka
|
598d11c5c7
|
exported new viewLoader
|
2022-09-26 10:37:17 +03:00 |
|
mushka
|
62ecdace05
|
created single viewLoader component for easier access
|
2022-09-26 10:37:05 +03:00 |
|
mushka
|
7f0cadfb98
|
created and finished history loader
|
2022-09-26 10:36:31 +03:00 |
|
mushka
|
3c56e8fe6d
|
changed members loader
|
2022-09-26 10:36:11 +03:00 |
|
|
|
80be6fafec
|
Web:Common:Add isEmptyPage, delete isPageWithoutFiles.
|
2022-09-25 12:32:06 +03:00 |
|
|
|
94c945718c
|
Web: Common: Access to the portal recovery page is denied when the portal is not being restored.
|
2022-09-24 10:46:02 +03:00 |
|
|
|
b97d4d8148
|
Web:Common:Add isPageWithoutFiles props.
|
2022-09-23 19:47:40 +03:00 |
|
|
|
f1150f6748
|
Merge branch 'bugfix/section-header' of github.com:ONLYOFFICE/AppServer into bugfix/section-header
|
2022-09-23 17:14:16 +03:00 |
|
|
|
5f00094d1a
|
Web: Common: Changed padding style of section header.
|
2022-09-23 17:14:06 +03:00 |
|
|
|
9afa3de331
|
Merge branch 'develop' into bugfix/section-header
|
2022-09-23 16:48:30 +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 |
|
|
|
d804bf848a
|
Web: Common: Fixed section header for iOS.
|
2022-09-23 16:10:55 +03:00 |
|
|
|
c2ab59c2ff
|
Merge branch 'develop' into feature/new-profile
|
2022-09-23 15:17:22 +03:00 |
|
|
|
389298dfd6
|
Web: Client: added theme to logo
|
2022-09-23 13:32:43 +03:00 |
|
|
|
57f9f8420f
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-22 18:13:42 +03:00 |
|
|
|
3d02e64934
|
Web: Common: ColorTheme: Added hoverColor property to rest
|
2022-09-22 18:11:51 +03:00 |
|
TimofeyBoyko
|
7a2e3fea01
|
Merge branch 'develop' into feature/portal-access-rights
|
2022-09-22 16:24:57 +03:00 |
|
|
|
2ed2f68cb6
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
|
2022-09-22 12:48:46 +03:00 |
|
