Tim Otten [Tue, 19 May 2015 05:09:24 +0000 (22:09 -0700)]
CRM-16499 - Fix relative Angular paths in Windows
Dave Greenberg [Tue, 19 May 2015 00:03:07 +0000 (17:03 -0700)]
Merge pull request #5861 from totten/4.6-ck-img
CRM-16445 - crmUiRichtext - Fix image insertion. Wait 50ms.
Tim Otten [Mon, 18 May 2015 21:28:56 +0000 (14:28 -0700)]
CRM-16445 - crmUiRichtext - Fix image insertion. Wait 50ms.
Kurund Jalmi [Mon, 18 May 2015 17:01:55 +0000 (22:31 +0530)]
Merge pull request #5857 from sudhabisht/CRM-16390
Fix for pledge payments record for particular contact id
Kurund Jalmi [Mon, 18 May 2015 17:01:51 +0000 (22:31 +0530)]
Merge pull request #5859 from sudhabisht/CRM16485
Fix for subject not display on delete page
Kurund Jalmi [Mon, 18 May 2015 15:42:34 +0000 (21:12 +0530)]
Merge pull request #5858 from jitendrapurohit/CRM-16488
Search Builder: Qill display operator is missing when searching by Co…
Kurund Jalmi [Mon, 18 May 2015 12:32:19 +0000 (18:02 +0530)]
Merge pull request #5736 from eileenmcnaughton/CRM-16422
CRM-16422 permit processor_id without ? in IPN urls
Kurund Jalmi [Mon, 18 May 2015 11:31:04 +0000 (17:01 +0530)]
Merge pull request #5854 from kurund/CRM-15629
CRM-15629
Sudha Bisht [Mon, 18 May 2015 10:03:59 +0000 (15:33 +0530)]
Fix for subject not display on delete page
Sudha Bisht [Mon, 18 May 2015 09:40:29 +0000 (15:10 +0530)]
Fix for pledge api
jitendrapurohit [Mon, 18 May 2015 09:34:59 +0000 (15:04 +0530)]
Search Builder: Qill display operator is missing when searching by Contact Type
kurund [Mon, 18 May 2015 06:38:12 +0000 (12:08 +0530)]
CRM-15629, more cleanup
----------------------------------------
* CRM-15629: Paypal IPN not working on Wordpress the first time
https://issues.civicrm.org/jira/browse/CRM-15629
kurund [Mon, 18 May 2015 06:35:53 +0000 (12:05 +0530)]
CRM-15629, more cleanup
----------------------------------------
* CRM-15629: Paypal IPN not working on Wordpress the first time
https://issues.civicrm.org/jira/browse/CRM-15629
Kurund Jalmi [Sat, 16 May 2015 09:31:27 +0000 (15:01 +0530)]
Merge pull request #5833 from kurund/CRM-15629
CRM-15629
Dave Greenberg [Fri, 15 May 2015 21:48:49 +0000 (14:48 -0700)]
Merge pull request #5846 from totten/4.6-dedupe-email
CRM-16465 - CiviMail - Handle dedupe_email
Dave Greenberg [Fri, 15 May 2015 21:39:50 +0000 (14:39 -0700)]
Merge pull request #5836 from eileenmcnaughton/4.6
CRM-16504 add auto-renew to back office renewal form
Dave Greenberg [Fri, 15 May 2015 21:07:18 +0000 (14:07 -0700)]
Merge pull request #5842 from sudhabisht/CRM-16441
Fix for re-assign a case to another contact
Tim Otten [Fri, 15 May 2015 19:57:12 +0000 (12:57 -0700)]
CRM-16465 - crmMailing - Update estimate when toggling dedupe_email
Tim Otten [Fri, 15 May 2015 19:56:20 +0000 (12:56 -0700)]
CRM-16465 - Mailing BAO - Handle dedupe_email
Dave Greenberg [Fri, 15 May 2015 19:14:21 +0000 (12:14 -0700)]
Merge pull request #5841 from rohankatkar/CRM-16475
Fix for CRM-16475
Kurund Jalmi [Fri, 15 May 2015 12:00:42 +0000 (17:30 +0530)]
Merge pull request #5834 from sudhabisht/CRM-16480
Fix for batch validation issue
Kurund Jalmi [Fri, 15 May 2015 11:36:27 +0000 (17:06 +0530)]
Merge pull request #5744 from davejenx/CRM-16427
CRM-16427 - Advanced logging: ignore changes to civicrm_group refresh_date field
Kurund Jalmi [Fri, 15 May 2015 07:01:07 +0000 (12:31 +0530)]
Merge pull request #5813 from kenwest/CRM-16276-4.6
CRM-16276
Sudha Bisht [Fri, 15 May 2015 06:02:03 +0000 (11:32 +0530)]
Fix for re-assign a case to another contact
Web Access [Fri, 15 May 2015 05:35:14 +0000 (11:05 +0530)]
Fix for CRM-16475
Kurund Jalmi [Fri, 15 May 2015 05:19:03 +0000 (10:49 +0530)]
Merge pull request #5820 from GinkgoFJG/CRM-16497
CRM-16497: Fixed problematic loop related to report display options.
Dave Greenberg [Thu, 14 May 2015 19:09:04 +0000 (12:09 -0700)]
Merge pull request #5830 from davecivicrm/CRM-16502
CRM-16502 - fix type assignments in Geocode Job.
Kurund Jalmi [Thu, 14 May 2015 15:17:17 +0000 (20:47 +0530)]
Merge pull request #5838 from kurund/CRM-16410
CRM-16410, license fixes
kurund [Thu, 14 May 2015 15:16:25 +0000 (20:46 +0530)]
CRM-16410, license fixes
----------------------------------------
* CRM-16410: please clarify copyright and license of
https://issues.civicrm.org/jira/browse/CRM-16410
Kurund Jalmi [Thu, 14 May 2015 14:37:20 +0000 (20:07 +0530)]
Merge pull request #5832 from sudhabisht/CRM-16456
Fix for expire priceset field
Eileen McNaughton [Thu, 14 May 2015 12:42:12 +0000 (00:42 +1200)]
CRM-16504 add auto-renew to back office renewal form
Sudha Bisht [Thu, 14 May 2015 11:00:16 +0000 (16:30 +0530)]
Fix for batch validation issue
Kevin Cristiano [Sat, 9 May 2015 02:35:57 +0000 (22:35 -0400)]
formatting fix
Kevin Cristiano [Sat, 9 May 2015 02:22:58 +0000 (22:22 -0400)]
CRM-15629: Add wpLoadPhp to core settings file
----------------------------------------
* CRM-15629: Paypal IPN not working on Wordpress the first time
https://issues.civicrm.org/jira/browse/CRM-15629
Kevin Cristiano [Sat, 2 May 2015 14:53:16 +0000 (10:53 -0400)]
formatting fixes
Kevin Cristiano [Sat, 2 May 2015 12:59:48 +0000 (08:59 -0400)]
CRM-15629 Fix for IPN issue on 4.6 branch. Call wp-load via CRM_Utils_System::loadBootStrap() Original PR https://github.com/civicrm/civicrm-core/pull/5749
----------------------------------------
* CRM-15629: Paypal IPN not working on Wordpress the first time
https://issues.civicrm.org/jira/browse/CRM-15629
Conflicts:
CRM/Core/Permission/WordPress.php
Kurund Jalmi [Thu, 14 May 2015 05:20:46 +0000 (10:50 +0530)]
Merge pull request #5666 from davejenx/CRM-16321
CRM-16321 - stop CiviCRM log rotation overwriting existing file if log r...
Sudha Bisht [Thu, 14 May 2015 04:54:08 +0000 (10:24 +0530)]
Fix for expire priceset field
Kurund Jalmi [Thu, 14 May 2015 04:38:43 +0000 (10:08 +0530)]
Merge pull request #5767 from pradpnayak/CRM-16460
--CRM-16460, used money format function to format the total amount
Kurund Jalmi [Thu, 14 May 2015 04:06:48 +0000 (09:36 +0530)]
Merge pull request #5831 from totten/4.6-droptemp
CRM-16251 - Change DROP TABLE to DROP TEMPORARY TABLE
Kurund Jalmi [Thu, 14 May 2015 03:46:17 +0000 (09:16 +0530)]
Merge pull request #5827 from rohankatkar/CRM-15778
Fix for CRM-15778
Dave Greenberg [Wed, 13 May 2015 22:51:46 +0000 (15:51 -0700)]
Merge pull request #5775 from guanhuan/invoice-permission
Add permission for users to view their own invoices
Tim Otten [Wed, 13 May 2015 21:31:55 +0000 (14:31 -0700)]
CRM-16251 - Change DROP TABLE to DROP TEMPORARY TABLE
If a table was created as a temporary table, then it should be dropped as a
temporary table. MySQL will accept DROP TABLE on temporary tables, but
doing so will break transactions.
Dave Greenberg [Wed, 13 May 2015 21:02:01 +0000 (14:02 -0700)]
CRM-16502 - fix type assignments in Geocode Job.
----------------------------------------
* CRM-16502: Geocoder scheduled job incorrect API parameters
https://issues.civicrm.org/jira/browse/CRM-16502
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
Guanhuan Chen [Wed, 13 May 2015 13:06:43 +0000 (14:06 +0100)]
Fix UserDashboard.tpl indentations
Guanhuan Chen [Wed, 13 May 2015 13:05:46 +0000 (14:05 +0100)]
Fixed button display based on permission
Web Access [Wed, 13 May 2015 13:02:20 +0000 (18:32 +0530)]
Fix for CRM-15778
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
Frank J. Gómez [Wed, 13 May 2015 00:32:22 +0000 (20:32 -0400)]
CRM-16497: Fixed problematic loop related to report display options.
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
Ken West [Tue, 21 Apr 2015 11:53:27 +0000 (21:53 +1000)]
CRM-16276 Daily jobs run by cron slip forward each day, until eventually missed
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.
Guanhuan Chen [Fri, 8 May 2015 18:28:39 +0000 (19:28 +0100)]
Add permission for users to view their own invoices
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...
projects / civicrm-core.git / log