Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 13:12:50 +01:00
Code Issues Releases Activity
6,889 Commits 7 Branches 917 Tags 2 GiB
3e39100eda
Commit Graph

928 Commits

Author SHA1 Message Date
Hillel Coren
7f038809fd Working on credit notes 2017-03-26 21:15:51 +03:00
Hillel Coren
aa709a47dd Working on credit notes 2017-03-26 18:25:59 +03:00
Hillel Coren
12c7b8ab9f Separate cc/ach fees 2017-03-26 12:01:34 +03:00
Hillel Coren
eb8d164b37 Show online payment settings by default 2017-03-26 11:19:00 +03:00
Hillel Coren
7278b34ad3 Adding page number in pdf footer #1182 2017-03-26 00:35:08 +03:00
Hillel Coren
5384b79082 Add help for inclusive tax rates 2017-03-24 17:31:59 +03:00
Hillel Coren
db55725890 Tweak gateway fees texts/UI 2017-03-24 17:14:39 +03:00
Hillel Coren
b680891929 Add extra logout delete check 2017-03-24 16:44:01 +03:00
Hillel Coren
7bb6a7945a Hide fee on custom gateway 2017-03-24 16:28:31 +03:00
Hillel Coren
d208e54a24 Only support line item gateway fees 2017-03-24 16:21:35 +03:00
Hillel Coren
3061209ea7 Improve new company process #460 2017-03-24 14:51:24 +03:00
Hillel Coren
34776b2eb2 Show ‘Discount’ for negative online payment surcharges 2017-03-23 17:17:05 +02:00
Hillel Coren
fe3710fe4b Notify user if auto bill fails 2017-03-23 15:55:46 +02:00
Hillel Coren
1df20adca4 Support reseting counters 2017-03-23 11:39:44 +02:00
Hillel Coren
88d5ca37d8 Translation fix #1225 2017-03-22 22:31:05 +02:00
Hillel Coren
1f01c006eb Support importing settings 2017-03-22 11:50:55 +02:00
Hillel Coren
a066071cca Show message for token error 2017-03-21 10:45:33 +02:00
Hillel Coren
ea464aa814 Handle image upload exception 2017-03-20 16:02:59 +02:00
Hillel Coren
546e1b56dc Fix for email templates 2017-03-20 13:18:58 +02:00
Hillel Coren
1c4a60f2be Fix for tests 2017-03-19 18:31:24 +02:00
Hillel Coren
1fb06295d4 Tweak texts 2017-03-19 17:17:29 +02:00
Hillel Coren
81671152e5 Hide partial field if using surcharge gateway fee 2017-03-19 17:03:46 +02:00
Hillel Coren
d753096268 Add gateway fee surcharge settings link 2017-03-19 16:45:44 +02:00
Hillel Coren
eff34f9133 Warning if changing gateway fee location 2017-03-19 16:35:03 +02:00
Hillel Coren
b2cfc8b99a Working on gateway fees 2017-03-17 12:13:27 +02:00
Hillel Coren
be6c9035aa Working on gateway fees 2017-03-16 22:56:13 +02:00
Hillel Coren
87507c06f4 Working on gateway fees 2017-03-16 22:10:13 +02:00
Hillel Coren
2a7dec8893 Support negative gateway fees 2017-03-16 17:32:46 +02:00
Hillel Coren
5920940403 Working on gateway fees 2017-03-16 16:24:50 +02:00
Hillel Coren
63096aaae1 Working on gateway fees 2017-03-16 16:15:58 +02:00
Hillel Coren
21166a3be7 Working on gateway fees 2017-03-16 16:03:17 +02:00
Hillel Coren
f9b8603d09 Working on gateway fees 2017-03-15 20:10:40 +02:00
Hillel Coren
5fd2c456da Working on gateway fees 2017-03-15 17:09:23 +02:00
Hillel Coren
5fcf0c57a4 Working on gateway fees 2017-03-14 23:27:09 +02:00
Hillel Coren
f1c464c4cf Working on gateway fees 2017-03-14 22:39:52 +02:00
Hillel Coren
7d0ec404da Working on gateway fees 2017-03-14 15:18:31 +02:00
Hillel Coren
924a213dcb Refine quote approved text 2017-03-12 22:05:23 +02:00
Hillel Coren
8623c3a3c6 Clarify recurring invoice status 2017-03-09 15:08:18 +02:00
Hillel Coren
9f56791e3a Clarify that reports require a pro plan 2017-03-07 20:48:01 +02:00
Hillel Coren
4c5c68eff5 Fix unmatched italics tag 2017-03-02 23:09:42 +02:00
Hillel Coren
5f478af9a4 Support creating inline vendors and categories 2017-03-02 18:02:48 +02:00
Hillel Coren
e78194ec2f Add support for creating projects inline 2017-03-01 22:03:15 +02:00
Hillel Coren
5fb0ee1393 Payment amount greater than invoice amount #1317 2017-03-01 11:51:27 +02:00
Hillel Coren
631a401e8c Users: Send invitation only #1333 2017-02-28 20:15:55 +02:00
Hillel Coren
a0f596521e Fix translation files 2017-02-27 21:59:07 +02:00
Hillel Coren
cce9e41c93 Update language files 2017-02-27 18:05:33 +02:00
Hillel Coren
122937f7d2 Working on supporting custom payment terms 2017-02-26 11:39:25 +02:00
Hillel Coren
e6eb84f49e Update company settings layout 2017-02-26 09:44:47 +02:00
Hillel Coren
deda434322 Support statement in additional designs 2017-02-24 14:15:02 +02:00
Hillel Coren
cb14c8d851 Add missing text 2017-02-23 20:28:11 +02:00
Hillel Coren
5be79d4208 Added default payment method #1273 2017-02-23 20:20:15 +02:00
Hillel Coren
d89690ebe4 Support custom product fields 2017-02-23 16:33:02 +02:00
Hillel Coren
44c2959f05 Added card library 2017-02-22 20:57:32 +02:00
Hillel Coren
1487da3dc4 Enable support for PayPal white label payment 2017-02-21 19:52:12 +02:00
Hillel Coren
bbce6b8ce8 Don’t require client email address 2017-02-21 15:27:04 +02:00
Hillel Coren
52da285c16 Suggest using an email alias 2017-02-19 17:54:07 +02:00
Joshua Dwire
0d078d27af New dashboard styling 2017-02-16 22:03:31 -05:00
Joshua Dwire
7ce06a28e9 Style client facing auth screens 2017-02-15 22:00:13 -05:00
Joshua Dwire
4adc3a798a Add login page styling 2017-02-15 17:47:37 -05:00
Hillel Coren
fe3fbeb9cc Corrected text files 2017-02-14 21:24:17 +02:00
Hillel Coren
b37f2ff96c Don't refresh page when sending 'contact us' message 2017-02-09 21:11:23 +02:00
Hillel Coren
0b791dc9bf Use fiscal year in date range picker #1310 2017-02-09 17:13:47 +02:00
Hillel Coren
411bfe01dc Tweak texts 2017-02-07 16:33:48 +02:00
Hillel Coren
c92947ad6f Added help text to the report 2017-02-07 16:04:23 +02:00
Hillel Coren
ecc6cc0b7a Added help texts to localization settings 2017-02-07 13:52:12 +02:00
Hillel Coren
58c50edff7 Working on #1234 2017-02-06 11:41:16 +02:00
Hillel Coren
30045ecdbb Working on #1234 2017-02-05 23:29:11 +02:00
Hillel Coren
d38101545f Working on manual send reminders #1234 2017-02-05 09:53:49 +02:00
Hillel Coren
a33b088a93 Support editing reminders when they're not automatically sent 2017-02-02 22:07:17 +02:00
Hillel Coren
c1789839b8 Change 'Mark Sent' to 'Mark Active' for recurring invoices 2017-01-31 14:59:20 +02:00
Hillel Coren
6371339805 Auto logout after inactivity 2017-01-31 13:09:25 +02:00
Hillel Coren
7e22bc9116 Fix for tests 2017-01-23 20:53:17 +02:00
Hillel Coren
068b4e617c Fix for tests 2017-01-23 17:38:45 +02:00
Hillel Coren
9d1a92d0dd Updated lanugage files\added Greek 2017-01-23 17:26:09 +02:00
Hillel Coren
de6302d12a Add client statements 2017-01-23 17:00:44 +02:00
Hillel Coren
a63f694d09 Improvements to reports 2017-01-22 12:09:29 +02:00
Hillel Coren
c8419c14d1 Improvements to CSV import/export 2017-01-15 20:38:36 +02:00
Hillel Coren
923bea823e Fix for 'quote_subject' variable name 2017-01-15 11:50:12 +02:00
Hillel Coren
0095cdf7dd Add secondary domain choice 2017-01-12 15:12:02 +02:00
Hillel Coren
b6527cddc3 Refactor client portal and email settings requests 2017-01-12 13:52:37 +02:00
Hillel Coren
318b189bc0 Support bulk emailing 2017-01-11 15:53:26 +02:00
Hillel Coren
0275ab92ab Tweak help text 2017-01-09 17:08:23 +02:00
Hillel Coren
b34c5724de Support 'Tax Invoice\Quote' PDF labels 2017-01-08 19:43:59 +02:00
Hillel Coren
1b738b3913 Add payment types #1158 2017-01-08 13:14:06 +02:00
Hillel Coren
334b7d20ab Clarify what JSON export includes 2017-01-08 12:58:53 +02:00
Hillel Coren
c8345e8fc1 BCC email 2017-01-06 15:24:53 +02:00
Hillel Coren
6ff1c79db3 Label reminder activity records 2017-01-05 12:46:03 +02:00
Hillel Coren
69369619af Support automatic client ids 2017-01-03 21:48:40 +02:00
Hillel Coren
8ee451b42f Working on client numbers 2017-01-03 15:53:49 +02:00
Hillel Coren
318dfd83e1 Local Pdf generation 2017-01-02 20:56:06 +02:00
Hillel Coren
d0cb07eb2d Local Pdf generation #886 2017-01-02 20:47:40 +02:00
Hillel Coren
c2171e5f4f Add post\state\city field to invoice design 2017-01-02 13:58:51 +02:00
Hillel Coren
c4cdc45a93 Add inclusive tax rates #552 2017-01-02 13:38:58 +02:00
Hillel Coren
9e051da756 Bug: change plan when company has multiple accounts 2016-12-29 22:50:55 +02:00
Hillel Coren
152b8770f5 Simplify new company process 2016-12-29 22:24:11 +02:00
Hillel Coren
e313a32c6a Show app link when logging in on iOS device 2016-12-29 21:49:55 +02:00
Hillel Coren
f0f62790a6 Show dashboard alert when white label license is expired 2016-12-28 16:39:29 +02:00
Hillel Coren
cf0889bc90 Improvements to white label purchase 2016-12-27 23:56:55 +02:00
Hillel Coren
4bcdc155c0 Working on white label renewal 2016-12-27 13:44:15 +02:00
Hillel Coren
f288915970 Add last year option 2016-12-25 23:58:40 +02:00
Hillel Coren
a7858a8561 Right align number and center statuses in data tables 2016-12-25 23:43:57 +02:00
Hillel Coren
edc3531965 Add require HTTPS self host setting 2016-12-25 22:31:02 +02:00
Hillel Coren
8b2fdc3860 Clarify dashboard values 2016-12-25 20:22:56 +02:00
Hillel Coren
3f8efb986d Enable sending message from within the app 2016-12-25 19:43:42 +02:00
Hillel Coren
d12a1a35de Fix for % translation issue 2016-12-21 14:39:26 +02:00
Hillel Coren
700bac552b Fix for % translation issue 2016-12-21 14:37:57 +02:00
Hillel Coren
84a20fba4d Text changes 2016-12-21 13:45:51 +02:00
Hillel Coren
a95f15ab6a Update translation files 2016-12-15 17:16:48 +02:00
Hillel Coren
7085c0137f Fix payments column headers 2016-12-15 15:20:36 +02:00
Hillel Coren
16dba695b1 Support bulk mark paid 2016-12-14 21:47:22 +02:00
Hillel Coren
cc8959626f Support pro plan discounts 2016-12-14 16:19:16 +02:00
Hillel Coren
03e9e978d7 Added social icons to navigation footer 2016-12-12 00:25:22 +02:00
Hillel Coren
98bad586e2 Fix for rounding subtotal value 2016-12-11 21:45:40 +02:00
Hillel Coren
07f76067e0 CRUD 2016-12-09 00:18:10 +02:00
Hillel Coren
98a237b5ad Added keyboard shortcuts 2016-12-06 23:39:10 +02:00
Hillel Coren
7c4d0a2af5 Label credits created by deleting payments 2016-12-06 12:04:30 +02:00
Hillel Coren
1646870431 Added link to error if email is not confirmed 2016-12-05 22:02:23 +02:00
Hillel Coren
8d8156f580 Hide draft invoices from the client portal 2016-12-04 23:26:38 +02:00
Hillel Coren
531b707945 Support setting redirect URL for buy now button 2016-12-02 15:37:25 +02:00
Hillel Coren
c8d4941fa6 Support setting redirect URL for buy now button 2016-12-02 14:51:05 +02:00
Hillel Coren
4bcf95ea69 Added UI setting to enable JS PDF renderer 2016-12-01 21:40:10 +02:00
Hillel Coren
d7f22041ab Added UI setting to enable JS PDF renderer 2016-12-01 21:39:00 +02:00
Hillel Coren
7f72836aad Make larger area clickable in datatable header 2016-11-30 20:33:05 +02:00
Hillel Coren
9f7d7a32a3 Make larger area clickable in datatable header 2016-11-30 20:30:48 +02:00
Hillel Coren
55340b8d13 Support editing credits 2016-11-30 20:21:50 +02:00
Hillel Coren
bbbf1237c5 Added task projects 2016-11-29 19:47:26 +02:00
Hillel Coren
408aede80a Fix for JSON payment import 2016-11-28 10:55:00 +02:00
Hillel Coren
a99079da95 Improve error if email fails to send 2016-11-27 16:58:32 +02:00
Hillel Coren
547a8e80b9 Clarify JSON import/export help 2016-11-27 15:46:45 +02:00
Hillel Coren
ae28c3c5c3 Working on bulk list changes 2016-11-27 11:46:32 +02:00
Hillel Coren
8bac6b6c27 Working on adding bulk actions to client page 2016-11-24 11:22:37 +02:00
Hillel Coren
ccecb65f58 Working on status selector 2016-11-20 16:08:36 +02:00
Hillel Coren
e1a84a29e1 Tweaks to BlueVine 2016-11-16 12:41:32 +02:00
Joshua Dwire
82167de1d2 Merge remote-tracking branch 'upstream/develop' into 2016-11-bluevine-integration 2016-11-10 18:29:13 -05:00
Joshua Dwire
5bee41789f Show BlueVine quote and redirect to BlueVine 2016-11-10 18:24:54 -05:00
Hillel Coren
b19a1d73de Minor text update 2016-11-09 16:08:33 +02:00
Hillel Coren
ed7e8baaef Updated language files 2016-11-06 19:35:28 +02:00
Hillel Coren
ef44a95902 Working on signature feature 2016-11-06 13:44:58 +02:00
Hillel Coren
3ccb33ec21 Support signing for invoice 2016-11-04 15:34:15 +02:00
Joshua Dwire
5713561261 Add UI for BlueVine signup 2016-11-03 16:54:33 -04:00
Hillel Coren
eca4d7ce6a Add financial year start setting for dashboard 2016-10-31 11:11:30 +02:00
Hillel Coren
5b80e32fa7 Add ability to enable\disable modules 2016-10-27 11:57:51 +03:00
Hillel Coren
070bb72601 Add author name to footer #1052 2016-10-25 20:37:34 +03:00
Hillel Coren
8fb8b63a13 Track changes to expenses in activities 2016-10-20 23:18:42 +03:00
Hillel Coren
83b66c880b Track changes to expenses in activities 2016-10-20 23:17:37 +03:00
Hillel Coren
040fb76a48 UI to apply white label license 2016-10-20 21:35:59 +03:00
Hillel Coren
a0f8475a35 Enable selecting currency symbol or code 2016-10-20 17:17:47 +03:00
Hillel Coren
7c0eea08cd Added new upgrade modal 2016-10-16 09:38:04 -04:00
Hillel Coren
06100a3598 Fixed punctuation 2016-10-09 17:17:44 +03:00
Hillel Coren
48d0b1b9cf Improve expense import 2016-10-05 23:46:15 +03:00
Hillel Coren
08a07f09ed Add link to Transifex 2016-10-05 21:20:00 +03:00
Hillel Coren
6a7dcc21a2 Corrected invoice save error 2016-10-05 13:36:31 +03:00
Hillel Coren
8e010e687c Update lang files 2016-10-02 11:03:26 +03:00
Hillel Coren
7bd4026e4c Working on importing expenses 2016-10-02 10:10:28 +03:00
Hillel Coren
3510f749c8 Fix text capitalization 2016-09-28 10:52:03 +03:00
Hillel Coren
6088a36175 Support for custom gateway 2016-09-26 12:33:30 +03:00
Hillel Coren
078527443f Enable recurring for a cloned invoice 2016-09-26 09:54:59 +03:00
Hillel Coren
f3a9f88107 Enable resubmitting form if invoice fails to save 2016-09-25 13:41:38 +03:00
Hillel Coren
f529b2ed06 Enabled adding blank row in invoice fields 2016-09-25 11:07:15 +03:00
Hillel Coren
249c89dbfd Added products to main navigation 2016-09-23 17:00:47 +03:00
Hillel Coren
f49baa3e38 Updated bot message 2016-09-22 09:52:14 +03:00
Hillel Coren
9892c10be4 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-09-21 20:56:37 +03:00
Hillel Coren
0b54c8408a Merge pull request #1081 from codedge/Self-updater-integration 
Integrate updater in sidebar
 2016-09-21 20:54:55 +03:00
