1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 13:12:50 +01:00
Commit Graph

3153 Commits

Author SHA1 Message Date
Hillel Coren
614044364b Fixes for #442 and #702 2016-05-22 13:13:24 +03:00
Hillel Coren
99da41669b Fixes for #442 and #702 2016-05-22 13:10:58 +03:00
Hillel Coren
990ba1a89c Merge pull request #881 from turbo124/develop
Include Documents in Invoice transformer
2016-05-19 10:57:28 +03:00
Hillel Coren
6caf1ff30d Minor fixes 2016-05-19 09:47:57 +03:00
David Bomba
2034c11795 Include Documents in Invoice transformer 2016-05-19 09:43:03 +10:00
Hillel Coren
617ac98a75 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-05-18 22:58:42 +03:00
Hillel Coren
2f8b79891a Merge pull request #880 from joshuadwire/wepay-integration
Update dependencies
2016-05-18 22:56:12 +03:00
Joshua Dwire
9bbd4c99b2 Update dependencies 2016-05-18 15:27:51 -04:00
Hillel Coren
ef65bb7d84 Merge pull request #879 from joshuadwire/wepay-integration
Wepay integration - Part 3
2016-05-18 19:22:44 +03:00
Joshua Dwire
e05bbd18ef Fix JS error 2016-05-18 10:00:33 -04:00
Joshua Dwire
f0d276be4c Listen for WePay IPNs 2016-05-18 09:51:20 -04:00
Hillel Coren
510f5cffac Auto populate Stripe keys for testing 2016-05-18 11:05:00 +03:00
Hillel Coren
43defa270a readme changes 2016-05-18 10:21:14 +03:00
Hillel Coren
e45ef02b75 readme changes 2016-05-18 10:20:51 +03:00
Hillel Coren
8be1771f47 Bumped version number 2016-05-18 10:12:33 +03:00
Hillel Coren
8e3fa428c0 Updated readme 2016-05-17 23:44:50 +03:00
Hillel Coren
d7570f5d40 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-05-17 22:45:22 +03:00
Hillel Coren
fa9370d4fb Fix for symbol placement 2016-05-17 22:45:10 +03:00
Hillel Coren
1968632122 Merge pull request #876 from bSzala/develop
Swap symbol for Danish currency
2016-05-17 22:35:27 +03:00
Bartlomiej Szala
7cebb4b7fb Swap symbol for Danish currency 2016-05-17 21:33:13 +02: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
Hillel Coren
35f6ada762 Added initial CONTRIBUTING.md 2016-05-17 22:08:10 +03:00
Joshua Dwire
3835c62b0d Fix composer.json 2016-05-17 15:08:08 -04:00
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
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