Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-11 21:52:35 +01:00
Code Issues Releases Activity
19,146 Commits 7 Branches 919 Tags 2 GiB
c817b7b937
Commit Graph

2803 Commits

Author SHA1 Message Date
David Bomba
8dcc3c4cbd Merging designer changes 2023-02-25 14:52:52 +11:00
David Bomba
d21ce4a567 Merge designer into design_changes 2023-02-25 14:36:00 +11:00
David Bomba
dd88b06bb0 minor fixes for auth gate on destroy scheduler 2023-02-24 12:16:40 +11:00
David Bomba
c8f8ef9ad6 Fixes for conflicts 2023-02-24 07:40:25 +11:00
David Bomba
0dc4b64ad0 Minor cleanup 2023-02-23 20:59:14 +11:00
David Bomba
36655eabec Limit per page to 5000 2023-02-23 18:37:15 +11:00
David Bomba
0d6c8f05e1 Limit per page to 5000 2023-02-23 18:36:56 +11:00
David Bomba
2f4e4278d7 fixes for conflicts 2023-02-23 06:35:39 +11:00
David Bomba
57cbbd0a42 Fixes for valid urls 2023-02-22 18:01:35 +11:00
David Bomba
c3668d7999 Fixes for valid urls 2023-02-22 17:58:21 +11:00
David Bomba
cfdaa1517c php-cs-fixer 2023-02-22 17:37:16 +11:00
David Bomba
e3e535e5b7 Run mailer syncronously 2023-02-22 09:38:27 +11:00
David Bomba
58317f24e8 Stub PDF generator 2023-02-21 20:41:23 +11:00
David Bomba
60fe4bd5cb Stub PDF generator 2023-02-21 20:33:07 +11:00
David Bomba
badf68005a Stub pdf 2023-02-21 20:04:45 +11:00
David Bomba
2774c50ac8 Merge branch 'v5-develop' into design_changes 2023-02-21 18:16:28 +11:00
David Bomba
a38730ed3f Fixes for test mail server setup 2023-02-21 17:07:27 +11:00
David Bomba
e3949c0479 merge v5-develop 2023-02-21 10:59:11 +11:00
David Bomba
19fdd9e96e Merge branch 'v5-develop' into design_changes 2023-02-21 10:49:16 +11:00
David Bomba
5765dd697c Clean up and doc blocks for BaseController 2023-02-20 20:56:01 +11:00
David Bomba
949ea3d523 Add excludable permissions for client view list 2023-02-20 19:52:50 +11:00
David Bomba
4364b4369e Additional permissions levels when we want to filtered and intersect permissions 2023-02-20 18:46:26 +11:00
David Bomba
daf65587ca Clean up 2023-02-20 17:23:39 +11:00
David Bomba
ed20376bf5 Fixes for client portal error page logo 2023-02-20 17:09:48 +11:00
David Bomba
e28b75e83f phpcs 2023-02-18 08:36:51 +11:00
David Bomba
4babfbb651 php-cs-fixer 2023-02-16 12:36:09 +11:00
David Bomba
b76e78e9ed Fixes for email designs and cross client compatibility 2023-02-16 09:20:24 +11:00
David Bomba
eefd2eb5d4 minor fixes 2023-02-16 07:51:12 +11:00
David Bomba
8d0b9fef1f minor fixes 2023-02-15 22:55:18 +11:00
David Bomba
9745cbed4a Wind back mailmailer' 2023-02-15 22:31:02 +11:00
David Bomba
55bdc6b1cc Fixes for designs and client compatibility 2023-02-15 21:11:34 +11:00
David Bomba
342f33b5e1 Updates for Task Status 2023-02-15 11:55:16 +11:00
David Bomba
453042f7e8 Fixes for mailable 2023-02-15 11:37:14 +11:00
David Bomba
a4f2d40d75 Working on emailers 2023-02-15 11:04:47 +11:00
David Bomba
1a3d5420ed Minor fixes 2023-02-14 11:27:14 +11:00
David Bomba
a8362762cf Fixes for base redirect 2023-02-14 11:25:48 +11:00
David Bomba
328b3a3113 Updates for API docs 2023-02-10 20:21:10 +11:00
David Bomba
dfbb7ec093 Add back token creation 2023-02-09 20:24:35 +11:00
David Bomba
49841ae78d Bulk action request layer 2023-02-09 13:30:39 +11:00
David Bomba
641cda79af Clean up for bank integration bulk actions 2023-02-09 13:12:26 +11:00
David Bomba
6db335575c Handle user returning from stripe connect without authenticating 2023-02-09 11:07:40 +11:00
David Bomba
e182ce9a66 Handle case where Stripe Connect permission is denied 2023-02-09 11:02:25 +11:00
David Bomba
2746eaef06 Redirect to invoicing.co for login, always 2023-02-07 23:03:05 +11:00
Lars Kusch
841489e895
Merge branch 'v5-develop' into v5-develop 2023-02-07 09:32:44 +01:00
David Bomba
f6e440af80 Add purge purchase orders to company deletes 2023-02-05 15:22:44 +11:00
David Bomba
cbf8735d23 additional logging 2023-02-05 08:41:28 +11:00
David Bomba
c7fe3c8824 Set credit payments for subscriptions 2023-02-04 17:09:04 +11:00
David Bomba
6d07e78280 Allow user input after a quote is approved 2023-02-02 21:04:55 +11:00
David Bomba
8cf9fdf759 Fail if no invitation found 2023-02-02 12:08:06 +11:00
David Bomba
a69eae2f66 Download purchase order PDF from API 2023-02-01 20:00:55 +11:00
David Bomba
83def1f297 OPENAPI docs for download PDF 2023-02-01 19:56:02 +11:00
David Bomba
4c502919dc Credit PDF download 2023-02-01 19:54:30 +11:00
David Bomba
be03714aa4 Add download route for quote pdf 2023-02-01 19:52:38 +11:00
David Bomba
a2f0c5d4fe Refactor for observers 2023-02-01 15:00:45 +11:00
David Bomba
801740bdb4 Fixes for exception testing 2023-02-01 14:12:44 +11:00
David Bomba
fecf1e13b5 Fixes for tests 2023-02-01 13:46:39 +11:00
David Bomba
c2e177e13b Change error page for subscriptions where upgrade is not available 2023-02-01 08:43:32 +11:00
David Bomba
b8d97a69a2 Refactor for observers 2023-02-01 01:06:21 +11:00
David Bomba
0bff698bc4 fixes for design preview 2023-01-31 23:00:04 +11:00
David Bomba
da245c073a Refactor for permissions to include Edit permissions when testing view permissions 2023-01-31 22:21:23 +11:00
David Bomba
5ca0bf3b23 Minor fixes 2023-01-30 22:26:33 +11:00
David Bomba
a8982cde44 Clean up 2023-01-30 17:08:21 +11:00
David Bomba
cb7897b75e Roll back for selective permission loads 2023-01-30 12:59:47 +11:00
David Bomba
a896faf0bf Fixes for mailers using the appropriate retries and backoff 2023-01-29 14:22:10 +11:00
David Bomba
6c86d7151a Update copyright year 2023-01-29 09:21:40 +11:00
David Bomba
e8608ab58e Fixes for reports 2023-01-28 14:59:35 +11:00
David Bomba
dad9766b26 Fixes for ninja plans 2023-01-28 09:47:57 +11:00
David Bomba
20b7bdfaef Live Design Preview Test 2023-01-27 22:04:02 +11:00
David Bomba
0a696da9f5 Fixes for validation of webhooks 2023-01-27 21:38:59 +11:00
David Bomba
c121971636 Implement logic that changes the response based on user permissions 2023-01-27 20:41:22 +11:00
David Bomba
57596ef26f Clean up for Base controller and enhanced permission filers 2023-01-25 12:58:24 +11:00
David Bomba
a0ac9df5fd Improve rate limiting when using send with gmail 2023-01-25 11:28:23 +11:00
David Bomba
79ec6b2ddc Ensure api token has a name using update route 2023-01-25 10:43:18 +11:00
David Bomba
27b79aa551 Set companies on trial commence 2023-01-25 08:45:05 +11:00
David Bomba
3312e7ce12 Update permissions logic 2023-01-23 11:01:27 +11:00
David Bomba
9f061ad0bb add filename to headers for inline files 2023-01-23 09:43:46 +11:00
David Bomba
f6e740b582 add filename to headers for inline files 2023-01-23 09:39:29 +11:00
David Bomba
e2ef82b266 Fixes for content-disposition in CORS 2023-01-23 09:31:40 +11:00
David Bomba
5e012aa520 Setup permissions for Bank Transactions 2023-01-23 08:25:43 +11:00
David Bomba
35726575c8 Clean up for credit controller 2023-01-22 16:49:39 +11:00
David Bomba
3438d19a10 Improve bulk route auth layer 2023-01-22 16:40:02 +11:00
David Bomba
5888252267 Enhance bulk action guards + validation layer 2023-01-22 16:34:47 +11:00
David Bomba
c502177470 Bulk credit requests 2023-01-22 15:19:49 +11:00
David Bomba
7bd5a73d70 Bulk action request for company gateways 2023-01-22 15:11:33 +11:00
David Bomba
9628580be0 Add statement date range to the statement 2023-01-22 15:03:23 +11:00
David Bomba
b7a49b97cd Bulk action request for bank transactions 2023-01-22 14:49:15 +11:00
David Bomba
ec1d4392bd Add form request for client bulk actions 2023-01-22 14:40:22 +11:00
David Bomba
f6549f43ad Updates for API Docs 2023-01-22 09:28:50 +11:00
David Bomba
1944d8214e Clean up for logging. 2023-01-21 19:19:08 +11:00
David Bomba
c1563c571d Permissions tests 2023-01-21 16:52:24 +11:00
David Bomba
580868767c Add additional checks into check data script 2023-01-21 11:33:41 +11:00
David Bomba
fc5d6a99fe add guard to client gateway tokens 2023-01-21 09:59:00 +11:00
David Bomba
f7281e4310 ListResponse permissions 2023-01-21 09:23:56 +11:00
David Bomba
883c8f2289 Tests for refactors of API permissions 2023-01-20 23:45:29 +11:00
David Bomba
24aa73c359 Fixes for notifications 2023-01-19 17:20:31 +11:00
David Bomba
c46d5ecef7 Rewrite zip, when deleting files prior to extraction 2023-01-18 21:23:02 +11:00
David Bomba
0d767f7d98 update billing_context to use hashed_ids 2023-01-18 16:52:32 +11:00
David Bomba
dedc1f5774 Update meta data for swagger documentation 2023-01-18 10:47:41 +11:00
David Bomba
52a982d634 Email Tests 2023-01-17 12:21:36 +11:00
David Bomba
c51dd313b9 Tests for emailing client statements 2023-01-17 11:00:12 +11:00
David Bomba
67dfe8a4b9 Show terms/footers on Recurring Invoice Preview 2023-01-17 09:43:11 +11:00
David Bomba
f84a309964 Add task schedulers to login / refresh routes 2023-01-17 08:37:15 +11:00
David Bomba
9641d88b14 Remove .htaccess from update script 2023-01-17 08:31:07 +11:00
Lars Kusch
7285b39f1e
Merge branch 'v5-develop' into v5-develop 2023-01-16 16:31:30 +01:00
David Bomba
7c3aaa4898 Set the trial flag only once 2023-01-15 19:05:52 +11:00
David Bomba
5d1dc68739 Pass whitelabel to front end 2023-01-15 07:46:23 +11:00
David Bomba
9e415b420c Refactor for scheduled tasks 2023-01-13 12:43:38 +11:00
David Bomba
5389c00c2f migrations for companies/accounts table 2023-01-13 00:32:54 +11:00
David Bomba
1d811c49b9 Return success to webhook URL when the gateway has been deleted/non-resolvable to prevent constant webhook retries 2023-01-12 15:58:02 +11:00
David Bomba
afad1245c9 Clean up for Filters 2023-01-12 13:52:06 +11:00
David Bomba
fadc039eba Merge branch 'cleanup_deprecated_import' into v5-develop 2023-01-12 11:08:42 +11:00
David Bomba
d2d181e7a1 Fixes for CSV delimiters 2023-01-12 09:20:24 +11:00
David Bomba
077986d59c Clean up legacy importer 2023-01-12 09:19:38 +11:00
David Bomba
ff9bd79449 Merge branch 'v5-develop' into designer 2023-01-11 23:40:19 +11:00
David Bomba
e174b379a6 Additional mailer implementation 2023-01-11 19:29:27 +11:00
David Bomba
b950c805be Handle trials 2023-01-11 12:47:03 +11:00
David Bomba
05192c9f87 Push purchase order PDf creator into unified system 2023-01-08 16:15:04 +11:00
David Bomba
c5de8de343 Add subscription filters 2023-01-05 22:09:25 +11:00
David Bomba
dc4e0b9c96 Add subscription filters 2023-01-04 13:09:47 +11:00
David Bomba
fd51303617 Product Sales Report 2023-01-04 01:30:50 +11:00
David Bomba
d4356af782 Refactor Livewire passing references 2022-12-23 11:33:14 +11:00
David Bomba
3e4926d88e Reduce object sizes in Livewire 2022-12-22 16:44:36 +11:00
David Bomba
28cbe52d9c Refactor for subscriptions and changing between subscriptions 2022-12-22 15:58:18 +11:00
David Bomba
cb823ef8b5 Clean up for register form 2022-12-20 23:53:52 +11:00
David Bomba
13f8aa2140 Refactor subscription invoices to use standard allow temporary invoice numbers until they are confirmed 2022-12-20 21:46:20 +11:00
David Bomba
971787161c Enforce registration for subscriptions if configured 2022-12-20 15:50:02 +11:00
David Bomba
af0b459f94 Fixes for category IDs for recurring expenses 2022-12-20 10:26:29 +11:00
David Bomba
515e93250f Purchase Order Notifications 2022-12-19 23:25:48 +11:00
David Bomba
e29b08824a Use id_token for apple when deleting companies 2022-12-19 21:07:38 +11:00
David Bomba
9cb1e2b0b4 Harvest only the error message from the webhook endpoint 2022-12-19 14:57:44 +11:00
David Bomba
e6903984f4 Code cleanup 2022-12-18 14:35:13 +11:00
Lars Kusch
10cc02c14d Fix route 2022-12-16 15:19:00 +01:00
Lars Kusch
b3dd3aaaa1 Added BACS to payment controller 2022-12-16 12:05:10 +01:00
David Bomba
e2439b60c3 Prevent relinking of payments with transactions 2022-12-16 09:38:02 +11:00
David Bomba
1b1016efb9 Fixes for Apple OAuth 2022-12-14 17:35:36 +11:00
David Bomba
efa66f1a8b logging for socialite 2022-12-13 20:47:49 +11:00
David Bomba
32ff078a64 Remove all instances of dispatchSync() 2022-12-12 15:27:22 +11:00
David Bomba
69a1419e9b Fixes for updateinvoice events 2022-12-08 11:17:18 +11:00
David Bomba
5b63e0fd81 Fixes for latency when sending emails 2022-12-03 09:50:55 +11:00
David Bomba
986ed9016a Updates for translations for Stripe 2022-12-02 06:59:16 +11:00
David Bomba
b28aa5d1cd Add form request for enable two factor 2022-12-01 15:33:40 +11:00
David Bomba
c4b7cc615e Minor cleanup 2022-11-30 16:38:01 +11:00
David Bomba
7abc257499 Merge branch 'attachData_for_attachments_rather_than_file_paths' into v5-develop 2022-11-30 16:37:29 +11:00
David Bomba
d87cdd84b3
Merge pull request #8009 from checkitsedo/#8008-CSV-Import-AutoDetect-Delimiter 
#8008 csv import auto detect delimiter
 2022-11-30 16:03:06 +11:00