Holger Lösken
752c1684df Integrate updater in sidebar 
- Show little badge, when update available
- Remove download only link
- Change self update texts
- Update to latest version of laravel-selfupdater package
 2016-09-21 15:25:56 +00:00
Hillel Coren
7ae01f8f42 Link to relevant page in docs 2016-09-21 16:18:26 +03:00
Hillel Coren
a8b606634d Refinements to the invoice fields settings 2016-09-21 12:43:47 +03:00
Hillel Coren
73781e88d5 Fix issue with hipster design with quotes 2016-09-19 14:08:21 +03:00
Hillel Coren
8d0adbde61 Enabled usign raw HTML with email templates 2016-09-19 12:49:15 +03:00
Hillel Coren
ea18ac74c8 Text correction 2016-09-18 22:15:05 +03:00
Hillel Coren
1e48a9c17d Use improve date selector in reports 2016-09-18 17:06:56 +03:00
Hillel Coren
e743af4d24 Merged #1062 2016-09-15 13:41:09 +03:00
Hillel Coren
531c26e87c Updated language files 2016-09-15 11:08:07 +03:00
Hillel Coren
8cfcb93179 Added Albanian 2016-09-12 13:08:32 +03:00
Hillel Coren
b2074ae004 Updated lanuguages and added Albaninan 2016-09-12 13:04:47 +03:00
Hillel Coren
e4f914f65d Updated lanuguages and added Albaninan 2016-09-12 13:03:34 +03:00
Hillel Coren
359271d6c8 Fix undefined on playful quote 2016-09-12 09:38:02 +03:00
Hillel Coren
ce3a510037 Working on the dashboard 2016-09-11 17:30:23 +03:00
Hillel Coren
9543336b31 Show 'Unnamed Client' for clients w/o a name 2016-09-06 14:55:31 +03:00
Hillel Coren
657f5c066c Change label to Partial/Deposit 2016-09-06 12:12:23 +03:00
Hillel Coren
b57deab66e Clarify white label message 2016-09-06 11:13:31 +03:00
Hillel Coren
8f65817dc5 Added fb/twtr to notifications page 2016-09-06 11:02:21 +03:00
Hillel Coren
d14cf5f9ed Working on invoice fields 2016-09-05 15:28:59 +03:00
Hillel Coren
08590a4b6f Working on invoice fields 2016-09-05 08:10:39 +03:00
Hillel Coren
db0c305b4f Working on history sidebar 2016-08-31 22:10:41 +03:00
Hillel Coren
a2f7d32e57 Working on the sidebars 2016-08-31 12:58:31 +03:00
Hillel Coren
f021ee11fa Working on nav sidebar 2016-08-23 20:28:45 +03:00
Hillel Coren
5389a5aa87 Merge branch 'Self-updater' of https://github.com/codedge/invoiceninja into codedge-Self-updater 
Conflicts:
	resources/lang/en/texts.php
 2016-08-21 19:39:31 +03:00
