1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-13 22:54:25 +01:00
Commit Graph

453 Commits

Author SHA1 Message Date
Hillel Coren
cc6c6194c6 Added support for additional invoice designs 2014-10-24 13:48:59 +03:00
Hillel Coren
cfc6e22241 Working on new invoice designs 2014-10-21 15:10:29 +03:00
Troels Liebe Bentsen
2c1b67c4aa Remove the custom ui stuff 2014-10-20 22:39:25 +02:00
Troels Liebe Bentsen
99021fdedd Remove the custom ui stuff 2014-10-20 22:38:52 +02:00
Troels Liebe Bentsen
1bca065ca7 Added initial page for the Timesheet controller 2014-10-20 22:30:48 +02:00
Troels Liebe Bentsen
68a53db5bb Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja 2014-10-20 19:10:04 +02:00
Hillel Coren
ca8db0ffbc Enabled using date variables for non-recurring invoices 2014-10-19 23:15:37 +03:00
Hillel Coren
001208e345 fix #174 - Tax rate error in live PDF 2014-10-19 23:10:16 +03:00
Hillel Coren
27339dbfa0 Added tax percent to PDF 2014-10-19 18:06:20 +03:00
Troels Liebe Bentsen
d6ceb33318 Implement missing function and client vat number to invoice 2014-10-15 01:42:17 +02:00
Troels Liebe Bentsen
8ca8cc91b1 Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja
Conflicts:
	composer.lock
