7018 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
David Bomba	9ea175eb74	Merge pull request #6023 from turbo124/v5-stable ... v5.2.2	2021-06-15 08:21:51 +10:00
David Bomba	e91b79a160	Merge branch 'v5-develop' into v5-stable	2021-06-15 08:21:05 +10:00
David Bomba	bb06fe6edd	v5.2.2	2021-06-15 08:20:52 +10:00
David Bomba	35237849ff	Merge pull request #6021 from turbo124/v5-develop ... Fixes for reminders	2021-06-15 08:20:11 +10:00
David Bomba	d582e67962	Fixes for Stripe import customers	2021-06-15 08:19:23 +10:00
David Bomba	887bc3d4a6	Fixes for reminders	2021-06-15 08:06:01 +10:00
David Bomba	4ce093ff8b	Merge pull request #6015 from turbo124/v5-develop ... Update license	2021-06-14 19:14:48 +10:00
David Bomba	9db0758cc1	Update license	2021-06-14 19:13:48 +10:00
David Bomba	7de18a5f0e	Merge pull request #6014 from turbo124/v5-develop ... Hosted Users console command	2021-06-14 18:11:07 +10:00
David Bomba	2e1a6ef6c4	HostedUsers console command	2021-06-14 18:10:46 +10:00
David Bomba	7469ca30eb	HostedUsers console command	2021-06-14 18:06:34 +10:00
David Bomba	f2e29bdcf4	Merge pull request #6013 from turbo124/v5-develop ... Changes to CompanyImport logic - allow multiple users to be imported …	2021-06-14 17:09:21 +10:00
David Bomba	d2d6a9fe5a	Changes to CompanyImport logic - allow multiple users to be imported - however we prevent them from logging in if their plan isn't Enterprise	2021-06-14 17:09:05 +10:00
David Bomba	cdafa4e8a7	Merge pull request #6012 from turbo124/v5-develop ... Fixes logic for hosted login	2021-06-14 17:06:25 +10:00
David Bomba	1397c9ab1c	Fixes logic for hosted login	2021-06-14 17:04:15 +10:00
=	c67998219e	invoice_total_raw	2021-06-13 22:56:33 +10:00
David Bomba	9ffa092fb1	Merge pull request #6011 from turbo124/v5-develop ... Tests for clean up S3 orphans	2021-06-13 21:47:27 +10:00
=	46ae91f920	Fixes for regex for subdomain name	2021-06-13 20:47:49 +10:00
=	2b6f0870b3	Tests for clean up S3 orphans	2021-06-13 20:09:52 +10:00
David Bomba	a42223a0be	Clean up filesystem:	2021-06-13 19:44:33 +10:00
David Bomba	046bbfd546	Merge pull request #6010 from turbo124/v5-develop ... Don't delete the PDF prior to sending	2021-06-13 14:19:53 +10:00
David Bomba	59fcbfe52c	Don't delete the PDF prior to sending	2021-06-13 14:19:40 +10:00
David Bomba	3aefc1ba41	Merge pull request #6009 from turbo124/v5-develop ... Declare disk for storage	2021-06-13 14:09:52 +10:00
David Bomba	0a0ea46851	Declare disk for storage	2021-06-13 14:09:33 +10:00
David Bomba	92bf22bf91	Merge pull request #6008 from turbo124/v5-develop ... Specify disk for storage operations	2021-06-13 13:57:23 +10:00
David Bomba	55918d772c	Specify disk for storage operations	2021-06-13 13:57:08 +10:00
David Bomba	5987967f9c	Merge pull request #6007 from turbo124/v5-develop ... Ensure directories are created prior to PDF generation	2021-06-13 13:47:17 +10:00
David Bomba	7709bd32d1	Ensure directories are created prior to PDF generation	2021-06-13 10:18:07 +10:00
David Bomba	06ee04ffa5	Merge pull request #6006 from turbo124/v5-develop ... code cleanup	2021-06-13 09:58:38 +10:00
David Bomba	0fb7f58851	code cleanup	2021-06-13 09:58:23 +10:00
David Bomba	86f97cc443	Merge pull request #6005 from turbo124/v5-develop ... Refactor for entity paths	2021-06-13 08:49:42 +10:00
=	afdfddd7e9	Refactor for entity paths	2021-06-12 21:50:01 +10:00
David Bomba	edf2dfcc80	Minor fixes	2021-06-12 19:40:28 +10:00
David Bomba	492d8dc308	Merge pull request #6004 from turbo124/v5-stable ... v5.2.1	2021-06-12 08:02:33 +10:00
David Bomba	13606aa8f3	Merge pull request #6003 from turbo124/v5-develop ... Minor fixes	2021-06-12 08:02:15 +10:00
David Bomba	229add03a7	Merge branch 'v5-develop' into v5-stable	2021-06-12 08:01:55 +10:00
David Bomba	d823b86d69	Minor fixes	2021-06-12 08:01:47 +10:00
David Bomba	d0b6bd6ed0	Merge pull request #6002 from turbo124/v5-stable ... v5.2.0	2021-06-12 08:01:01 +10:00
David Bomba	2e29db741d	Merge branch 'v5-stable' of https://github.com/turbo124/invoiceninja into v5-stable	2021-06-12 08:00:07 +10:00
David Bomba	9b0c860d44	Merge branch 'v5-develop' into v5-stable	2021-06-12 07:59:56 +10:00
David Bomba	3a8485884d	Merge pull request #6001 from turbo124/v5-develop ... v5.2.0	2021-06-12 07:53:27 +10:00
David Bomba	f04f16ea93	Merge branch 'v5-develop' into v5-stable	2021-06-12 07:53:08 +10:00
David Bomba	4d41caffee	v5.2.0	2021-06-12 07:46:08 +10:00
David Bomba	3954ac3f3a	Fixes for timezone offsets	2021-06-12 07:41:02 +10:00
hillelcoren	73e0c79a4e	New admin portal [selfhosted]	2021-06-11 07:20:48 +00:00
hillelcoren	3e28315cbd	New admin portal [hosted]	2021-06-11 07:17:38 +00:00
David Bomba	7712b7ba69	Merge pull request #5999 from turbo124/v5-develop ... Timezone Offset implementation	2021-06-11 14:28:54 +10:00
David Bomba	86be7c6690	add ninja_portal_url to company_user transformer	2021-06-11 14:16:21 +10:00
David Bomba	c367ea60ae	Timezone Offset implementation	2021-06-11 08:20:46 +10:00
David Bomba	b84084dffc	Merge pull request #5998 from turbo124/v5-develop ... Timezone Offsets	2021-06-11 07:34:24 +10:00