Hillel Coren
6c92a6a94a Enabled adding expense to open invoice 2016-08-21 18:25:35 +03:00
Holger Lösken
d2d64d2a63 Use self-updater package, initial commit 2016-08-19 13:13:55 +00:00
Hillel Coren
9bb64d4984 Add help message to explain limited gateways 2016-08-19 16:11:00 +03:00
Hillel Coren
b35c44b1e8 Fixes for JSON import 2016-08-15 21:37:47 +03:00
Hillel Coren
c01e42ac87 Added option to include line item taxes in line total 2016-08-15 18:08:06 +03:00
Hillel Coren
bfae5018e0 Fixes for the bot 2016-08-14 12:30:16 +03:00
Hillel Coren
ce2c71843c Working on the bot 2016-08-13 22:19:37 +03:00
Hillel Coren
73574fbd14 Workign on the bot 2016-08-10 20:48:24 +03:00
Hillel Coren
0a7381294e Working on the bot 2016-08-10 17:04:17 +03:00
Hillel Coren
d374843e50 Working on the bot 2016-08-09 23:06:24 +03:00
Hillel Coren
f8fda5f241 Working on the bot 2016-08-07 22:42:32 +03:00
Hillel Coren
b8a124dc0f Working on our bot 2016-08-07 09:10:36 +03:00
Hillel Coren
f1a278e4ff Working on our bot 2016-08-06 20:54:56 +03:00
Hillel Coren
7f3bd44d9a Working on bots 2016-08-04 20:01:30 +03:00
Hillel Coren
293e7cbb61 Support saving credit card and paypal tokens for the same client 2016-08-02 13:40:20 +03:00
Hillel Coren
ae87edadfc Fix for fr_CA 2016-07-31 21:41:21 +03:00
Hillel Coren
af78a3dd2d Test Stripe credentials when adding gateway 2016-07-29 14:58:26 +03:00
Hillel Coren
028743e440 Improve warning messages when sending emails 2016-07-28 23:08:51 +03:00
Hillel Coren
22c920701c Implemented sweetalert 2016-07-28 19:55:23 +03:00
Hillel Coren
4795f33067 Adding back fixes 2016-07-21 16:04:23 +03:00
Hillel Coren
498578cefc Rollback to 2.6.5 2016-07-21 15:35:23 +03:00
Hillel Coren
d13e95399e Revert "Translate error template" 2016-07-21 15:30:11 +03:00
Holger Lösken
97d6fcbf06 Translate error template 
- Fix #1001
- Translate error contact text
 2016-07-21 12:52:33 +02:00
