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
|
9bfe233c9f
|
Fix for default payment method check
|
2016-07-20 10:19:39 +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
|
a0817d8de3
|
Check for payment driver
|
2016-07-19 20:15:03 +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
|
4348270c96
|
Bumped version number to 2.6.4
|
2016-07-19 19:15:30 +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
|
d534b5595b
|
Workaround for problem with images in PDF on MS Edge
|
2016-07-19 15:42:08 +03:00 |
|
Hillel Coren
|
2e0129b279
|
Fix when adding a new user who is already logged in
|
2016-07-19 10:59:50 +03:00 |
|
Hillel Coren
|
cb4a2b6a49
|
Fix for app cipher setting
|
2016-07-19 10:38:54 +03:00 |
|
Hillel Coren
|
dcfea90781
|
Merge pull request #989 from codedge/Put-cipher-back-to-env
Put APP_CIPHER back to .env
|
2016-07-19 10:28:05 +03:00 |
|
Hillel Coren
|
e7c8ca50db
|
API optimization
|
2016-07-19 10:07:56 +03:00 |
|
Hillel Coren
|
109c97dc55
|
Fix for is_system setting in actvities
|
2016-07-19 09:57:17 +03:00 |
|
Holger Lösken
|
fdeca11660
|
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-18 22:12:41 +00:00 |
|
Hillel Coren
|
7249b29bf6
|
Change settings navigation order
|
2016-07-18 23:28:30 +03:00 |
|
Hillel Coren
|
618ed868e6
|
Show WePay's fees
|
2016-07-18 23:10:04 +03:00 |
|
Hillel Coren
|
6cc84ddfab
|
Add link to WePAY TOS
|
2016-07-18 22:58:56 +03:00 |
|
Hillel Coren
|
60982deb08
|
Don't show clients w/o names
|
2016-07-18 22:53:54 +03:00 |
|
Hillel Coren
|
7cb797fcc2
|
Fix for cancel account
|
2016-07-18 22:07:23 +03:00 |
|
Hillel Coren
|
ce6068f924
|
Additional online payment checks
|
2016-07-18 22:03:28 +03:00 |
|
Hillel Coren
|
078964d297
|
Improve offsite payment checks
|
2016-07-18 21:45:32 +03:00 |
|
Hillel Coren
|
cef35a98e1
|
Prevent creating payment for a quote through the API
|
2016-07-18 21:12:18 +03:00 |
|
Hillel Coren
|
5e5207973f
|
Prevent entering online payment for deleted invoice
|
2016-07-18 21:05:40 +03:00 |
|
Hillel Coren
|
fb28521160
|
Increase API page limit
|
2016-07-18 14:15:52 +03:00 |
|
Holger Lösken
|
3d7e412d24
|
Put APP_CIPHER back to .env
- APP_CIPHER included in .env.example
- APP_CIPHER being included into .env when doing a fresh install
|
2016-07-18 11:13:35 +02:00 |
|
Hillel Coren
|
59969a4677
|
Fix for API pagination
|
2016-07-17 13:31:31 +03:00 |
|
Hillel Coren
|
0d58e6da94
|
Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop
|
2016-07-16 23:51:30 +03:00 |
|
Hillel Coren
|
1e568dc408
|
Fixes for WePay
|
2016-07-16 23:51:18 +03:00 |
|
Hillel Coren
|
f8672e3feb
|
Fix for buy now buttons
|
2016-07-16 23:51:05 +03:00 |
|
Hillel Coren
|
e41d47eb0d
|
Prevent charging downgraded accounts
|
2016-07-16 23:19:43 +03:00 |
|