7889 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
David Bomba	75ac7ec48c	minor fixes	2021-07-21 09:21:32 +10:00
David Bomba	27d4b9d349	Merge branch 'v5-develop' into paytrace	2021-07-21 09:20:31 +10:00
David Bomba	a470ecbe2c	Version bump	2021-07-21 09:14:32 +10:00
David Bomba	6c2db0c853	Merge pull request #6302 from turbo124/v5-develop ... Fixes for account creation	2021-07-21 09:13:47 +10:00
David Bomba	ca4cbb918b	Minor fixes for tests	2021-07-21 09:13:04 +10:00
David Bomba	511b8f8074	v5.2.14	2021-07-21 08:17:27 +10:00
David Bomba	f417b27e55	Minor fixes for first account creation	2021-07-21 08:07:19 +10:00
David Bomba	df7d20fa76	Scaffolding Paytrace	2021-07-21 07:53:11 +10:00
David Bomba	c0287085b5	Scaffolding Paytrace	2021-07-20 21:26:24 +10:00
David Bomba	f9ffe7e76e	Merge pull request #6300 from turbo124/v5-develop ... Fixes for queries	2021-07-20 19:58:57 +10:00
hillelcoren	f21bbfb8b9	New admin portal [selfhosted]	2021-07-20 09:55:23 +00:00
hillelcoren	794a331fc6	New admin portal [hosted]	2021-07-20 09:52:23 +00:00
David Bomba	11ae85732b	Fixes for queries	2021-07-20 19:45:54 +10:00
David Bomba	cdcd58a098	Merge pull request #6299 from turbo124/v5-develop ... Return 200 HTTP code on webhook response from payfast.	2021-07-20 17:23:57 +10:00
David Bomba	b4698b1919	Fixes for import	2021-07-20 17:23:31 +10:00
David Bomba	6dbba38a49	Merge branch 'paytrace' into v5-develop	2021-07-20 17:18:50 +10:00
David Bomba	29006a2da0	Fixes for client - country codes	2021-07-20 15:09:02 +10:00
David Bomba	aff6eb2701	Fixes for bad country codes in client request	2021-07-20 14:53:43 +10:00
David Bomba	dbb60c029e	Fixes for reminderS	2021-07-20 14:49:04 +10:00
David Bomba	a8d148b0dc	Fixes for invoices which are not payable if archived	2021-07-20 09:30:12 +10:00
David Bomba	48c5c56a4a	Fixes for webhook bug	2021-07-20 08:39:04 +10:00
David Bomba	46852794aa	return 200 HTTP code on webhook response from payfast.	2021-07-20 07:58:40 +10:00
David Bomba	055cacbfa7	Fixes for support message	2021-07-19 20:46:18 +10:00
David Bomba	44c88496af	Merge pull request #6295 from turbo124/v5-develop ... Set 'invoice_task_datelog' to true	2021-07-19 17:46:31 +10:00
David Bomba	ca9c420aab	Set 'invoice_task_datelog' to true	2021-07-19 17:46:16 +10:00
David Bomba	e65016d2dd	Merge pull request #6294 from turbo124/v5-develop ... Add net_subtotal option	2021-07-19 17:39:55 +10:00
David Bomba	74551c2caf	Add delete company email	2021-07-19 15:38:07 +10:00
David Bomba	d82491d163	Email user when another user is added into the system	2021-07-19 14:17:58 +10:00
David Bomba	bcc286e537	Handle base64 encoded passwords	2021-07-19 10:57:13 +10:00
David Bomba	856e3b846b	Fixes for viewed entity notifications	2021-07-19 07:50:22 +10:00
=	643e05212b	Fixes for reminders	2021-07-18 21:49:25 +10:00
=	5a198af0d1	Mark designs as free	2021-07-18 20:10:55 +10:00
hillelcoren	1685f2318d	New admin portal [selfhosted]	2021-07-18 09:02:41 +00:00
hillelcoren	9008deee5f	New admin portal [hosted]	2021-07-18 08:59:46 +00:00
David Bomba	53f6aeb9d3	Add net_subtotal option	2021-07-18 18:57:26 +10:00
David Bomba	729c92a343	Merge pull request #6291 from turbo124/v5-develop ... Fixes for PaypalExpressDriver	2021-07-18 17:48:02 +10:00
David Bomba	13004e249b	Fixes for line items for PaypalExpressPaymentDriver	2021-07-18 17:47:34 +10:00
David Bomba	edff2881eb	Import Stripe Customers	2021-07-18 17:30:29 +10:00
David Bomba	e6963ea6c9	Merge pull request #6289 from turbo124/v5-develop ... v5.2.13	2021-07-18 14:19:07 +10:00
David Bomba	8ea08d2c5f	v5.2.13	2021-07-18 14:18:24 +10:00
David Bomba	2e53daa95d	Merge pull request #6288 from turbo124/v5-develop ... General fixes and improvements	2021-07-18 14:10:40 +10:00
David Bomba	d1c4da1d64	Do no add duplicate Task Statuses if they already exist	2021-07-18 14:05:33 +10:00
David Bomba	0f10c4b8dd	minor fixes	2021-07-18 08:43:07 +10:00
hillelcoren	088710ce2b	New admin portal [selfhosted]	2021-07-17 20:53:22 +00:00
hillelcoren	16cca72bdf	New admin portal [hosted]	2021-07-17 20:50:27 +00:00
hillelcoren	e83aefeb4b	New admin portal [selfhosted]	2021-07-17 20:40:19 +00:00
hillelcoren	4be5ceefe2	New admin portal [hosted]	2021-07-17 20:37:11 +00:00
David Bomba	a1e9de5807	Minor Clean up	2021-07-17 22:01:00 +10:00
David Bomba	970cf417cc	Merge pull request #6286 from turbo124/v5-develop ... Uses inclusives taxes fix	2021-07-17 20:37:20 +10:00
David Bomba	0a77e571fe	Fixes for uses_inclusive_taxes	2021-07-17 20:36:51 +10:00