Hillel Coren
7bb8f0ca4a Merge https://github.com/codedge/invoiceninja into codedge-#904-Unify-js-no-public-js 
Conflicts:
	app/Http/Controllers/AccountController.php
	resources/lang/en/texts.php
 2016-07-20 10:49:08 +03:00
Hillel Coren
4306892a5b Update language files 2016-07-19 19:07:03 +03:00
Hillel Coren
bd70b4596c Add batch limits for hosted imports 2016-07-19 18:57:01 +03:00
Hillel Coren
618ed868e6 Show WePay's fees 2016-07-18 23:10:04 +03:00
Hillel Coren
078964d297 Improve offsite payment checks 2016-07-18 21:45:32 +03:00
Hillel Coren
1e568dc408 Fixes for WePay 2016-07-16 23:51:18 +03:00
Hillel Coren
86c08f3af5 Working on new pricing 2016-07-15 11:24:08 +03:00
Hillel Coren
09e06703ea Added dwolla to text files 2016-07-13 21:49:10 +03:00
Hillel Coren
f47b6dc5ac Added dwolla to text files 2016-07-13 21:11:26 +03:00
Hillel Coren
fa9b0bf78b Working on buy now buttons 2016-07-13 12:03:39 +03:00
Hillel Coren
401851e212 Working on buy now buttons 2016-07-12 23:46:41 +03:00
Hillel Coren
986487b4c9 Working on new hosted pricing 2016-07-11 20:08:43 +03:00
Hillel Coren
6756fde908 Merge pull request #955 from codedge/#583-Add-Task-creating-editing-to-activity-stream 
#583 add task creating editing to activity stream
 2016-07-10 12:42:29 +03:00
