Tim Otten [Fri, 28 Apr 2017 22:04:04 +0000 (15:04 -0700)]
Merge branch '4.7.19-rc-new' into master-new
eileen [Fri, 28 Apr 2017 01:27:36 +0000 (13:27 +1200)]
CRM-20493 Payment instrument id is incorrectly a required field for online additional payments
colemanw [Fri, 28 Apr 2017 16:06:19 +0000 (12:06 -0400)]
Merge pull request #10278 from JMAConsulting/CRM-20498
CRM-20498, removed code from run() since its been invoked in parent f…
Pradeep Nayak [Fri, 28 Apr 2017 14:29:34 +0000 (19:59 +0530)]
CRM-20498, removed code from run() since its been invoked in parent function
----------------------------------------
* CRM-20498: buildform hook invoked twice
https://issues.civicrm.org/jira/browse/CRM-20498
Eileen McNaughton [Fri, 28 Apr 2017 04:07:48 +0000 (16:07 +1200)]
Merge pull request #10275 from eileenmcnaughton/4.7.19-rc
4.7.19 rc
eileen [Fri, 28 Apr 2017 01:27:36 +0000 (13:27 +1200)]
CRM-20493 Payment instrument id is incorrectly a required field for online additional payments
Eileen McNaughton [Fri, 28 Apr 2017 00:17:45 +0000 (12:17 +1200)]
Merge pull request #10236 from eileenmcnaughton/uffield
CRM-20474 Refactor UFField api to be standardised
Eileen McNaughton [Thu, 27 Apr 2017 23:24:56 +0000 (11:24 +1200)]
Merge pull request #10268 from eileenmcnaughton/master
Fix merge conflict
eileen [Thu, 27 Apr 2017 23:24:15 +0000 (11:24 +1200)]
Fix merge conflict
Saurabh Batra [Thu, 27 Apr 2017 22:41:10 +0000 (10:41 +1200)]
Towards CRM-20474 Refactor UFField api to be standardised - move functionality to BAO::create
Saurabh Batra [Thu, 27 Apr 2017 22:34:10 +0000 (10:34 +1200)]
Minor tidy ups.
Fix comments. Remove unused function. The function has a mismatch between input & parameter so can never work
Eileen McNaughton [Thu, 27 Apr 2017 22:24:08 +0000 (10:24 +1200)]
Merge pull request #10266 from civicrm/4.7.19-rc
4.7.19 rc
Eileen McNaughton [Thu, 27 Apr 2017 22:23:59 +0000 (10:23 +1200)]
Merge branch 'master' into 4.7.19-rc
Eileen McNaughton [Thu, 27 Apr 2017 22:10:42 +0000 (10:10 +1200)]
Merge pull request #10261 from eileenmcnaughton/activitybackout
CRM-20481 temporarily switch back while we assess / fix performance i…
eileen [Thu, 27 Apr 2017 08:53:17 +0000 (20:53 +1200)]
CRM-20481 temporarily switch back while we assess / fix performance
Eileen McNaughton [Thu, 27 Apr 2017 20:57:47 +0000 (08:57 +1200)]
Merge pull request #10263 from eileenmcnaughton/case
Remove unused var. emailActivityTypeIDs is retrieved twice, statusTit…
Eileen McNaughton [Thu, 27 Apr 2017 20:49:37 +0000 (08:49 +1200)]
Merge pull request #10259 from eileenmcnaughton/caserc
CRM-20424 remove call to deprecated function.
Monish Deb [Thu, 27 Apr 2017 11:50:04 +0000 (17:20 +0530)]
Merge pull request #10235 from eileenmcnaughton/follow_on
CRM-20276 update line item financial amount when updating line item.
deb.monish [Thu, 27 Apr 2017 11:42:11 +0000 (17:12 +0530)]
minor change
eileen [Thu, 27 Apr 2017 10:27:52 +0000 (22:27 +1200)]
Remove unused var. emailActivityTypeIDs is retrieved twice, statusTitle never used
eileen [Wed, 26 Apr 2017 23:37:45 +0000 (11:37 +1200)]
CRM-20424 remove call to deprecated function.
This is the one covering the UI with errors. The fact it did not cause any test fails means it is
not covered by unit tests :-(.
As long as the Open Case link is still present for CiviCase users this is working
eileen [Wed, 15 Mar 2017 10:52:13 +0000 (23:52 +1300)]
CRM-20276 update line item financial amount when updating line item.
We don't have to leave the e-notice in, but I suspect that line is never called & it would be good
to figure that out rather than leave it 'in case', hence the enotice
Eileen McNaughton [Thu, 27 Apr 2017 00:13:00 +0000 (12:13 +1200)]
Merge pull request #10257 from JMAConsulting/CRM-20308
CRM-20308: Document the new behaivour under help icon
Eileen McNaughton [Wed, 26 Apr 2017 21:15:19 +0000 (09:15 +1200)]
Merge pull request #10124 from adixon/CRM-20396
CRM-20396 Corrected payment_processor in contrib params
deb.monish [Wed, 26 Apr 2017 18:14:42 +0000 (23:44 +0530)]
added unit test
adixon [Thu, 6 Apr 2017 21:41:45 +0000 (17:41 -0400)]
CRM-20396 Corrected payment_processor in contrib params
deb.monish [Wed, 26 Apr 2017 14:14:33 +0000 (19:44 +0530)]
CRM-20308: Document the new behaivour under help icon
Eileen McNaughton [Wed, 26 Apr 2017 12:53:43 +0000 (00:53 +1200)]
Merge pull request #10244 from eileenmcnaughton/uffield1
CRM-20474 Refactor UFField api to be standardised
Eileen McNaughton [Wed, 26 Apr 2017 05:45:20 +0000 (17:45 +1200)]
Merge pull request #10226 from eileenmcnaughton/master
Minor code tidy ups.
Eileen McNaughton [Wed, 26 Apr 2017 05:15:52 +0000 (17:15 +1200)]
Merge pull request #10254 from seamuslee001/4.7.19-rc
4.7.19 rc
eileen [Tue, 25 Apr 2017 22:59:12 +0000 (10:59 +1200)]
CRM-20441 always do acl checks from api
eileen [Tue, 25 Apr 2017 22:25:37 +0000 (10:25 +1200)]
CRM-20441 add test for no activities viewable and add test fix
eileen [Tue, 25 Apr 2017 22:01:15 +0000 (10:01 +1200)]
Test preparatory cleanup
Eileen McNaughton [Wed, 26 Apr 2017 04:29:29 +0000 (16:29 +1200)]
Merge branch 'master' into 4.7.19-rc
Eileen McNaughton [Wed, 26 Apr 2017 04:27:22 +0000 (16:27 +1200)]
Merge pull request #10251 from eileenmcnaughton/4.7.19-rc2
CRM-20441 further fixes & tests for api + acl
Eileen McNaughton [Wed, 26 Apr 2017 03:34:12 +0000 (15:34 +1200)]
Merge pull request #10195 from seanmadsen/CRM-20453
CRM-20453 Fix inconsistencies in XML schema definitions
Eileen McNaughton [Wed, 26 Apr 2017 03:15:59 +0000 (15:15 +1200)]
Merge pull request #10165 from jitendrapurohit/mailingfix
CRM-20431 - Fix unsubscribe group list
eileen [Tue, 25 Apr 2017 22:59:12 +0000 (10:59 +1200)]
CRM-20441 always do acl checks from api
eileen [Tue, 25 Apr 2017 22:25:37 +0000 (10:25 +1200)]
CRM-20441 add test for no activities viewable and add test fix
eileen [Tue, 25 Apr 2017 22:01:15 +0000 (10:01 +1200)]
Test preparatory cleanup
Sean Madsen [Tue, 25 Apr 2017 21:11:44 +0000 (15:11 -0600)]
CRM-20453 - DAO changes after running GenCode.php
Eileen McNaughton [Tue, 25 Apr 2017 20:24:24 +0000 (08:24 +1200)]
Merge pull request #10246 from civicrm/4.7.19-rc
4.7.19 rc
Author: Saurabh Batra [Tue, 25 Apr 2017 19:34:28 +0000 (07:34 +1200)]
CRM-20474 Refactor UFField api to be standardised
Move to standardise duplicateField function
Format fields on the form, rather than trying to mimic weird form
formatting in api & BAO
Eileen McNaughton [Tue, 25 Apr 2017 18:45:44 +0000 (06:45 +1200)]
Merge pull request #10243 from JMAConsulting/CRM-20467
CRM-20467: PHP notices on contact search for ACL'd user
deb.monish [Tue, 25 Apr 2017 18:40:41 +0000 (00:10 +0530)]
CRM-20467: PHP notices on contact search for ACL'd user
Eileen McNaughton [Tue, 25 Apr 2017 18:26:28 +0000 (06:26 +1200)]
Merge pull request #10241 from aydun/CRM-20312
CRM-20312 Fix typo
Eileen McNaughton [Tue, 25 Apr 2017 18:22:53 +0000 (06:22 +1200)]
Merge pull request #10238 from eileenmcnaughton/log
CRM-13639 minor tidy up from larger pr on logging
Aidan Saunders [Tue, 25 Apr 2017 15:24:54 +0000 (16:24 +0100)]
Fix typo
Monish Deb [Tue, 25 Apr 2017 12:31:41 +0000 (18:01 +0530)]
Merge pull request #10208 from jitendrapurohit/CRM-20461
CRM-20461 - Use api instead of query so that post hook gets invoked for additional participants
Eileen McNaughton [Tue, 25 Apr 2017 11:34:20 +0000 (23:34 +1200)]
Merge pull request #10237 from seamuslee001/CRM-20441-4
CRM-20441 Return early if we have removed all Activity IDs as got no …
Chris Burgess [Tue, 25 Apr 2017 10:51:41 +0000 (22:51 +1200)]
CRM-13639 minor tidy up from larger pr on logging
The PR is stalled but I wanted to pull out these comment changes for now
Seamus Lee [Tue, 25 Apr 2017 10:41:44 +0000 (20:41 +1000)]
CRM-20441 Return early if we have removed all Activity IDs as got no access to them
Eileen McNaughton [Tue, 25 Apr 2017 09:18:06 +0000 (21:18 +1200)]
Merge pull request #9984 from eileenmcnaughton/sales
CRM-20260 fix data errors creation in financial_line_item when editin…
Eileen McNaughton [Tue, 25 Apr 2017 08:07:53 +0000 (20:07 +1200)]
Merge pull request #10234 from JMAConsulting/IIDA-127
CRM-20264: additional fixes for online Event registration, backoffice, membership and other validation
Eileen McNaughton [Tue, 25 Apr 2017 07:50:08 +0000 (19:50 +1200)]
Merge pull request #10233 from twomice/CRM-20472_soft_credit_validation_error_display
CRM-20472: Fix field name in error so validation will display.
deb.monish [Tue, 25 Apr 2017 07:03:27 +0000 (12:33 +0530)]
CRM-20264: additional fixes for online Event registration, backoffice membership and validation
Allen Shaw [Tue, 25 Apr 2017 04:45:40 +0000 (23:45 -0500)]
CRM-20472: Fix field name in error so validation will display.
Eileen McNaughton [Tue, 25 Apr 2017 04:00:21 +0000 (16:00 +1200)]
Merge pull request #10232 from seamuslee001/CRM-20441-3
CRM-20441 Check to see if user has permission on the activities befor…
Seamus Lee [Tue, 25 Apr 2017 03:09:20 +0000 (13:09 +1000)]
Fix Tests
Seamus Lee [Tue, 25 Apr 2017 01:04:46 +0000 (11:04 +1000)]
Add in some further comments
Eileen McNaughton [Tue, 25 Apr 2017 00:55:32 +0000 (12:55 +1200)]
Merge pull request #10231 from seamuslee001/CRM-20441-2
CRM-20441 Limit acceptable operators to IN only
Seamus Lee [Tue, 25 Apr 2017 00:39:22 +0000 (10:39 +1000)]
CRM-20441 Check to see if user has permission on the activities before getting rest of information. If fails silently remove the activity from the list of ids
Seamus Lee [Mon, 24 Apr 2017 23:49:19 +0000 (09:49 +1000)]
Add test of operator whitelist
Seamus Lee [Mon, 24 Apr 2017 23:28:20 +0000 (09:28 +1000)]
CRM-20441 Limit acceptable operators to IN only
Eileen McNaughton [Mon, 24 Apr 2017 21:44:06 +0000 (09:44 +1200)]
Merge pull request #10230 from adixon/CRM-20469
CRM-20469 Event form currency is in a slightly different spot
Eileen McNaughton [Mon, 24 Apr 2017 21:36:40 +0000 (09:36 +1200)]
Merge pull request #10229 from civicrm/4.7.19-rc
4.7.19 rc
Eileen McNaughton [Mon, 24 Apr 2017 21:36:26 +0000 (09:36 +1200)]
Merge pull request #10202 from eileenmcnaughton/deprecate4
CRM-20424 Add method to mark deprecation & ensure it causes test fail
adixon [Mon, 24 Apr 2017 20:46:57 +0000 (16:46 -0400)]
CRM-20469 Event form currency is in a slightly different spot
eileen [Fri, 21 Apr 2017 03:08:33 +0000 (15:08 +1200)]
CRM-20424 Add method to mark deprecation & ensure it causes test fail
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
Eileen McNaughton [Mon, 24 Apr 2017 20:01:46 +0000 (08:01 +1200)]
Merge pull request #10228 from colemanw/IIDA-127
CRM-20264: handle submission of CC type and number during 'record payment'
deb.monish [Fri, 21 Apr 2017 09:18:07 +0000 (14:48 +0530)]
CRM-20264: handle submission of CC type and number during 'record payment'
Jitendra Purohit [Mon, 24 Apr 2017 10:30:24 +0000 (16:00 +0530)]
use api instead
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 [Mon, 24 Apr 2017 05:59:04 +0000 (17:59 +1200)]
Minor code tidy ups.
Use getLoggedInContactID, remove unused vars. Don't precede function with &
Note the function is only called from one place in the code so no issue with
it being passed as a variable
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.
Pradeep Nayak [Mon, 10 Apr 2017 21:02:15 +0000 (09:02 +1200)]
CRM-20260, Added Unit test
eileen [Wed, 15 Mar 2017 10:08:01 +0000 (23:08 +1300)]
CRM-20260 fix data errors creation in financial_line_item when editing contribution, with sales tax enabled
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
projects / civicrm-core.git / log