From f472950ed0643c3e110f81f6cf802a47267887f7 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Wed, 13 Jul 2016 21:10:43 +0300 Subject: [PATCH 1/3] Fix for [Object] problem with certain designs --- public/built.js | 2 -- public/js/pdf.pdfmake.js | 2 -- 2 files changed, 4 deletions(-) diff --git a/public/built.js b/public/built.js index 6e96fb8e2408..f72e47d0968e 100644 --- a/public/built.js +++ b/public/built.js @@ -31773,8 +31773,6 @@ NINJA.processItem = function(item, section) { NINJA.parseMarkdownText = function(val, groupText) { - val = val + "\n"; - var rules = [ ['\\\*\\\*(\\\w.+?)\\\*\\\*', {'bold': true}], // **value** ['\\\*(\\\w.+?)\\\*', {'italics': true}], // *value* diff --git a/public/js/pdf.pdfmake.js b/public/js/pdf.pdfmake.js index a9624c5f3b50..4a7a54849932 100644 --- a/public/js/pdf.pdfmake.js +++ b/public/js/pdf.pdfmake.js @@ -737,8 +737,6 @@ NINJA.processItem = function(item, section) { NINJA.parseMarkdownText = function(val, groupText) { - val = val + "\n"; - var rules = [ ['\\\*\\\*(\\\w.+?)\\\*\\\*', {'bold': true}], // **value** ['\\\*(\\\w.+?)\\\*', {'italics': true}], // *value* From f47b6dc5ac9cf6d98eb44a78093fe21f98c45183 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Wed, 13 Jul 2016 21:11:26 +0300 Subject: [PATCH 2/3] Added dwolla to text files --- resources/lang/en/texts.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index 4038ee96a24e..3029357cf526 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -2028,6 +2028,7 @@ $LANG = array( 'apply_taxes' => 'Apply taxes', 'min_to_max_users' => ':min to :max users', 'max_users_reached' => 'The maximum number of users has been reached.' + 'dwolla' => 'Dwolla', ); From 09e06703ea426dfb1415818b8b0199270185614d Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Wed, 13 Jul 2016 21:49:10 +0300 Subject: [PATCH 3/3] Added dwolla to text files --- resources/lang/en/texts.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index 3029357cf526..fc2689c4582d 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -2027,7 +2027,7 @@ $LANG = array( 'restored_expense_category' => 'Successfully restored expense category', 'apply_taxes' => 'Apply taxes', 'min_to_max_users' => ':min to :max users', - 'max_users_reached' => 'The maximum number of users has been reached.' + 'max_users_reached' => 'The maximum number of users has been reached.', 'dwolla' => 'Dwolla', );