Hillel Coren
fd2155d10a Merge pull request #950 from codedge/#868-Configurable-start-of-week 
Adding configuration for first day of the week
 2016-07-10 12:42:12 +03:00
Hillel Coren
386c606558 Added support for taxes to expenses 2016-07-07 19:54:06 +03:00
Hillel Coren
cd9aae1e22 Working on expense categories 2016-07-06 21:35:16 +03:00
Hillel Coren
21a91ff0e1 Added expense category 2016-07-05 21:49:47 +03:00
Holger Lösken
d1dc1a7e5b Added tasks to activity on dashboard 
- Fixes #583 and resolves #583
- Creating and updating tasks creates an activity now
- Each has its own event
- The activity is shown on the dashboard
 2016-07-05 16:31:57 +00:00
Hillel Coren
979690d116 Improved options when exporting data 2016-07-05 16:09:52 +03:00
Hillel Coren
fdb2aefc66 Improved help for 2checkout.com 2016-07-04 22:26:41 +03:00
Hillel Coren
b5f606df47 Added and as email template variables 2016-07-04 21:47:05 +03:00
Holger Lösken
fcc8cac7b5 Adding configuration for first day of the week 
- Fix #868 and resolves #868
- The first day of the week can be configured in localization settings,
which affects the Bootstrap date picker
 2016-07-04 16:20:22 +02:00
