Kurund Jalmi [Wed, 13 May 2015 18:25:39 +0000 (23:55 +0530)]
Merge pull request #5824 from pratikshad/apitests
fixed failed apitest
Dave Greenberg [Wed, 13 May 2015 17:55:43 +0000 (10:55 -0700)]
Merge pull request #5826 from eileenmcnaughton/4.6
CRM-16245 missing renewal box on backoffice membership pages
Eileen McNaughton [Wed, 13 May 2015 13:02:09 +0000 (01:02 +1200)]
CRM-16245 missing renewal box on backoffice membership pages
pratikshad [Wed, 13 May 2015 12:19:21 +0000 (17:49 +0530)]
fixed failed apitest
Kurund Jalmi [Wed, 13 May 2015 09:52:55 +0000 (15:22 +0530)]
Merge pull request #5811 from kurund/CRM-16367
Crm 16367
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
Kurund Jalmi [Tue, 12 May 2015 20:29:53 +0000 (01:59 +0530)]
Merge pull request #5816 from pratikshad/Fixedwebtests
Fixed webtest
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
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 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 04:20:58 +0000 (16:20 +1200)]
trying to get whitespace right
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 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 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: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 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
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 …
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…
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
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
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
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
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
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...
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.
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
Kurund Jalmi [Tue, 5 May 2015 03:15:59 +0000 (23:15 -0400)]
Merge pull request #5763 from davecivicrm/CRM-16307
CRM-16307 - Fix civicrm_navigation permission for A/B Test items.
Dave Greenberg [Tue, 5 May 2015 01:19:20 +0000 (18:19 -0700)]
CRM-16307 - Fix civicrm_navigation permission for A/B Test items.
----------------------------------------
* CRM-16307: A/B test menu items don't appear on upgrade to 4.6
https://issues.civicrm.org/jira/browse/CRM-16307
Dave Greenberg [Tue, 5 May 2015 01:05:00 +0000 (18:05 -0700)]
CRM-16411 - improve xsstring detection error message.
----------------------------------------
* CRM-16411: CiviMail: Clarify Illegal characters warning
https://issues.civicrm.org/jira/browse/CRM-16411
Tim Otten [Mon, 4 May 2015 21:39:09 +0000 (14:39 -0700)]
Merge pull request #5752 from totten/4.6-install-sitekey
install/civicrm.php - Generate siteKey
Monish Deb [Mon, 4 May 2015 20:05:50 +0000 (01:35 +0530)]
Merge pull request #5761 from sudhabisht/ReceivedateIssue
Changes related to trxn_date
monishdeb [Fri, 17 Apr 2015 15:12:14 +0000 (20:42 +0530)]
added comment
monishdeb [Fri, 17 Apr 2015 15:09:33 +0000 (20:39 +0530)]
Added Webtests
monishdeb [Wed, 15 Apr 2015 09:38:59 +0000 (15:08 +0530)]
minor change
monishdeb [Wed, 15 Apr 2015 09:30:34 +0000 (15:00 +0530)]
Improvement and bug fixes
monishdeb [Mon, 6 Apr 2015 14:31:40 +0000 (20:01 +0530)]
CRM-16165 fix - Combining online membership signup with a recurring additional contribution results in incorrect recurring contribution amount and frequency
https://issues.civicrm.org/jira/browse/CRM-16165
Sudha Bisht [Mon, 4 May 2015 10:35:05 +0000 (16:05 +0530)]
Changes related to trxn_date
torenware [Sun, 3 May 2015 05:20:21 +0000 (22:20 -0700)]
Merge pull request #4 from eileenmcnaughton/patch-6
Remove whitespace
Eileen McNaughton [Sun, 3 May 2015 03:22:45 +0000 (15:22 +1200)]
Remove whitespace
Eileen McNaughton [Sun, 3 May 2015 03:20:52 +0000 (15:20 +1200)]
Merge pull request #5695 from mlutfy/46-crm16359
CRM-16359: Report templates title/description translation.
torenware [Sun, 3 May 2015 01:43:22 +0000 (18:43 -0700)]
Merge pull request #3 from eileenmcnaughton/patch-5
Disable failing timestamp test in the 4.6 series; hopefully now in TW CRM-16367 branch.
torenware [Sun, 3 May 2015 01:42:11 +0000 (18:42 -0700)]
Merge pull request #1 from eileenmcnaughton/patch-4
Default created date to current timestamp; hopefully merged from Eileen's PR#1
torenware [Sun, 3 May 2015 01:08:25 +0000 (18:08 -0700)]
Merge pull request #2 from eileenmcnaughton/patch-3
Add default of current timestamp to the create_datek
Tim Otten [Sun, 3 May 2015 00:28:36 +0000 (17:28 -0700)]
install/civicrm.php - Generate siteKey
Eileen McNaughton [Sat, 2 May 2015 23:41:05 +0000 (11:41 +1200)]
Fix comment - wrong ticket ref
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, 2 May 2015 23:30:52 +0000 (11:30 +1200)]
Default created date to current timestamp
Eileen McNaughton [Sat, 2 May 2015 23:25:38 +0000 (11:25 +1200)]
Add default of current timestamp to the create_date
colemanw [Fri, 1 May 2015 17:23:56 +0000 (12:23 -0500)]
Merge pull request #5746 from colemanw/CRM-16333
CRM-16333 - explodePadded should return an empty array from an empty string
Kurund Jalmi [Thu, 30 Apr 2015 14:26:56 +0000 (08:26 -0600)]
Merge pull request #5727 from sudhabisht/4.6
Fix for contribution api filter
Coleman Watts [Thu, 30 Apr 2015 14:15:57 +0000 (08:15 -0600)]
CRM-16333 - explodePadded should return an empty array from an empty string
Monish Deb [Thu, 30 Apr 2015 13:10:15 +0000 (18:40 +0530)]
Merge pull request #5716 from jitendrapurohit/CRM-15716_4.6
fix for CRM-15716 Include missing contact fields in (constituent) report...
torenware [Thu, 30 Apr 2015 04:52:08 +0000 (22:52 -0600)]
Update 4.6.3.mysql.tpl
Rob Thorne [Thu, 30 Apr 2015 01:44:07 +0000 (01:44 +0000)]
CRM-16367 (Payment): changes in version number for schema xml; Jenkins related fixes in xml and sql
Rob Thorne [Wed, 29 Apr 2015 22:14:34 +0000 (22:14 +0000)]
CRM-16367 (Payment): recurring contrib test formatting issue.
Rob Thorne [Wed, 29 Apr 2015 22:06:28 +0000 (22:06 +0000)]
CRM-16367 (Payment): added a payment token test for recurring contributions.
Rob Thorne [Wed, 29 Apr 2015 21:12:02 +0000 (21:12 +0000)]
CRM-16367 (Payment): remove a trailing comma to keep rampaging Jenkins at bay.
Rob Thorne [Wed, 29 Apr 2015 20:47:30 +0000 (20:47 +0000)]
CRM-16367 (Payment): Added payment_token_id + FK to recurring contributions table.
Rob Thorne [Wed, 29 Apr 2015 18:16:21 +0000 (18:16 +0000)]
CRM-16367 (Payment): first pass on payment_token API definition and API test.
Rob Thorne [Wed, 29 Apr 2015 16:27:54 +0000 (16:27 +0000)]
CRM-16367 (Payment): Added upgrader template for 4.6.3
Rob Thorne [Wed, 29 Apr 2015 16:11:37 +0000 (16:11 +0000)]
CRM-16367 (Payment): added FK for created_id field.
Rob Thorne [Wed, 29 Apr 2015 03:31:51 +0000 (03:31 +0000)]
CRM-16367 (Payment): adding the corrected PaymentToken table definition.
Rob Thorne [Wed, 29 Apr 2015 02:21:19 +0000 (02:21 +0000)]
CRM-16367: Payment Processors -- add shared token table civicrm_payment_token.
Sudha Bisht [Wed, 29 Apr 2015 11:28:59 +0000 (16:58 +0530)]
Fix for contribution api filter
Kurund Jalmi [Tue, 28 Apr 2015 23:19:24 +0000 (17:19 -0600)]
Merge pull request #5647 from kurund/CRM-15629
CRM-15629, during exten/ipn calls we don't bootstrap hence some constants ...
Monish Deb [Tue, 28 Apr 2015 13:09:51 +0000 (18:39 +0530)]
Merge pull request #5708 from atif-shaikh/CRM-16319
CRM-16319 - CiviEvent Registration Invoice Fatal Error
Monish Deb [Tue, 28 Apr 2015 13:08:03 +0000 (18:38 +0530)]
Merge pull request #5677 from atif-shaikh/CRM-16300Regression
CRM-16300 fixed regression which caused webtest to break
Monish Deb [Tue, 28 Apr 2015 13:07:57 +0000 (18:37 +0530)]
Merge pull request #5711 from jitendrapurohit/CRM-16300QA
Set message after updating Relationship
jitendrapurohit [Tue, 28 Apr 2015 11:17:49 +0000 (16:47 +0530)]
field fix for contact_type and contact_subtype
Monish Deb [Tue, 28 Apr 2015 09:39:27 +0000 (15:09 +0530)]
Merge pull request #5709 from pratikshad/16068
CRM-16068 Fix-Tab with table date field shows wrong date format
jitendrapurohit [Tue, 28 Apr 2015 08:28:19 +0000 (13:58 +0530)]
fix for CRM-15716 Include missing contact fields in (constituent) reports in 4.6.3 version
pratikshad [Tue, 28 Apr 2015 07:23:59 +0000 (12:53 +0530)]
typo fix
pratikshad [Mon, 27 Apr 2015 09:30:50 +0000 (15:00 +0530)]
CRM-16068 Fix-Tab with table date field shows wrong date format
----------------------------------------
* CRM-16068: Tab with table date field shows wrong date format
https://issues.civicrm.org/jira/browse/CRM-16068