5336 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
David Bomba	0d44249f41	Subdomain checks for hosted	2021-03-22 22:38:09 +11:00
David Bomba	dd46e6384a	Clean line items for billing subscriptions	2021-03-22 22:31:53 +11:00
David Bomba	f058b16d06	Merge pull request #5223 from turbo124/v5-develop ... Fixes for password protection	2021-03-22 22:19:16 +11:00
David Bomba	5700da5323	Fixes for password protection	2021-03-22 22:18:57 +11:00
David Bomba	a74e38902b	Merge pull request #5222 from turbo124/v5-develop ... Fixes for default timeouts	2021-03-22 22:12:28 +11:00
David Bomba	5d28271df9	Fixes for default timeouts	2021-03-22 22:12:12 +11:00
Benjamin Beganović	9c6e14f33f	Merge pull request #5221 from beganovich/v5-2203-remove-nl2br-for-public-notes ... (v5) Remove nl2br for public notes	2021-03-22 12:11:15 +01:00
Benjamin Beganović	296d3046e8	Add margins between items	2021-03-22 12:10:53 +01:00
Benjamin Beganović	500fa38a29	Remove nl2br for public notes	2021-03-22 12:08:59 +01:00
David Bomba	22f81a036f	Merge pull request #5220 from turbo124/v5-develop ... Fixes for default timeouts	2021-03-22 21:55:25 +11:00
David Bomba	793247e0f7	Fixes for default timeouts	2021-03-22 21:55:09 +11:00
Benjamin Beganović	0b1834eabb	Merge pull request #5215 from beganovich/v5-2203-fix-translations ... (v5) Fix translations for the design	2021-03-22 11:32:24 +01:00
Benjamin Beganović	ac547fa9a6	wip	2021-03-22 11:31:57 +01:00
Benjamin Beganović	d804dc6f17	Merge pull request #5196 from beganovich/v5-2003-fix-billing-subscription-integration ... (v5) Construct the billing service with correct dependency	2021-03-22 11:15:19 +01:00
Benjamin Beganović	540f5b647a	uncomment the initialization of billing service	2021-03-22 11:14:56 +01:00
Benjamin Beganović	44bf716fc9	Merge branch 'v5-develop' into v5-2003-fix-billing-subscription-integration	2021-03-22 11:12:14 +01:00
Benjamin Beganović	5dd1d5a6ad	Merge pull request #5213 from beganovich/v5-show-correct-invoice-status ... (v5) Show invoice status based on status_id property	2021-03-22 11:07:40 +01:00
Benjamin Beganović	c8666efafd	wip	2021-03-22 11:06:42 +01:00
hillelcoren	50ca229283	New admin portal build	2021-03-22 09:21:34 +00:00
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