3384 Commits

Author	SHA1	Message	Date
Benjamin Beganović	8839bfabd3	Hide quantity if max_seats_limit = 1	2021-03-22 13:32:29 +01: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ć	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ć	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ć	187be058f7	Merge branch 'v5-develop' into v5-1803-billing	2021-03-22 09:38:34 +01:00
David Bomba	cfdcf889ad	Small type check fix	2021-03-22 17:46:59 +11:00
David Bomba	56b0452d2e	Add oauth user token	2021-03-22 12:54:50 +11:00
David Bomba	0c5b551ce1	Connected Gmail Account	2021-03-22 10:48:00 +11:00
David Bomba	c97dea08d2	Connected Gmail Account	2021-03-22 09:52:39 +11:00
David Bomba	24c8325fb1	Connected Gmail Account	2021-03-22 09:02:22 +11:00
David Bomba	32b8575ce1	Connected Gmail Account	2021-03-22 08:06:26 +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
=	4285b5f6fc	Minor fixes for oauth login	2021-03-21 21:38:57 +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	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
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
=	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
=	e2314359b9	Pass back the correct entity!	2021-03-20 11:54:47 +11:00
=	5288893220	Small fixes for 2FA	2021-03-20 11:46:42 +11:00
=	b158fb430f	Small fixes for 2FA	2021-03-20 11:41:41 +11:00
=	7173ba2931	catch project exceptions	2021-03-20 11:16:29 +11:00
David Bomba	9e0328757a	Tests for number validation across entities	2021-03-20 10:06:44 +11:00
David Bomba	451e4e1bbe	Ensure better unique rules	2021-03-20 09:51:52 +11:00
David Bomba	b841fe7000	Working on unique rules for numbers	2021-03-20 09:29:20 +11:00
David Bomba	422fd4f88c	Merge pull request #5182 from turbo124/v5-develop ... Minor fixes	2021-03-19 23:40:05 +11:00
David Bomba	34b9877868	Minor fixes	2021-03-19 23:37:57 +11:00
Benjamin Beganović	d98165a8dd	Set client language_id if locale is present	2021-03-18 16:01:13 +01:00
Benjamin Beganović	3bcb65efc2	Set locale from query parameter	2021-03-18 15:41:26 +01:00
Benjamin Beganović	69eecbf281	Qty	2021-03-18 15:22:22 +01:00
Benjamin Beganović	415ea81eec	Support for "Start Free Trial"	2021-03-18 14:14:10 +01:00
Benjamin Beganović	85c09ecf11	Show the message about coupon code/discount under the input field	2021-03-18 13:51:10 +01:00
David Bomba	2a89a12b69	Merge pull request #5175 from turbo124/v5-develop ... Fixes for 2fa	2021-03-18 22:47:31 +11:00
David Bomba	10f7b1a309	Fixes for 2fa	2021-03-18 22:46:58 +11:00
Benjamin Beganović	c75e4e678f	Set min-width for designs when using repeating headers/footers	2021-03-18 12:12:44 +01:00
David Bomba	ea1156cc81	Merge pull request #5172 from turbo124/v5-develop ... Small fix for new PDF generator	2021-03-18 20:58:36 +11:00
David Bomba	ac6feb706e	Small fix for new PDF generator	2021-03-18 20:57:55 +11:00
Benjamin Beganović	d706d226e8	Disable automatic custom column processing on the PDF	2021-03-18 09:32:11 +01:00
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	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
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	dc4980a8b2	Update demo data	2021-03-17 21:26:02 +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
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	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	059cec705d	Small fix for user notifications	2021-03-17 11:13:29 +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
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
David Bomba	0422c95e13	Cache password protection on login	2021-03-16 23:10:15 +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	816ea281ff	Fixes for connected account	2021-03-16 22:33:48 +11:00
David Bomba	591bfb9e9d	Fixes for connected account	2021-03-16 22:30:33 +11:00
David Bomba	6bb71dc33b	Fixes for connected account	2021-03-16 22:29:16 +11:00
David Bomba	05b008ca60	Fixes for 2FA	2021-03-16 09:33:55 +11:00
David Bomba	eb70c7c2ed	Merge pull request #5139 from turbo124/v5-develop ... Fix for invite resend	2021-03-16 07:35:47 +11:00
David Bomba	1e72f20c3d	Fix for invite resend permission	2021-03-16 07:35:19 +11:00
Benjamin Beganović	4350816804	wip	2021-03-15 17:33:27 +01:00
Benjamin Beganović	dade7bad0a	Merge upstream/v5-develop	2021-03-15 13:08:43 +01:00
Benjamin Beganović	4918423124	use ->getData()	2021-03-15 11:14:09 +01:00
Benjamin Beganović	b07eedb755	PayPal fixes for loggin	2021-03-15 11:12:01 +01:00
David Bomba	6a2332526b	Biling Subscription Service	2021-03-15 08:42:05 +11:00
David Bomba	8f37a06e24	Fixes for 2FA	2021-03-15 08:40:07 +11:00
David Bomba	e176be086a	Fixes for 2FA	2021-03-15 07:18:53 +11:00
David Bomba	255643d7dc	Fixes for connected account	2021-03-14 21:32:09 +11:00
Benjamin Beganović	0b9c6e782d	merge upstream/v5-develop	2021-03-13 14:55:13 +01:00
Benjamin Beganović	b9bea02b68	wip	2021-03-13 14:51:01 +01:00
=	e2bc086f75	Type check on custom fields	2021-03-13 19:36:00 +11:00
=	94b1e59535	Improvements in Setup workflow	2021-03-13 17:55:18 +11:00
=	0bf8b9c9e5	Fixes for setup flow	2021-03-13 17:45:41 +11:00
=	487cf555b9	Fix for displaying logo	2021-03-13 16:56:52 +11:00
David Bomba	f67652cf88	Merge pull request #5100 from beganovich/v5-1003-company-custom-fields ... (v5) Support for custom company fields on the PDF	2021-03-13 15:07:08 +11:00
David Bomba	d01b97104a	Merge pull request #5111 from joshuadwire/v5-develop ... Fix request validation for preconfigured installs	2021-03-13 14:58:23 +11:00
Joshua Dwire	941132133c	Fix request validation for preconfigured installs	2021-03-12 18:46:56 -05:00
Benjamin Beganović	908678cdc4	wip	2021-03-12 15:00:33 +01:00
David Bomba	aef31d8193	Merge pull request #5104 from joshuadwire/v5-develop ... Support pre-configured installs where setup doesn't allow changing DB config	2021-03-12 21:00:58 +11:00
David Bomba	4f626ca90d	Merge pull request #5105 from turbo124/v5-develop ... Improve PDF creation performance	2021-03-12 15:00:50 +11:00
Joshua Dwire	a844afd128	Support pre-configured installs where setup doesn't allow changing DB info	2021-03-11 19:48:41 -05:00
David Bomba	ff2f43d8fc	Do no add value from custom_value to invoice total	2021-03-12 07:24:09 +11:00
David Bomba	57ef1c9b78	Return user for /connected_account	2021-03-12 07:07:52 +11:00
Benjamin Beganović	d546c4711c	wip	2021-03-11 17:20:30 +01:00
Benjamin Beganović	3696b06566	Scaffold landing page for billing, controller & endpoint	2021-03-11 14:05:23 +01:00
Benjamin Beganović	b88533d3d2	Catch possible invalid format exception & return "Invalid date!"	2021-03-10 16:56:17 +01:00
Benjamin Beganović	7c01b3bb64	Support for custom fields in company details section	2021-03-10 16:55:49 +01:00
Benjamin Beganović	653973c826	Align content to left by default	2021-03-10 14:32:17 +01:00
David Bomba	b9c9874533	Improve PDF creation performance	2021-03-10 21:00:18 +11:00
David Bomba	64c483befe	Code cleanup	2021-03-10 20:42:39 +11:00
David Bomba	76a27f3946	Fix for null design column	2021-03-10 20:41:18 +11:00
David Bomba	e54562b6d4	Only one confirmation per user signup	2021-03-10 20:32:38 +11:00
David Bomba	ed8c880750	add reconfirm route	2021-03-10 20:15:24 +11:00
David Bomba	9888d7acb9	Improve delete pdf performance	2021-03-10 13:28:35 +11:00
David Bomba	e7e455667d	Fixes for company logo in emails	2021-03-10 12:51:08 +11:00
David Bomba	18e8934e70	Delete pdf in service rather than child job	2021-03-10 12:28:12 +11:00
David Bomba	839a5c49d3	Fixes for billing subs cron	2021-03-10 11:14:05 +11:00
David Bomba	11de159458	Commit event for client subs	2021-03-10 11:11:05 +11:00
David Bomba	00eefcd781	Client Subscription scaffolding	2021-03-10 11:08:58 +11:00
David Bomba	e0b169b64b	Fixes for billing subscriptions	2021-03-10 09:56:59 +11:00
David Bomba	b91fcf1b34	Merge branch 'v5-develop' into billing_subscriptions	2021-03-10 09:27:28 +11:00
David Bomba	90b3b25849	Fixes for tests - changed listResponse to itemResponse	2021-03-10 09:23:13 +11:00
David Bomba	599a1626a7	Fix for logo	2021-03-10 07:56:23 +11:00
Benjamin Beganović	737020eeed	Fix wrong variable in the BillingSubscriptionTransformer.php	2021-03-09 15:25:11 +01:00
Benjamin Beganović	83b23956f6	Update authorize methods on billing subscription requests	2021-03-09 14:29:57 +01:00
Benjamin Beganović	868b6efd8e	Add currency_id to billing_subscriptions table	2021-03-09 14:24:31 +01:00
David Bomba	9290873b8b	Fixes for qr code"	2021-03-09 21:53:25 +11:00
David Bomba	59beb9dd39	Customize the password protect timeout	2021-03-09 21:52:48 +11:00
David Bomba	d7d0768eae	Minor fixes	2021-03-09 21:34:39 +11:00
David Bomba	cd48ae78f9	Minor fixes	2021-03-09 21:30:34 +11:00
David Bomba	0a3b5e0665	minor fixes	2021-03-09 17:06:03 +11:00
David Bomba	67cedb8348	minor fixes	2021-03-09 17:03:22 +11:00
David Bomba	9a15d2c6cf	Minor fixes	2021-03-09 15:43:54 +11:00
David Bomba	4baa89382b	Minor fix for connected account	2021-03-09 09:55:31 +11:00
David Bomba	68f0e99f26	Fixes for connected account	2021-03-09 09:53:04 +11:00
David Bomba	053c1ca5fa	billing_subscriptions cleanup	2021-03-09 08:29:59 +11:00
David Bomba	31d92a3dc0	add russian language	2021-03-09 08:05:20 +11:00
David Bomba	4e9b92c2da	Minor fix for 2fa method name	2021-03-09 07:46:30 +11:00
David Bomba	45104f6ae5	Merge branch 'billing_subscriptions' into billing_subscription_scaffold	2021-03-09 07:43:30 +11:00
David Bomba	b21714c00c	Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop	2021-03-09 05:57:34 +11:00
David Bomba	38e5a14172	Bug fix for reconfirm useR	2021-03-09 05:47:49 +11:00
Benjamin Beganović	2660b8fa58	Billing subscriptions: Requests for crud endpoints	2021-03-08 15:19:45 +01:00
Benjamin Beganović	29922a24a0	Billing subscriptions: Event for created	2021-03-08 15:19:23 +01:00
Benjamin Beganović	780ab6885b	Billing subscriptions: Controller	2021-03-08 15:19:04 +01:00
Benjamin Beganović	420d904551	Client subscriptions: Model	2021-03-08 15:18:48 +01:00
Benjamin Beganović	9c1a3368e9	Billing subscriptions: Database schema & model	2021-03-08 15:18:34 +01:00
Benjamin Beganović	ea5117ecbe	Billing subscriptions: Factory, repository & transformer	2021-03-08 15:18:14 +01:00
David Bomba	9c2e5c2de4	Fixes for blank company name	2021-03-08 15:20:02 +11:00
David Bomba	d83073ad91	Validation rule for recurring frequency	2021-03-08 12:31:00 +11:00
David Bomba	e39ce7491b	Feature permissions for hosted	2021-03-08 08:32:38 +11:00
David Bomba	2595d3d2a4	Fixes for typo in password protection	2021-03-08 07:56:44 +11:00
David Bomba	8d6f6d9eb5	Fixes for 2FA	2021-03-08 07:49:33 +11:00
=	f4d1917f32	Hosted feature implementation	2021-03-07 21:14:53 +11:00
=	616dea2c9d	Add webcron support	2021-03-07 17:45:48 +11:00
=	6360f62ef3	Integrate phantom js secret default value into config	2021-03-07 17:27:44 +11:00
David Bomba	7a50032b35	Logging	2021-03-07 08:50:14 +11:00
=	93493116ed	Scaffolds for billing_subscriptions	2021-03-06 17:19:57 +11:00
=	097d9ac1b8	Padding out functionality	2021-03-06 11:47:05 +11:00
David Bomba	86673a6c66	Fixes for client address	2021-03-05 21:27:36 +11:00
David Bomba	1599711dee	Observers and policy scaffold	2021-03-05 21:18:28 +11:00
David Bomba	f99195c07a	Small fixes	2021-03-05 11:16:38 +11:00
David Bomba	7dae7cb326	Fixes for mailer	2021-03-04 19:42:22 +11:00
David Bomba	20440189d2	Fixes for password protection middleware	2021-03-04 16:03:28 +11:00
David Bomba	609cb1ee8d	Merge pull request #5022 from turbo124/v5-develop ... Fixes for user management	2021-03-04 13:51:03 +11:00
David Bomba	11ad2cd57e	Fixes for caching protection route	2021-03-04 12:17:29 +11:00
David Bomba	07aca3d8c0	Fixes for tests	2021-03-04 10:34:18 +11:00
David Bomba	365c190cca	Remove return type for User Service	2021-03-04 10:12:34 +11:00
David Bomba	1780db52bd	Invite user route	2021-03-04 09:39:24 +11:00
David Bomba	a6282cee56	Create single account from command line	2021-03-04 08:30:11 +11:00
Benjamin Beganović	c69b424928	Merge pull request #5020 from beganovich/v5-0303-payment-methods-fix-blinking-modal ... Payment methods improvements	2021-03-03 11:54:57 +01:00
Benjamin Beganović	c48dafa962	wip	2021-03-03 11:38:59 +01:00
David Bomba	9b3ea22c22	Merge pull request #5018 from turbo124/v5-develop ... Fixes for attaching a user to different companies	2021-03-03 21:11:12 +11:00
David Bomba	bfbde2ba51	Fixes	2021-03-03 21:04:10 +11:00
Benjamin Beganović	2ab76adfad	Reduce default white label logo size	2021-03-03 08:49:02 +01:00
=	c23b9b147d	Fixes for attaching a user to different companies	2021-03-03 18:22:14 +11:00
Benjamin Beganović	a04b075956	Update entity labels on PDF	2021-03-02 15:42:42 +01:00
Benjamin Beganović	7543ab33ff	Update white label logo	2021-03-02 14:26:34 +01:00
=	b57d4bfb7c	Fixes for recurring invoice number not being prefixed	2021-03-02 21:57:14 +11:00
=	7a2cea1d9c	One Time Token	2021-03-02 19:54:23 +11:00
=	aa290172ae	One Time Token Requests	2021-03-02 19:03:01 +11:00
=	18fa537791	Add one time token functionality	2021-03-02 18:52:25 +11:00
David Bomba	c37c441d92	Associate a user with multiple companies	2021-03-02 09:18:19 +11:00
David Bomba	edc25c1342	Associate a user with multiple companies	2021-03-02 09:08:57 +11:00
David Bomba	ab5fb7c376	Fixes for company logo	2021-03-02 07:15:28 +11:00
David Bomba	bf326e6d26	Working on adding user to another company	2021-03-01 23:06:24 +11:00
David Bomba	2ab76e9098	v5.1.12	2021-03-01 22:00:07 +11:00
David Bomba	9a2160c325	Verified users only for hosted platform	2021-03-01 13:51:00 +11:00
David Bomba	d238d53b26	Delete PDF helper	2021-03-01 10:40:18 +11:00
David Bomba	92f729c10d	Catch if an OAuth user doesn't exist and attempts to login	2021-02-28 19:54:14 +11:00
David Bomba	e668e7fd5a	Fixes for Quotes not attaching to emails	2021-02-28 13:12:55 +11:00
=	5f14cc0c5d	Working on task range overlap	2021-02-27 21:08:39 +11:00
David Bomba	c887d81dd6	Merge pull request #5000 from turbo124/v5-develop ... Fixes for archived invoice not emailing	2021-02-27 11:32:50 +11:00
=	4b147ca77a	Fixes for migration mailer	2021-02-27 11:32:10 +11:00
=	c94c3fa373	Add project relationships across all entities	2021-02-27 08:37:56 +11:00
=	57e3b59b91	Add project relationship to recurring invoice	2021-02-27 07:48:49 +11:00
David Bomba	cc883f0926	Fixes for archived invoice not emailing	2021-02-26 22:20:17 +11:00
Benjamin Beganović	6284b3a9ea	Merge pull request #4996 from beganovich/v5-2602-currency-fixes ... (v5) Prevent word breaking from unit costs & task rates	2021-02-26 07:48:19 +01:00
Benjamin Beganović	da9e2e1759	Prevent word breaking from unit costs & task rates	2021-02-26 07:47:04 +01:00
Benjamin Beganović	441db23414	Format quantity output using formatValue()	2021-02-26 07:05:44 +01:00
David Bomba	4b3c7ec771	Merge pull request #4991 from turbo124/v5-develop ... User verified middleware	2021-02-26 08:18:59 +11:00
David Bomba	4884b039df	User verified middleware	2021-02-26 08:18:14 +11:00