2014-10-14 23:48:59 +02:00
Hillel Coren
65f58c64d6 Added invoice and quote number prefixes and counters 2014-10-14 10:46:30 +03:00
Hillel Coren
edea8d0bc2 Moved custom client and company fields to their respective sections on the PDF 2014-10-12 22:36:35 +03:00
Hillel Coren
9770e6a1d5 Working on invoice design page 2014-10-12 21:11:41 +03:00
Hillel Coren
e8b5317f2e Added d3 to js folder 2014-10-06 00:31:14 +03:00
Troels Liebe Bentsen
20bf88b028 Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja 2014-10-05 15:19:20 +02:00
Hillel Coren
e7184ab59d Added moolah as recommended payment gateway 2014-10-05 16:07:04 +03:00
Hillel Coren
fa676f1e57 Working on d3 viz 2014-10-05 10:49:34 +03:00
Hillel Coren
020158a0ae Working on d3.js vizualizer 2014-10-03 02:51:21 +03:00
Troels Liebe Bentsen
b09ebf3229 Added support for listing VAT numbers as used in all of EU 2014-10-01 16:33:09 +02:00
Troels Liebe Bentsen
be408db583 Add handsontable for TimeSheet feature 2014-10-01 02:47:56 +02:00
Troels Liebe Bentsen
3da8555a53 Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja 2014-09-29 12:38:17 +02:00
Hillel Coren
539d86770e Prevented text in inputs from wrapping 2014-09-17 09:26:01 +03:00
Hillel Coren
84cf760785 Added confirm when saving recurring invoice 2014-09-12 00:28:36 +03:00
Troels Liebe Bentsen
a09a563219 Fix CSS errors 2014-08-29 23:24:02 +02:00
Hillel Coren
bb560778af Working on API 2014-07-30 10:08:01 +03:00
Hillel Coren
9feb616f1b Added support for Zapier 2014-07-27 23:31:41 +03:00
Hillel Coren
f5f87319b2 Fixed issue with showing paid to date 2014-07-23 23:55:04 +03:00
Hillel Coren
0123ee36a2 Working on multi-user support 2014-07-23 23:28:40 +03:00
Hillel Coren
051ba95b7b Working on multi-user support 2014-07-23 18:02:56 +03:00
Hillel Coren
4b177e160d Added custom invoice fields 2014-07-20 13:38:42 +03:00
Hillel Coren
4620a06a9b Enabled setting accepted credit cards 2014-07-17 23:44:34 +03:00
Hillel Coren
daf14c6916 Improvements for responsive design 2014-07-17 00:04:56 +03:00
Hillel Coren
9427f5180f Working on self hosting 2014-07-15 23:36:40 +03:00
Hillel Coren
7d48d9d138 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2014-07-07 09:43:30 +03:00
Hillel Coren
b6092efb41 Show new client form on click 2014-07-07 09:43:16 +03:00
Troels Liebe Bentsen
f2de3f8a81 Update static builds 2014-07-04 19:18:55 +02:00
Hillel Coren
7d41fcd7ac Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2014-06-29 12:39:29 +03:00
Hillel Coren
306e51c09b Bug fixes 2014-06-29 12:39:08 +03:00
aggepagge
24a071c0f3 added functionallity to company/payments page 2014-06-22 21:08:52 +02:00
Hillel Coren
d2760c42f2 Merge pull request #134 from aggepagge/master
Added functionality to display credit card types for user
2014-06-18 12:28:31 +03:00
aggepagge
a9312d1092 Added functionality to display credit card types for user 2014-06-17 18:53:51 +02:00
Hillel Coren
b4bb01bc90 Text changes 2014-06-17 16:17:38 +03:00
Razi KAntorp
da1db89c75 Header updates 2014-06-16 17:56:06 +02:00
Hillel Coren
1892e3f413 Bug fixes 2014-06-16 01:13:31 +03:00
Hillel Coren
0e5ca8d8f0 Bug fixes 2014-06-16 00:49:07 +03:00
Hillel Coren
7db893e286 Bug fixes 2014-06-16 00:06:59 +03:00
Hillel Coren
fc00c12f98 Bug fixes 2014-06-15 23:54:58 +03:00
Hillel Coren
6fab2cf962 Bug fixes 2014-06-15 21:52:14 +03:00
Hillel Coren
605a04a32f Bug fixes 2014-06-15 21:51:22 +03:00
Razi KAntorp
5a4f625d31 Responsive fixes for homepage 2014-06-14 14:29:37 +02:00
Razi KAntorp
080800d646 Testimonials page 2014-06-13 17:11:46 +02:00
Razi KAntorp
4441c9f283 New menu and mobile menu 2014-06-13 15:49:37 +02:00
Razi KAntorp
7af5a7bb35 FAQ page and some code cleaning 2014-06-12 18:58:19 +02:00
Hillel Coren
f97fed96c9 Merge pull request #127 from raziraz/master
Prevented horizontal scrolling on the features page
2014-06-04 23:40:31 +03:00
Hillel Coren
cdd4ffde68 Bug fixes 2014-06-04 23:41:34 +03:00
Razi KAntorp
f07c327845 Prevented horizontal scrolling on the features page 2014-06-02 18:39:24 +02:00
Hillel Coren
04679b41ce Bug fixes 2014-06-01 17:38:23 +03:00
Hillel Coren
3688669963 Bug fixes 2014-06-01 16:35:19 +03:00
Hillel Coren
8049a27beb Working on quotes 2014-05-21 00:40:09 +03:00
Hillel Coren
c6f0d9e71e Secure payment design 2014-05-14 01:17:33 +03:00
Hillel Coren
fd99dd122c Fixed date picker in chart builder 2014-05-14 00:04:42 +03:00
Razi KAntorp
4b45f5adc8 About page, Secure payment page, footer 2014-05-13 20:21:14 +02:00
Razi KAntorp
e233d4b347 Onging work 2014-05-12 12:19:25 +02:00
Razi KAntorp
f4c857d4b9 Ongoing work with the about us page 2014-05-12 12:14:29 +02:00
Hillel Coren
113665da1e Updating texts 2014-05-11 21:24:30 +03:00
Hillel Coren
4d2473dc9f Added goal tracking 2014-05-09 16:28:20 +03:00
Hillel Coren
7b86aea0a7 Enabled setting the transaction reference field when creating a payment 2014-05-08 20:16:00 +03:00
Razi KAntorp
226c376dc0 Features page and updated heros 2014-05-06 19:54:28 +02:00
Hillel Coren
1fbf61cd55 Bug fixes 2014-05-06 11:50:17 +03:00
Razi KAntorp
dfd8546cf5 new header style 2014-05-05 20:44:21 +02:00
Razi KAntorp
5bb370eda0 Merge remote-tracking branch 'upstream/master' 2014-05-05 15:09:11 +02:00
Razi KAntorp
76a0a013ef ongoing work 2014-05-05 15:08:57 +02:00
Hillel Coren
c2998b888c Removing bower components from repo 2014-05-04 23:34:51 +03:00
Hillel Coren
bbbcca2768 Bug fixes 2014-05-04 20:11:27 +03:00
Hillel Coren
9d858f4bfc Updating texts and added invoice_now link 2014-05-04 18:49:57 +03:00
Hillel Coren
0208ea1e75 Bug fixes 2014-05-01 22:54:02 +03:00
Hillel Coren
9360852ad5 Bug fixes 2014-05-01 21:17:04 +03:00
root
8bb90759fc fixed invoice payment calculations 2014-05-01 15:47:55 +00:00
Razi KAntorp
3e24a8e3b4 Updated splash page 2014-05-01 13:21:59 +02:00
Razi KAntorp
7c06b95e83 pricing page 2014-04-30 16:14:11 +02:00
Hillel Coren
3e26880561 Adding custom invoice colors 2014-04-29 23:46:40 +03:00
Hillel Coren
fca1078401 Working on Grunt support 2014-04-28 23:22:55 +03:00
Hillel Coren
113cf9b482 Adding Grunt for file concat 2014-04-28 23:05:37 +03:00
Hillel Coren
8595ba6113 Bug fixes 2014-04-28 01:07:45 +03:00
Hillel Coren
0ef559562e Bug fixes 2014-04-27 16:22:03 +03:00
Hillel Coren
b0091bd27b Bug fixes 2014-04-26 22:00:31 +03:00
Hillel Coren
805f5cf189 Text changes 2014-04-25 16:04:57 +03:00
Hillel Coren
4c621758f1 Added bower depedancies to codebase 2014-04-22 18:10:41 +03:00
Hillel Coren
f7c41827bf Adding bower dependancies 2014-04-22 14:33:53 +03:00
Hillel Coren
add9cb1569 Bug fixes 2014-04-22 00:25:40 +03:00
Hillel Coren
40dae71bc4 Custom fields layout in the PDF 2014-04-21 22:09:16 +03:00
Hillel Coren
01ec2cb838 Working on custom fields for pro plan 2014-04-18 11:57:31 +03:00
Hillel Coren
4d1df9bdc3 Removing debug messages 2014-04-14 15:16:32 +03:00
Hillel Coren
45ed680c77 Bug fixes 2014-04-14 14:33:43 +03:00
Hillel Coren
3a50fd6aa2 Working on pro plan 2014-04-13 16:34:58 +03:00
blkmutt
ba13c105ed Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja
Merged from parent
2014-04-09 22:33:41 -04:00
Hillel Coren
bd2ef0b7b6 Fixing some issues getting the site set up 2014-04-09 14:49:18 +03:00
Hillel Coren
e609b49b2c Fixing some issues getting the site set up 2014-04-09 14:47:25 +03:00
blkmutt
f613caec07 Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja
Merging files from parent.
2014-04-07 09:53:26 -04:00
Hillel Coren
0e48e9b637 Deleting files 2014-04-06 21:00:02 +03:00
Razi KAntorp
7a368e9533 New about page 2014-04-06 19:48:34 +02:00
blkmutt
3c99bebae9 merged from parent 2014-04-06 11:47:22 -04:00
Hillel Coren
6710eba329 Bug fixes 2014-04-06 12:02:04 +03:00
Hillel Coren
5b323e04d7 Adding ability to remove ninja logo 2014-04-04 12:24:56 +03:00
Hillel Coren
3d6530e83f Bug fixes 2014-04-03 20:54:06 +03:00
Hillel Coren
1b7c885367 Working on multi-language support 2014-04-02 21:20:01 +03:00
Razi KAntorp
e88712e42f Removed about link and added features and faq to header and footer. 2014-04-02 11:54:25 +02:00
Razi KAntorp
7747943136 Updated hero for contact page 2014-03-31 17:54:21 +02:00
Razi KAntorp
80f0a17eea Features page added 2014-03-31 17:43:43 +02:00
Razi KAntorp
008cca025f Faq page added 2014-03-31 17:06:44 +02:00
Razi KAntorp
bdd4fa18b4 Updated login page. 2014-03-31 15:40:19 +02:00
blkmutt
227282a8cf Made changes to include PHP-Payments. Added Recommended Gateways to the Company/Payments UI. 2014-03-29 20:21:57 -04:00
blkmutt
33d54abb1e Made some styling updates. 2014-03-29 20:21:37 -04:00
Hillel Coren
2e299aa83f Working on multi-language support 2014-03-27 14:25:31 +02:00
blkmutt
3ca03eb2b4 Merge branch 'master' into Dev_PHP-Payments
Merged changes from master.
2014-03-25 21:21:23 -04:00
blkmutt
33ff8e1d60 Updated account controller, data objects, and logos for recommended gateways. 2014-03-25 20:59:33 -04:00
Hillel Coren
b99427b05c Bug fixes 2014-03-23 21:38:03 +02:00
Hillel Coren
db3a6abad3 Bug fixes 2014-03-23 21:17:45 +02:00
Hillel Coren
a09b898cb1 Bug fixes 2014-03-23 20:19:03 +02:00
Hillel Coren
9a592753b2 Bug fixes 2014-03-23 19:54:02 +02:00
Hillel Coren
c08a46a7da Bug fixes 2014-03-23 17:59:30 +02:00
Hillel Coren
3bbb156124 Bug fixes 2014-03-23 17:49:14 +02:00
Hillel Coren
c4665f84f0 Bug fixes 2014-03-23 16:23:53 +02:00
Hillel Coren
631cdef345 Bug fixes 2014-03-23 15:36:18 +02:00
Hillel Coren
6e532063fd Working on multi-language support 2014-03-23 14:53:16 +02:00
Hillel Coren
6d6084728d Working on multi-language support 2014-03-23 14:19:54 +02:00
Hillel Coren
b7061222e8 Bug fixes 2014-03-23 13:11:04 +02:00
Hillel Coren
bb06e31403 Reworking public pages and bug fixes 2014-03-21 00:12:07 +02:00
Hillel Coren
36cf1810e8 Added sign up popover message 2014-03-19 18:17:26 +02:00
Hillel Coren
b523d6f44d Enabled off-site payment with PayPal Express 2014-03-19 01:28:43 +02:00
Hillel Coren
0f9f32dd49 Improved logo in PDF 2014-03-18 22:43:12 +02:00
Hillel Coren
1757dd706d Added ability to remove account logo 2014-03-18 20:55:50 +02:00
Razi KAntorp
723b45f3a7 Fixed field jumping issue in Manage Rate Modal, changed to red color of the remove icon in Manage Rate Modal and Create invoice 2014-03-18 17:08:30 +01:00
Razi KAntorp
0f6c87e39e modal styling updates 2014-03-18 16:17:49 +01:00
Hillel Coren
cf6e199bbe Merging conflicts 2014-03-18 15:20:38 +02:00
Razi KAntorp
6dd89bb77f background color 2014-03-18 14:09:36 +01:00
Razi KAntorp
a5e9d52958 merging conflicts 2014-03-18 14:05:42 +01:00
Razi KAntorp
d117683c37 alert border-radius + border: none 2014-03-18 11:01:02 +01:00
Hillel Coren
c25e821748 Bug fixes 2014-03-17 20:11:39 +02:00
Hillel Coren
ccbbf6c6fa Bug fixes 2014-03-17 20:05:01 +02:00
Razi KAntorp
d6e7f19f2f .. 2014-03-14 11:24:40 +01:00
Hillel Coren
013a2103dd bug fixes 2014-03-10 23:55:56 +02:00
Hillel Coren
915e0636c0 Bug fixes 2014-03-10 20:22:40 +02:00
Hillel Coren
3050e915e2 merging changes 2014-03-10 19:06:10 +02:00
Hillel Coren
7fa754c067 merging changes 2014-03-10 19:05:00 +02:00
Razi KAntorp
d63d7d3b40 Images to about page 2014-03-10 17:58:02 +01:00
Hillel Coren
78be769c8d bug fixes 2014-03-10 13:04:15 +02:00
Hillel Coren
388ca323c8 bug fixes 2014-03-10 08:10:08 +02:00
Hillel Coren
1f5ba56f0f Bug fixes 2014-03-10 00:31:46 +02:00
Hillel Coren
6ed65f3572 Working on the invoice designs 2014-03-09 23:24:05 +02:00
Hillel Coren
76080fcc69 Working on the invoice designs 2014-03-09 23:19:56 +02:00
alltheworld
04e7b05d03 fix
terms and notes
2014-03-09 04:06:00 +02:00
alltheworld
1f7f331a80 fix 2014-03-09 03:45:17 +02:00
alltheworld
e444df9f8e fix 2014-03-09 03:43:50 +02:00
alltheworld
03087580ec fix 2014-03-09 03:26:26 +02:00
alltheworld
c17b8ed40f fix 2014-03-09 03:23:05 +02:00
Hillel Coren
a035387d86 Updated contact page 2014-03-06 11:51:01 +02:00
Hillel Coren
c42a3113de Updated contact page 2014-03-06 11:49:34 +02:00
Hillel Coren
083fda272a bug fixes 2014-03-05 22:30:47 +02:00
Hillel Coren
63a6b88e20 bug fixes 2014-03-05 22:19:12 +02:00
alltheworld
31452a37e8 report fixes 2014-03-05 18:42:48 +02:00
alltheworld
03031710d7 report fixes 2014-03-05 18:40:10 +02:00
alltheworld
41cdbea7f7 report fixes 2014-03-05 17:42:38 +02:00
Hillel Coren
a1c7efb919 Merge pull request #23 from raziraz/master
About page update, image update.
2014-03-05 17:34:02 +02:00
Razi KAntorp
eb980f2ecc Merge remote-tracking branch 'upstream/master' 2014-03-05 16:06:21 +01:00
Razi KAntorp
71c9ca9961 Addded text to the About page. Hided the blur section on the landing page that coused a blur line over the second large image 2014-03-05 16:05:36 +01:00
Hillel Coren
09bc3f2f39 Merge pull request #22 from alltheworld/reportfix2
Reportfix2
2014-03-05 16:57:39 +02:00
alltheworld
50e8f45dff report fixes
lines
2014-03-05 16:43:41 +02:00
Razi KAntorp
cc360e3d57 Contact page 2014-03-05 14:59:13 +01:00
alltheworld
9af257a278 report fixes 2014-03-05 15:46:38 +02:00
alltheworld
d4b9ad8f72 report fixes
background
2014-03-05 15:35:59 +02:00
alltheworld
da30d94bce report fixes
discount field
2014-03-05 15:31:46 +02:00
alltheworld
2f006363c6 report fixes
update
2014-03-05 15:21:53 +02:00
alltheworld
2aec776523 report fixes
update
2014-03-05 15:20:21 +02:00
alltheworld
ccea93d0cb report fixes
update
2014-03-05 14:31:15 +02:00
alltheworld
2a42f44acb report fixes
update
2014-03-05 11:41:06 +02:00
alltheworld
15d6eece81 report fixes
add email and phone
2014-03-05 11:36:13 +02:00
alltheworld
1e85b5d0fd report fixes
update report image
2014-03-05 10:58:52 +02:00
alltheworld
da2ad78db4 report fixes 2014-03-03 21:18:31 +02:00
alltheworld
31377eb226 report fixes 2014-03-03 21:03:55 +02:00
alltheworld
2f207f8a7f report fixes 2014-03-03 21:03:55 +02:00
Hillel Coren
a6fac4f900 bug fixes 2014-03-03 20:31:29 +02:00
Hillel Coren
c87a58c3c5 bug fixes 2014-03-03 20:30:56 +02:00
Hillel Coren
6f87769077 bug fixes 2014-03-03 20:26:45 +02:00
Hillel Coren
cfa06662f8 merging conflicts 2014-03-02 08:44:33 +02:00
Hillel Coren
6beb35a710 fixing conflicts 2014-03-02 08:42:08 +02:00
Hillel Coren
39774ccaaf merging changes 2014-03-02 08:30:30 +02:00
alltheworld
57a99c8498 report 3-3 2014-03-02 06:57:48 +02:00
alltheworld
cbc4f46558 report 3-3 2014-03-02 06:57:00 +02:00
alltheworld
2fcdb0c28b report 3-3 2014-03-02 06:39:07 +02:00
alltheworld
0db59a9c9d report 3-3 2014-03-02 06:33:29 +02:00
alltheworld
f647d78065 report 3-3 2014-03-02 06:20:23 +02:00
alltheworld
acaba0635b report 3-3 2014-03-02 06:19:00 +02:00
alltheworld
a11d6958af report 3-3 2014-03-02 05:49:59 +02:00
alltheworld
9432fd16e6 report 3-3 2014-03-02 05:46:41 +02:00
alltheworld
fbfd9c324c report 3-3 2014-03-02 05:19:14 +02:00
alltheworld
12aac27b95 report 3-3 2014-03-02 05:16:15 +02:00
alltheworld
28a2eece85 report 3-3 2014-03-02 05:13:12 +02:00
alltheworld
f13e42f34f report 3-3 2014-03-02 04:28:51 +02:00