20017 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Benjamin Beganović	60800c9ea7	Merge pull request #5179 from beganovich/v5-1803-billing ... (v5) 18th March: Billing page	2021-03-22 09:39:29 +01:00
Benjamin Beganović	187be058f7	Merge branch 'v5-develop' into v5-1803-billing	2021-03-22 09:38:34 +01:00
David Bomba	608d085c5d	Merge pull request #5211 from turbo124/v5-develop ... Small type check fix	2021-03-22 17:47:27 +11:00
David Bomba	cfdcf889ad	Small type check fix	2021-03-22 17:46:59 +11:00
hillelcoren	ed8060deab	New admin portal build	2021-03-22 06:16:19 +00:00
David Bomba	a2148a9b10	Merge pull request #5210 from turbo124/v5-develop ... Add oauth user token	2021-03-22 16:46:14 +11:00
David Bomba	56b0452d2e	Add oauth user token	2021-03-22 12:54:50 +11:00
David Bomba	ff8c846004	Merge pull request #5209 from turbo124/v5-develop ... 5.1.30	2021-03-22 12:49:30 +11:00
David Bomba	99a0edbc57	Merge pull request #5208 from turbo124/v5-stable ... 5.1.30	2021-03-22 12:48:14 +11:00
David Bomba	b10008b193	v5.1.30	2021-03-22 12:47:33 +11:00
David Bomba	5ab01adaf2	Merge pull request #5207 from turbo124/v5-develop ... Connected Gmail Account	2021-03-22 10:48:16 +11:00
David Bomba	0c5b551ce1	Connected Gmail Account	2021-03-22 10:48:00 +11:00
David Bomba	cfef367952	Merge pull request #5206 from turbo124/v5-develop ... Connected Gmail Account	2021-03-22 09:52:52 +11:00
David Bomba	c97dea08d2	Connected Gmail Account	2021-03-22 09:52:39 +11:00
hillelcoren	458b3fdd9e	New admin portal build	2021-03-21 22:30:36 +00:00
hillelcoren	b284259ad5	New admin portal build	2021-03-21 22:11:01 +00:00
David Bomba	e16908b176	Merge pull request #5205 from turbo124/v5-develop ... Connected Gmail Account	2021-03-22 09:02:41 +11:00
David Bomba	24c8325fb1	Connected Gmail Account	2021-03-22 09:02:22 +11:00
hillelcoren	1ecb04b985	New admin portal build	2021-03-21 21:56:29 +00:00
hillelcoren	0236a666ca	New admin portal build	2021-03-21 21:30:34 +00:00
David Bomba	d86217995c	Merge pull request #5204 from turbo124/v5-develop ... Connect Gmail Accounts	2021-03-22 08:06:47 +11:00
David Bomba	32b8575ce1	Connected Gmail Account	2021-03-22 08:06:26 +11:00
David Bomba	8197a87ad0	remove unique constraint on payment hash	2021-03-22 07:23:21 +11:00
David Bomba	f80179814d	fix conflicts	2021-03-22 07:22:20 +11:00
David Bomba	1b5d6d44f2	Set default time out	2021-03-22 07:21:51 +11:00
hillelcoren	5ed5aef276	New admin portal build	2021-03-21 11:21:40 +00:00
hillelcoren	a14c5a717d	New admin portal build	2021-03-21 10:44:25 +00:00
David Bomba	bb8a55ca6e	Merge pull request #5202 from turbo124/v5-develop ... Minor fixes for oauth login	2021-03-21 21:39:51 +11:00
=	4285b5f6fc	Minor fixes for oauth login	2021-03-21 21:38:57 +11:00
hillelcoren	241f3fe001	New admin portal build	2021-03-21 10:25:17 +00:00
David Bomba	e565355e90	Merge pull request #5201 from turbo124/v5-develop ... Working on Google OAuth	2021-03-21 20:56:27 +11:00
=	42ae8d53dd	Working on client subscriptions	2021-03-21 20:45:30 +11:00
=	932185e6c2	Working on client subscriptions	2021-03-21 20:26:30 +11:00
David Bomba	c7d7916b04	Update defaults	2021-03-21 16:35:09 +11:00
David Bomba	ae8942b187	Merge pull request #5198 from turbo124/v5-develop ... Fixes for task policy	2021-03-21 15:05:56 +11:00
David Bomba	8d490200b6	Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop	2021-03-21 13:51:45 +11:00
David Bomba	58aee4250e	Fixes for task policy	2021-03-21 13:51:28 +11:00
David Bomba	4b2c8318c5	Merge pull request #5197 from turbo124/v5-stable ... v5.1.29	2021-03-21 09:34:15 +11:00
=	4292f4492d	Merge branch 'v5-develop' into v5-stable	2021-03-21 09:33:22 +11:00
=	53c606e744	v5.1.29	2021-03-21 09:33:09 +11:00
Benjamin Beganović	fdd1601120	wip	2021-03-20 23:15:26 +01:00
=	5b290b1770	Small fix for usernotifies	2021-03-21 08:57:11 +11:00
=	36ffeb9344	bug fixes	2021-03-21 08:53:33 +11:00
David Bomba	ada49ca083	Merge pull request #5192 from turbo124/v5-develop ... billing subscriptions	2021-03-21 00:30:32 +11:00
=	2eb7de95ad	Add invoie_id to client subs	2021-03-20 14:39:30 +11:00
David Bomba	6be79ad022	Billing Subs	2021-03-20 13:57:03 +11:00
David Bomba	ba91c96c40	update texts	2021-03-20 13:49:45 +11:00
David Bomba	9403bf3aa9	Merge pull request #5191 from turbo124/v5-develop ... Pass back the correct entity!	2021-03-20 12:39:26 +11:00
=	e2314359b9	Pass back the correct entity!	2021-03-20 11:54:47 +11:00
David Bomba	a449451330	Merge pull request #5190 from turbo124/v5-stable ... Small fixes for 2FA	2021-03-20 11:47:54 +11:00