David Bomba
eb0bdd12ba Fixes for CSV imports, replace work_phone with phone 2022-11-30 11:46:02 +11:00
checkitsedo
b63b53e9d3
Add CSV delimiter Autodetection 
Line 139 and Lines 162-173:
Checks $csvfile for the most accurate delimiter ($bestDelimiter)

Line 140:
Sets the Delimiter for league/csv Reader
 2022-11-30 00:52:27 +01:00
David Bomba
93c96e0d78 Inject slight delay into emails 2022-11-28 12:24:07 +11:00
David Bomba
788055dad8 Fixes for updated_at in bank_transaction_rules 2022-11-27 19:10:11 +11:00
David Bomba
31988d0387 Fixes for creating backup directory if it does not exist 2022-11-27 09:46:24 +11:00
David Bomba
ff38a91302 Bulk match transactions 2022-11-25 07:52:47 +11:00
David Bomba
20810bd7fe Minor fixes for company count 2022-11-24 20:33:52 +11:00
David Bomba
4ea0d03b5c Update validation rules for subscriptions 2022-11-24 14:33:18 +11:00
David Bomba
60341c7c07 Add filters for tasks by project 2022-11-24 11:38:57 +11:00
David Bomba
b043d1a190 Merge branch 'v5-develop' into bank_rules 2022-11-24 08:05:15 +11:00
David Bomba
9718e657cd minor fixes for invoice controller bulk actions 2022-11-24 07:39:06 +11:00
David Bomba
1ef260cb14 Purge company transactions/integrations 2022-11-23 22:28:22 +11:00
David Bomba
428f42c723 Merge branch 'v5-develop' into bank_rules 2022-11-23 22:00:44 +11:00
David Bomba
d2ea53b0a4 Subscriptions v2 2022-11-23 17:27:43 +11:00
David Bomba
7727b90cd5 Allow auto billing as a bulk action 2022-11-23 13:02:41 +11:00
David Bomba
0f2e19a873 Merge branch 'v5-develop' into bank_rules 2022-11-23 12:54:26 +11:00
David Bomba
161b6a6466 Allow bulk email with selecting a template 2022-11-23 12:37:39 +11:00
David Bomba
9091951f41 Include bank transaction rules to first load 2022-11-22 08:42:53 +11:00
David Bomba
a8fcec8ace minor fixes for create company routeS' 2022-11-21 09:28:49 +11:00
David Bomba
3562c3376c Fixes for CRUD actions on bank transaction rules 2022-11-20 11:25:57 +11:00
David Bomba
f6f659521f Merge branch 'v5-develop' into bank_rules 2022-11-20 11:08:09 +11:00
David Bomba
050079b76a Wind back some changes for react fallback routes 2022-11-17 18:56:52 +11:00
David Bomba
d58de8e02c patch for 2FA Verification 2022-11-15 13:35:24 +11:00
David Bomba
93ecb8790b API Doc Blocks for Bank Transaction Rules 2022-11-14 11:21:05 +11:00
David Bomba
27936bfb7d fixes for leaking bank transactions 2022-11-14 10:02:01 +11:00
David Bomba
fe7f30785a Merge branch 'v5-develop' into bank_rules 2022-11-14 07:56:32 +11:00
David Bomba
84a985ec0e Add checks for bank_transaction in basecontroller 2022-11-13 18:34:23 +11:00
David Bomba
6ef21be16c Bank transaction rules 2022-11-13 15:21:37 +11:00
David Bomba
7150fdf66c Bank Transaction Rules 2022-11-13 15:12:50 +11:00
David Bomba
d2491476e4 minor fixes 2022-11-13 10:22:31 +11:00
David Bomba
c60fd8c7c6 Improvements for using react with self hots 2022-11-13 09:35:04 +11:00
David Bomba
dacde3358a Add Bank Services class 2022-11-11 15:28:49 +11:00
David Bomba
e73df693aa Bank Transaction Filters 2022-11-11 10:28:25 +11:00
David Bomba
52a01cb924 Add filters to Bank Integrations 2022-11-11 10:13:11 +11:00
David Bomba
3466d53845 Fixes for the Forte payment driver 2022-11-10 17:28:00 +11:00
David Bomba
d70a9ddd05 Rate limit bank syncing internally, not at edge of application 2022-11-10 07:49:45 +11:00
David Bomba
18a038a34d Fixes for 2FA 2022-11-09 22:22:52 +11:00
David Bomba
dd4d5534fb Minor fixes 2022-11-09 08:09:42 +11:00
David Bomba
237725a9c8 Additional functionality for bank integrations 2022-11-08 21:48:29 +11:00
David Bomba
2ffc4cb68d Additional logging for Microsoft acccounts 2022-11-08 17:20:39 +11:00
David Bomba
9c16c12ee9 remove html_backup column from backups tables 2022-11-07 08:52:06 +11:00
David Bomba
023de23a45 Update validation rules 2022-11-05 15:13:08 +11:00
David Bomba
7019cb1779 Yodlee Webhooks 2022-11-05 12:27:01 +11:00
David Bomba
0fc0ff25bd Minor fixes for Bank Transactions / Integratiosn 2022-11-04 12:55:17 +11:00
David Bomba
15a1c6fab9 Fixes for importsa 2022-11-03 07:54:34 +11:00
David Bomba
0019d8b99a Updated lock file 2022-11-02 17:36:17 +11:00
David Bomba
33fdd0000c Improve memory handling 2022-11-01 22:23:52 +11:00
David Bomba
6ebf5ad31b Update merge actions to bulk_print 2022-10-31 16:46:51 +11:00
David Bomba
37682d6f30 Merge PDFs 2022-10-31 07:50:29 +11:00
David Bomba
c5a05efdc2 Merge PDFs 2022-10-31 07:37:52 +11:00
David Bomba
95610fd25e Restrict size and amount of jobs 2022-10-28 13:09:17 +11:00
David Bomba
9d5ff0711f 2FA reset 2022-10-27 17:24:49 +11:00
David Bomba
6004b7f08f 2FA reset 2022-10-27 16:11:55 +11:00
David Bomba
68d56e92cb Wipe OAuth data when changing email addresses 2022-10-27 13:11:50 +11:00
David Bomba
a9004fa9f7 Fixes for purchase order viewed activity 2022-10-27 11:28:09 +11:00
David Bomba
151f345d77 Ensure token is present in request 2022-10-26 17:15:52 +11:00
David Bomba
012322afcc Add Bank Transaction Importer 2022-10-25 10:25:04 +11:00
David Bomba
dfed106ba1 Return list of bank transactions 2022-10-24 21:20:29 +11:00
David Bomba
0a1f41f1f1 Always force a baseType 2022-10-24 19:11:37 +11:00
David Bomba
701b474efa Bank Transactions matching default category ID 2022-10-24 15:51:34 +11:00
David Bomba
ce47e30aa2 Merge branch 'v5-develop' into yodlee 2022-10-24 08:43:02 +11:00
David Bomba
9838131a37 Additional records 2022-10-14 15:39:39 +11:00
David Bomba
48e21e9495 fixes for purge client 2022-10-10 14:26:53 +11:00
David Bomba
f26cdc2da7 Minor fixes for snappdf on updates 2022-10-09 18:32:53 +11:00
David Bomba
0a2cb6f88d Merge branch 'v5-develop' into yodlee 2022-10-06 20:55:44 +11:00
David Bomba
e62e2d5fc9 Fixes for low permission users hitting list views 2022-10-06 16:37:39 +11:00
David Bomba
f072b921c7 Fixes for WePay 2022-10-05 11:21:55 +11:00
David Bomba
56fe8c08da Fixes for swagger 2022-09-27 20:02:37 +10:00
David Bomba
49044be48c Fixes for checkout catching failures 2022-09-27 20:01:58 +10:00
David Bomba
dd414fc588 Refactor bank transactions 2022-09-22 16:20:54 +10:00
David Bomba
8300b01504 Refactor for bank transactions 2022-09-22 15:54:58 +10:00
David Bomba
9c3b9f0548 fill from_date to be one year in the past 2022-09-21 21:05:12 +10:00
David Bomba
f14e9c9948 Auto pull transactions when linking accounts 2022-09-21 21:03:04 +10:00
David Bomba
55ab915529 Ensure we do not remove gateway feed prematurely 2022-09-18 10:03:03 +10:00
David Bomba
20fb487873 improve trial page 2022-09-17 13:23:06 +10:00
David Bomba
af8becfc68 Upgrades 2022-09-17 11:49:53 +10:00
David Bomba
090d4c994a Fixes for send now functionality of recurring invoice 2022-09-16 12:49:09 +10:00
David Bomba
e0a770c663 Working on matching transactions 2022-09-15 15:02:39 +10:00
David Bomba
7e7f5395f8 Match Bank Transactions validation 2022-09-15 14:15:02 +10:00
David Bomba
0f3893a6ab MatchBankTransactions 2022-09-15 13:58:42 +10:00
David Bomba
2f429b9313 Refactor for bank transactions 2022-09-15 13:49:57 +10:00
David Bomba
6015bb36dd Fixes for sending custom templates with purchase orders 2022-09-15 08:52:28 +10:00
David Bomba
73acc1b7d5 Fixes for bank transactions: 2022-09-14 16:48:56 +10:00
David Bomba
599424d75f Add bank transactios as default includes 2022-09-14 14:33:05 +10:00
David Bomba
700451bac1 Move lightlogs to batch 2022-09-10 08:24:23 +10:00
David Bomba
61b6bb4543 Move lightlogs back to batching 2022-09-09 11:07:14 +10:00
David Bomba
3a8b1eb7e3 Improve date resolution in recurring invoices 2022-09-08 11:30:40 +10:00
David Bomba
d6039cec3a Attempt to refresh account list from auth page 2022-09-07 15:24:08 +10:00
David Bomba
3542e35da0 Add bank integrations into default includes 2022-09-07 15:09:53 +10:00
David Bomba
c0cb157309 Merge branch 'v5-develop' into yodlee 2022-09-07 14:54:50 +10:00
David Bomba
52d5afbce0 Remove DispatchNow() 2022-09-07 14:15:27 +10:00
David Bomba
3e676d584b Fixes for registration fields and ensure client contact email is unique per company 2022-09-06 21:32:52 +10:00
David Bomba
a0d1635a58 Fixes for handling partial payments with credits 2022-09-06 19:18:05 +10:00
David Bomba
0187d92412 Improve handling of purchaseOrder and purchase_order 2022-09-05 11:29:46 +10:00
David Bomba
0dd4f53332 Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop 2022-09-03 10:48:27 +10:00
David Bomba
f29dfb8f0f Add gates for lists 2022-09-03 10:48:22 +10:00
David Bomba
a963fe1aee Fixes for canvaskit path 2022-09-02 20:53:32 +10:00
David Bomba
df1bdf0e68 Adjust spam filtering 2022-08-31 12:05:15 +10:00
David Bomba
322f81bbab Clean up login controller 2022-08-29 16:55:00 +10:00
David Bomba
8efbeda4e2 Refactor trial confirmed page 2022-08-29 07:52:18 +10:00
David Bomba
c01f6debca Fixes for showing invoice 2022-08-28 18:55:55 +10:00
David Bomba
98c07573e3 Minor fixes for invitation in view portal 2022-08-28 16:27:12 +10:00
David Bomba
b7c8e197e9 Improve query efficiency 2022-08-27 19:43:01 +10:00
David Bomba
9b629c80d9 Refactor to nested queries to improve query planner 2022-08-27 18:49:34 +10:00
David Bomba
0e2b945c3b Update client records when trial activated in Stripe 2022-08-27 10:01:53 +10:00
David Bomba
187c5b115b Update purchase order invitations table 2022-08-27 09:26:08 +10:00
David Bomba
a2b8d57313 Ensure correct PDF is displayed to the contact 2022-08-24 18:28:08 +10:00
David Bomba
1c95603b70 OpenAPI 2022-08-18 23:16:25 +10:00
David Bomba
d6ccc27507 Open API 2022-08-18 23:13:06 +10:00
David Bomba
b7a5c055a8 Fixes for single route actions 2022-08-18 14:08:50 +10:00
David Bomba
b031e53a77 Fixes for openapi docs 2022-08-16 09:47:05 +10:00
David Bomba
1bfafbe24c refactor test mode 2022-08-16 06:03:12 +10:00
=
9d5c181634 Convert quote to project tests 2022-08-15 13:49:47 +10:00
=
fa2c9fdcdd Convert to project 2022-08-15 12:50:45 +10:00
=
02b38316f2 Convert quote to project 2022-08-15 12:31:20 +10:00
David Bomba
baf38e07d3 OpenAPI 2022-08-12 22:35:30 +10:00
David Bomba
532b2325b8 Open API docs 2022-08-12 20:44:09 +10:00
David Bomba
e6045b3fa9 OPENAPI DOCS 2022-08-12 18:58:37 +10:00
David Bomba
3b1d0e07e2 Automating data pulls 2022-08-12 13:41:55 +10:00
David Bomba
f6c377a10a Padding out OpenAPI definitions 2022-08-11 10:47:34 +10:00
David Bomba
8c7d002b31 Bank Transaction scaffold 2022-08-11 17:13:40 +10:00
David Bomba
d50220c387 Bank Integration API Tests 2022-08-11 17:05:33 +10:00
David Bomba
90557a3083 Working on BankTransaction scaffolds 2022-08-11 16:26:47 +10:00
David Bomba
0c5efe3ec2 Refactor the tables 2022-08-11 14:47:08 +10:00
David Bomba
6f9baa1c37 Refresh and remove accounts 2022-08-11 14:19:35 +10:00
David Bomba
5a2a2cce4a Bank integration 2022-08-11 11:49:39 +10:00
David Bomba
a5bef4240a Fixes for password confirmation validation form 2022-08-11 07:50:45 +10:00
David Bomba
4573bd916b Fixes for confirmation password verification: 2022-08-11 07:36:16 +10:00
David Bomba
b471920155 Clean up for Yodlee authentication 2022-08-10 19:49:27 +10:00
David Bomba
d80ec520f9 Fast link provisioning 2022-08-10 11:56:46 +10:00
David Bomba
3d397b40e3 Transaction matching service 2022-08-08 19:07:35 +10:00
David Bomba
357cb17ebf Working on bank integration 2022-08-08 17:56:21 +10:00
David Bomba
38704c6ce5 Transaction transformers 2022-08-08 12:46:41 +10:00
David Bomba
090f8f5dab Refactor for Yodlee API' 2022-08-08 08:26:27 +10:00
David Bomba
c5269832f9 Padding 2022-08-06 18:11:43 +10:00
David Bomba
0dc50bb171 Stubbing bank integration controllers 2022-08-05 19:05:59 +10:00
David Bomba
1be1a80437 Stubs for bank integration 2022-08-05 14:25:06 +10:00
David Bomba
effd1678a5 Merge branch 'v5-stable' into yodlee 2022-08-05 11:27:52 +10:00
David Bomba
6eab259568 add memory limit to PHP check 2022-08-05 10:38:40 +10:00
David Bomba
e976a4d8fb Fixes for company logos in client portal 2022-08-04 17:12:07 +10:00
David Bomba
92c236e788 Fixes for payment emails 2022-08-04 16:22:48 +10:00
David Bomba
54ba4de7ad Fixes for update customer 2022-08-04 14:01:31 +10:00
David Bomba
95d53ada66 Minor fixes for PDF generation 2022-08-04 11:26:58 +10:00
David Bomba
7ac4786bff Refactor to remove dispatchSync from code path 2022-08-01 07:30:04 +10:00
David Bomba
2ac46b7392 Minor fixes 2022-08-01 04:53:39 +10:00
David Bomba
48c36d0004 Fixes for mailers 2022-07-31 19:11:32 +10:00
David Bomba
36509a3f5b Fixes for design controller 2022-07-30 10:45:55 +10:00
David Bomba
99c7adfab4 Fixes for client portal 2022-07-30 10:12:15 +10:00
David Bomba
9731054125 client contact login 2022-07-29 15:05:47 +10:00
David Bomba
15b53ca617 Stubs for yodlee 2022-07-28 17:33:47 +10:00
David Bomba
b44e1a02ca Auth tokens 2022-07-28 16:29:42 +10:00
David Bomba
f6821e9fcc Yodlee init 2022-07-28 14:09:13 +10:00
David Bomba
717a34aa99 Fixes for tests 2022-07-28 11:24:50 +10:00
David Bomba
d93bac1b09 Improve efficiency of queries relying on Country 2022-07-28 10:58:13 +10:00
David Bomba
c8fc1a36a3 Fixes for Twilio 2022-07-27 23:12:36 +10:00
David Bomba
3ee0186c67 fixeS 2022-07-27 22:43:53 +10:00
David Bomba
aceb377081 Fixes for settings purchase order designs 2022-07-27 20:03:46 +10:00
David Bomba
6df802509b Fixes for vendor documents 2022-07-27 16:09:25 +10:00
David Bomba
2942dfa528 Vendor documents 2022-07-27 15:39:43 +10:00
David Bomba
9bf603e584 Fixes for emails - remove mime types 2022-07-27 14:57:17 +10:00
David Bomba
0d4eb7e37a rebasing commits from v5-develop 2022-07-27 11:28:30 +10:00
David Bomba
438562ab8f Integrate twilio 2022-07-27 11:21:12 +10:00
David Bomba
8e654c21ce Merge v5 2022-07-25 15:28:06 +10:00
=
80ad607e62 Replace 404 with not available screen for deleted entities 2022-07-25 10:47:18 +10:00
David Bomba
93c782fcc5 Merge branch 'v5-develop' into l9 2022-07-21 14:22:45 +10:00
David Bomba
97eb8d2aad Force delete activities on purge data 2022-07-21 08:28:34 +10:00
David Bomba
e337abe819 Patches from v5-dev 2022-07-20 10:56:02 +10:00
David Bomba
add1827759 Add exchange rate to factory 2022-07-20 07:57:57 +10:00
David Bomba
c1352e700d Fixes for purging company data 2022-07-19 09:39:54 +10:00
David Bomba
852fe26cc1 minor fixes for stripe 2022-07-19 08:34:39 +10:00
David Bomba
d07ba90e10 Updates for minimum requirements 2022-07-17 21:14:25 +10:00
David Bomba
9b6bfbf96c merge v5-dev 2022-07-17 20:38:00 +10:00
David Bomba
49eb2b63df Add rules for invitations 2022-07-16 14:43:10 +10:00
David Bomba
6581abf46d Merge v5-develop into L9 2022-07-15 22:59:25 +10:00
David Bomba
071f2ee102 Post Merge v5-develop 2022-07-15 17:41:30 +10:00
David Bomba
90de7b9f96 MErge clients 2022-07-15 15:54:19 +10:00
David Bomba
5735dd7c15 Apple OAuth 2022-07-13 16:31:48 +10:00
David Bomba
8b03e9bee1 Apple OAuth 2022-07-13 16:29:45 +10:00
David Bomba
9c68aebd1a Apple OAuth 2022-07-13 16:27:19 +10:00
David Bomba
c7b5148e64 Apple OAuth 2022-07-13 16:23:11 +10:00
David Bomba
b487ac8c0c Apple OAuth 2022-07-13 16:19:27 +10:00
David Bomba
577751cf6f Apple OAuth 2022-07-13 16:17:54 +10:00
David Bomba
e96db5eb40 Apple OAuth 2022-07-13 16:16:49 +10:00
David Bomba
fa91a755c7 Apple OAuth 2022-07-13 16:14:46 +10:00
David Bomba
469a3f053e Apple OAuth 2022-07-13 16:05:52 +10:00
David Bomba
b135168dde Apple OAuth 2022-07-13 16:03:51 +10:00
David Bomba
49eb1bac9e Apple OAuth 2022-07-13 16:03:24 +10:00
David Bomba
2301409f16 Apple OAuth 2022-07-13 16:01:06 +10:00
David Bomba
33e68ba9d5 Apple OAuth 2022-07-13 16:00:41 +10:00
David Bomba
9925214b31 Apple OAuth 2022-07-13 15:55:15 +10:00
David Bomba
dfd0670dba Apple OAuth 2022-07-13 15:47:12 +10:00
David Bomba
0ae322798d Apple OAuth 2022-07-11 18:48:24 +10:00
David Bomba
eaf1e193dd Add webhook endpoint when connecting Stripe 2022-07-11 11:47:01 +10:00
David Bomba
47768a70a4 Allow forced sending of first recurring invoice 2022-07-11 10:33:41 +10:00
David Bomba
c072841e71 Clean up 2022-07-11 09:34:25 +10:00
David Bomba
1d4e68938e Handle pay now redirects offsite 2022-07-09 12:15:35 +10:00
David Bomba
9a3a1b92f6 Fixes for send_email bulk routes 2022-07-08 09:00:36 +10:00
David Bomba
44ec3fdd50 Fixes for purchase order to expense 2022-07-07 22:09:39 +10:00
David Bomba
261a2e0ab6 Inventory management from purchase orders 2022-07-06 20:04:59 +10:00
David Bomba
6b3b50318b Expense a Purchase Order 2022-07-06 19:25:22 +10:00
David Bomba
3e5e915acc Uploads for purchase orders 2022-07-06 15:18:41 +10:00
David Bomba
32387e052c Purchase Order Emails 2022-07-04 15:37:37 +10:00
David Bomba
8f5896db22 Purchase Order Emails 2022-07-04 15:37:00 +10:00
David Bomba
24b4c3fbab Purchase Order Emails 2022-07-04 15:34:54 +10:00
David Bomba
dee96182d5 Purchase Order Emails 2022-07-04 15:33:31 +10:00
David Bomba
80ea41568c Purchase Order Emails 2022-07-04 15:27:09 +10:00
David Bomba
8d0dffa4f4 Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop 2022-07-01 08:26:32 +10:00
David Bomba
b80ff12677 Fixes for duplicate quote approved notifications 2022-07-01 08:26:27 +10:00
David Bomba
716561e22b Add filters for swiss QR Codes 2022-06-30 20:12:23 +10:00
David Bomba
73bb2c96db Purchase order decorators 2022-06-29 11:47:16 +10:00
David Bomba
36a7290679 Purchase order decorators 2022-06-29 11:44:05 +10:00
David Bomba
776f3428ba Purchase order decorators 2022-06-29 11:37:40 +10:00
David Bomba
ae11332d24 Minor fixes for create user route 2022-06-27 16:37:18 +10:00
David Bomba
5c621b4e98 Minor fixes for connected accounts 2022-06-26 13:27:32 +10:00
David Bomba
53f76db81a Minor fixes for connected accounts 2022-06-26 13:26:58 +10:00
David Bomba
d2d14175b7 Minor fixes for connected accounts 2022-06-26 13:25:51 +10:00
David Bomba
b705cf0520 bulk actions for purchase orders 2022-06-25 09:44:14 +10:00
David Bomba
77845c2259 Always ensure contacts can pay an invoice with an invitation link 2022-06-25 09:13:56 +10:00
David Bomba
a26fd73169 Fixes for connected accounts 2022-06-25 08:49:12 +10:00
David Bomba
81a8e67b35 Fixes for connected accounts 2022-06-25 08:46:27 +10:00
Nikola Cirkovic
c75b1d303f
Cirkovic/ina 16 fixes (#50) 
* Dispatch | PdfCreatorTest | Removed deprecated method

* Dispatch | Remove deprecated dispatchNow() method and use dispatchSync or call handle() on class where return is mandatory.
 2022-06-24 21:15:14 +10:00
David Bomba
a170c4a4d1 Permissions updated at 2022-06-24 21:13:24 +10:00
David Bomba
94f224cf2e Reduce scopes for microsoft email 2022-06-24 20:41:18 +10:00
David Bomba
d46f55ed6d Add purchase orders to first load 2022-06-24 15:54:34 +10:00
David Bomba
c0e3d2e677 add signup checks to flutter routes 2022-06-23 18:47:44 +10:00
David Bomba
e7ab088e90 admin notifications 2022-06-23 10:52:41 +10:00
David Bomba
93ebf3a767 Response handling with microsoft 2022-06-22 20:55:14 +10:00
David Bomba
3141a33ced Appropriately refresh sending tokens 2022-06-22 19:15:31 +10:00
David Bomba
7515d0e689 checks for access token property 2022-06-22 11:47:14 +10:00
Shift
0a20889916
Convert optional() to nullsafe operator 2022-06-21 09:59:25 +00:00
Shift
19080933b6
Apply Laravel coding style 
Shift automatically applies the Laravel coding style - which uses the PSR-2 coding style as a base with some minor additions.

You may customize the code style applied by adding a [PHP CS Fixer][1] or [PHP CodeSniffer][2] ruleset to your project root. Feel free to use [Shift's Laravel ruleset][3] to help you get started.

For more information on customizing the code style applied by Shift, [watch this short video][4].

[1]: https://github.com/FriendsOfPHP/PHP-CS-Fixer
[2]: https://github.com/squizlabs/PHP_CodeSniffer
[3]: https://gist.github.com/laravel-shift/cab527923ed2a109dda047b97d53c200
[4]: https://laravelshift.com/videos/shift-code-style
 2022-06-21 09:57:17 +00:00
David Bomba
d9ca212f81 FIxes for microsoft oauth 2022-06-17 16:46:33 +10:00
David Bomba
98bc3e8125 Change id for microsoft from sub to oid 2022-06-17 16:20:35 +10:00
David Bomba
59ee228820 Handle personal o365 accounts 2022-06-17 16:14:52 +10:00
David Bomba
174b3af863 Handle personal o365 accounts 2022-06-17 15:59:47 +10:00
David Bomba
89f0740703 Handle personal o365 accounts 2022-06-17 15:53:44 +10:00
David Bomba
9e75ebb317 Handle personal o365 accounts 2022-06-17 15:51:37 +10:00
David Bomba
3d7a65fea0 OAuth o365 permissions 2022-06-17 15:42:14 +10:00
David Bomba
913b202743 Refactor logincontroller for oauth providers 2022-06-17 15:09:35 +10:00
David Bomba
250f0bf2e8 Clean up logout requests 2022-06-17 14:31:53 +10:00
David Bomba
c5f4b31023 Microsoft oauth + signup 2022-06-17 12:52:08 +10:00
David Bomba
8e7dc5fca4 Microsoft oauth 2022-06-17 11:48:17 +10:00
David Bomba
e546d7348a Fixes for viewing soft deleted invites 2022-06-17 09:08:07 +10:00
David Bomba
ce12b181cf Don't allow upgrade to react if it is not installed 2022-06-16 16:52:43 +10:00
David Bomba
77d0dd8ae4 Allow setting react_ap flag on accounts table 2022-06-16 15:58:11 +10:00
David Bomba
9032bc6fa7 Notifications for Purchase orders / Viewed / Accepted 2022-06-16 14:42:24 +10:00
David Bomba
2fb1a130c3 Update for self updater 2022-06-16 13:36:38 +10:00
David Bomba
742e0d5c9b Clean up for self updater 2022-06-16 13:07:53 +10:00
David Bomba
5ce95010d5 Add switch to force react as front end 2022-06-16 13:04:05 +10:00
David Bomba
2c5e6a4893 Minor fixes for recurring invoices 2022-06-16 08:04:20 +10:00
David Bomba
4606215ba2 vendor profile updates 2022-06-15 21:24:30 +10:00
David Bomba
e074350c5e Accept signatures on purchase orders 2022-06-15 16:33:03 +10:00
David Bomba
0f32e43fb6 Accept listener 2022-06-15 16:27:21 +10:00
David Bomba
1e30bf4bdc Accept a purchase order 2022-06-15 15:20:00 +10:00
David Bomba
03f756fc5d Fixes for plan controller 2022-06-15 14:38:22 +10:00
David Bomba
041156fa89 Updates for vendor portal 2022-06-14 22:54:31 +10:00
David Bomba
063d600bbd Vendor Portal - Purchase Orders 2022-06-14 22:18:20 +10:00
=
cbdf0a827c Remove old snappdf installations prior to upgrading 2022-06-14 09:01:25 +10:00
David Bomba
31054c8a13 Vendor Portal stubs 2022-06-13 20:34:40 +10:00
David Bomba
6674424244 Stubs for vendor portal 2022-06-13 19:59:24 +10:00
David Bomba
19216934a5
Merge pull request #7540 from CirkaN/Cirkovic/INA-12 
Cirkovic/ina 12
 2022-06-12 17:13:56 +10:00
Nikola Cirkovic
117a4e4028 INA-12 | add apple to the login, refactor of microsoft login. 2022-06-11 05:31:32 +02:00
Nikola Cirkovic
469461f490 INA-12 | Handle microsoft login 2022-06-11 04:07:56 +02:00
David Bomba
6e357d8c7b Purchase Order Download emails 2022-06-10 18:29:15 +10:00
David Bomba
b1c3878da2 Bulk actions for Purchase Orders 2022-06-10 18:00:07 +10:00
David Bomba
90bff41600 Purchase Order Emails 2022-06-10 17:04:16 +10:00
David Bomba
7885813c1a Store silent in session to prevent entities being viewed by admins 2022-06-10 13:03:05 +10:00
David Bomba
e6e651b4b4 Event / Listeners for Purchase Orders 2022-06-09 13:33:13 +10:00
David Bomba
76bd11facb Purchase Order Events 2022-06-09 12:24:42 +10:00
David Bomba
f92070e3be Inventory Management Tests 2022-06-08 20:40:26 +10:00
=
a6327b7694 Purchase Order Actions 2022-06-07 08:12:06 +10:00
David Bomba
feacf65160 Stubs for purchase orderS 2022-06-05 20:30:56 +10:00
David Bomba
4a2ecdb6a7 Update Purchase Order Scaffold 2022-06-05 19:22:58 +10:00
David Bomba
f2bfca648f
Merge pull request #7499 from CirkaN/Cirkovic/INA-6 
Cirkovic/ina 6
 2022-06-05 19:12:21 +10:00
David Bomba
3e8ad10efe Revert zip package 2022-06-02 16:42:37 +10:00
David Bomba
3bf56af37f Fixes for timezone issues with recurring entities 2022-06-02 13:49:29 +10:00
Nikola Cirkovic
d1f9235cec INA-6 | WIP 2022-06-02 04:41:44 +02:00
David Bomba
aecc3c27c4 Fixes for setting permissions on chrome binary 2022-06-01 08:59:00 +10:00
David Bomba
720e42e35e Purchase order scaffold 2022-05-31 08:28:32 +10:00
David Bomba
978884f2ee
Merge pull request #7489 from turbo124/v5-develop 
Adjustments for Stripe Webhooks
 2022-05-31 07:40:52 +10:00
David Bomba
605d38f756
Merge pull request #7488 from CirkaN/Cirkovic/INA-5-refactor 
Cirkovic/ina 5 refactor
 2022-05-31 07:36:54 +10:00
David Bomba
7874d52e2a
Merge pull request #7479 from CirkaN/Cirkovic/IINA-4 
Cirkovic/iina 4
 2022-05-31 07:36:33 +10:00
Nikola Cirkovic
f2d1ef6bbb INA-5 | Remove unused method, remove ScheduledJob references 2022-05-30 20:46:21 +02:00
Nikola Cirkovic
ea8325fbe7 INA-5 | Update docs 2022-05-30 20:44:59 +02:00
David Bomba
a96ff66dee Configure webhooks on gateway creation 2022-05-30 20:08:12 +10:00
David Bomba
16f52e0f45 Fixes for check data 2022-05-29 18:17:03 +10:00
Nikola Cirkovic
4b9a7a2b47 INA-4 | Purchase Order Controller 2022-05-29 04:29:06 +02:00
David Bomba
5d4ee1f586 Change output of activities for react app 2022-05-29 11:24:23 +10:00
David Bomba
5138dc8092 Fixes for activity controller 2022-05-29 10:14:12 +10:00
David Bomba
df3a1832fe Fixes for trial plans 2022-05-28 10:20:32 +10:00
David Bomba
1e43e172a7 Actitivity output for React 2022-05-27 18:25:32 +10:00
David Bomba
13a1447b79 Padding out react application 2022-05-27 13:10:32 +10:00
David Bomba
108aa22387 Fixes for openAPI schema 2022-05-27 12:17:06 +10:00
David Bomba
a17c97a5ba
Merge pull request #7475 from turbo124/v5-develop 
Prep for react application
 2022-05-27 12:06:38 +10:00
David Bomba
92b5af5a39
Merge pull request #7456 from CirkaN/Cirkovic/INA-5 
Cirkovic/INA-5 (Ninja task scheduler)
 2022-05-27 12:05:47 +10:00
Nikola Cirkovic
9bd2279290 INA-5 | Update OpenAPI schema 2022-05-27 02:50:12 +02:00
David Bomba
e071c3aae7 Ensure freshness of models 2022-05-27 09:51:54 +10:00
David Bomba
df9e1f902d Fixes for page numbering in previews 2022-05-27 07:32:13 +10:00
Nikola Cirkovic
63061b6cf4 INA-5 | Renamed repository and added license 2022-05-26 04:32:37 +02:00
Nikola Cirkovic
c4809b1e18 INA-5 | TaskSchedulerController (fixes for fractal) 2022-05-26 04:18:53 +02:00
David Bomba
f5e24de767 Fixes for self hosted setup 2022-05-26 12:00:53 +10:00
David Bomba
b6f48c0d8c Page numbering for PDFs 2022-05-25 22:00:17 +10:00
David Bomba
a2977ef1ad minor fixes for self updater 2022-05-25 20:53:12 +10:00
Nikola Cirkovic
de4adadfae INA-5 | Use fractal 2022-05-25 00:06:42 +02:00
Nikola Cirkovic
99dc9ac65a INA-5 | Add company_id to schedulers so we can fetch them via company_id 2022-05-23 21:58:05 +02:00
Nikola Cirkovic
d1a7ff9ff5 Merge remote-tracking branch 'origin/Cirkovic/INA-5' into Cirkovic/INA-5 2022-05-23 21:25:55 +02:00