Monish Deb [Tue, 26 May 2015 11:03:14 +0000 (16:33 +0530)]
Merge pull request #5902 from jitendrapurohit/CRM-16548
Batch Data Entry screens do not require payment instrument
jitendrapurohit [Tue, 26 May 2015 08:42:20 +0000 (14:12 +0530)]
warning fix
jitendrapurohit [Tue, 26 May 2015 08:26:57 +0000 (13:56 +0530)]
minor fix
jitendrapurohit [Tue, 26 May 2015 07:06:24 +0000 (12:36 +0530)]
Batch Data Entry screens do not require payment instrument
Monish Deb [Tue, 26 May 2015 05:09:30 +0000 (10:39 +0530)]
Merge pull request #5895 from jitendrapurohit/CRM-16551
CRM-16551 Notice on demo site re custom fields
colemanw [Tue, 26 May 2015 02:02:50 +0000 (22:02 -0400)]
Merge pull request #5863 from totten/4.6-ang-win
CRM-16499 - Fix relative Angular paths in Windows
colemanw [Mon, 25 May 2015 16:47:48 +0000 (12:47 -0400)]
Merge pull request #5899 from colemanw/CRM-16477
CRM-16477 - Additional backwards compatibility for report instances pre-dating 4.5
Coleman Watts [Mon, 25 May 2015 16:43:57 +0000 (12:43 -0400)]
CRM-16477 - Additional backwards compatibility for report instances pre-dating 4.5
colemanw [Mon, 25 May 2015 16:33:31 +0000 (12:33 -0400)]
Merge pull request #5797 from GinkgoFJG/4.6
CRM-16477: Added backwards compatibility for report instances pre-dating 4.5.
colemanw [Mon, 25 May 2015 15:47:31 +0000 (11:47 -0400)]
Merge pull request #5897 from colemanw/caseStyle
CaseType UI styling improvements
Coleman Watts [Mon, 27 Apr 2015 17:41:52 +0000 (11:41 -0600)]
CaseType UI styling improvements
colemanw [Mon, 25 May 2015 15:01:06 +0000 (11:01 -0400)]
Merge pull request #5618 from sfe-ev/fix-upgrade-option_value-4.6
Upgrade: Fix `value` for added `option_value` entries in various places
jitendrapurohit [Mon, 25 May 2015 12:49:09 +0000 (18:19 +0530)]
CRM-16551 Notice on demo site re custom fields
Kurund Jalmi [Fri, 22 May 2015 13:17:38 +0000 (18:47 +0530)]
Merge pull request #5887 from sudhabisht/CRM-7636
Fix for website url issue
Kurund Jalmi [Fri, 22 May 2015 13:17:19 +0000 (18:47 +0530)]
Merge pull request #5886 from sudhabisht/CRM-16519
Fixes for unable to deselect multi-select field
Sudha Bisht [Fri, 22 May 2015 10:11:27 +0000 (15:41 +0530)]
Fix for website url issue
Sudha Bisht [Fri, 22 May 2015 09:50:35 +0000 (15:20 +0530)]
Fixes for unable to deselect multi-select field
Kurund Jalmi [Fri, 22 May 2015 09:25:14 +0000 (14:55 +0530)]
Merge pull request #5847 from GinkgoFJG/CRM-16511
CRM-16511: Fixed missing closing tag for price set rows.
Kurund Jalmi [Fri, 22 May 2015 07:47:20 +0000 (13:17 +0530)]
Merge pull request #5885 from pratikshad/16528
CRM-16528 Fixed-hook_civicrm_contact_get_displayname does not work. M…
pratikshad [Fri, 22 May 2015 04:40:02 +0000 (10:10 +0530)]
CRM-16528 Fixed-hook_civicrm_contact_get_displayname does not work. Missing an "&" in alterDisplayName inhooks.php
----------------------------------------
* CRM-16528: hook_civicrm_contact_get_displayname does not work. Missing an "&" in alterDisplayName inhooks.php
https://issues.civicrm.org/jira/browse/CRM-16528
Eileen McNaughton [Thu, 21 May 2015 01:09:05 +0000 (13:09 +1200)]
Merge pull request #5880 from eileenmcnaughton/CRM-16536
CRM-16536 add settings overrides to template
Eileen McNaughton [Thu, 21 May 2015 00:54:02 +0000 (12:54 +1200)]
phpcs fixes - pre-existing issues
Eileen McNaughton [Wed, 20 May 2015 21:45:23 +0000 (09:45 +1200)]
CRM-16536 add settings overrides to templateg
Dave Greenberg [Wed, 20 May 2015 18:54:25 +0000 (11:54 -0700)]
Merge pull request #5869 from totten/4.6-ck-src
CRM-16445 - crmUiRichtext - Fix "Source" mode. Listen to 'key' event.
Dave Greenberg [Wed, 20 May 2015 17:08:45 +0000 (10:08 -0700)]
Merge pull request #5755 from eileenmcnaughton/CRM-16450
Crm 16450
Eileen McNaughton [Wed, 20 May 2015 09:28:30 +0000 (21:28 +1200)]
CRM-16450 patch for div layout on multi custom tab
CiviCRM [Wed, 20 May 2015 08:02:22 +0000 (01:02 -0700)]
Update version to 4.6.4
Tim Otten [Wed, 20 May 2015 00:41:13 +0000 (17:41 -0700)]
CRM-16445 - crmUiRichtext - Fix "Source" mode. Listen to 'key' event.
See also:
* http://civicrm.stackexchange.com/questions/2492/civimail-mailings-not-saving-or-corrupting
* http://stackoverflow.com/questions/
17358203/how-to-detect-ckeditor-source-mode-on-change-event
This is not strictly part of CRM-16445, but it's very similar (dealing with
the events emitted by ckeditor).
Dave Greenberg [Tue, 19 May 2015 21:28:33 +0000 (14:28 -0700)]
Merge pull request #5868 from davecivicrm/CRM-16524
CRM-16524 - fix batch entry total amount validation.
Dave Greenberg [Tue, 19 May 2015 18:42:25 +0000 (11:42 -0700)]
CRM-16524 - fix batch entry total amount validation.
----------------------------------------
* CRM-16524: Batch Entry form Validation failed, even total_amount reach the expected total_amount
https://issues.civicrm.org/jira/browse/CRM-16524
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
Eileen McNaughton [Mon, 18 May 2015 09:00:01 +0000 (21:00 +1200)]
phpcs fixes
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
Eileen McNaughton [Mon, 18 May 2015 00:19:12 +0000 (12:19 +1200)]
phpcs fixes
Eileen McNaughton [Sun, 17 May 2015 23:36:13 +0000 (11:36 +1200)]
CRM-16450 fix for multiple custom fields
Eileen McNaughton [Mon, 4 May 2015 00:31:00 +0000 (12:31 +1200)]
CRM-16450 Custom data tab - fix indentation on tpl
This is separate to the previous commit for readability
Eileen McNaughton [Mon, 4 May 2015 00:28:36 +0000 (12:28 +1200)]
CRM-16450 add pre & post custom group text & region to data tab
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
Frank J. Gómez [Fri, 15 May 2015 20:45:51 +0000 (16:45 -0400)]
CRM-16511: Fixed missing closing tag for price set rows.
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
Frank J. Gómez [Fri, 15 May 2015 13:24:11 +0000 (09:24 -0400)]
CRM-16477: Compliance with code style standards.
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
projects / civicrm-core.git / log