Hillel Coren
6f1776004a Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-07-04 09:40:06 +03:00
Holger Lösken
a114f60127 Adding translation support for languages 
- Languages can now be translated via texts.php
 2016-07-04 01:02:38 +02:00
Hillel Coren
dc1bcfbd9e Updates to white label marketing 2016-07-03 17:46:41 +03:00
vagrant
3e912db1cb Resolve conflicts 2016-07-03 09:34:34 +00:00
Holger Lösken
1aa0110580 Return $LANG array for Transifex 2016-07-03 09:27:49 +00:00
Holger Lösken
337ed1c719 - Fix #426, closes #426 
- Moved translations for industries, countries into texts.php
- Removed nested arrays in texts.php
 2016-07-03 09:26:08 +00:00
Holger Lösken
b13b9a2d7d Fix hardcoded translations for industry, country and payment types 
- Fixes #426, resolves #426
 2016-07-03 09:24:55 +00:00
Holger Lösken
da87f9342d Return $LANG array for Transifex 2016-07-03 11:06:34 +02:00
Holger Lösken
96d15ccb2d - Fix #426, closes #426 
- Moved translations for industries, countries into texts.php
- Removed nested arrays in texts.php
 2016-07-02 23:18:13 +02:00
Holger Lösken
fdb8c707e1 Fix hardcoded translations for industry, country and payment types 
- Fixes #426, resolves #426
 2016-07-01 23:19:09 +02:00
