1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 21:22:58 +01:00
Commit Graph

4986 Commits

Author SHA1 Message Date
David Bomba
a005716ca5
Merge pull request #5176 from turbo124/v5-stable
Fixes for 2fa
2021-03-18 22:47:46 +11: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ć
4c5f559659
Merge pull request #5174 from beganovich/v5-1803-fix-min-width
(v5) Set min-width for designs when using repeating headers/footers
2021-03-18 12:13:59 +01:00
Benjamin Beganović
c75e4e678f Set min-width for designs when using repeating headers/footers 2021-03-18 12:12:44 +01:00
hillelcoren
cae087ada9 New admin portal build 2021-03-18 10:20:21 +00:00
David Bomba
544da36f03
Merge pull request #5173 from turbo124/v5-stable
small fix for PDF generator
2021-03-18 20:58:56 +11: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ć
abb2d68904
Merge pull request #5171 from beganovich/v5-1803-fix-custom-column-processing
(v5) Disable automatic custom column processing on the PDF
2021-03-18 09:37:57 +01:00
Benjamin Beganović
d706d226e8 Disable automatic custom column processing on the PDF 2021-03-18 09:32:11 +01:00
Benjamin Beganović
6f822a1329
Merge pull request #5170 from beganovich/v5-1803-update-playful-labels
(v5) Fix labels on Playful design
2021-03-18 08:46:21 +01:00
Benjamin Beganović
28bc608d4f Fix labels on Playful design 2021-03-18 08:45:24 +01:00
David Bomba
bbcc06f22c
Merge pull request #5168 from turbo124/v5-develop
v5.1.27
2021-03-18 13:57:18 +11:00
David Bomba
bc4e3b1738
Merge pull request #5167 from turbo124/v5-stable
v5.1.27
2021-03-18 12:00:38 +11: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
2415a3cf32
Merge pull request #5166 from turbo124/v5-develop
Hosted PDF
2021-03-18 11:56:19 +11:00
David Bomba
0ea76db8a6 v5.1.27 2021-03-18 11:53:40 +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
David Bomba
28adccbb4c
Merge pull request #5118 from beganovich/v5-1103-billing-landing-page
(v5) Billing page
2021-03-18 08:19:36 +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
5041e11933
Merge pull request #5160 from turbo124/v5-stable
Update demo data
2021-03-17 21:26:59 +11:00
David Bomba
f10f7dca42
Merge pull request #5159 from turbo124/v5-develop
Update demo data
2021-03-17 21:26:20 +11:00
David Bomba
dc4980a8b2 Update demo data 2021-03-17 21:26:02 +11:00
David Bomba
22708553c9
Merge pull request #5158 from turbo124/v5-develop
v5.1.26
2021-03-17 21:18:08 +11:00
David Bomba
b23df66eb6
Merge pull request #5157 from turbo124/v5-stable
v5.1.26
2021-03-17 21:14:43 +11:00
David Bomba
acaccba113 v5.1.26 2021-03-17 21:13:55 +11:00
David Bomba
3a0624e649
Merge pull request #5156 from turbo124/v5-develop
Tuning company settings for missing properties
2021-03-17 21:07:17 +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
hillelcoren
173de30e69 New admin portal build 2021-03-17 09:06:40 +00:00
hillelcoren
9a34d50e93 New admin portal build 2021-03-17 07:04:58 +00: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
e3d056ab0b
Merge pull request #5155 from turbo124/v5-develop
Billing subscription - invoice generation
2021-03-17 17:27:58 +11: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
5a6a7248eb
Merge pull request #5154 from turbo124/v5-develop
Fixes for signature line breaks / HTML formatting
2021-03-17 11:36:45 +11:00
David Bomba
35bca3d7b6 Fixes for signature line breaks / HTML formatting 2021-03-17 11:35:41 +11:00
David Bomba
0f66845701
Merge pull request #5153 from turbo124/v5-develop
Small fix for user notifications
2021-03-17 11:14:19 +11:00
David Bomba
059cec705d Small fix for user notifications 2021-03-17 11:13:29 +11:00
David Bomba
b14ac6557b
Merge pull request #5150 from turbo124/v5-develop
Throw 400's on incorrect 2FA data
2021-03-17 10:19:43 +11:00
David Bomba
7da509dc99 add php 7.3 to composer dev 2021-03-17 10:19:06 +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
hillelcoren
d6eeddf0fb New admin portal build 2021-03-16 17:55:57 +00:00