Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-11 21:52:35 +01:00
Code Issues Releases Activity
4,071 Commits 7 Branches 919 Tags 2 GiB
c43aba0aef
Commit Graph

4071 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Hillel Coren
fa18feb8e5 Handle deleted account when charging renewals 2016-07-20 22:53:54 +03:00
Hillel Coren
8bc3d6c937 Ensure 0% taxes are shown 2016-07-20 20:48:56 +03:00
Hillel Coren
1aeded3d3b Merge pull request #998 from codedge/Fix-elixir-merging-js-problems 
JS problems after using elixir
 2016-07-20 20:40:55 +03:00
Holger Lösken
f5a5457d2b JS problems after using elixir 
- Added missing JS files
- Added missing images
- Recreated merged files
 2016-07-20 19:38:56 +02:00
Hillel Coren
f4f13d3119 Fix for attaching files 2016-07-20 20:09:03 +03:00
Hillel Coren
10fdfd2988 Add isStorageSupported() 2016-07-20 20:01:25 +03:00
Hillel Coren
80990bb7c4 Merge pull request #992 from codedge/#904-Unify-js-no-public-js 
Use Elixir for asset management
 2016-07-20 13:19:37 +03:00
Hillel Coren
61d3adecff Merge pull request #957 from codedge/#949-Improve-activity-stream-invoices 
Show client name next to invoice no. on dashboard
 2016-07-20 11:54:17 +03:00
Holger Lösken
86cc59af74 Merge branch '#904-Unify-js-no-public-js' of github.com:codedge/invoiceninja into #904-Unify-js-no-public-js 2016-07-20 08:29:50 +00:00
Holger Lösken
d36675b15b Use Elixir for asset management 
- Set up Elixir for asset management
- CSS + JS will be handled via Elixir/Gulp in gulpfile.js
- Removed outdates public/js files
 2016-07-20 08:29:45 +00:00
Hillel Coren
f83736478c Merge pull request #962 from codedge/#585-Reset-invoice-schema-counter-new-year 
Reset the invoice schema counter
 2016-07-20 11:10:19 +03:00
Hillel Coren
2f9854b346 Updated composer.lock file 2016-07-20 11:06:27 +03:00
Hillel Coren
baaa25127c Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-07-20 11:02:56 +03:00
Hillel Coren
87211d682f Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-07-20 11:01:47 +03:00
Hillel Coren
e81ba97088 Merge pull request #967 from Modelizer/develop 
Added mcrypt, gmp and gd extensions.
 2016-07-20 11:01:16 +03:00
Hillel Coren
034af87d1b Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-07-20 11:00:19 +03:00
Hillel Coren
7b4b84cedd Merge pull request #979 from codedge/Refactoring-docblocks-dead-code-unused-uses 
Refactor docblocks, unused vars, unused uses
 2016-07-20 11:00:03 +03:00
Hillel Coren
15ba33d85f Correct travis branch in readme 2016-07-20 10:58:57 +03:00
Hillel Coren
24503ad53b Merge pull request #980 from codedge/Refactor-utils-helper-class 
Refactor Utils class
 2016-07-20 10:58:32 +03:00
Hillel Coren
027860c9c3 Merge branch 'codedge-#904-Unify-js-no-public-js' into develop 2016-07-20 10:49:19 +03: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
a3271d6688 Merge pull request #994 from codedge/#705-set-app-language-for-templates 
Make app language available in templates
 2016-07-20 10:40:21 +03:00
Hillel Coren
55fb959d45 Update version 2016-07-20 10:23:12 +03:00
Hillel Coren
c78bc88fd5 Update version 2016-07-20 10:23:02 +03:00
Hillel Coren
9d9fa2ff7e Fix for default payment method check 2016-07-20 10:20:13 +03:00
Hillel Coren
9bfe233c9f Fix for default payment method check 2016-07-20 10:19:39 +03:00
Hillel Coren
97a56fac13 Fix for approving quotes 2016-07-20 10:05:19 +03:00
Hillel Coren
0caa865f7d Fix for approving quotes 2016-07-20 10:03:46 +03:00
Hillel Coren
ab331ba8d4 Updated change log 2016-07-19 20:16:56 +03:00
Hillel Coren
5be6abfa93 Check for payment driver 2016-07-19 20:15:18 +03:00
Hillel Coren
a0817d8de3 Check for payment driver 2016-07-19 20:15:03 +03:00
Hillel Coren
41f5e4ed9a Fix for archiving credit 2016-07-19 20:13:07 +03:00
Hillel Coren
96b4b19509 Fix for archiving credits 2016-07-19 20:12:45 +03:00
Hillel Coren
9d4c6a12dd Use credits when autobilling invoices 2016-07-19 20:12:28 +03:00
Holger Lösken
68a1a81748 Make app language available in templates 
- Fix #705
- $appLanguage can be fetched inside each template
 2016-07-19 19:04:31 +02:00
Hillel Coren
5adc665a95 Merge branch 'release-2.6.4' into develop 2016-07-19 19:19:19 +03:00
Hillel Coren
f42e8158c2 Merge branch 'release-2.6.4' 
Conflicts:
	app/Http/Controllers/AccountController.php
	app/Http/routes.php
	app/Models/User.php
	resources/lang/en/texts.php
 2016-07-19 19:18:24 +03:00
Hillel Coren
4348270c96 Bumped version number to 2.6.4 2016-07-19 19:15:30 +03:00