Hillel Coren
ff911888ec Merging tranlations from Transifex 2016-06-30 21:26:14 +03:00
Holger Lösken
ae78a177b0 Fix #562 
Make „Manual entry“ translatable
 2016-06-30 14:38:55 +02:00
Hillel Coren
0449fe2515 Minor text/styling fixes 2016-06-28 21:22:16 +03:00
Hillel Coren
7c0875841a Fixed autobill message in emails 2016-06-26 12:59:42 +03:00
Hillel Coren
dcdfb4f21c Check to prevent duplicate gateways 2016-06-22 20:13:45 +03:00
Hillel Coren
e2ddabe95d Minor fixes for payments 2016-06-22 12:22:38 +03:00
Hillel Coren
5ff69c6f29 Payments refactor 2016-06-20 17:14:43 +03:00
Hillel Coren
ffa67cef3b Refactoring payments code... 2016-06-09 10:56:22 +03:00
Hillel Coren
d5cb8b3abe Minor fixes 2016-06-05 22:55:23 +03:00
Hillel Coren
5c7a15ff83 Minor fixes 2016-06-05 19:10:15 +03:00
Hillel Coren
a7f92d0726 Merge pull request #901 from joshuadwire/wepay-integration 
Wepay integration
 2016-06-03 11:20:31 +03:00
Hillel Coren
0acf4ff1fc Support importing JSON file 2016-06-02 22:03:59 +03:00
Joshua Dwire
49d47bb9e3 Merge remote-tracking branch 'upstream/develop' into wepay-integration 2016-06-01 16:46:03 -04:00
Hillel Coren
42ac9507e5 Enabled importing products 2016-05-31 23:15:55 +03:00
Hillel Coren
0e75ddb5e6 Added setting to hide second tax rate 2016-05-29 12:26:02 +03:00
Hillel Coren
c55d6510bf Show permissions if not enabled 2016-05-26 16:04:53 +03:00
Joshua Dwire
acbc0e887f Support adding WePay ACH from payment page 2016-05-25 16:54:49 -04:00
Joshua Dwire
4dded687b5 Tweak payment settings page 2016-05-25 15:55:23 -04:00
Joshua Dwire
c9f00274b1 Support storing WePay bank tokens 2016-05-25 15:04:58 -04:00
Joshua Dwire
6ddbbbc64d Merge remote-tracking branch 'upstream/develop' into wepay-integration 2016-05-25 11:14:14 -04:00
Joshua Dwire
7d55ab033b Merge branch 'wepay-ach' into wepay-integration 2016-05-25 11:11:47 -04:00
Joshua Dwire
d19a3715f9 Warn user when editing an ACH auto bill invoice 2016-05-25 11:07:20 -04:00
Joshua Dwire
c701c5563c Add payment settings block 2016-05-25 10:36:40 -04:00
Hillel Coren
ba561c7d0d Prevent clicking save while document is still uploading 2016-05-25 14:42:20 +03:00
Joshua Dwire
9d4b42a514 Mention in the invoice notification that the invoice will be auto billed on the due date 2016-05-24 23:14:19 -04:00
Joshua Dwire
724f5738aa Add contact_key 2016-05-24 17:02:28 -04:00
Hillel Coren
f19058e35e Improved message after update 2016-05-23 09:18:39 +03:00
Hillel Coren
cdfaae2700 Minor change to client portal settings page 2016-05-22 20:31:26 +03:00
Hillel Coren
ac09d86f68 Show warning when changing recurring invoice start date 2016-05-22 19:51:09 +03:00
Hillel Coren
6caf1ff30d Minor fixes 2016-05-19 09:47:57 +03:00
Hillel Coren
2e1d340d27 Merge pull request #875 from joshuadwire/wepay-integration 
Wepay integration - Part 2
 2016-05-17 22:25:59 +03:00
