Commit Graph

25087 Commits

Author SHA1 Message Date
ee4a47454f Web: Disabled branding settings. 2022-09-16 10:45:10 +03:00
eb50124f48 Merge branch 'feature/stripe' of github.com:ONLYOFFICE/AppServer into feature/stripe 2022-09-16 09:33:15 +03:00
cd16261353 Web: fixed after merge. 2022-09-16 09:32:24 +03:00
6b728a0fca refactoring 2022-09-15 18:58:05 +03:00
c3b9ca3127 Merge branch 'feature/stripe' of github.com:ONLYOFFICE/AppServer into feature/stripe 2022-09-15 17:47:07 +03:00
53e0146a26 Quota: countroom 2022-09-15 17:44:48 +03:00
a252a07fd3 Web: fixed after merge. 2022-09-15 17:43:02 +03:00
bec4f11dcd Merge branch 'develop' into feature/stripe
# Conflicts:
#	common/ASC.Api.Core/Extensions/HostBuilderExtension.cs
#	common/services/ASC.Notify/Program.cs
#	common/services/ASC.Studio.Notify/Program.cs
#	common/services/ASC.Webhooks.Service/Program.cs
#	packages/common/components/Loaders/index.js
#	packages/common/store/AuthStore.js
#	packages/login/src/client/components/sub-components/recover-access-modal-dialog.tsx
#	packages/login/webpack.config.js
#	products/ASC.Files/Service/Program.cs
#	web/ASC.Web.Api/Program.cs
2022-09-15 17:16:04 +03:00
b4a8e496eb Web: Fixed bugs. 2022-09-15 16:34:14 +03:00
eeed96cb32 Web: Fixed bugs. 2022-09-15 15:58:21 +03:00
21fc46b8bc Web: Removed useless translations. 2022-09-15 15:07:26 +03:00
c20e01e351 Web: Added information about storage size, added checks. 2022-09-15 14:59:55 +03:00
2a943661c7
Merge pull request #796 from ONLYOFFICE/feature/backup_remove_waste_modules
Feature/backup remove waste modules
2022-09-15 14:50:12 +03:00
12780606c2 Merge branch 'develop' into feature/backup_remove_waste_modules 2022-09-15 14:27:24 +03:00
9c4f34b55a Web: Added a check for passing the quota when lowering the tariff. 2022-09-15 13:33:28 +03:00
e6408f3323
Merge pull request #822 from ONLYOFFICE/feature/redisign-files-settings
Feature/redisign files settings
2022-09-15 12:57:04 +03:00
20fe2a3763 Web:Added values for the downgrade plan dialog from the stores. 2022-09-15 12:54:00 +03:00
458101baea Merge branch 'feature/redisign-files-settings' of github.com:ONLYOFFICE/DocSpace into feature/redisign-files-settings 2022-09-15 12:39:28 +03:00
791dfb055c Web: Files: Settings: fix margin on mobile devices 2022-09-15 12:39:13 +03:00
23c582711c
Merge branch 'develop' into feature/redisign-files-settings 2022-09-15 12:16:16 +03:00
88df1f34d1 Merge branch 'feature/redisign-files-settings' of github.com:ONLYOFFICE/DocSpace into feature/redisign-files-settings 2022-09-15 12:06:30 +03:00
94f6cc8682 Web: Files: Settings: fix padding on tablet 2022-09-15 12:06:22 +03:00
b4009910a3 Web: Components: fixed tap selection 2022-09-15 12:02:50 +03:00
b85484a731 Web: Files: Settings: Fix sticky submenu 2022-09-15 11:59:38 +03:00
756af118d4 Web: Files: Hide ThirdPartyList 2022-09-15 11:44:48 +03:00
aef2200080 Web: Files: Settings: fix margin on tablet/mobile 2022-09-15 11:40:55 +03:00
17d476aafc Files: added new categories OForm,OFormTemplate 2022-09-14 18:56:18 +03:00
e911a9f478
Merge branch 'develop' into feature/redisign-files-settings 2022-09-14 18:40:09 +03:00
be5aa07726
Merge pull request #821 from ONLYOFFICE/bugfix/fixed-catalog-styles
Bugfix/fixed catalog styles
2022-09-14 18:37:10 +03:00
40aee9ff02 Web: Files: Settings: Added new loaders 2022-09-14 18:25:46 +03:00
c0244b5400 Web: Added plan title from the store. 2022-09-14 17:17:40 +03:00
f944272103 Web: Added step value from store. 2022-09-14 16:42:46 +03:00
9a7f969cd0 Web: Information about payment settings was used. 2022-09-14 16:39:30 +03:00
011461b598 Web: Refactoring. 2022-09-14 16:32:49 +03:00
44bedb3f1d
Merge branch 'develop' into bugfix/fixed-catalog-styles 2022-09-14 16:16:33 +03:00
34f9d5285e Merge branch 'feature/stripe' of github.com:ONLYOFFICE/AppServer into feature/stripe 2022-09-14 16:08:43 +03:00
9b6b55599f Web: Added getting max users count in room. 2022-09-14 16:07:22 +03:00
d2ce2f4435 Web: Added replacement in returned feature objects. 2022-09-14 16:01:40 +03:00
61fa70c886 Web: Components: Navigation: fixed z-index 2022-09-14 15:42:38 +03:00
a7bf07c0ab Web: Files: Settings: Added display settings for none-admin user 2022-09-14 15:29:14 +03:00
81b8e0ce3b Web: Fix: Error on additionalResources is null 2022-09-14 15:10:13 +03:00
94859dfd24 Web: Files: Settings: fix routing 2022-09-14 14:54:02 +03:00
b5e08fddf4 Web: Components: Navigation fixed text clipping 2022-09-14 14:48:19 +03:00
ff1a18eb0f Web: Components: fixed Navigation component for IOS devices 2022-09-14 14:41:24 +03:00
40702707bd refactoring 2022-09-14 14:21:25 +03:00
5131b49b0b Web: Refactoring. 2022-09-14 14:13:21 +03:00
1f76f8b058 Web: Components: fixed settings-icon color 2022-09-14 14:05:38 +03:00
45a79a0eff Web: ThirdParty: Fix saveThirdParty call 2022-09-14 14:03:01 +03:00
a1c30b4ad3 Web: Files: Settings: fix primary url loading + refactoring 2022-09-14 13:52:38 +03:00
fbcb8113e1 Web: Files: Settings: increased font-size for Header on table 2022-09-14 13:06:32 +03:00