4060 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
David Bomba	419b381c21	Filter exceptions	2020-12-12 22:23:29 +11:00
David Bomba	b8c1c130c9	Merge pull request #4485 from turbo124/v5-develop ... Working on import	2020-12-12 21:54:28 +11:00
David Bomba	2a1a9e2a16	Working on import	2020-12-12 21:47:52 +11:00
David Bomba	3419d7900f	Tests for importing CSV files	2020-12-12 21:35:42 +11:00
David Bomba	584bef52fc	Working on import	2020-12-12 21:01:53 +11:00
David Bomba	aa1a788d6e	Public document download route	2020-12-12 19:46:28 +11:00
David Bomba	f6ed7be0da	Fixes for expense and project numbers	2020-12-12 07:51:10 +11:00
David Bomba	8cb9f3f80a	Merge pull request #4483 from turbo124/v5-stable ... v5.0.35 v5.0.35-release v5.0.35	2020-12-11 23:22:12 +11:00
David Bomba	df09336761	Merge pull request #4482 from turbo124/v5-develop ... Version bump 5.0.35	2020-12-11 23:21:22 +11:00
David Bomba	23f07a901b	Version bump to 5.0.35	2020-12-11 23:20:46 +11:00
David Bomba	c94eaa4599	Force Custom Language translations before pushing to PhantomJS	2020-12-11 19:54:40 +11:00
hillelcoren	5c7f1d4dba	New admin portal build	2020-12-11 08:27:32 +00:00
hillelcoren	608975204d	New admin portal build	2020-12-11 07:39:01 +00:00
David Bomba	b2a34bb37b	Merge pull request #4479 from turbo124/v5-develop ... Add custom variables	2020-12-11 17:51:18 +11:00
David Bomba	6ee4e45d1e	Add custom variables	2020-12-11 17:50:54 +11:00
David Bomba	f7852c793a	Merge pull request #4470 from turbo124/v5-develop ... Custom gateway query.	2020-12-11 08:11:27 +11:00
David Bomba	f49faf8f16	Fix for custom gateway query	2020-12-11 08:10:50 +11:00
David Bomba	763fa6ef08	Fix for custom gateway query	2020-12-11 08:09:04 +11:00
David Bomba	69c31bca2f	Merge pull request #4469 from turbo124/v5-develop ... Return NPM String error rather than bool	2020-12-11 07:27:39 +11:00
David Bomba	44fdadff07	Return NPM String error rather than bool	2020-12-11 07:24:43 +11:00
hillelcoren	45dae2f58a	New admin portal build	2020-12-10 19:53:48 +00:00
Benjamin Beganović	e6890e5430	Merge branch 'v5-develop' into v5-custom-payment-driver	2020-12-10 12:40:27 +01:00
Benjamin Beganović	5f796aeab6	php-cs-fixer	2020-12-10 12:38:46 +01:00
Benjamin Beganović	9df4938837	change gateway type & remove processPayment	2020-12-10 12:38:23 +01:00
Benjamin Beganović	5c776d4911	show custom driver with its label	2020-12-10 12:38:07 +01:00
Benjamin Beganović	37f79247ac	remove payment options from custom driver	2020-12-10 12:19:13 +01:00
David Bomba	b6a384737e	Merge pull request #4464 from turbo124/v5-develop ... Fixes for version check + schema fixes	2020-12-10 21:48:39 +11:00
David Bomba	c5a4b1fcfd	Fixes for version check + schema fixes	2020-12-10 21:48:16 +11:00
David Bomba	9227904c8d	Merge pull request #4463 from turbo124/v5-develop ... Fix for User Validation	2020-12-10 21:29:54 +11:00
David Bomba	3fc8374cb5	Fixes for attempting to create a user with duplicate email	2020-12-10 21:28:19 +11:00
David Bomba	bb1ca556c4	wire up custom gateway	2020-12-10 21:20:12 +11:00
David Bomba	1be59fe589	Merge pull request #4462 from turbo124/v5-develop ... Fixes for NPM Status reporting	2020-12-10 21:08:10 +11:00
David Bomba	22cd6cdff0	Fixes for NPM/NODE status	2020-12-10 21:06:24 +11:00
David Bomba	8c46e140af	Also factor in optin and optout for auto_enabled	2020-12-10 19:51:00 +11:00
David Bomba	894481989c	Also factor in optin and optout for auto_enabled	2020-12-10 19:47:17 +11:00
David Bomba	91f90c94e3	Merge pull request #4454 from turbo124/v5-develop ... Notifications clean up.	2020-12-10 07:58:08 +11:00
Benjamin Beganović	d45571d7f9	wip	2020-12-09 15:17:48 +01:00
Benjamin Beganović	a67de4ad7e	Merge pull request #4452 from beganovich/v5-4450 ... (v5) Fix #4450 & apply php-cs-fixer	2020-12-09 13:39:42 +01:00
Benjamin Beganović	23a64562c9	fix issue with setup & apply php-cs-fixer	2020-12-09 13:38:22 +01:00
David Bomba	df9fe5677d	Notification for quotes credits and invoices	2020-12-09 21:05:26 +11:00
David Bomba	7ba78cc342	Reduce notification emails to one per entity	2020-12-09 20:52:08 +11:00
David Bomba	b74d80e091	Merge pull request #4449 from turbo124/v5-stable ... 5.0.34 Enhancments, bug fixes and improvements in app stability v5.0.34 v5.0.34-release	2020-12-09 07:41:12 +11:00
David Bomba	c1d0733f8f	Version bump	2020-12-09 07:40:11 +11:00
David Bomba	7e32c46643	Merge pull request #4448 from turbo124/v5-develop ... Fixes for how to display CHF currency	2020-12-09 07:36:24 +11:00
David Bomba	dc2e5706c6	Fixes for how to display CHF currency	2020-12-09 07:35:26 +11:00
David Bomba	d8498bdd03	Merge pull request #4447 from turbo124/v5-develop ... Multiple fixes	2020-12-09 07:25:23 +11:00
David Bomba	6a03bcc546	Merge branch 'v5-develop' into v5-develop	2020-12-09 07:25:16 +11:00
David Bomba	ed3061fa7d	Remove html tags from texts	2020-12-09 07:22:35 +11:00
hillelcoren	e86eb9a2c4	New admin portal build	2020-12-08 20:14:43 +00:00
David Bomba	7075ec5096	Reorder default includes	2020-12-09 07:12:10 +11:00