Hillel Coren
0dd55b4cf2 Merge pull request #873 from vincentdh/patch-3 
use_card_on_file translation ambiguous
 2016-05-17 22:19:51 +03:00
Joshua Dwire
4f3bb7eeb4 Merge remote-tracking branch 'upstream/develop' into wepay-integration 2016-05-17 15:07:53 -04:00
Joshua Dwire
e905b29510 Partial WePay ACH support 2016-05-17 14:09:39 -04:00
Hillel Coren
a2998a8cfb Added Croatian 2016-05-17 20:22:41 +03:00
vincentdh
f532639e3c use_card_on_file translation ambiguous 2016-05-17 12:59:55 -04:00
Joshua Dwire
43fade2339 Support app fees and Canadian users 2016-05-17 11:32:17 -04:00
Hillel Coren
a82437b2bc Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 
Conflicts:
	app/Http/routes.php
	resources/lang/en/texts.php
 2016-05-16 11:34:00 +03:00
Joshua Dwire
f6942a199f Merge remote-tracking branch 'upstream/develop' into wepay-integration 2016-05-15 21:21:59 -04:00
Hillel Coren
3df6ad2529 Changes to support transifex.com 2016-05-15 23:16:08 +03:00
Hillel Coren
1faf0a477a Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-05-15 22:55:25 +03:00
Bartlomiej Szala
5eaa90fd05 Add new translations into texts file 2016-05-15 21:49:58 +02:00
Hillel Coren
b067697b1c Support manually importing OFX files 2016-05-15 13:58:11 +03:00
Hillel Coren
52fe1b0dec Added missing text value 2016-05-15 10:06:14 +03:00
Joshua Dwire
947cb4a6f7 Better WePay configuration support 2016-05-14 17:23:20 -04:00
Hillel Coren
df3a103825 Added missing report field 2016-05-13 15:26:22 +03:00
Joshua Dwire
ba000546c4 Better WePay switching 2016-05-12 11:09:07 -04:00
Joshua Dwire
88c9fc1ac1 Add WePay configuration UI 2016-05-11 22:55:37 -04:00
Hillel Coren
7ad81bdf5e Merge pull request #856 from bSzala/translation 
Working on polish translations
 2016-05-11 23:18:29 +03:00
Bartlomiej Szala
ae6d85bb49 Working on texts translations 2016-05-11 20:59:40 +02:00
Joshua Dwire
fc029a62e1 Merge remote-tracking branch 'upstream/develop' into payments-changes 2016-05-10 22:32:28 -04:00
Joshua Dwire
88ec714cd5 Store Stripe card summary locally 2016-05-10 18:46:32 -04:00
Hillel Coren
a503697152 Updated lang files 2016-05-10 21:25:57 +03:00
Hillel Coren
ee579f91f3 Added plan help text 2016-05-10 21:17:46 +03:00
Joshua Dwire
41f4c98e08 Merge remote-tracking branch 'upstream/develop' into payments-changes 2016-05-10 10:25:42 -04:00
Hillel Coren
d34441b039 Merge translation fix #796 2016-05-10 12:26:30 +03:00
Hillel Coren
e7e7476505 Merge translation fix #825 2016-05-10 12:24:21 +03:00
Hillel Coren
d56a75ca5e Merge translation fix #832 2016-05-10 12:22:50 +03:00