7280 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
David Bomba	ce0cd5ddb1	Fixes for conflicts	2021-06-16 20:21:08 +10:00
David Bomba	368725cb31	Merge branch 'turbo124-v5-develop' into v5-develop	2021-06-16 20:16:30 +10:00
David Bomba	f4d686c70c	Fixes for conflicts	2021-06-16 20:16:22 +10:00
David Bomba	c076998366	Wepay Payments	2021-06-16 20:12:04 +10:00
David Bomba	36f6cbbcc9	Update license in codebase	2021-06-16 16:58:16 +10:00
David Bomba	43ff685543	WePay authorize for Bank Transfer	2021-06-16 16:41:29 +10:00
David Bomba	d4f27bb3ee	WePay authorize for Bank Transfer	2021-06-16 13:26:33 +10:00
David Bomba	8c36ba78b1	Merge pull request #6034 from beganovich/v5-update-email-templates ... (v5) New e-mail templates	2021-06-16 13:11:04 +10:00
David Bomba	af328ac929	Merge pull request #6040 from turbo124/v5-develop ... Fixes for release	2021-06-16 07:32:32 +10:00
David Bomba	978b713107	Fixes for release	2021-06-16 07:31:43 +10:00
David Bomba	ced0cd2dfc	Merge pull request #6037 from turbo124/v5-develop ... Fixes for releases	2021-06-16 07:09:47 +10:00
David Bomba	c7d5390b49	Fixes for releases	2021-06-16 07:09:04 +10:00
David Bomba	9f4fab9617	Fixes for releases	2021-06-16 07:04:12 +10:00
hillelcoren	9805da6733	New admin portal [selfhosted]	2021-06-15 20:05:39 +00:00
hillelcoren	31d66492d3	New admin portal [hosted]	2021-06-15 20:02:51 +00:00
Benjamin Beganović	e377953f0a	Merge pull request #6036 from beganovich/v5-1506-generic-error-page ... Throw PaymentFailed (generic) exception	2021-06-15 18:53:37 +02:00
Benjamin Beganović	3f729bedde	Throw PaymentFailed (generic) exception	2021-06-15 18:52:15 +02:00
Benjamin Beganović	dfdb4b1cd9	Merge remote-tracking branch 'upstream/v5-develop' into v5-update-email-templates	2021-06-15 15:45:14 +02:00
Benjamin Beganović	01e7e3271e	Adapt templates for dynamic emails	2021-06-15 15:42:37 +02:00
David Bomba	1b7198c1a0	Merge pull request #6032 from turbo124/v5-develop ... v5.2.4	2021-06-15 23:25:30 +10:00
David Bomba	6959c6ae7d	v5.2.4	2021-06-15 23:25:01 +10:00
David Bomba	76262dd0de	Merge pull request #6031 from turbo124/v5-develop ... Fixes for company exporter	2021-06-15 23:12:03 +10:00
David Bomba	3a5cd34f83	Fixes for company exporter	2021-06-15 23:11:45 +10:00
David Bomba	ca7631e950	Minor fixes for company exporter	2021-06-15 23:08:59 +10:00
David Bomba	bbc5e96e44	Merge pull request #6027 from turbo124/v5-develop ... License update	2021-06-15 21:43:09 +10:00
David Bomba	db3a7ac642	License update	2021-06-15 21:42:00 +10:00
David Bomba	8fd4a3f202	Authorize credit card	2021-06-15 21:37:16 +10:00
David Bomba	177a4ce58f	Working on authorization for WePay	2021-06-15 15:56:23 +10:00
David Bomba	5fa5fda7ae	Merge pull request #6025 from turbo124/v5-develop ... v5.2.3	2021-06-15 11:09:51 +10:00
David Bomba	7a1fc28de7	v5.2.3	2021-06-15 11:09:27 +10:00
David Bomba	31c8eb1a19	Fixes for stripe import customers	2021-06-15 11:09:12 +10:00
David Bomba	8a217358a8	Fixes for model binding in livewire	2021-06-15 09:47:10 +10:00
David Bomba	63ded8eeaf	Merge pull request #6022 from turbo124/v5-develop ... v5.2.2	2021-06-15 08:21:24 +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
Benjamin Beganović	2bc83aff27	CSS inliner plugin	2021-06-14 14:50:28 +02:00
David Bomba	ddad699925	composer.lock	2021-06-14 20:54:33 +10:00
David Bomba	95c9eb03a9	merge v5-dev	2021-06-14 20:47:03 +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
David Bomba	dc7f4507cd	Update .env vars for wepay	2021-06-14 08:33:56 +10:00