Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes

Browse Source
This commit is contained in:
Hillel Coren 2016-06-05 19:11:37 +03:00
parent d472fcc93d
commit 85d94b5a36
4 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/routes.php
View File

@ -306,6 +306,9 @@ Route::get('/compare-online-invoicing{sites?}', function() {
Route::get('/forgot', function() { Route::get('/forgot', function() {
return Redirect::to(NINJA_APP_URL.'/recover_password', 301); return Redirect::to(NINJA_APP_URL.'/recover_password', 301);
}); });
Route::get('/feed', function() {
return Redirect::to(NINJA_WEB_URL.'/feed', 301);
});
if (!defined('CONTACT_EMAIL')) { if (!defined('CONTACT_EMAIL')) {
define('CONTACT_EMAIL', Config::get('mail.from.address')); define('CONTACT_EMAIL', Config::get('mail.from.address'));

2
app/Ninja/Repositories/ReferralRepository.php
View File

@ -7,7 +7,7 @@ class ReferralRepository
{ {
public function getCounts($userId) public function getCounts($userId)
{ {
$accounts = Account::where('referral_user_id', $userId); $accounts = Account::where('referral_user_id', $userId)->get();
$counts = [ $counts = [
'free' => 0, 'free' => 0,

2
resources/lang/en/texts.php
View File

@ -1182,6 +1182,8 @@ $LANG = array(
'enterprise_plan_features' => 'The Enterprise plan adds support for multiple users and file attachments.', 'enterprise_plan_features' => 'The Enterprise plan adds support for multiple users and file attachments.',
'return_to_app' => 'Return to app', 'return_to_app' => 'Return to app',
'update_font_cache' => 'Please force refresh the page to update the font cache.',
); );
return $LANG; return $LANG;

2
resources/views/master.blade.php
View File

@ -48,7 +48,7 @@
} }
if (errorMsg.indexOf('No unicode cmap for font') > -1) { if (errorMsg.indexOf('No unicode cmap for font') > -1) {
alert("Please force refresh the page to update the font cache.\n\n - Windows: Ctrl + F5\n - Mac/Apple: Apple + R or Command + R\n - Linux: F5"); alert("{{ trans('texts.update_font_cache') }}\n\n - Windows: Ctrl + F5\n - Mac/Apple: Apple + R or Command + R\n - Linux: F5");
} }
try { try {