adixon [Mon, 24 Apr 2017 20:46:57 +0000 (16:46 -0400)]
CRM-20469 Event form currency is in a slightly different spot
Eileen McNaughton [Mon, 24 Apr 2017 20:14:38 +0000 (08:14 +1200)]
Merge pull request #9809 from seamuslee001/CRM-19986
CRM-19986 Fix schema differences between a new installl and an upgrad…
Eileen McNaughton [Mon, 24 Apr 2017 20:04:52 +0000 (08:04 +1200)]
Merge pull request #10167 from twomice/CRM-20172_membership_additional_payment
CRM-20172: "Separate Membership Payment" with Memberships enabled and additional contribution causes incorrect authorize.net transactions
Seamus Lee [Thu, 9 Feb 2017 03:39:06 +0000 (14:39 +1100)]
CRM-19986 Fix schema differences between a new installl and an upgrade from 4.6
Eileen McNaughton [Mon, 24 Apr 2017 05:12:13 +0000 (17:12 +1200)]
Merge pull request #10224 from eileenmcnaughton/inv
CRM-20450 unit test for invoice amount
eileen [Mon, 24 Apr 2017 02:15:50 +0000 (14:15 +1200)]
CRM-20450 unit test for invoice amount
Eileen McNaughton [Mon, 24 Apr 2017 02:38:03 +0000 (14:38 +1200)]
Merge pull request #10225 from civicrm/4.7.19-rc
4.7.19 rc
Eileen McNaughton [Mon, 24 Apr 2017 02:33:21 +0000 (14:33 +1200)]
Merge pull request #10223 from seamuslee001/CRM-20450
CRM-20450 Update post upgrade message with correct list of modified t…
Seamus Lee [Mon, 24 Apr 2017 02:26:28 +0000 (12:26 +1000)]
CRM-20450 Update post upgrade message with correct list of modified templates and fix closing tag which should be font
Eileen McNaughton [Mon, 24 Apr 2017 02:25:16 +0000 (14:25 +1200)]
Merge pull request #10220 from civicrm/4.7.19-rc
4.7.19 rc
Eileen McNaughton [Mon, 24 Apr 2017 02:24:46 +0000 (14:24 +1200)]
Merge pull request #10222 from KarinG/CRM-20450
CRM-20450: Fix invoice math for partial payments.
Eileen McNaughton [Mon, 24 Apr 2017 01:31:36 +0000 (13:31 +1200)]
Merge pull request #10221 from JohnFF/bugfix/minor_template_errors
Fixed minor template errors.
Eileen McNaughton [Mon, 24 Apr 2017 01:24:43 +0000 (13:24 +1200)]
Merge pull request #10219 from eileenmcnaughton/token
CRM-20449: enotices from 'send thankyou letter' on contribution search
KarinG [Mon, 24 Apr 2017 00:30:35 +0000 (18:30 -0600)]
Upgrade the message template in the database.
John Kirk [Sun, 23 Apr 2017 16:37:10 +0000 (16:37 +0000)]
Fixed minor template errors.
Eileen McNaughton [Sun, 23 Apr 2017 08:05:53 +0000 (20:05 +1200)]
Merge pull request #10217 from fuzionnz/CRM-20466-php7.1_only_vars_by_ref
Address fatal errors on PHP7.1 - only vars can be passed by reference.
Eileen McNaughton [Sun, 23 Apr 2017 08:02:41 +0000 (20:02 +1200)]
Merge pull request #9471 from adixon/CRM-19697
CRM-19697: No recycling the static _links object when you change it!
eileen [Sun, 23 Apr 2017 03:06:38 +0000 (15:06 +1200)]
CRM-20449: enotices from 'send thankyou letter' on contribution search
Eileen McNaughton [Sun, 23 Apr 2017 07:56:13 +0000 (19:56 +1200)]
Merge pull request #10218 from JMAConsulting/CRM-20465
CRM-20465, changed pan_truncation field type to VARCHAR
Eileen McNaughton [Sun, 23 Apr 2017 02:43:07 +0000 (14:43 +1200)]
Merge pull request #10209 from jmcclelland/CRM-20463
CRM-20463 - simplify parsing of doc URLs and ensure all work.
Chris Burgess [Sun, 23 Apr 2017 02:22:40 +0000 (14:22 +1200)]
Address fatal errors on PHP7.1 - only vars can be passed by reference.
It is not clear why we clone these DAO/BAO objects, but we cannot do it inside the function call. It is likely this fix can be improved.
CRM-20466
Eileen McNaughton [Sun, 23 Apr 2017 01:05:59 +0000 (13:05 +1200)]
Merge pull request #10154 from eileenmcnaughton/timestamp
CRM-9683 implement timezone support for CiviMail.
Eileen McNaughton [Sun, 23 Apr 2017 00:19:59 +0000 (12:19 +1200)]
Merge pull request #10216 from JohnFF/refactor/CRM-20428_sourceSQLFile_rework
CRM-20428: refactored sourceSQLFile
Eileen McNaughton [Sun, 23 Apr 2017 00:16:00 +0000 (12:16 +1200)]
Merge pull request #10168 from GinkgoFJG/CRM-20435
CRM-20435: Replace SQL-based activityContact creation with DAO-based approach.
Eileen McNaughton [Sun, 23 Apr 2017 00:10:39 +0000 (12:10 +1200)]
Merge pull request #10200 from eileenmcnaughton/deprecate
CRM-20459 replace all instances where CRM_Core_OptionGroup::getValue …
eileen [Thu, 13 Apr 2017 09:03:40 +0000 (21:03 +1200)]
CRM-9683 regenerate DAOs
Eileen McNaughton [Sun, 23 Apr 2017 00:03:23 +0000 (12:03 +1200)]
Merge pull request #10215 from civicrm/4.7.19-rc
4.7.19 rc
eileen [Thu, 13 Apr 2017 06:13:04 +0000 (18:13 +1200)]
CRM-9683 implement timezone support for CiviMail
This will affect new installs only per discussion on the ticket. Motivation dependent, we could add a method to convert on existing installs.
Note some fields, like event_start_date might have a case for being in a non-timezone aware format
Eileen McNaughton [Sat, 22 Apr 2017 23:25:33 +0000 (11:25 +1200)]
Merge pull request #10201 from eileenmcnaughton/deprecate2
CRM-20459 replace all instances where CRM_Core_OptionGroup::getValue …
Eileen McNaughton [Sat, 22 Apr 2017 23:16:09 +0000 (11:16 +1200)]
Merge pull request #10203 from eileenmcnaughton/deprecate3
CRM-20459 replace last instances where CRM_Core_OptionGroup::getValue…
Eileen McNaughton [Sat, 22 Apr 2017 23:15:15 +0000 (11:15 +1200)]
Merge pull request #10213 from seamuslee001/master
(NFC) CRM-20308 Fix Test due to not truncating civicrm_email table
Eileen McNaughton [Sat, 22 Apr 2017 23:11:25 +0000 (11:11 +1200)]
Merge pull request #10212 from seamuslee001/CRM-20441
CRM-20441 Fix issue where multiple activity Ids were not supported wh…
John Kirk [Sat, 22 Apr 2017 22:46:03 +0000 (22:46 +0000)]
Refactored CRM-20428. Refactored sourceSQLFile by creating a separate function to run the SQL piece. This means that sourceSQLFile no longer has an 'isQueryString' variable, which was used to pass an SQL query in the filename parameter.
Monish Deb [Sat, 22 Apr 2017 07:19:06 +0000 (12:49 +0530)]
Merge pull request #10210 from JMAConsulting/CRM-20464
CRM-20464, fixed smarty error
Seamus Lee [Sat, 22 Apr 2017 05:24:06 +0000 (15:24 +1000)]
CRM-20308 Fix Test due to not truncating civicrm_email table
Seamus Lee [Fri, 21 Apr 2017 23:22:46 +0000 (09:22 +1000)]
CRM-20441 Fix issue where multiple activity Ids were not supported when check permissions was used
Allen Shaw [Fri, 21 Apr 2017 21:52:40 +0000 (16:52 -0500)]
CRM-20172: more thorough handling of params.
Pradeep Nayak [Fri, 21 Apr 2017 21:26:50 +0000 (02:56 +0530)]
CRM-20465, changed pan_truncation field type to VARCHAR
----------------------------------------
* CRM-20465: pan truncation doesn't respect values preceding with 0
https://issues.civicrm.org/jira/browse/CRM-20465
Tim Otten [Fri, 21 Apr 2017 21:13:30 +0000 (14:13 -0700)]
Set version to 4.7.20
Tim Otten [Fri, 21 Apr 2017 20:45:16 +0000 (13:45 -0700)]
Merge pull request #10199 from eileenmcnaughton/comment
[NFC] Remove comment as this has been fixed
Pradeep Nayak [Fri, 21 Apr 2017 19:58:49 +0000 (01:28 +0530)]
CRM-20464, fixed smarty error
----------------------------------------
* CRM-20464: Smarty error when receipt is send for recording payment
https://issues.civicrm.org/jira/browse/CRM-20464
Jamie McClelland [Fri, 21 Apr 2017 16:12:06 +0000 (12:12 -0400)]
CRM-20463 - simplify parsing of doc URLs and ensure all work.
Eileen McNaughton [Fri, 21 Apr 2017 03:16:05 +0000 (15:16 +1200)]
Merge pull request #10198 from eileenmcnaughton/iida3
[NFC] Further test improvement
eileen [Fri, 21 Apr 2017 03:07:47 +0000 (15:07 +1200)]
CRM-20459 replace last instances where CRM_Core_OptionGroup::getValue is called
eileen [Fri, 21 Apr 2017 03:03:46 +0000 (15:03 +1200)]
CRM-20459 replace all instances where CRM_Core_OptionGroup::getValue is called to get contribution_status_id
eileen [Fri, 21 Apr 2017 03:00:53 +0000 (15:00 +1200)]
CRM-20459 replace all instances where CRM_Core_OptionGroup::getValue is called on activities.
I limited this to activities as there are only 2 separate values & I thought it would keep it readable.
eileen [Fri, 21 Apr 2017 02:41:39 +0000 (14:41 +1200)]
Remove comment as this has been fixed
eileen [Thu, 20 Apr 2017 22:04:03 +0000 (10:04 +1200)]
Further test improvement
KarinG [Fri, 21 Apr 2017 01:55:59 +0000 (19:55 -0600)]
Fix syntax errors.
KarinG [Fri, 21 Apr 2017 01:52:20 +0000 (19:52 -0600)]
Fix typo.
KarinG [Thu, 20 Apr 2017 00:54:45 +0000 (18:54 -0600)]
Fix invoice math for partial payments.
Eileen McNaughton [Thu, 20 Apr 2017 22:57:39 +0000 (10:57 +1200)]
Merge pull request #10157 from eileenmcnaughton/iida3
CRM-20264, Added Card type and Pan Truncation form fields on Payment …
Eileen McNaughton [Thu, 20 Apr 2017 22:25:09 +0000 (10:25 +1200)]
Merge pull request #10099 from eileenmcnaughton/anet
CRM-19597 allow receive_date to be passed in for A.net, plus some code simplification
Eileen McNaughton [Thu, 20 Apr 2017 22:23:36 +0000 (10:23 +1200)]
Merge pull request #10030 from eileenmcnaughton/test
CRM-20008 fix pending flow.
Eileen McNaughton [Thu, 20 Apr 2017 22:23:03 +0000 (10:23 +1200)]
Merge pull request #10161 from totten/master-hook-inspector
CiviEventInspector - Add util for displaying hook metadata
eileen [Wed, 12 Apr 2017 02:11:18 +0000 (14:11 +1200)]
CRM-19597 move function only used by Authorize.net to a.net for clarity.
We could do with a better solution around this, but it needs to be around the completetransaction api
eileen [Wed, 12 Apr 2017 02:05:05 +0000 (14:05 +1200)]
CRM-19597 allow receive_date to be passed in for A.net
Eileen McNaughton [Thu, 20 Apr 2017 21:56:38 +0000 (09:56 +1200)]
Merge pull request #10125 from jitendrapurohit/eventtest
CRM-19773: unit test to check getLocationEvent invokes selectWhereClause() hook
Eileen McNaughton [Thu, 20 Apr 2017 21:55:58 +0000 (09:55 +1200)]
Merge pull request #10158 from JMAConsulting/CRM-20308
CRM-20308: Activity copy is always sent FROM logged in user's email ID
Eileen McNaughton [Thu, 20 Apr 2017 21:55:42 +0000 (09:55 +1200)]
Merge pull request #10176 from JMAConsulting/codeCleanup
Code cleanup
deb.monish [Wed, 19 Apr 2017 12:25:47 +0000 (17:55 +0530)]
CRM-20264 support card_type_id and pan_truncation in all backoffice form
Monish Deb [Thu, 20 Apr 2017 05:31:53 +0000 (11:01 +0530)]
Merge pull request #10193 from eileenmcnaughton/pan_tunc
CRM-20264 handling for storing card_type_id
Eileen McNaughton [Thu, 20 Apr 2017 05:10:16 +0000 (17:10 +1200)]
Merge pull request #10194 from eileenmcnaughton/master
CRM-20264 add test for submitting pan_truncation & card_type_id via t…
deb.monish [Thu, 20 Apr 2017 04:50:55 +0000 (16:50 +1200)]
CRM-20264 add test for submitting pan_truncation & card_type_id via the api
eileen [Thu, 20 Apr 2017 04:03:38 +0000 (16:03 +1200)]
CRM-20264 handling for storing card_type_id
Eileen McNaughton [Thu, 20 Apr 2017 04:03:18 +0000 (16:03 +1200)]
Merge pull request #10189 from eileenmcnaughton/pan_tunc
CRM-20264 make pan_truncation save on contribution form, additional payment, event
Eileen McNaughton [Thu, 20 Apr 2017 03:36:15 +0000 (15:36 +1200)]
Merge pull request #10191 from eileenmcnaughton/report
CRM-20451 Do not assume all BAOs have exportableFields method in Core_…
eileen [Thu, 20 Apr 2017 02:42:44 +0000 (14:42 +1200)]
CRM-20451 Do no assume all BAOs have exportableFields method in Core_report
eileen [Wed, 19 Apr 2017 21:46:08 +0000 (09:46 +1200)]
CRM-20264 make pan_truncation save on event form.
note that this PR should be testable & mergeable as making 'no change' without the changes to Core_Payment_Manual as it is primarily code consolidation
Allen Shaw [Fri, 14 Apr 2017 22:24:51 +0000 (17:24 -0500)]
CRM-20172: Added test and fix for correct amounts.
colemanw [Wed, 19 Apr 2017 22:23:05 +0000 (18:23 -0400)]
Merge pull request #10182 from totten/master-listall-checksum
GenCode - Reduce merge-conflicts on AllCoreTables
colemanw [Wed, 19 Apr 2017 19:25:15 +0000 (15:25 -0400)]
Merge pull request #10188 from colemanw/CRM-20105
CRM-20105 - Add case restore and merge api actions
colemanw [Wed, 19 Apr 2017 17:48:08 +0000 (13:48 -0400)]
Merge pull request #9544 from colemanw/CRM-19773
CRM-19773 - Call hook_civicrm_selectWhereClause when checking event permissions
Coleman Watts [Wed, 19 Apr 2017 16:15:27 +0000 (12:15 -0400)]
CRM-20105 - Add merge function to case api
colemanw [Wed, 19 Apr 2017 16:05:28 +0000 (12:05 -0400)]
Merge pull request #10087 from lcdservices/CRM-20368
CRM-20368
Coleman Watts [Thu, 15 Dec 2016 03:33:34 +0000 (22:33 -0500)]
CRM-19773 - Call hook_civicrm_selectWhereClause when checking event permissions
eileen [Wed, 19 Apr 2017 07:41:22 +0000 (19:41 +1200)]
Fully remove deprecated Constants
Pradeep Nayak [Wed, 19 Apr 2017 07:03:30 +0000 (19:03 +1200)]
CRM-20392 enable remaining unit tests added by Pradeep
I did alter the fix side on this a little more - notably to use the shared
functions beginPostProcess and assignPaymentRelatedVariables so this will require
independent review
eileen [Thu, 13 Apr 2017 09:43:03 +0000 (21:43 +1200)]
CRM-20264, Added Card type and Pan Truncation form fields on Payment form
I deliberately excluded card_type because I think we need to review the appropriateness of
the field first. My issue is that the wrangling wound up really wierd & it was apparent the issue
is that card_type is 'Visa' whereas card_type_id is 1 - we should either rename the field
or store the word.
Eileen McNaughton [Wed, 19 Apr 2017 06:29:45 +0000 (18:29 +1200)]
Merge pull request #10187 from eileenmcnaughton/prad
CRM-20392 add unit test and fix for incorrect total used in line item…
Eileen McNaughton [Wed, 19 Apr 2017 05:04:02 +0000 (17:04 +1200)]
Merge pull request #10186 from eileenmcnaughton/mandatory_created_id
CRM-20316 the mailing should still create without created_id (not man…
Pradeep Nayak [Wed, 12 Apr 2017 11:32:42 +0000 (23:32 +1200)]
CRM-20392 add unit test and fix for incorrect total used in line item creation code.
Eileen's note - this is code done by Pradeep that I am reviewing - I am committing
and merging the portion I have reviewed so far. This fixes a bug replicable in
the test Pradeep wrote, and some minor obvious cleanups such as removing unused parameters.
I've commented out some tests to complete this portion & there is still code of Pradeeps
not yet reviewed.
Coleman Watts [Wed, 19 Apr 2017 04:31:52 +0000 (00:31 -0400)]
CRM-20105 - Add restore function to case api
eileen [Tue, 18 Apr 2017 23:00:06 +0000 (11:00 +1200)]
CRM-20316 the mailing should still create without created_id (not mandatory).
eileen [Tue, 18 Apr 2017 23:00:06 +0000 (11:00 +1200)]
CRM-20316 the mailing should still create without created_id (not mandatory).
Eileen McNaughton [Tue, 18 Apr 2017 23:24:04 +0000 (11:24 +1200)]
Merge pull request #10185 from eileenmcnaughton/master
[NFC] Fix invalid php in test-generated example
eileen [Tue, 18 Apr 2017 22:32:22 +0000 (10:32 +1200)]
Fix invalid php in test-generated example
Eileen McNaughton [Tue, 18 Apr 2017 22:08:48 +0000 (10:08 +1200)]
Merge pull request #10171 from seamuslee001/CRM-20427
CRM-20427 Fix issue with the regex in I18n query rewriting and add tests
Seamus Lee [Tue, 18 Apr 2017 21:21:16 +0000 (07:21 +1000)]
CRM-20427 Skip tests that are currently failing as edge cases and not blockers to current issue
Eileen McNaughton [Tue, 18 Apr 2017 21:19:19 +0000 (09:19 +1200)]
Merge pull request #10184 from colemanw/CRM-17711
CRM-17711 - Remove "-unstable" from backdrop filename
Coleman Watts [Tue, 18 Apr 2017 20:20:57 +0000 (16:20 -0400)]
CRM-17711 - Remove "-unstable" from backdrop filename
Tim Otten [Tue, 18 Apr 2017 17:00:04 +0000 (10:00 -0700)]
GenCode - Reduce merge-conflicts on AllCoreTables
The previous checksum was based on the full schema spec. This is
technically safe, but many irrelevant schema changes (such as editing field
comments) will ding the checksum.
The main goal here is to avoid `$template->run()` (line ~44) and its
code-beautifier (which is expensive/slow). This revised algorithm for
`needsUpdate()` should:
* Still be "fast enough" (given that it's a singular file built from a simple template)
* Still be "accurate enough" (given that `getRaw()` is a fair predictor of `run()`)
* Be less prone to merge-conflics (given that it doesn't use the checksum)
colemanw [Tue, 18 Apr 2017 14:55:19 +0000 (10:55 -0400)]
Merge pull request #10175 from TobiasLounsbury/CRM-20438-fix-panels
Added object type selector to panel rule to prevent broad disabling o…
Eileen McNaughton [Tue, 18 Apr 2017 10:12:04 +0000 (22:12 +1200)]
Merge pull request #10179 from yashodha/CRM-20417
CRM-20417 - translate strings
Eileen McNaughton [Tue, 18 Apr 2017 09:29:16 +0000 (21:29 +1200)]
Merge pull request #10178 from JMAConsulting/CRM-20439
CRM-20439: Rename card_type to card_type_id of civicrm_financial_trxn table (IIDA-126)
Eileen McNaughton [Tue, 18 Apr 2017 09:28:39 +0000 (21:28 +1200)]
Merge pull request #10155 from totten/master-pdf-save2
CRM-20420 - Add option to save generated PDF/doc files
yashodha [Tue, 18 Apr 2017 08:06:00 +0000 (13:36 +0530)]
CRM-20417 - translate strings
deb.monish [Tue, 18 Apr 2017 07:28:33 +0000 (12:58 +0530)]
Additional fixes in report and Search form
deb.monish [Tue, 18 Apr 2017 06:39:46 +0000 (12:09 +0530)]
Rename card_type to card_type_id of civicrm_financial_trxn table (IIDA-126)
Eileen McNaughton [Tue, 18 Apr 2017 01:37:40 +0000 (13:37 +1200)]
Merge pull request #10177 from eileenmcnaughton/master
Fix visibility typo