Commit Graph

25218 Commits

Author SHA1 Message Date
130e485a0c Payments: refactoring. TrialEnabled setting 2022-09-21 18:44:32 +03:00
54a47a00df Merge branch 'feature/stripe' of github.com:ONLYOFFICE/AppServer into feature/stripe 2022-09-21 12:43:09 +03:00
beb3acc55b Web: Refactoring, added checking of the free portal with the payer's email. 2022-09-21 12:42:08 +03:00
9c8bf9708a Payment: UsersInRoomStatistic 2022-09-20 23:22:27 +03:00
55fc747e96 Web: Refactoring. 2022-09-20 18:15:38 +03:00
4bfb411ff7 Web: Fixed height of settings header. 2022-09-20 18:13:52 +03:00
6b3ffad49c Web: Fixed settings section header. 2022-09-20 17:59:01 +03:00
5d92a00f11 Web: Fixed bug. 2022-09-20 15:49:51 +03:00
1cc72b52da Web: Fixed dark theme. 2022-09-20 12:03:28 +03:00
fd4b664b64 Merge branch 'feature/stripe' of github.com:ONLYOFFICE/AppServer into feature/stripe 2022-09-20 11:29:26 +03:00
c9a0e3195c Web: Added backup icon. 2022-09-20 10:46:41 +03:00
5b95f8778d Web: Fixed styles. 2022-09-20 10:41:09 +03:00
f251632987 Web: Components: Separated styles. 2022-09-20 10:40:30 +03:00
b261f94687 Web: Components: Added props. 2022-09-20 10:39:23 +03:00
c91968adf6 Merge branch 'feature/stripe' of github.com:ONLYOFFICE/DocSpace into feature/stripe 2022-09-19 22:59:12 +03:00
ccbbc5499e Quota: MaxFileSizeChecker 2022-09-19 22:49:41 +03:00
eeb94810f1 Merge branch 'feature/stripe' of github.com:ONLYOFFICE/DocSpace into feature/stripe 2022-09-19 18:40:08 +03:00
5740b578db Payment: rename 2022-09-19 18:20:21 +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
bf4eee0f11 Fix Confirm LinkInvite validation 2022-09-19 18:08:00 +03:00
4b0fc12efc Payment: rename 2022-09-19 18:03:25 +03:00
5848bf5cd3 Api: payments check 2022-09-19 17:56:45 +03:00
4fee53f3e9 Web: Condition added. 2022-09-19 17:05:43 +03:00
bc20d9fe8f Web: Fixed bugs. 2022-09-19 16:31:32 +03:00
8a380d24f5 Web: Added dark theme. 2022-09-19 16:31:00 +03:00
22381f8f44 Web: Moved dialog to common folder. 2022-09-19 15:12:49 +03:00
e480e419a0
Merge pull request #837 from ONLYOFFICE/bugfix/fixed-accounts-row-styles
Web: People: fixed accounts row styles
2022-09-19 13:46:42 +03:00
0b160d9a3f Web: People: fixed accounts row styles 2022-09-19 13:41:47 +03:00
cbf411d80b
Merge pull request #836 from ONLYOFFICE/bugfix/filter-empty-screen
Bugfix/filter empty screen
2022-09-19 13:37:30 +03:00
TimofeyBoyko
1c40c181eb Web:Client: fix reload page for archived rooms 2022-09-19 13:23:17 +03:00
ce4cacc43c Web: Fixed bugs. 2022-09-19 12:18:37 +03:00
6b3ebed8b9 Web: Fixed bugs. 2022-09-19 11:59:47 +03:00
TimofeyBoyko
39366b49ab Web:Client:Components: add new tranlsation key for rooms emptyFilterContainer 2022-09-19 11:23:32 +03:00
TimofeyBoyko
3c0bc5e500 Web:Common:API: fix filterValue at roomsFilter after page reload 2022-09-19 11:19:15 +03:00
TimofeyBoyko
5b2255d468 Web:Client:Components: fix empty filter screen for rooms 2022-09-19 10:47:27 +03:00
TimofeyBoyko
ab2fb1a8a0 Web:Client:Home: fix onSearch, onFilter function for rooms 2022-09-19 10:28:31 +03:00
75a6cebfce
Merge pull request #834 from ONLYOFFICE/feature/update-filters
Feature/update filters
2022-09-16 19:13:57 +03:00
TimofeyBoyko
6f2269f9af Merge branch 'develop' into feature/update-filters 2022-09-16 18:30:09 +03:00
TimofeyBoyko
007d25ce8e Web:Client:Home: update files filter with 'Other' and 'Me' filter author 2022-09-16 18:28:49 +03:00
TimofeyBoyko
2d01924ea6 Web:Common:FilterInput: fix select option 2022-09-16 18:28:23 +03:00
TimofeyBoyko
45675c5dc1 Web:Common:Api: add excludeSubject at files filter 2022-09-16 18:27:28 +03:00
3d6913a9de
Merge pull request #833 from ONLYOFFICE/bugfix/fixed-logo-route
Web: Common: fixed logo click
2022-09-16 18:18:54 +03:00
9b60a73c21 Web: Common: fixed logo click 2022-09-16 18:17:28 +03:00
TimofeyBoyko
0e5b27e8ad Web:Client:Home: update rooms filter with excludeSubject 2022-09-16 17:34:46 +03:00
TimofeyBoyko
65e04b76c8 Web:Common:Api: change withoutMe to excludeSubject at rooms filter 2022-09-16 17:34:17 +03:00
f5bdc75bc1
Merge pull request #826 from ONLYOFFICE/feature/nlog-refactoring
Feature/nlog refactoring
2022-09-16 17:43:41 +04:00
6563d4b633 nlog: refactoring service name 2022-09-16 16:41:51 +03:00
11121bb7e5 Web: Refactoring. 2022-09-16 16:21:46 +03:00
b1c8ce4ba0
Merge pull request #832 from ONLYOFFICE/bugfix/fixed-accounts-crash
Web: People: fixed user role
2022-09-16 16:21:28 +03:00
fbc24b2187 Web: People: fixed user role 2022-09-16 16:20:04 +03:00