Joshua Dwire
|
10462cdeb4
|
Merge remote-tracking branch 'origin/v5-develop' into v5-develop
# Conflicts:
# resources/views/email/import/completed.blade.php
|
2021-02-16 18:20:27 -05:00 |
|
Joshua Dwire
|
68c2246e64
|
Remove dispatchNow used for testing
|
2021-02-16 18:17:41 -05:00 |
|
Joshua Dwire
|
ff27f351c7
|
Bug fixes; add support for other platform imports
|
2021-02-16 18:15:42 -05:00 |
|
hillelcoren
|
a2f4a60e81
|
New admin portal build
|
2021-02-16 20:04:22 +00:00 |
|
Benjamin Beganović
|
a081f966f8
|
wip
|
2021-02-16 14:57:37 +01:00 |
|
Benjamin Beganović
|
001b6902f2
|
wip
|
2021-02-16 14:42:35 +01:00 |
|
David Bomba
|
0b8bf4fbf1
|
Remove invoice deletion observer
|
2021-02-17 00:31:00 +11:00 |
|
David Bomba
|
4c9f6fcf8f
|
Merge pull request #4922 from turbo124/v5-develop
Fixes for EmailEntity
|
2021-02-16 23:56:31 +11:00 |
|
David Bomba
|
a056f95e13
|
Fixes for EmailEntity
|
2021-02-16 23:56:12 +11:00 |
|
David Bomba
|
0e9e5eb744
|
Merge pull request #4921 from turbo124/v5-develop
Fixes for switching mailers are runtime when using queues
|
2021-02-16 23:24:57 +11:00 |
|
David Bomba
|
6e4979f2a1
|
Fixes for switching mailers are runtime when using queues
|
2021-02-16 23:24:36 +11:00 |
|
Benjamin Beganović
|
e7e65e128a
|
wip
|
2021-02-16 13:24:09 +01:00 |
|
Benjamin Beganović
|
22bd29f8fc
|
wip
|
2021-02-16 13:16:22 +01:00 |
|
David Bomba
|
2418b823d2
|
Merge pull request #4920 from turbo124/v5-develop
Add back
|
2021-02-16 22:47:46 +11:00 |
|
David Bomba
|
da8fe555a7
|
Add back
|
2021-02-16 22:47:30 +11:00 |
|
David Bomba
|
8e9629c9ee
|
Merge pull request #4919 from turbo124/v5-develop
Register mail provider after initing variables
|
2021-02-16 22:46:22 +11:00 |
|
David Bomba
|
68b000efe9
|
Register mail provider after initing variables
|
2021-02-16 22:46:05 +11:00 |
|
David Bomba
|
1d7e3d0379
|
Merge pull request #4918 from turbo124/v5-develop
Wire up settings in mailer job
|
2021-02-16 22:19:36 +11:00 |
|
David Bomba
|
58a1e2812d
|
Wire up settings in mailer job
|
2021-02-16 22:19:07 +11:00 |
|
David Bomba
|
648e6b3252
|
Merge pull request #4917 from turbo124/v5-develop
Wire up settings in mailer job
|
2021-02-16 22:00:46 +11:00 |
|
David Bomba
|
0a4cb4afe7
|
Wire up settings in mailer job
|
2021-02-16 21:59:49 +11:00 |
|
David Bomba
|
943bede7ac
|
Merge pull request #4916 from turbo124/v5-develop
Wire up settings in mailer job
|
2021-02-16 21:56:08 +11:00 |
|
David Bomba
|
818e56d39e
|
Wire up settings in mailer job
|
2021-02-16 21:55:48 +11:00 |
|
David Bomba
|
29056141da
|
Merge pull request #4915 from turbo124/v5-develop
Email refactor
|
2021-02-16 21:23:58 +11:00 |
|
David Bomba
|
d4532c4d21
|
Refactoring emails
|
2021-02-16 21:23:32 +11:00 |
|
David Bomba
|
13e96121d7
|
Refactoring emails
|
2021-02-16 21:14:53 +11:00 |
|
David Bomba
|
92c83100e0
|
Merge pull request #4914 from turbo124/v5-develop
Dedicated upload routes
|
2021-02-16 20:06:53 +11:00 |
|
David Bomba
|
4612379811
|
Fixes for file upload on dedicated routes
|
2021-02-16 20:02:33 +11:00 |
|
hillelcoren
|
d800c6167e
|
New admin portal build
|
2021-02-16 06:21:00 +00:00 |
|
hillelcoren
|
7a636654de
|
New admin portal build
|
2021-02-15 22:08:22 +00:00 |
|
David Bomba
|
181902fece
|
Additional company table properties
|
2021-02-16 08:52:38 +11:00 |
|
David Bomba
|
6edaf5d557
|
Entity upload routes + reorder api.php routes file
|
2021-02-16 08:14:30 +11:00 |
|
David Bomba
|
e546764e29
|
Upload documents route
|
2021-02-16 07:58:19 +11:00 |
|
hillelcoren
|
bd66640052
|
New admin portal build
|
2021-02-15 19:43:58 +00:00 |
|
hillelcoren
|
781b0fcd1d
|
New admin portal build
|
2021-02-15 15:34:44 +00:00 |
|
Benjamin Beganović
|
aacc3b6602
|
wip
|
2021-02-15 15:52:13 +01:00 |
|
hillelcoren
|
97e94debe0
|
New admin portal build
|
2021-02-15 14:30:37 +00:00 |
|
Benjamin Beganović
|
ce97a0d32e
|
Merge pull request #4911 from beganovich/v5-1502-stripe-required-fields
Stripe: Show required fields if enabled in admin panel
|
2021-02-15 15:01:00 +01:00 |
|
Benjamin Beganović
|
63060cd878
|
Stripe: Show required fields if enabled in admin panel
|
2021-02-15 14:58:25 +01:00 |
|
Benjamin Beganović
|
cada68f5c8
|
Merge pull request #4910 from beganovich/v5-1502-fix-endless-for-recurring
(v5) Recurring invoices: Show endless for -1 frequency
|
2021-02-15 13:22:26 +01:00 |
|
Benjamin Beganović
|
f8403addd6
|
fix endless for -1
|
2021-02-15 13:21:52 +01:00 |
|
Benjamin Beganović
|
5f443116f3
|
Merge pull request #4909 from beganovich/v5-1502-alias-task-as-service
(v5) PDF: Alias task.product key for task.service
|
2021-02-15 13:17:54 +01:00 |
|
Benjamin Beganović
|
a593ecc48d
|
wip
|
2021-02-15 13:16:47 +01:00 |
|
David Bomba
|
4ff96c0f58
|
Merge pull request #4908 from turbo124/v5-develop
Refactoring emails
|
2021-02-15 22:40:12 +11:00 |
|
David Bomba
|
292c7b8068
|
Invoice upload document route
|
2021-02-15 22:34:05 +11:00 |
|
David Bomba
|
dedc7c2cb3
|
Expense document uploads
|
2021-02-15 22:07:47 +11:00 |
|
David Bomba
|
afb2306598
|
Credit upload route
|
2021-02-15 22:00:02 +11:00 |
|
David Bomba
|
7bf6d7c48a
|
Document route for clients / company
|
2021-02-15 21:52:50 +11:00 |
|
Benjamin Beganović
|
c4e85bc2bd
|
Merge pull request #4907 from beganovich/v5-1502-pull-invoicee-from-hash
(v5) Custom payment driver: Pull invoices from payment hash
|
2021-02-15 11:46:15 +01:00 |
|
Benjamin Beganović
|
2a5cd72d0b
|
Get invoice_id from payment has
|
2021-02-15 11:45:14 +01:00 |
|