5321 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
David Bomba	9ca9736de6	resolved conflicts'	2021-03-18 12:00:01 +11:00
David Bomba	ee15ea9434	v5.1.27	2021-03-18 11:58:10 +11:00
David Bomba	2415a3cf32	Merge pull request #5166 from turbo124/v5-develop ... Hosted PDF	2021-03-18 11:56:19 +11:00
David Bomba	0ea76db8a6	v5.1.27	2021-03-18 11:53:40 +11:00
David Bomba	086189a1ea	Hosted PDFs by invoice ninja	2021-03-18 11:53:08 +11:00
David Bomba	7fbe4ceb5d	Merge pull request #5162 from turbo124/v5-develop ... Remove illegal characters from pdf file names	2021-03-18 08:19:56 +11:00
David Bomba	28adccbb4c	Merge pull request #5118 from beganovich/v5-1103-billing-landing-page ... (v5) Billing page	2021-03-18 08:19:36 +11:00
Benjamin Beganović	c320b6bfbb	Merge branch 'v5-develop' into v5-1103-billing-landing-page	2021-03-17 17:14:55 +01:00
Benjamin Beganović	127c6cb3cd	wip	2021-03-17 16:12:25 +01:00
David Bomba	f52fb31ced	Remove illegal characters from pdf file names	2021-03-17 22:29:20 +11:00
Benjamin Beganović	81f5808bf6	- Use user from $billing_subscription to create client ... - Disable generating the cache for temporary state - Generate the blank invoice based on the product	2021-03-17 12:06:58 +01:00
David Bomba	5041e11933	Merge pull request #5160 from turbo124/v5-stable ... Update demo data	2021-03-17 21:26:59 +11:00
David Bomba	f10f7dca42	Merge pull request #5159 from turbo124/v5-develop ... Update demo data	2021-03-17 21:26:20 +11:00
David Bomba	dc4980a8b2	Update demo data	2021-03-17 21:26:02 +11:00
David Bomba	22708553c9	Merge pull request #5158 from turbo124/v5-develop ... v5.1.26	2021-03-17 21:18:08 +11:00
David Bomba	b23df66eb6	Merge pull request #5157 from turbo124/v5-stable ... v5.1.26 v5.1.26-release v5.1.26	2021-03-17 21:14:43 +11:00
David Bomba	acaccba113	v5.1.26	2021-03-17 21:13:55 +11:00
David Bomba	3a0624e649	Merge pull request #5156 from turbo124/v5-develop ... Tuning company settings for missing properties	2021-03-17 21:07:17 +11:00
David Bomba	f00c1f95c0	Add new counter settings	2021-03-17 21:06:08 +11:00
David Bomba	c95e0c3d7e	Tuning company settings for missing properties	2021-03-17 20:28:44 +11:00
hillelcoren	173de30e69	New admin portal build	2021-03-17 09:06:40 +00:00
hillelcoren	9a34d50e93	New admin portal build	2021-03-17 07:04:58 +00:00
Benjamin Beganović	eb2cfde303	Merge remote-tracking branch 'upstream/v5-develop' into v5-1103-billing-landing-page	2021-03-17 07:34:23 +01:00
David Bomba	e3d056ab0b	Merge pull request #5155 from turbo124/v5-develop ... Billing subscription - invoice generation	2021-03-17 17:27:58 +11:00
David Bomba	1012c8df4b	Working on billing subscriptions	2021-03-17 13:21:06 +11:00
David Bomba	86ea2f0709	Fixes for free plan invoice designs - default to clean	2021-03-17 12:04:54 +11:00
David Bomba	5a6a7248eb	Merge pull request #5154 from turbo124/v5-develop ... Fixes for signature line breaks / HTML formatting	2021-03-17 11:36:45 +11:00
David Bomba	35bca3d7b6	Fixes for signature line breaks / HTML formatting	2021-03-17 11:35:41 +11:00
David Bomba	0f66845701	Merge pull request #5153 from turbo124/v5-develop ... Small fix for user notifications	2021-03-17 11:14:19 +11:00
David Bomba	059cec705d	Small fix for user notifications	2021-03-17 11:13:29 +11:00
David Bomba	b14ac6557b	Merge pull request #5150 from turbo124/v5-develop ... Throw 400's on incorrect 2FA data	2021-03-17 10:19:43 +11:00
David Bomba	7da509dc99	add php 7.3 to composer dev	2021-03-17 10:19:06 +11:00
David Bomba	db03dccbaf	Limit reminders for free plans	2021-03-17 08:15:43 +11:00
David Bomba	5ef6afdc28	Limit attachment features on free plan	2021-03-17 08:08:23 +11:00
hillelcoren	d6eeddf0fb	New admin portal build	2021-03-16 17:55:57 +00:00
David Bomba	b762ea37d2	Throw 400's on incorrect 2FA data	2021-03-17 00:40:58 +11:00
Benjamin Beganović	851a31b3c0	Proof of concept for billing page	2021-03-16 14:35:57 +01:00
hillelcoren	56ff704ae4	New admin portal build	2021-03-16 13:23:13 +00:00
David Bomba	0422c95e13	Cache password protection on login	2021-03-16 23:10:15 +11:00
David Bomba	2207168ee8	Merge pull request #5146 from turbo124/v5-develop ... Fixes for 2FA	2021-03-16 22:48:27 +11:00
David Bomba	ae62bf63c6	Fixes for 2FA	2021-03-16 22:47:14 +11:00
David Bomba	aef2270f05	Fixes for connected account	2021-03-16 22:44:10 +11:00
David Bomba	5e8646adc9	Merge pull request #5145 from turbo124/v5-develop ... Fixes for connected account	2021-03-16 22:34:12 +11:00
David Bomba	816ea281ff	Fixes for connected account	2021-03-16 22:33:48 +11:00
David Bomba	36cd6f7262	Merge pull request #5144 from turbo124/v5-develop ... Fixes for connected account	2021-03-16 22:30:46 +11:00
David Bomba	591bfb9e9d	Fixes for connected account	2021-03-16 22:30:33 +11:00
David Bomba	d4b05d7d7b	Merge pull request #5143 from turbo124/v5-develop ... Fixes for connected account	2021-03-16 22:29:38 +11:00
David Bomba	6bb71dc33b	Fixes for connected account	2021-03-16 22:29:16 +11:00
David Bomba	a8395ab1ac	Merge pull request #5141 from turbo124/v5-develop ... 2FA	2021-03-16 21:53:36 +11:00
hillelcoren	874dcd58d6	New admin portal build	2021-03-16 10:11:38 +00:00