Eileen McNaughton [Wed, 13 May 2015 23:39:35 +0000 (11:39 +1200)]
Merge pull request #5745 from mallezie/relation-addField-date
addField in CRM_Contact_Form_Relationship, add Date support to AddField
colemanw [Wed, 13 May 2015 23:25:59 +0000 (17:25 -0600)]
Merge pull request #5725 from twomice/CRM-15762
CRM-15762: Modify releaser script to update versions.json
Eileen McNaughton [Wed, 13 May 2015 21:06:30 +0000 (09:06 +1200)]
Merge pull request #5822 from eileenmcnaughton/tests
CRM-16368 refactor of backoffice membership form
Kurund Jalmi [Wed, 13 May 2015 18:33:57 +0000 (00:03 +0530)]
Merge pull request #5825 from mallezie/strict-warning-event-permission
CRM-16498 resolve strict warnings on event permissions
Tim Mallezie [Wed, 13 May 2015 12:49:09 +0000 (14:49 +0200)]
CRM-16498 resolve strict warnings on event permissions
Eileen McNaughton [Wed, 13 May 2015 12:44:58 +0000 (00:44 +1200)]
r
Eileen McNaughton [Wed, 13 May 2015 05:51:41 +0000 (17:51 +1200)]
(backoffice Membership form) minor variable removal and fix to capitalisation on
phpcs fixes
Eileen McNaughton [Wed, 13 May 2015 05:48:56 +0000 (17:48 +1200)]
minor variable tidy up
Eileen McNaughton [Wed, 13 May 2015 06:20:41 +0000 (18:20 +1200)]
Put common preProcess actions into parent class
Note that this switches the Participant form to calling
CRM_Contact_Form_Task::preProcessCommon($this);
rather than parent::preProcess();
I think this may remove the need for the twisted inheritance
but haven't set AbstractEditPayment back to inherit from
CRM_Core_Form
which is more desirable.y
towards consolidating onto parent preProcess
but the whole cdtype seems to block tidy up - although cdType seems to be a misimplementation -
in that there should be a custom data type form called for ajax rather than putting it on every form
r
r
kurund [Wed, 13 May 2015 10:31:56 +0000 (16:01 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-05-13-15-51-23
Conflicts:
sql/civicrm_generated.mysql
tests/phpunit/api/v3/SyntaxConformanceTest.php
Kurund Jalmi [Wed, 13 May 2015 09:52:55 +0000 (15:22 +0530)]
Merge pull request #5811 from kurund/CRM-16367
Crm 16367
Eileen McNaughton [Tue, 12 May 2015 07:45:35 +0000 (19:45 +1200)]
tests passing
Eileen McNaughton [Tue, 12 May 2015 05:23:04 +0000 (17:23 +1200)]
update MembershipForm test to be less clobbery
fix merge errors
Eileen McNaughton [Tue, 12 May 2015 02:42:59 +0000 (14:42 +1200)]
CRM-16368 refactoring by Lola on membership form
Tim Otten [Wed, 13 May 2015 04:43:17 +0000 (21:43 -0700)]
Merge pull request #5803 from totten/4.6-smartgroup-tx
CRM-16251 - CRM_Contact_BAO_GroupContactCache - Respect transactions
Eileen McNaughton [Tue, 12 May 2015 20:53:14 +0000 (08:53 +1200)]
Merge pull request #5810 from eileenmcnaughton/master
Refactorings on backoffice contribution & membership form
Kurund Jalmi [Tue, 12 May 2015 20:31:46 +0000 (02:01 +0530)]
Merge pull request #5817 from rohankatkar/webtest-master
Webtest Fix for master
Kurund Jalmi [Tue, 12 May 2015 20:29:53 +0000 (01:59 +0530)]
Merge pull request #5816 from pratikshad/Fixedwebtests
Fixed webtest
Web Access [Tue, 12 May 2015 14:10:46 +0000 (19:40 +0530)]
Webtest Fix
pratikshad [Tue, 12 May 2015 12:01:52 +0000 (17:31 +0530)]
Fixed webtest
Kurund Jalmi [Tue, 12 May 2015 11:37:36 +0000 (17:07 +0530)]
Merge pull request #5806 from rohankatkar/webtestFix-4.6
Webtests Fix for 4.6
Eileen McNaughton [Tue, 12 May 2015 08:08:12 +0000 (20:08 +1200)]
Merge pull request #5807 from JohnFF/patch-1
PHPUnit: Added debug output
Eileen McNaughton [Tue, 12 May 2015 05:44:18 +0000 (17:44 +1200)]
Fix to formRule refactor
Eileen McNaughton [Tue, 12 May 2015 05:23:04 +0000 (17:23 +1200)]
update MembershipForm test to be less clobbery
Conflicts:
tests/phpunit/CRM/Member/Form/MembershipTest.php
Eileen McNaughton [Tue, 12 May 2015 02:38:11 +0000 (14:38 +1200)]
phpcs fixes
Eileen McNaughton [Tue, 12 May 2015 02:15:28 +0000 (14:15 +1200)]
CRM-16368 partial commit of Lola's refactoring (PR has gone stale :-()
John P Kirk [Mon, 11 May 2015 22:47:40 +0000 (23:47 +0100)]
Added debug output
This helped me identify a problem I had in getting unit tests working, thought I'd share.
Dave Greenberg [Mon, 11 May 2015 20:35:04 +0000 (13:35 -0700)]
Merge pull request #5805 from colemanw/CRM-16483
CRM-16483 - Fix search builder groups operators
Web Access [Mon, 11 May 2015 12:54:33 +0000 (18:24 +0530)]
Webtests Fix for 4.6
Eileen McNaughton [Sun, 10 May 2015 23:26:01 +0000 (11:26 +1200)]
Merge pull request #5804 from eileenmcnaughton/unusedparams
Remove unused parameters from function signature
Eileen McNaughton [Sun, 10 May 2015 21:36:41 +0000 (09:36 +1200)]
Merge pull request #5780 from eileenmcnaughton/CRM-16397
CRM-16397 handle changes to contribution amount in repeattransaction api
Kurund Jalmi [Sun, 10 May 2015 20:12:55 +0000 (01:42 +0530)]
Merge pull request #5791 from monishdeb/CRM-16338
CRM-16338 fix - Incorrect Contribution Summary Report when a contribu…
kurund [Sun, 10 May 2015 10:37:03 +0000 (06:37 -0400)]
Merge remote-tracking branch 'rob/CRM-16367-46' into CRM-16367
Conflicts:
CRM/Upgrade/Incremental/sql/4.6.3.mysql.tpl
sql/civicrm_generated.mysql
Eileen McNaughton [Sun, 10 May 2015 09:48:11 +0000 (21:48 +1200)]
CRM-16357 rename processContribution to processFormContribution to make it easier to change signature (since name is same as other function)
Eileen McNaughton [Sun, 10 May 2015 09:44:39 +0000 (21:44 +1200)]
CRM-16357 towards passing pledge id from calling function & extracting on the form it thethe form
Eileen McNaughton [Sun, 10 May 2015 07:45:54 +0000 (19:45 +1200)]
Merge pull request #5782 from eileenmcnaughton/master
CRM-16417 stop removing failed payments
Eileen McNaughton [Sun, 10 May 2015 04:20:58 +0000 (16:20 +1200)]
trying to get whitespace right
Eileen McNaughton [Sun, 10 May 2015 03:52:33 +0000 (15:52 +1200)]
Merge pull request #5764 from eileenmcnaughton/FinancialItemApi
CRM-16543 add finanical item api
Coleman Watts [Sun, 10 May 2015 01:35:58 +0000 (21:35 -0400)]
CRM-16483 - Fix search builder groups operators
colemanw [Sun, 10 May 2015 00:39:14 +0000 (20:39 -0400)]
Merge pull request #5714 from colemanw/uiSelect
Allow crmUiSelect to function without an attached model
Eileen McNaughton [Sat, 9 May 2015 21:35:07 +0000 (09:35 +1200)]
whitespace
Eileen McNaughton [Sat, 9 May 2015 09:50:10 +0000 (21:50 +1200)]
minor comment fixes
Eileen McNaughton [Sat, 9 May 2015 09:46:20 +0000 (21:46 +1200)]
Removed unused parameter from function signature
Eileen McNaughton [Sat, 9 May 2015 09:38:52 +0000 (21:38 +1200)]
Removed unused parameter from function signature
Eileen McNaughton [Sat, 9 May 2015 09:04:27 +0000 (21:04 +1200)]
whitespace
Eileen McNaughton [Sat, 2 May 2015 23:35:09 +0000 (11:35 +1200)]
Disable failing timestamp test in the 4.6 series
Per CRM-16204 we should allow this properly in 4.7
Eileen McNaughton [Sat, 9 May 2015 08:50:32 +0000 (20:50 +1200)]
whitespace
Dave Greenberg [Fri, 8 May 2015 23:45:43 +0000 (16:45 -0700)]
Merge pull request #5572 from monishdeb/4.6
CRM-16165 fix - Combining online membership signup with a recurring addi...
Tim Otten [Fri, 8 May 2015 23:10:05 +0000 (16:10 -0700)]
CRM-16251 - CRM_Contact_BAO_GroupContactCache - Respect transactions
The use of "DROP TABLE" will force-commit any pending transactions, even if
the table is temporary. To avoid a force-commit, one must explicitly say
"DROP TEMPORARY TABLE".
Dave Greenberg [Fri, 8 May 2015 18:42:51 +0000 (11:42 -0700)]
Merge pull request #5801 from davecivicrm/fixUpgradeDonateLink
Fix link in upgrade success message - supposed to go to /contribute p…
Dave Greenberg [Fri, 8 May 2015 18:40:35 +0000 (11:40 -0700)]
Fix link in upgrade success message - supposed to go to /contribute page.
Monish Deb [Fri, 8 May 2015 18:18:21 +0000 (23:48 +0530)]
Merge pull request #5799 from monishdeb/CRM-13596
Crm 13596
Monish Deb [Fri, 8 May 2015 15:27:05 +0000 (20:57 +0530)]
Merge pull request #5798 from sudhabisht/CRM-16391
Renamed type for contribution and membership profile
Kurund Jalmi [Fri, 8 May 2015 14:53:35 +0000 (10:53 -0400)]
Merge pull request #5783 from mallezie/crm-16473
CRM-16473-empty display en sort_name_format get filled in with default values
Kurund Jalmi [Fri, 8 May 2015 14:49:04 +0000 (10:49 -0400)]
Merge pull request #5795 from totten/4.6-case-actname
CRM-16360 - CiviCase XML - Escape ampersand
monishdeb [Fri, 8 May 2015 13:01:58 +0000 (18:31 +0530)]
format fixes
Andrew West [Wed, 6 May 2015 12:48:51 +0000 (13:48 +0100)]
CRM-13596
fix for contact subtypes being overwritten
monishdeb [Fri, 8 May 2015 10:10:11 +0000 (15:40 +0530)]
Format fix
monishdeb [Thu, 30 Apr 2015 13:28:22 +0000 (18:58 +0530)]
CRM-16338 fix - Incorrect Contribution Summary Report when a contributions has multiple soft credits
https://issues.civicrm.org/jira/browse/CRM-16338
Sudha Bisht [Fri, 8 May 2015 07:02:25 +0000 (12:32 +0530)]
Renamed type for contribution and membership profile
Kurund Jalmi [Fri, 8 May 2015 04:52:56 +0000 (00:52 -0400)]
Merge pull request #5786 from mallezie/crm-16283-duplicaterelationcheck
Crm 16283 duplicaterelationcheck
colemanw [Fri, 8 May 2015 02:13:55 +0000 (22:13 -0400)]
Merge pull request #5794 from colemanw/CRM-16462
CRM-16462 - update select2 elements on billing block
Tim Otten [Fri, 8 May 2015 00:44:59 +0000 (17:44 -0700)]
CRM-16360 - CiviCase XML - Escape ampersand
Coleman Watts [Fri, 8 May 2015 00:26:23 +0000 (20:26 -0400)]
CRM-16462 - update select2 elements on billing block
Kurund Jalmi [Thu, 7 May 2015 20:10:33 +0000 (16:10 -0400)]
Merge pull request #5635 from pradpnayak/CRM-16268
--CRM-16268, modified post hook params for line item to use line item BA...
Kurund Jalmi [Thu, 7 May 2015 19:01:57 +0000 (15:01 -0400)]
Merge pull request #5776 from monishdeb/CRM-16437
CRM-16437 fix - Participant export retains all fee levels after change
Monish Deb [Thu, 7 May 2015 18:52:17 +0000 (00:22 +0530)]
Merge pull request #5785 from pratikshad/16336
CRM-16336 fix-API Pledge Get does not return correct pledge_next_pay_…
Kurund Jalmi [Thu, 7 May 2015 18:00:55 +0000 (14:00 -0400)]
Merge pull request #5772 from atif-shaikh/CRM-16407
CRM-16407 - Report title entered on Title and Format tab is ignored by C...
Kurund Jalmi [Thu, 7 May 2015 17:56:57 +0000 (13:56 -0400)]
Merge pull request #5787 from monishdeb/CRM-16330
CRM-16330 fix - Edit Contribution form validation on total amount is …
colemanw [Thu, 7 May 2015 17:36:57 +0000 (13:36 -0400)]
Merge pull request #5788 from colemanw/AJAX
AJAX cleanup & remove unused functions
Dave Greenberg [Thu, 7 May 2015 16:26:08 +0000 (09:26 -0700)]
Merge pull request #5778 from davecivicrm/CRM-15228
CRM-15228 - replace bogus DTEND with DURATION property in activity ic…
Coleman Watts [Thu, 7 May 2015 14:20:23 +0000 (10:20 -0400)]
AJAX cleanup & remove unused functions
monishdeb [Thu, 7 May 2015 11:26:43 +0000 (16:56 +0530)]
CRM-16330 fix - Edit Contribution form validation on total amount is incorrect when tax is included
https://issues.civicrm.org/jira/browse/CRM-16330
pratikshad [Thu, 7 May 2015 10:41:08 +0000 (16:11 +0530)]
CRM-16336 fix-API Pledge Get does not return correct pledge_next_pay_amount for overdue pledgesAPI Pledge Get does not return correct pledge_next_pay_amount for overdue pledges
----------------------------------------
* CRM-16336: API Pledge Get does not return correct pledge_next_pay_amount for overdue pledges
https://issues.civicrm.org/jira/browse/CRM-16336
Tim Mallezie [Thu, 7 May 2015 10:15:16 +0000 (12:15 +0200)]
empty is valid value for display and sort_name_format
Monish Deb [Thu, 7 May 2015 07:02:21 +0000 (12:32 +0530)]
Merge pull request #5769 from monishdeb/CRM-16433
CRM-16433 fix - "User and User Admin Only" groups should NOT be included...
Monish Deb [Thu, 7 May 2015 06:18:14 +0000 (11:48 +0530)]
Merge pull request #5773 from sudhabisht/16452
Fix for Georgia division
Eileen McNaughton [Thu, 7 May 2015 04:35:01 +0000 (16:35 +1200)]
CRM-16397 handle changes to contribution amount in repeattransaction api
Eileen McNaughton [Thu, 7 May 2015 02:38:05 +0000 (14:38 +1200)]
CRM-16397 test for repeatcontribution with altered line items
colemanw [Thu, 7 May 2015 01:54:31 +0000 (21:54 -0400)]
Merge pull request #5720 from josephlacey/datatables-update
Datatables update
colemanw [Thu, 7 May 2015 01:43:15 +0000 (21:43 -0400)]
Merge pull request #5777 from colemanw/CRM-16204
CRM-16204 - Add entityRef support for PaymentProcessor api
Dave Greenberg [Thu, 7 May 2015 00:25:25 +0000 (17:25 -0700)]
CRM-15228 - replace bogus DTEND with DURATION property in activity ical output.
----------------------------------------
* CRM-15228: Activity End Time same as start Time in iCal invitation
https://issues.civicrm.org/jira/browse/CRM-15228
Coleman Watts [Wed, 6 May 2015 21:07:52 +0000 (17:07 -0400)]
CRM-16204 - Fix incorrect label on PaymentProcessor pseudoconstant
Coleman Watts [Wed, 6 May 2015 21:07:01 +0000 (17:07 -0400)]
CRM-16204 - Add entityRef support for PaymentProcessor api
monishdeb [Wed, 6 May 2015 19:33:09 +0000 (01:03 +0530)]
format fix
monishdeb [Wed, 6 May 2015 19:22:52 +0000 (00:52 +0530)]
CRM-16437 fix - Participant export retains all fee levels after change
https://issues.civicrm.org/jira/browse/CRM-16437
Kurund Jalmi [Wed, 6 May 2015 16:03:46 +0000 (12:03 -0400)]
Merge pull request #5771 from sudhabisht/C16386
Fix for contribution time
Sudha Bisht [Wed, 6 May 2015 13:49:09 +0000 (19:19 +0530)]
Removed hardcode country ID
Sudha Bisht [Wed, 6 May 2015 12:22:22 +0000 (17:52 +0530)]
Fix for georgia division
atif-shaikh [Wed, 6 May 2015 12:02:15 +0000 (17:32 +0530)]
CRM-16407 - Report title entered on Title and Format tab is ignored by Create Report action
https://issues.civicrm.org/jira/browse/CRM-16407
Sudha Bisht [Wed, 6 May 2015 09:16:09 +0000 (14:46 +0530)]
Fix for contribution time
monishdeb [Wed, 6 May 2015 06:37:13 +0000 (12:07 +0530)]
CRM-16433 fix - "User and User Admin Only" groups should NOT be included in Contribution Receipt Profile Field Group(s) output
https://issues.civicrm.org/jira/browse/CRM-16433
Kurund Jalmi [Wed, 6 May 2015 06:13:51 +0000 (02:13 -0400)]
Merge pull request #5758 from atif-shaikh/CRM-16320
CRM-16320 - Multiple Registration Confirmation Email does not shows indi...
Kurund Jalmi [Wed, 6 May 2015 04:42:59 +0000 (00:42 -0400)]
Merge pull request #5768 from eileenmcnaughton/lola
CRM-16386 - Minor code cleanup: Undefined and unused variables.
Lola Slade [Sun, 26 Apr 2015 19:50:06 +0000 (13:50 -0600)]
CRM-16386 - Minor code cleanup: Undefined and unused variables.
Dave Greenberg [Tue, 5 May 2015 16:32:00 +0000 (09:32 -0700)]
Merge pull request #5762 from davecivicrm/CRM-16411
CRM-16411 - improve xsstring detection error message.
Eileen McNaughton [Tue, 5 May 2015 08:10:10 +0000 (20:10 +1200)]
Enotice fix
atif-shaikh [Mon, 4 May 2015 13:00:07 +0000 (18:30 +0530)]
CRM-16320 Missed out changes for event_online_receipt_text.tpl
----------------------------------------
* CRM-16320: Multiple Registration Confirmation Email does not shows individual sums
https://issues.civicrm.org/jira/browse/CRM-16320
atif-shaikh [Mon, 4 May 2015 12:28:41 +0000 (17:58 +0530)]
CRM-16320 - Multiple Registration Confirmation Email does not shows individual sums
https://issues.civicrm.org/jira/browse/CRM-16320
Eileen McNaughton [Tue, 5 May 2015 05:47:11 +0000 (17:47 +1200)]
CRM-16417, CRM-16357, CRM-14011 (Contribution Page) was working on keeping failed transactions but cross-il
between tickets is high & the solution for one seems to be the solution for all
projects / civicrm-core.git / log