1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-14 07:02:34 +01:00
Commit Graph

3380 Commits

Author SHA1 Message Date
Joshua Dwire
4f3bb7eeb4 Merge remote-tracking branch 'upstream/develop' into wepay-integration 2016-05-17 15:07:53 -04:00
Hillel Coren
5cb8c317fd Added initial CONTRIBUTING.md 2016-05-17 22:05:21 +03: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
faec0a2f04 Fix for deleting account 2016-05-17 15:03:17 +03:00
Hillel Coren
e5e65c0349 Added getCompletedAmount to payments 2016-05-17 14:55:53 +03:00
Hillel Coren
38866ff6f0 Disabled iOS push notifications by default 2016-05-17 14:35:16 +03:00
Hillel Coren
74343b710e Added support for GAE filesystem 2016-05-17 11:45:14 +03:00
Hillel Coren
bc0cd4ee52 Added fields for expense taxes 2016-05-17 10:47:24 +03:00
Hillel Coren
e59bcbd234 Merge branch 'bSzala-develop' into develop 2016-05-17 10:28:19 +03:00
Hillel Coren
d159f648a0 Merge branch 'develop' of git://github.com/bSzala/invoiceninja into bSzala-develop 2016-05-17 10:28:00 +03:00
Bartlomiej Szala
9c0202713a Enable swap symbol for currencies 2016-05-16 22:37:16 +02:00
Bartlomiej Szala
5d94dfe3a6 Update Currency seeder 2016-05-16 22:34:42 +02:00
Bartlomiej Szala
9d67e54fbb Add swap currency symbol to currency 2016-05-16 22:33:34 +02:00
Hillel Coren
abbece4bea Added datetimepicker to readme 2016-05-16 21:27:36 +03:00
Hillel Coren
8a8534fc74 Fix for new wepay .env properties 2016-05-16 11:44:43 +03: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
Hillel Coren
5e7cdddc3e Merge pull request #863 from joshuadwire/wepay-integration
Wepay integration - Part 1
2016-05-16 11:29:37 +03:00
David Bomba
b11c8dba1d Merge pull request #864 from turbo124/develop
typo
2016-05-16 12:31:51 +10:00
David Bomba
1d05525ee3 typo 2016-05-16 12:30:24 +10:00
Joshua Dwire
f6942a199f Merge remote-tracking branch 'upstream/develop' into wepay-integration 2016-05-15 21:21:59 -04:00
Joshua Dwire
a482c63ee3 Payments bug fixes 2016-05-15 16:27:56 -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
Hillel Coren
ce5e9fe535 Merge pull request #861 from bSzala/translation
Add new translations into texts file
2016-05-15 22:53:01 +03:00
Bartlomiej Szala
5eaa90fd05 Add new translations into texts file 2016-05-15 21:49:58 +02:00
Hillel Coren
46cf89361f Support manually importing OFX files 2016-05-15 14:06:25 +03: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
d99d81d655 Make autobill setting numbers match token settings 2016-05-14 23:15:22 -04:00
Joshua Dwire
919aec2192 Better refund handling 2016-05-14 23:03:39 -04:00
Joshua Dwire
65feee34e3 Fox expiration off-by-one error 2016-05-14 22:43:55 -04:00
Joshua Dwire
8bc8b384c5 Fix auto bill error when the user hasn't entered payment information 2016-05-14 22:38:09 -04:00
Joshua Dwire
9afd0741f7 Better WePay setup UI 2016-05-14 22:32:27 -04:00
Joshua Dwire
1524447cd4 WePay fixes; support account updater 2016-05-14 22:22:06 -04:00
Joshua Dwire
947cb4a6f7 Better WePay configuration support 2016-05-14 17:23:20 -04:00
Joshua Dwire
ce04c994dd Support payments and storing cards via WePay. 2016-05-13 09:30:22 -04:00
Hillel Coren
32ab340b74 Added fake card details for test payment 2016-05-13 16:00:07 +03:00
Hillel Coren
b111adaf17 Added and removed extra lables from activity messages 2016-05-13 15:35:59 +03:00
Hillel Coren
df3a103825 Added missing report field 2016-05-13 15:26:22 +03:00
Hillel Coren
f873998e22 Simplified reseller setup 2016-05-13 12:23:13 +03:00
Hillel Coren
fba37171ae Support query counter in webapp as well as API 2016-05-13 12:08:41 +03:00
Hillel Coren
02b0840215 Fix for online payment test 2016-05-13 10:38:42 +03:00
Hillel Coren
751b084a59 Fix javasript typo 2016-05-12 22:35:33 +03:00
Hillel Coren
0ce8a0d70a Set initial key value to enable setup page to load w/o error 2016-05-12 20:31:31 +03:00
Hillel Coren
6c4009d1ef Fixes for initial setup 2016-05-12 20:27:24 +03:00
Hillel Coren
3202d2480f Fix for saving client portal setting in self host 2016-05-12 20:26:36 +03:00
Joshua Dwire
ba000546c4 Better WePay switching 2016-05-12 11:09:07 -04:00