1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-20 16:31:33 +02:00
Commit Graph

1087 Commits

Author SHA1 Message Date
David Bomba
9b54113b9b Merge remote-tracking branch 'upstream/master' 2015-11-03 19:09:40 +11:00
David Bomba
38c3f14081 working on api 2015-11-03 13:02:15 +11:00
David Bomba
c3066c824f working on api 2015-11-03 10:55:31 +11:00
Hillel Coren
c3d43ab480 Bug fixes 2015-11-03 00:05:28 +02:00
David Bomba
d577a34675 fix conflicts 2015-11-03 08:47:32 +11:00
Rafael Almeida
c8375ad983 Distinct text message when quote is converted or approved 2015-11-02 15:14:00 -05:00
Hillel Coren
6130626422 Working on the API 2015-11-02 20:43:22 +02:00
Hillel Coren
c130e67e54 Fixed problem with PayFast integration 2015-11-02 11:47:47 +02:00
David Bomba
09ccb88784 separate API logic 2015-11-02 15:29:38 +11:00
Hillel Coren
3b6a4a6100 Added Fractal 2015-11-02 00:10:20 +02:00
Hillel Coren
9b840a24dd Enabled social login 2015-11-01 20:21:11 +02:00
Hillel Coren
0b2705b943 Enabled restoring deleted invoices and payments 2015-10-30 14:56:25 +02:00
Hillel Coren
b040aad021 Separated recurring invoices from invoices list 2015-10-29 19:21:00 +02:00
Hillel Coren
aa0a35f9d8 Added default quote terms 2015-10-29 16:42:05 +02:00
Hillel Coren
404435a145 Refactored to events 2015-10-28 21:22:07 +02:00
Hillel Coren
4a3beeeae7 Bug fixes 2015-10-25 13:08:11 +02:00
Hillel Coren
3d55dbc05b Bug fixes 2015-10-25 09:13:06 +02:00
Hillel Coren
17f853f907 Working on custom invoice numbers 2015-10-23 14:55:18 +03:00
Hillel Coren
a0ec032f69 Working on custom invoice numbers 2015-10-23 11:06:46 +03:00
Hillel Coren
7ca98c9080 Custom invoice/quote numbers 2015-10-22 21:48:12 +03:00
Hillel Coren
47f38ad54e Added support for default taxes 2015-10-21 14:11:08 +03:00
Hillel Coren
7150a148af Added PayPal buttonsource 2015-10-21 07:30:23 +03:00
Hillel Coren
392c1facc0 Fixed issue with TwoCheckout integration 2015-10-20 22:04:49 +03:00
Hillel Coren
2c5667aacb Added new acceptance tests 2015-10-20 20:12:34 +03:00
Hillel Coren
88c215d1df Bug fixes 2015-10-20 11:23:38 +03:00
Hillel Coren
420de05ebc Bug fixes 2015-10-18 13:37:04 +03:00
Hillel Coren
9283362d28 Bug fixes 2015-10-18 10:30:28 +03:00
Hillel Coren
c24b2f352d Updated version 2015-10-16 08:32:02 +03:00
Hillel Coren
1ab154aba9 Bug fixes 2015-10-15 22:37:01 +03:00
Hillel Coren
a4960245c2 Bug fixes 2015-10-15 09:19:41 +03:00
Hillel Coren
8da5517206 Bug fixes 2015-10-14 23:56:17 +03:00
Hillel Coren
831c81a4b9 Improved settings navigation 2015-10-14 17:15:39 +03:00
Hillel Coren
d3550903f4 Bug fix 2015-10-14 08:18:14 +03:00
Hillel Coren
aef0fe8430 Added client dashboard 2015-10-13 18:44:01 +03:00
Hillel Coren
2dfc053cbc Bug fixes 2015-10-13 10:11:44 +03:00
Hillel Coren
1d04bc2a05 Added custom invoice text fields 2015-10-11 17:41:09 +03:00
Hillel Coren
a1cef22a48 Add quotes to the dashboard and a map to the client page 2015-10-06 20:55:55 +03:00
Hillel Coren
254a819e92 Fix for #445 2015-10-05 20:48:16 +03:00
Hillel Coren
6d7f0d6611 Zapier fixes 2015-10-02 11:32:13 +03:00
Hillel Coren
cb16e7f950 Added support for basic markdown 2015-10-01 23:02:22 +03:00
Hillel Coren
06be7afedf Bug fixes 2015-09-29 21:19:18 +03:00
Hillel Coren
c38577e0a8 Bug fixes 2015-09-29 17:16:19 +03:00
Hillel Coren
bf85aa7ddd Bug fixes 2015-09-29 13:21:57 +03:00
Hillel Coren
f8b449a471 Added warning when form token is about to expire 2015-09-28 23:37:32 +03:00
Hillel Coren
8337bc9669 Working on session warning 2015-09-27 00:08:59 +03:00
Hillel Coren
4268c18f8a Fixed money format in PDF for EU 2015-09-25 12:57:40 +03:00
Hillel Coren
6b063abe9a Bug fixes 2015-09-21 00:05:02 +03:00
Hillel Coren
98cabd4138 Added auto-reminder emails 2015-09-17 22:01:06 +03:00
Hillel Coren
4741fad4be Added auto-billing and per-client language support 2015-09-10 20:50:09 +03:00
Hillel Coren
3fdad48179 API improvements 2015-09-07 12:07:55 +03:00
Hillel Coren
79aa5bad92 Minor fixes 2015-09-04 10:20:30 +03:00
Hillel Coren
9d96a9daed Bug fixes 2015-09-03 10:32:39 +03:00
Hillel Coren
5bf287f51a Fixed task bug 2015-09-02 23:33:47 +03:00
Hillel Coren
4d71b193d6 Bug fixes 2015-09-02 13:59:03 +03:00
Hillel Coren
e4672b1213 Merge pull request #405 from trendler/master
Fixed timezone DST issues in timelog
2015-09-01 23:29:09 +03:00
Hillel Coren
0183c02ef6 Added online payment acceptance test 2015-09-01 21:40:30 +03:00
Hillel Coren
ba50e701c8 Integration tests 2015-08-30 15:08:15 +03:00
Hillel Coren
95fd9a4c1c Initial acceptance tests 2015-08-20 18:09:04 +03:00
Hillel Coren
407af306a5 Bug fixes 2015-08-20 11:02:03 +03:00
Hillel Coren
9e6b25bcc4 Bug fixes 2015-08-14 15:04:33 +03:00
Tobias Rendler
663070e36b Fixed timezone DST issues in timelog
- Added moment-timezone-with-data.js
- Added new datetime format and variants
2015-08-13 12:54:03 +02:00
Hillel Coren
dc8bd36e76 Moved line item tax amounts to invoice subtotals section 2015-08-12 22:16:02 +03:00
Hillel Coren
0e15c12298 Bug fixes 2015-08-11 17:38:36 +03:00
Hillel Coren
78bf49cd19 Recurring invoices no longer prevent invoice numbers from being sequential 2015-08-10 18:48:41 +03:00
Hillel Coren
2cfcdd1e77 Minor improvements 2015-08-04 17:33:30 +03:00
Hillel Coren
8f80ccf4d7 Minor fixes 2015-08-04 14:38:48 +03:00
Hillel Coren
4b7d143630 Minor fixes 2015-08-03 22:08:07 +03:00
Hillel Coren
5aa64523dc Disabled datepicker localization 2015-08-03 11:52:47 +03:00
Hillel Coren
559a7d8a46 Moved unlink to separate page 2015-08-03 10:15:58 +03:00
Hillel Coren
33364d3d9c Bug fixes 2015-07-30 20:48:59 +03:00
Hillel Coren
4fa4f65005 Support updating invoices through the API 2015-07-30 17:44:47 +03:00
Hillel Coren
914334511e Enhancements to the dashboard 2015-07-29 22:55:12 +03:00
Hillel Coren
da6e59a925 Merge pull request #355 from Lykegenes/master
Charts & reports SQLite compatibility
2015-07-28 10:00:32 +03:00
Hillel Coren
ba8419356d Moved invoice design files 2015-07-28 10:00:00 +03:00
Hillel Coren
76a53ed5dc Working on invoice customizer 2015-07-26 23:05:38 +03:00
Hillel Coren
912fe5b7a3 Working on invoice customizations 2015-07-24 17:13:17 +03:00
Hillel Coren
35d794b36f Enabled customizing invoice designs 2015-07-21 21:51:56 +03:00
Hillel Coren
25496061ee Ensured JS client dates use timezone setting 2015-07-15 17:45:02 +03:00
Hillel Coren
b9c00a0531 Re-worked editing task details 2015-07-12 22:43:45 +03:00
Hillel Coren
9477c7467d Prevent seeder from being run twice 2015-07-09 17:12:43 +03:00
Hillel Coren
c42dfb8b96 Improvments to multi-account switching 2015-07-07 23:08:16 +03:00
Hillel Coren
39ba8d1287 Added support for creating payments through the API 2015-07-05 11:01:16 +03:00
Hillel Coren
b387661271 Improvments to the API 2015-07-02 23:21:29 +03:00
Hillel Coren
e678d2be62 Fix for when user cancels Dwolla payment 2015-07-01 22:01:12 +03:00
Florian Levis
0781757a82 API - Client : allow edition of client data 2015-06-30 19:08:40 +02:00
Hillel Coren
4a170ffb3e Improving initial setup 2015-06-20 20:40:50 +03:00
Patrick Samson
23d9a2728b Fix Charts & Reports queries using SQLite 2015-06-18 19:28:43 -04:00
Hillel Coren
67dff394b4 Added multi-company support 2015-06-16 22:35:35 +03:00
Hillel Coren
7b4c377100 Fixed problem using token 2015-06-15 16:12:31 +03:00
Hillel Coren
a301e58609 Enabled sending payment confirmation email for manual payment entries 2015-06-14 20:30:01 +03:00
Hillel Coren
9c577371bb Added resume option to tasks 2015-06-14 17:49:13 +03:00
Hillel Coren
97adc27ba1 Added resume option to tasks 2015-06-14 17:03:37 +03:00
Hillel Coren
84a117c84b Added resume option to tasks 2015-06-14 15:21:29 +03:00
Hillel Coren
d34ed74863 Bug fixes 2015-06-12 11:39:53 +03:00
Hillel Coren
fcaacdf48b Bug fixes 2015-06-10 23:55:23 +03:00
Hillel Coren
1c1bef3abb Bug fixes 2015-06-10 11:34:20 +03:00
Hillel Coren
77c90ad21f Bug fixes 2015-06-07 11:05:30 +03:00
Hillel Coren
b80842759e Bug fixes 2015-06-04 23:53:58 +03:00
Hillel Coren
060a14736b Added support for Dwolla 2015-06-03 20:55:48 +03:00
Alex Sears
59f5d60207 New account gateways not saving
Noticed a bug when setting up things locally.  This prevented new account gateways from being saved in the DB.
2015-06-01 16:07:37 -04:00
Hillel Coren
c902552d5f Bug fixes 2015-06-01 17:34:00 +03:00
Hillel Coren
74787804e7 Minor tweaks 2015-06-01 16:06:18 +03:00
Hillel Coren
eb572d9021 Fixed problem with invoice design page 2015-05-31 21:45:39 +03:00
Hillel Coren
1a8245dcff Adding support for Dwolla 2015-05-31 15:37:29 +03:00
Hillel Coren
976773ce7b Enabled setting custom invoice item labels 2015-05-27 23:20:35 +03:00
Hillel Coren
57b5db4ed8 Merge pull request #329 from Lykegenes/Lykegenes-sqlite-patch-1
SQLite compatibility
2015-05-27 21:47:42 +03:00
Patrick Samson
2717298e56 fixed ambiguous column name in SQLite 2015-05-27 13:29:52 -04:00
Patrick Samson
d4df8747f7 fixed ambiguous column name in SQLite 2015-05-27 13:27:29 -04:00
Hillel Coren
3b90030059 Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja 2015-05-27 19:52:14 +03:00
Hillel Coren
3da1e738d8 Working on tasks 2015-05-27 19:52:10 +03:00
Hillel Coren
e4a45c6cf9 Merge pull request #326 from bcole808/whitelabel-fix
Public payment page white label issue
2015-05-27 09:20:34 +03:00
Ben Cole
e054c4d9e4 Hide logo on public payment page if white label 2015-05-26 21:40:53 -07:00
Hillel Coren
33d139adf5 Working on pdfmake 2015-05-22 10:22:24 +03:00
Hillel Coren
edec5028c6 Bug fixes 2015-05-19 22:14:00 +03:00
Hillel Coren
935780f7bc Bug fixes 2015-05-15 11:51:22 +03:00
Hillel Coren
140943f166 Fixed problem when adding user 2015-05-12 12:36:32 +03:00
Hillel Coren
0fa30fb55f Bug fixes 2015-05-11 14:16:36 +03:00
Hillel Coren
fcbec2617b Bug fixes 2015-05-10 22:02:35 +03:00
Hillel Coren
c4a94834a1 API improvements 2015-05-10 11:45:03 +03:00
Hillel Coren
f41e0d999b Bug fixes 2015-05-09 21:25:16 +03:00
Hillel Coren
ef6e930f1b Minor dashboard improvements 2015-05-08 11:21:29 +03:00
Hillel Coren
b368e5589c Bug fixes 2015-05-05 12:48:23 +03:00
Hillel Coren
5a28ff2612 Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja 2015-04-30 20:54:41 +03:00
Hillel Coren
1d6013178f Working on basic reports 2015-04-30 20:54:19 +03:00
Jeramy Simpson
9cb51f449b Fix PHP 5.4 Compatibility for pdfupload 2015-04-29 11:49:28 +10:00
Hillel Coren
bc10719fbe Added support for custom subdomains 2015-04-28 23:13:52 +03:00
Hillel Coren
723aa285f5 Bug fixes 2015-04-27 15:28:40 +03:00
Hillel Coren
b2678220c3 Working on PDF attachments 2015-04-23 00:40:21 +03:00
Hillel Coren
dc6ed9fca1 Updating design 2015-04-22 22:21:04 +03:00
Hillel Coren
c0571b0b2e Bug fixes 2015-04-21 23:09:45 +03:00
Hillel Coren
8018bcad6c Working on pdfmake 2015-04-21 14:42:31 +03:00
Hillel Coren
dea421259c Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja 2015-04-17 14:57:34 +03:00
Hillel Coren
168bb7cfb0 Added support for partial payments 2015-04-17 14:57:17 +03:00
sigitas
9be2538213 Merge remote-tracking branch 'remotes/ninja/master' 2015-04-17 00:34:57 +03:00
Hillel Coren
96a71864ed Added support for partial payments 2015-04-16 22:57:12 +03:00
Hillel Coren
caae008403 Added support for partial payments 2015-04-16 20:12:56 +03:00
Hillel Coren
be327fbcbf Added support for Bitcoin 2015-04-15 19:35:41 +03:00
Hillel Coren
868744c696 Working on L5 2015-04-14 21:58:07 +03:00
Hillel Coren
635c1b9df1 Working on L5 2015-04-13 18:05:34 +03:00
Hillel Coren
3641019d04 Enabled re-sending confirmation email 2015-04-13 15:49:40 +03:00
Hillel Coren
5a6197fbb4 Added notification email when quote is approved 2015-04-13 15:00:31 +03:00
sigitas
5f1495073f use custom fonts 2015-04-13 12:23:43 +03:00
Hillel Coren
564d006428 Working on L5 2015-04-13 10:54:51 +03:00
Hillel Coren
9dcc4e0e52 Working on L5 2015-04-12 17:18:05 +03:00
Hillel Coren
c19d09fa0c Added back gruntfile 2015-04-12 12:58:28 +03:00
Hillel Coren
0e2eba4521 Bug fixes 2015-04-12 12:43:51 +03:00
Hillel Coren
717d214157 Working on L5 2015-04-08 21:19:58 +03:00
Hillel Coren
4750bacd71 Reworked query caching for L5 2015-04-08 16:19:17 +03:00
Hillel Coren
424eb15870 Working on L5 2015-04-06 14:46:02 +03:00
Jeramy Simpson
a1eb78faac PDF Setting Fixed 2015-04-06 16:24:35 +10:00
Jeramy Simpson
b8c1d49e30 Remove last mentions of PHP-Payments
Closes #257
2015-04-06 15:55:17 +10:00
Jeramy Simpson
698809fa01 L5 Updates 2015-04-06 15:45:27 +10:00
Hillel Coren
b8f2f59b5b Working on L5 2015-04-05 22:15:37 +03:00
Hillel Coren
d47d715181 Working on L5 2015-04-02 16:12:12 +03:00
Hillel Coren
83a48df567 Working on L5 2015-04-02 16:06:16 +03:00
Jeramy Simpson
37ca4c9481 Working on L5
Also includes very minor meta tag changes to bring to industry standard.
2015-04-02 14:09:32 +10:00
Hillel Coren
515f6fd131 Working on L5 2015-04-01 22:57:02 +03:00
Hillel Coren
194eb9e28a Working on L5 2015-04-01 18:44:55 +03:00
Hillel Coren
7f69991ca8 Working on L5 2015-03-31 21:50:58 +03:00
Hillel Coren
4fc7e3f5d1 Reworking events for L5 2015-03-31 20:42:37 +03:00
Hillel Coren
bb66ed7a96 Fixed creating invoices 2015-03-31 12:38:24 +03:00
Hillel Coren
f4930681b0 Working on users in L5 2015-03-30 22:45:10 +03:00
Hillel Coren
58746d9eec Working on users in L5 2015-03-30 18:20:53 +03:00
Hillel Coren
78502f74e4 Working on users in L5 2015-03-29 15:37:42 +03:00
Jeramy Simpson
1cc88c1a76 L5 Syntax Changes 2015-03-27 15:02:19 +10:00
Jeramy Simpson
d787b566e0 Minor Fixes and Cleanup 2015-03-27 11:09:13 +10:00
Hillel Coren
8ed675ebe1 Working on users 2015-03-26 16:35:57 +02:00
Jeramy Simpson
1080d9e2f6 L5 Syntax Changes and Namespacing 2015-03-26 16:24:02 +10:00
Jeramy Simpson
de1a5252ec Fixes the creation of the initial user during setup 2015-03-26 14:15:18 +10:00
Jeramy Simpson
c6d8b6f8e1 Merge Master Changes
Had to manually resolve conflict issues
2015-03-26 10:10:22 +10:00
Hillel Coren
b0421b8321 Working on setup page 2015-03-25 22:00:00 +02:00
Hillel Coren
d773c72970 Working on setup page 2015-03-25 21:56:31 +02:00
Jeramy Simpson
54a126a0d0 Fix Namespacing 2015-03-24 18:26:57 +10:00
Jeramy Simpson
6ae6a29117 Fix Ninja Namespace
Also includes other minor clean ups and L5 syntax changes
2015-03-24 18:21:12 +10:00
Jeramy Simpson
f83d694477 Minor Cleanup and Syntax Changes 2015-03-24 17:24:44 +10:00
Jeramy Simpson
37921e4653 Merge branch 'master' of github.com:hillelcoren/invoice-ninja into laravel-5 2015-03-24 09:55:21 +10:00
Jeramy Simpson
6659803a21 Update Config Settings to use .env
Also has a minor change to the install and upgrade function to work with L5.
2015-03-24 09:54:49 +10:00
Jeramy Simpson
cf5adfad25 Namespace Updates and Confide Changes 2015-03-23 16:52:01 +10:00
Jeramy Simpson
5584121afb Update Namespaces 2015-03-23 14:20:33 +10:00
Jeramy Simpson
291242fcb0 Update language references
As a result of removing confide, the lang name for some text must change.
2015-03-18 13:55:05 +10:00
Jeramy Simpson
80392e5902 Update imported classes 2015-03-18 13:46:36 +10:00
Jeramy Simpson
638d9c5087 Move Auth Files back to Model Folder 2015-03-18 09:58:34 +10:00
Jeramy Simpson
eb3d9f44a2 Syntax Changes 2015-03-17 15:22:44 +10:00
Jeramy Simpson
9af731545c Update Namespaces & Syntax 2015-03-17 11:30:56 +10:00
Jeramy Simpson
04c392136e Add Files 2015-03-17 07:45:25 +10:00
root
2c696666df Initial Progress.
- Moved most files
- fixed composer dependencies
- Started fixing issues.
2015-03-12 13:39:52 +10:00
root
32e78ef3da Bring in Laravel5 framework. 2015-03-12 10:44:39 +10:00