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

4059 Commits

Author SHA1 Message Date
Hillel Coren
7c314347db Fix for upgrading Stripe accounts 2016-07-27 12:53:11 +03:00
Hillel Coren
6d5f69f4fa Changed default keys to be 32 length 2016-07-27 12:21:42 +03:00
Hillel Coren
ecd6422156 Fix for Grunt 2016-07-26 23:04:25 +03:00
Hillel Coren
6bcdc98d08 Merge pull request #1020 from codedge/Set-up-Elixir-with-built.public.js
Set up Elixir with built.public.js
2016-07-26 23:03:11 +03:00
Holger Lösken
62a25b00b3 Set up Elixir with built.public.js 2016-07-26 13:03:40 +00:00
Hillel Coren
a82739de70 Moved faker from require-dev 2016-07-26 09:59:53 +03:00
Hillel Coren
d491082a9d Moved faker from require-dev 2016-07-26 09:58:41 +03:00
Hillel Coren
f6c23ead60 Fix alignment of logo in footer 2016-07-26 09:55:39 +03:00
Hillel Coren
b5fdf8568c Updated lock file 2016-07-25 13:16:50 +03:00
Hillel Coren
1354d47218 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-07-25 13:15:25 +03:00
Hillel Coren
1b571131f5 Merge pull request #1017 from codedge/#970-Pull-fedachdir-source-via-https
Pull fedachdir repository via HTTPS, not SSH
2016-07-25 09:42:59 +03:00
Hillel Coren
aa8a5ca93e Merge pull request #1015 from codedge/Set-up-pdf.built.js-with-Elixir
Set up Elixir with pdf.built.js
2016-07-25 09:41:46 +03:00
Holger Lösken
1eef0b9188 Pull fedachdir repository via HTTPS, not SSH 2016-07-24 18:30:16 +02:00
Holger Lösken
f362bb663c Set up Elixir with pdf.built.js 2016-07-24 17:43:03 +02:00
Hillel Coren
2c8a137375 Merge pull request #1014 from codedge/Set-up-D3.js-with-Elixir
Set up D3.js with Elixir
2016-07-24 16:19:38 +03:00
Hillel Coren
a758a26caf Fix for asdf 2016-07-24 14:40:17 +03:00
Hillel Coren
d51c437c3c Fix for asdf 2016-07-24 14:40:03 +03:00
Holger Lösken
3d471f7c82 Set up D3.js with Elixir
- Use latest V3 version (3.5.17)
- V4 not supported by IN / gives errors
- Use Elixir to minify + deploy to public dir
2016-07-24 13:31:25 +02:00
Hillel Coren
93b35187c7 Merge pull request #1013 from codedge/Set-up-Elixir-for-chart-js-no2
Use Chart.js with Elixir
2016-07-24 13:48:31 +03:00
Hillel Coren
c9ea294d80 Added barryvdh/laravel-debugbar back to require 2016-07-24 13:42:51 +03:00
Holger Lösken
31297be564 Use Chart.js with Elixir 2016-07-24 12:41:56 +02:00
Hillel Coren
dffe337a68 Added barryvdh/laravel-debugbar back to require 2016-07-24 13:40:37 +03:00
Hillel Coren
26c78e4a34 Merge pull request #1011 from codedge/Remove-built-public-js
Remove built.public.js
2016-07-24 10:24:55 +03:00
Holger Lösken
a6bc152f1e Remove built.public.js 2016-07-23 23:57:08 +02:00
Hillel Coren
fb420087dd Merge pull request #1010 from codedge/Built-js-file-via-elixir-no1
Building built.public.js via Elixir
2016-07-22 18:52:52 +03:00
Holger Lösken
1e1a636ebb Building built.public js via Elixir
- Fetching bootstrap-combobox via Bower, same version as before
- Minifying result
2016-07-22 17:48:14 +02:00
Hillel Coren
e512bad1a5 Merge pull request #1009 from codedge/Set-up-basic-elixir-config
Set up basic elixir config
2016-07-22 15:42:38 +03:00
Holger Lösken
1b4cdb4c3c Set up basic elixir config 2016-07-22 12:36:58 +02:00
Hillel Coren
2bdf47ee13 Merge pull request #1007 from codedge/Remove-old-less-files
Remove less folder from resources
2016-07-22 10:46:35 +03:00
Holger Lösken
98a8b7b368 Remove less folder from resources 2016-07-21 20:52:55 +00:00
Hillel Coren
74b552e132 Show 0% tax rates in line items 2016-07-21 20:21:57 +03:00
Hillel Coren
5387963731 Show 0% tax rates in line items 2016-07-21 20:21:46 +03:00
Hillel Coren
5fd4bddcd8 Show 0% tax rates in line items 2016-07-21 20:21:27 +03:00
Hillel Coren
c9d87c15d3 Show 0% tax rates in line items 2016-07-21 20:19:11 +03:00
Hillel Coren
8568f68ad2 Show 0% tax rates in line items 2016-07-21 20:18:32 +03:00
Hillel Coren
70244ec12e Merging fixes from develop 2016-07-21 20:12:59 +03:00
Hillel Coren
8c15e2a735 Fix for payment gateway failing validation 2016-07-21 20:09:33 +03:00
Hillel Coren
fa7203a90d Updated pem locations 2016-07-21 17:57:57 +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
dc22611d2f Merge pull request #1005 from invoiceninja/revert-1004-#1001-Translate-error-template
Revert "Translate error template"
2016-07-21 15:30:39 +03:00
Hillel Coren
d13e95399e Revert "Translate error template" 2016-07-21 15:30:11 +03:00
Hillel Coren
83665a491d Merge pull request #1004 from codedge/#1001-Translate-error-template
Translate error template
2016-07-21 14:37:01 +03:00
Hillel Coren
ee937d9994 Fixes from refactor 2016-07-21 14:28:06 +03:00
Hillel Coren
00f1c935cf Merge pull request #1000 from codedge/Make-assets-minified
Making assets minified
2016-07-21 14:12:40 +03:00
Holger Lösken
97d6fcbf06 Translate error template
- Fix #1001
- Translate error contact text
2016-07-21 12:52:33 +02:00
Holger Lösken
089ad1bd18 Making assets minified 2016-07-20 23:12:46 +02:00
Hillel Coren
660ffab0c5 Checked in compiled files 2016-07-20 23:49:02 +03:00
Hillel Coren
49a94bc1a0 Fix for unintialized contact 2016-07-20 23:35:07 +03:00
Hillel Coren
9c00a0ce6f Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-07-20 22:54:26 +03:00