7222 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
David Bomba	50749cd2bb	Payfast	2021-06-24 14:43:14 +10:00
David Bomba	6e212d7d55	Tweaks for company size check	2021-06-24 13:22:46 +10:00
David Bomba	f696f4926a	Merge pull request #6119 from turbo124/v5-develop ... V4 -> V5 compatiblity improvements	2021-06-24 07:56:16 +10:00
David Bomba	77432954d3	V4 -> V5 compatiblity improvements	2021-06-24 07:55:29 +10:00
David Bomba	a0ffcd78f0	Strip Tags from Paypal noteS	2021-06-24 07:07:36 +10:00
David Bomba	bc427c97cf	Catch all for designs	2021-06-24 06:55:33 +10:00
Benjamin Beganović	cb338141eb	Merge pull request #6116 from beganovich/v5-2306-swap-bottom-text-for-signature ... (v5) E-mail improvements	2021-06-23 15:32:11 +02:00
David Bomba	7e6e1d3de0	Backward compatiblity for custom counters	2021-06-23 22:55:01 +10:00
David Bomba	fc1a605046	Minor fixes for WePay	2021-06-23 22:41:29 +10:00
Benjamin Beganović	857d3a6e8f	Merge pull request #6117 from beganovich/v5-2306-signatures-on-pdf ... (v5) Fixes for PDFs	2021-06-23 11:56:20 +02:00
Benjamin Beganović	71fff59e8e	Fixes for signature & surcharge fields	2021-06-23 11:54:59 +02:00
hillelcoren	46dc98265b	New admin portal [selfhosted]	2021-06-23 09:22:57 +00:00
hillelcoren	651a44d1ea	New admin portal [hosted]	2021-06-23 09:18:57 +00:00
Benjamin Beganović	489b147357	Update translations for confirmation email	2021-06-23 11:05:04 +02:00
Benjamin Beganović	724e3b8191	Fixes for correct email template selector	2021-06-23 11:00:43 +02:00
Benjamin Beganović	7f342b589d	Remove unused method	2021-06-23 10:48:56 +02:00
Benjamin Beganović	bd2e05d3ac	Insert signature into bottom section of client emails instead of generic text	2021-06-23 10:47:41 +02:00
Benjamin Beganović	38504e2d53	Skip post-table processing for emails	2021-06-23 10:46:51 +02:00
David Bomba	98aaf3028b	Change payment exchange_currency_id from the clients currency to the company currency	2021-06-23 16:49:40 +10:00
David Bomba	f6c9a3a6a3	Merge pull request #6114 from turbo124/v5-develop ... Fixes for Gmail BCC	2021-06-23 15:13:52 +10:00
David Bomba	dbfb4069f7	Fixes for Gmail BCC	2021-06-23 15:13:33 +10:00
David Bomba	752122cbc6	Merge pull request #6113 from turbo124/v5-develop ... Fixes for Two Factor	2021-06-23 15:01:29 +10:00
David Bomba	1195c98660	Fixes for Two Factor	2021-06-23 15:01:13 +10:00
David Bomba	d2d62adf55	Merge pull request #6112 from turbo124/v5-develop ... Fixes for Two Factor	2021-06-23 14:55:30 +10:00
David Bomba	b56b5c1ec9	Fixes for Two Factor	2021-06-23 14:55:12 +10:00
David Bomba	4eea13334e	Code cleanup	2021-06-23 13:03:47 +10:00
David Bomba	d98bf747f7	Merge pull request #6110 from turbo124/v5-develop ... Fixes for Gmail BCC	2021-06-23 08:50:18 +10:00
David Bomba	6af1ac9373	Fixes for Gmail BCC	2021-06-23 08:50:02 +10:00
David Bomba	314cebb99e	Merge pull request #6109 from turbo124/v5-develop ... Refresh gmail tokens prior to emailing events	2021-06-23 08:31:38 +10:00
David Bomba	83b798dba0	Refresh gmail tokens prior to emailing events	2021-06-23 08:31:22 +10:00
David Bomba	d1d0945089	Merge pull request #6108 from turbo124/v5-develop ... Fixes for mailers	2021-06-23 08:17:46 +10:00
David Bomba	fee346e723	Fixes for mailers	2021-06-23 08:17:22 +10:00
David Bomba	49e1a13b53	Verify ACH amounts as integers	2021-06-23 08:15:03 +10:00
David Bomba	24a5548619	Verify ACH amounts as integers	2021-06-23 08:14:23 +10:00
David Bomba	5e4d70d69b	Default shown tasks = invoiced	2021-06-23 07:54:06 +10:00
David Bomba	8825ce4585	Merge pull request #6105 from turbo124/v5-develop ... Fixes for login where the user is not attached to an account	2021-06-22 21:33:32 +10:00
David Bomba	830cbb179a	v5.2.6	2021-06-22 21:15:14 +10:00
David Bomba	293b12e348	Fixes for login where the user is not attached to an account	2021-06-22 21:14:08 +10:00
hillelcoren	bcdfe2f5d1	New admin portal [selfhosted]	2021-06-22 10:31:11 +00:00
hillelcoren	5bb6e20b34	New admin portal [hosted]	2021-06-22 10:28:27 +00:00
David Bomba	f245457a6c	Merge pull request #6104 from turbo124/v5-develop ... Fixes for check data script	2021-06-22 19:02:43 +10:00
David Bomba	a76678e7b4	Fixes for check data script	2021-06-22 19:02:26 +10:00
David Bomba	30a98dc011	Merge pull request #6103 from turbo124/v5-develop ... Change query parameter when querying datetimes	2021-06-22 18:47:05 +10:00
David Bomba	756543f132	Change query parameter when querying datetimes	2021-06-22 18:46:46 +10:00
David Bomba	a952011bf4	Merge pull request #6102 from turbo124/v5-develop ... Cross fill subdomains	2021-06-22 17:46:12 +10:00
David Bomba	a04be52615	Cross fill subdomains	2021-06-22 17:45:55 +10:00
Benjamin Beganović	b748412f6f	Merge pull request #6095 from beganovich/v5-2106-jsify-wepay ... (v5) Standardize Javascript for WePay	2021-06-22 09:38:14 +02:00
David Bomba	1a6add3e0b	Merge pull request #6101 from turbo124/v5-develop ... Subdomain filling	2021-06-22 17:24:31 +10:00
David Bomba	2da5ac6caa	Subdomain filling	2021-06-22 17:24:14 +10:00
David Bomba	ceefde5378	Merge pull request #6099 from turbo124/v5-develop ... Set Exchange Rates on invoice when marked as paid	2021-06-22 11:24:29 +10:00